diff --git a/showkeyHelper/AndroidManifest.xml b/showkeyHelper/AndroidManifest.xml
index 39b6990..9174484 100644
--- a/showkeyHelper/AndroidManifest.xml
+++ b/showkeyHelper/AndroidManifest.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.joyplus.tvhelper"
-    android:versionCode="19"
-    android:versionName="1.4.2apha" >
+    android:versionCode="22"
+    android:versionName="1.5" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="17" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" /> -->
+    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
+    <!-- <uses-permission android:name="android.permission.DELETE_PACKAGES" /> -->
     <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
@@ -69,9 +69,19 @@
         <activity
             android:name="VideoPlayerJPActivity"
             android:configChanges="orientation|keyboardHidden|navigation"
-            android:launchMode="singleTop"
             android:screenOrientation="landscape" >
         </activity>
+        <activity
+            android:name="com.joyplus.JoyplusMediaPlayerActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:screenOrientation="landscape" >
+        </activity>
+        <activity
+            android:name="io.vov.vitamio.InitActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />        
         <activity
             android:name="ThirdPlayActivity"
             android:configChanges="orientation|keyboardHidden|navigation"
@@ -161,10 +171,21 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter> -->
         </activity>
+        <activity
+            android:name="com.joyplus.tvhelper.GuideActivity"
+            android:label="@string/app_name" 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">>
+            
+            <!-- <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter> -->
+        </activity>
         <service android:name="com.joyplus.tvhelper.faye.FayeService" >
         </service>
 		<meta-data android:value="51e75b5956240ba99502e874" android:name="UMENG_APPKEY"></meta-data>
-		<meta-data android:value="t001001" android:name="UMENG_CHANNEL"/>
+		<meta-data android:value="j001" android:name="UMENG_CHANNEL"/>
         <service
             android:name="com.umeng.common.net.DownloadingService"
             android:exported="true"
diff --git a/showkeyHelper/libs/adkey.jar b/showkeyHelper/libs/adkey.jar
new file mode 100644
index 0000000..61e3597
Binary files /dev/null and b/showkeyHelper/libs/adkey.jar differ
diff --git a/showkeyHelper/libs/armeabi-v7a/libvinit.so b/showkeyHelper/libs/armeabi-v7a/libvinit.so
new file mode 100644
index 0000000..5f4f92f
Binary files /dev/null and b/showkeyHelper/libs/armeabi-v7a/libvinit.so differ
diff --git a/showkeyHelper/libs/armeabi/libvinit.so b/showkeyHelper/libs/armeabi/libvinit.so
new file mode 100644
index 0000000..687db91
Binary files /dev/null and b/showkeyHelper/libs/armeabi/libvinit.so differ
diff --git a/showkeyHelper/libs/fasterxml.jar b/showkeyHelper/libs/fasterxml.jar
new file mode 100644
index 0000000..a444692
Binary files /dev/null and b/showkeyHelper/libs/fasterxml.jar differ
diff --git a/showkeyHelper/libs/joyplus_subtitle.jar b/showkeyHelper/libs/joyplus_subtitle.jar
new file mode 100644
index 0000000..addf682
Binary files /dev/null and b/showkeyHelper/libs/joyplus_subtitle.jar differ
diff --git a/showkeyHelper/res/anim/alpha_appear_dialog.xml b/showkeyHelper/res/anim/alpha_appear_dialog.xml
new file mode 100644
index 0000000..4e0a541
--- /dev/null
+++ b/showkeyHelper/res/anim/alpha_appear_dialog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<alpha
+	android:fromAlpha="0.1"
+	android:toAlpha="1.0"
+	android:duration="200"
+/> 
+<!-- 透明度控制动画效果 alpha
+        浮点型值：
+            fromAlpha 属性为动画起始时透明度
+            toAlpha   属性为动画结束时透明度
+            说明: 
+                0.0表示完全透明
+                1.0表示完全不透明
+            以上值取0.0-1.0之间的float数据类型的数字
+        
+        长整型值：
+            duration  属性为动画持续时间
+            说明:     
+                时间以毫秒为单位
+-->
+</set>
diff --git a/showkeyHelper/res/anim/alpha_disappear_dialog.xml b/showkeyHelper/res/anim/alpha_disappear_dialog.xml
new file mode 100644
index 0000000..383c1fd
--- /dev/null
+++ b/showkeyHelper/res/anim/alpha_disappear_dialog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<alpha
+	android:fromAlpha="1.0"
+	android:toAlpha="0.1"
+	android:duration="200"
+/> 
+<!-- 透明度控制动画效果 alpha
+        浮点型值：
+            fromAlpha 属性为动画起始时透明度
+            toAlpha   属性为动画结束时透明度
+            说明: 
+                0.0表示完全透明
+                1.0表示完全不透明
+            以上值取0.0-1.0之间的float数据类型的数字
+        
+        长整型值：
+            duration  属性为动画持续时间
+            说明:     
+                时间以毫秒为单位
+-->
+</set>
diff --git a/showkeyHelper/res/drawable-hdpi/bg_app.jpg b/showkeyHelper/res/drawable-hdpi/bg_app.jpg
new file mode 100644
index 0000000..0c2dbd0
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/bg_app.jpg differ
diff --git a/showkeyHelper/res/drawable-hdpi/bg_app.png b/showkeyHelper/res/drawable-hdpi/bg_app.png
deleted file mode 100644
index fcfb1ba..0000000
Binary files a/showkeyHelper/res/drawable-hdpi/bg_app.png and /dev/null differ
diff --git a/showkeyHelper/res/drawable-hdpi/guide_page_1.jpg b/showkeyHelper/res/drawable-hdpi/guide_page_1.jpg
new file mode 100644
index 0000000..6353745
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/guide_page_1.jpg differ
diff --git a/showkeyHelper/res/drawable-hdpi/guide_page_2.jpg b/showkeyHelper/res/drawable-hdpi/guide_page_2.jpg
new file mode 100644
index 0000000..20415dd
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/guide_page_2.jpg differ
diff --git a/showkeyHelper/res/drawable-hdpi/guide_page_3.jpg b/showkeyHelper/res/drawable-hdpi/guide_page_3.jpg
new file mode 100644
index 0000000..1e3e463
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/guide_page_3.jpg differ
diff --git a/showkeyHelper/res/drawable-hdpi/guide_page_4.jpg b/showkeyHelper/res/drawable-hdpi/guide_page_4.jpg
new file mode 100644
index 0000000..1647033
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/guide_page_4.jpg differ
diff --git a/showkeyHelper/res/drawable-hdpi/ic_launcher.png b/showkeyHelper/res/drawable-hdpi/ic_launcher.png
index 7160716..acfea4a 100644
Binary files a/showkeyHelper/res/drawable-hdpi/ic_launcher.png and b/showkeyHelper/res/drawable-hdpi/ic_launcher.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_bg.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_bg.png
new file mode 100644
index 0000000..63b9aa5
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_bg.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_pause01.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_pause01.png
new file mode 100644
index 0000000..698277a
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_pause01.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_pause02.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_pause02.png
new file mode 100644
index 0000000..d954a0e
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_pause02.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_play01.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_play01.png
new file mode 100644
index 0000000..81bcb26
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_play01.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_play02.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_play02.png
new file mode 100644
index 0000000..67100f8
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_play02.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar01.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar01.png
new file mode 100644
index 0000000..8bcdcab
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar01.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar02.png b/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar02.png
new file mode 100644
index 0000000..b7fd9dd
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/mediacontroller_seekbar02.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/player_menu_title_hl.png b/showkeyHelper/res/drawable-hdpi/player_menu_title_hl.png
new file mode 100644
index 0000000..608e02c
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/player_menu_title_hl.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/switch_hard.png b/showkeyHelper/res/drawable-hdpi/switch_hard.png
new file mode 100644
index 0000000..b931284
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/switch_hard.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/switch_off.png b/showkeyHelper/res/drawable-hdpi/switch_off.png
new file mode 100644
index 0000000..7b1f891
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/switch_off.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/switch_on.png b/showkeyHelper/res/drawable-hdpi/switch_on.png
new file mode 100644
index 0000000..39faeae
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/switch_on.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/switch_soft.png b/showkeyHelper/res/drawable-hdpi/switch_soft.png
new file mode 100644
index 0000000..8613764
Binary files /dev/null and b/showkeyHelper/res/drawable-hdpi/switch_soft.png differ
diff --git a/showkeyHelper/res/drawable-hdpi/swith_off.png b/showkeyHelper/res/drawable-hdpi/swith_off.png
deleted file mode 100644
index 6e92d31..0000000
Binary files a/showkeyHelper/res/drawable-hdpi/swith_off.png and /dev/null differ
diff --git a/showkeyHelper/res/drawable-hdpi/swith_on.png b/showkeyHelper/res/drawable-hdpi/swith_on.png
deleted file mode 100644
index 1106aac..0000000
Binary files a/showkeyHelper/res/drawable-hdpi/swith_on.png and /dev/null differ
diff --git a/showkeyHelper/res/drawable-ldpi/ic_launcher.png b/showkeyHelper/res/drawable-ldpi/ic_launcher.png
index 7160716..acfea4a 100644
Binary files a/showkeyHelper/res/drawable-ldpi/ic_launcher.png and b/showkeyHelper/res/drawable-ldpi/ic_launcher.png differ
diff --git a/showkeyHelper/res/drawable-mdpi/bg_app.jpg b/showkeyHelper/res/drawable-mdpi/bg_app.jpg
new file mode 100644
index 0000000..f25d820
Binary files /dev/null and b/showkeyHelper/res/drawable-mdpi/bg_app.jpg differ
diff --git a/showkeyHelper/res/drawable-mdpi/bg_app.png b/showkeyHelper/res/drawable-mdpi/bg_app.png
deleted file mode 100644
index 2c9ebcf..0000000
Binary files a/showkeyHelper/res/drawable-mdpi/bg_app.png and /dev/null differ
diff --git a/showkeyHelper/res/drawable-mdpi/ic_launcher.png b/showkeyHelper/res/drawable-mdpi/ic_launcher.png
index 7160716..acfea4a 100644
Binary files a/showkeyHelper/res/drawable-mdpi/ic_launcher.png and b/showkeyHelper/res/drawable-mdpi/ic_launcher.png differ
diff --git a/showkeyHelper/res/drawable-mdpi/player_menu.png b/showkeyHelper/res/drawable-mdpi/player_menu.png
new file mode 100644
index 0000000..d18d4a4
Binary files /dev/null and b/showkeyHelper/res/drawable-mdpi/player_menu.png differ
diff --git a/showkeyHelper/res/drawable-mdpi/player_menu_bg.png b/showkeyHelper/res/drawable-mdpi/player_menu_bg.png
new file mode 100644
index 0000000..c35754a
Binary files /dev/null and b/showkeyHelper/res/drawable-mdpi/player_menu_bg.png differ
diff --git a/showkeyHelper/res/drawable-mdpi/player_menu_divider.png b/showkeyHelper/res/drawable-mdpi/player_menu_divider.png
new file mode 100644
index 0000000..7e81d99
Binary files /dev/null and b/showkeyHelper/res/drawable-mdpi/player_menu_divider.png differ
diff --git a/showkeyHelper/res/drawable-mdpi/player_menu_item_bg.9.png b/showkeyHelper/res/drawable-mdpi/player_menu_item_bg.9.png
new file mode 100644
index 0000000..8294435
Binary files /dev/null and b/showkeyHelper/res/drawable-mdpi/player_menu_item_bg.9.png differ
diff --git a/showkeyHelper/res/drawable-xhdpi/ic_launcher.png b/showkeyHelper/res/drawable-xhdpi/ic_launcher.png
index 7160716..acfea4a 100644
Binary files a/showkeyHelper/res/drawable-xhdpi/ic_launcher.png and b/showkeyHelper/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/showkeyHelper/res/drawable-xxhdpi/ic_launcher.png b/showkeyHelper/res/drawable-xxhdpi/ic_launcher.png
index 7160716..acfea4a 100644
Binary files a/showkeyHelper/res/drawable-xxhdpi/ic_launcher.png and b/showkeyHelper/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/showkeyHelper/res/drawable/mediacontroller_pause_button.xml b/showkeyHelper/res/drawable/mediacontroller_pause_button.xml
new file mode 100644
index 0000000..ec96825
--- /dev/null
+++ b/showkeyHelper/res/drawable/mediacontroller_pause_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_pause01"/>
+
+</selector>
\ No newline at end of file
diff --git a/showkeyHelper/res/drawable/mediacontroller_play_button.xml b/showkeyHelper/res/drawable/mediacontroller_play_button.xml
new file mode 100644
index 0000000..eb91676
--- /dev/null
+++ b/showkeyHelper/res/drawable/mediacontroller_play_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_play01"/>
+
+</selector>
\ No newline at end of file
diff --git a/showkeyHelper/res/drawable/mediacontroller_seekbar.xml b/showkeyHelper/res/drawable/mediacontroller_seekbar.xml
new file mode 100644
index 0000000..04efcb9
--- /dev/null
+++ b/showkeyHelper/res/drawable/mediacontroller_seekbar.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:id="@android:id/background"
+            android:drawable="@drawable/mediacontroller_seekbar02"/>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="#00000000"/>
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <layer-list>
+                <item
+                        android:bottom="2.0dip"
+                        android:left="2.0dip"
+                        android:right="2.0dip"
+                        android:top="2.0dip">
+                    <bitmap
+                            android:gravity="center_vertical|fill_vertical|left"
+                            android:src="@drawable/mediacontroller_seekbar01"
+                            android:tileMode="disabled"/>
+                </item>
+            </layer-list>
+        </clip>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/showkeyHelper/res/drawable/mediacontroller_seekbar_thumb.xml b/showkeyHelper/res/drawable/mediacontroller_seekbar_thumb.xml
new file mode 100644
index 0000000..44002f5
--- /dev/null
+++ b/showkeyHelper/res/drawable/mediacontroller_seekbar_thumb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="ring">
+
+    <solid android:color="#00000000"/>
+
+    <size
+            android:height="40dip"
+            android:width="40dip"/>
+
+</shape>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/activity_clouddate_display.xml b/showkeyHelper/res/layout/activity_clouddate_display.xml
index 50d23cd..44f8e7c 100644
--- a/showkeyHelper/res/layout/activity_clouddate_display.xml
+++ b/showkeyHelper/res/layout/activity_clouddate_display.xml
@@ -109,8 +109,17 @@
                 				android:paddingLeft="@dimen/list_padding_left"
 	       		                android:textSize="@dimen/max_text_size"
 	       		                android:textColor="#f0f0f0"/>
+	       		                <Button android:layout_width="133dp"
+               					android:layout_height="45dp"
+               					android:layout_gravity="center_vertical"
+		                        android:background="@drawable/xunlei_return_btn_bg"
+		                        android:textSize="@dimen/mid_text_size"
+		                        android:textColor="#ffffff"
+		                        android:id="@+id/clear_Button"
+		                        android:text="清空"/>
 	       		            <RelativeLayout android:layout_width="wrap_content"
-	                        android:layout_height="fill_parent">
+	                        android:layout_height="fill_parent"
+	                        android:layout_marginLeft="30dp">
 	                        <LinearLayout android:layout_width="wrap_content"
 	                            android:layout_height="fill_parent"
 	                            android:id="@+id/fistBtn_group">
diff --git a/showkeyHelper/res/layout/activity_guide.xml b/showkeyHelper/res/layout/activity_guide.xml
new file mode 100644
index 0000000..8b10d5a
--- /dev/null
+++ b/showkeyHelper/res/layout/activity_guide.xml
@@ -0,0 +1,24 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity" >
+	<com.joyplus.tvhelper.ui.GuideScrollLayout 
+	    android:layout_width="fill_parent"
+	    android:id="@+id/layout"
+	    android:layout_height="fill_parent">
+	    <ImageView android:id="@+id/guide_page_1"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_2"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_3"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_4"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	</com.joyplus.tvhelper.ui.GuideScrollLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/activity_main.xml b/showkeyHelper/res/layout/activity_main.xml
index 42a2d49..c9c5ceb 100644
--- a/showkeyHelper/res/layout/activity_main.xml
+++ b/showkeyHelper/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
 
     <LinearLayout android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:id="@+id/title"
+        android:id="@+id/layout_title"
         android:layout_marginTop="90dp"
         android:paddingLeft="147dp"
         android:gravity="center_vertical"
@@ -41,7 +41,8 @@
     <include layout="@layout/layout_1"
         />
 <!--     <include layout="@layout/layout_2"/> -->
-    <include layout="@layout/layout_3"/>
+    <include layout="@layout/layout_3"
+        android:id="@+id/layout_page_3"/>
 </com.joyplus.tvhelper.ui.MyScrollLayout>
 <com.joyplus.tvhelper.ui.NotificationView android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/showkeyHelper/res/layout/activity_main_simple.xml b/showkeyHelper/res/layout/activity_main_simple.xml
new file mode 100644
index 0000000..668535c
--- /dev/null
+++ b/showkeyHelper/res/layout/activity_main_simple.xml
@@ -0,0 +1,63 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity" xmlns:app="http://schemas.android.com/apk/res/com.joyplus.tvhelper">
+
+    <LinearLayout android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:id="@+id/layout_title"
+        android:layout_marginTop="90dp"
+        android:paddingLeft="147dp"
+        android:gravity="center_vertical"
+        android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="30dp"
+            android:id="@+id/title_1"
+            android:textColor="@color/main_title_selected"
+            android:text="转  屏 "/>
+        <ImageView android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="fitXY"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/main_title_divider"/>
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:id="@+id/title_2"
+            android:textSize="30dp"
+            android:textColor="@color/main_title_unselected"
+            android:text=" 工  具 "/>
+    </LinearLayout>
+<com.joyplus.tvhelper.ui.MyScrollLayout 
+    android:layout_width="fill_parent"
+    android:id="@+id/layout"
+    android:layout_weight="1"
+    android:layout_height="fill_parent">
+    <include layout="@layout/layout_1_simple"
+        />
+<!--     <include layout="@layout/layout_2"/> -->
+    <include layout="@layout/layout_3"
+        android:id="@+id/layout_page_3"/>
+</com.joyplus.tvhelper.ui.MyScrollLayout>
+<com.joyplus.tvhelper.ui.NotificationView android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="147dp"
+   	app:textColor="#f0f0f0"
+   	app:textSize="24dp"
+   	app:text="正在连接服务器···"
+    android:id="@+id/statue_connect"/>
+<TextView android:layout_width="fill_parent"
+    android:paddingBottom="20dp"
+    android:layout_height="90dp"
+    android:textSize="24dp"
+    android:visibility="invisible"
+    android:textColor="#ffffff"
+    android:gravity="right|center_vertical"
+    android:paddingRight="147dp"
+    android:text="今日已推送800次"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/activity_setting.xml b/showkeyHelper/res/layout/activity_setting.xml
index 95c5f27..aa065d9 100644
--- a/showkeyHelper/res/layout/activity_setting.xml
+++ b/showkeyHelper/res/layout/activity_setting.xml
@@ -123,6 +123,28 @@
 	       		                    android:textColor="@color/common_list_content_textcolor"
 	       		                    android:text="B 5 P 6 2 J"/>
 	       		            </LinearLayout>
+	       		            <LinearLayout android:layout_width="fill_parent"
+	       		                android:layout_height="60dp"
+	       		                android:paddingLeft="20dp"
+	       		                android:paddingRight="20dp"
+	       		                android:gravity="center_vertical"
+	       		                android:focusable="true"
+	       		            	android:id="@+id/layout_player_decode_mode"
+	       		            	android:background="@drawable/bg_xunlei_content_setting_selector"
+	       		                android:orientation="horizontal"
+	       		                android:visibility="gone">
+	       		                <TextView android:layout_width="0dp"
+	       		                    android:layout_height="fill_parent"
+	       		                    android:gravity="center_vertical"
+	       		                    android:textSize="25dp"
+	       		                    android:textColor="@color/common_list_content_textcolor"
+	       		                    android:text="播放器解码模式"
+	       		                    android:layout_weight="1"/>
+	       		                <ImageView android:layout_width="wrap_content"
+	       		                    android:layout_height="wrap_content"
+	       		                    android:id="@+id/switch_player_decode_mode"
+	       		                    android:src="@drawable/switch_hard"/>
+	       		            </LinearLayout>
 	       		            <LinearLayout android:layout_width="fill_parent"
 	       		                android:layout_height="60dp"
 	       		                android:paddingLeft="20dp"
@@ -143,7 +165,7 @@
 	       		                <ImageView android:layout_width="wrap_content"
 	       		                    android:layout_height="wrap_content"
 	       		                    android:id="@+id/switch_deleteApk"
-	       		                    android:src="@drawable/swith_on"/>
+	       		                    android:src="@drawable/switch_on"/>
 	       		            </LinearLayout>
 	       		            <LinearLayout android:layout_width="fill_parent"
 	       		                android:layout_height="60dp"
@@ -165,7 +187,7 @@
 	       		                <ImageView android:layout_width="wrap_content"
 	       		                    android:layout_height="wrap_content"
 	       		                    android:id="@+id/switch_confirm"
-	       		                    android:src="@drawable/swith_off"/>
+	       		                    android:src="@drawable/switch_off"/>
 	       		            </LinearLayout>
 	       		        </LinearLayout>
        		            <ScrollView android:layout_width="fill_parent"
@@ -174,13 +196,18 @@
 	       		                android:paddingRight="20dp"
 	       		                android:visibility="gone"
 			                    android:id="@+id/layout_help">
-			                    <WebView android:layout_width="fill_parent"
+	       		            	<LinearLayout android:layout_width="fill_parent"
+			                        android:layout_height="wrap_content"
+			                        android:orientation="vertical"
+			                        android:id="@+id/layout_content">
+			                    </LinearLayout>
+			                    <!-- <WebView android:layout_width="fill_parent"
 			                    android:layout_height="wrap_content"
 			                    android:layerType="software"  
 			                    android:fadingEdge="@null"
 			                    android:focusable="false"
 			                    android:focusableInTouchMode="false"
-			                    android:id="@+id/webView"/>
+			                    android:id="@+id/webView"/> -->
                  		</ScrollView>
 	       		        <ScrollView android:layout_width="fill_parent"
 			                    android:layout_height="fill_parent"
diff --git a/showkeyHelper/res/layout/item_faq_list.xml b/showkeyHelper/res/layout/item_faq_list.xml
new file mode 100644
index 0000000..f55d496
--- /dev/null
+++ b/showkeyHelper/res/layout/item_faq_list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <LinearLayout android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:orientation="vertical">
+        <TextView android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#000000"
+            android:textSize="24dp"
+            android:id="@+id/text_qustion"/>
+        <TextView android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#030303"
+            android:textSize="20dp"
+            android:paddingLeft="10dp"
+            android:lineSpacingExtra="5dip"
+            android:id="@+id/text_answer"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/item_play_list_layout.xml b/showkeyHelper/res/layout/item_play_list_layout.xml
index 529c607..22fee3d 100644
--- a/showkeyHelper/res/layout/item_play_list_layout.xml
+++ b/showkeyHelper/res/layout/item_play_list_layout.xml
@@ -35,10 +35,11 @@
                 android:id="@+id/tv_movie_name"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
                 android:singleLine="true"
                 android:textColor="@color/common_list_content_textcolor"
-                android:textSize="@dimen/mid_text_size"/>
+                android:textSize="@dimen/mid_text_size"
+                android:ellipsize="marquee"
+                android:marqueeRepeatLimit="marquee_forever"/>
         </LinearLayout>
 
         <TextView
diff --git a/showkeyHelper/res/layout/joyplusmediaplayer_loading_process.xml b/showkeyHelper/res/layout/joyplusmediaplayer_loading_process.xml
new file mode 100644
index 0000000..af52914
--- /dev/null
+++ b/showkeyHelper/res/layout/joyplusmediaplayer_loading_process.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" 
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" 
+	android:gravity="center">
+
+	<io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:gravity="center"
+            android:orientation="vertical" >
+            <LinearLayout
+		            android:layout_width="match_parent"
+		            android:layout_height="wrap_content"
+		            android:layout_marginTop="50dp"
+		            android:gravity="center"
+		            android:orientation="horizontal" >
+		            <ProgressBar
+		                android:id="@+id/loading_process_processbar"
+		                style="?android:attr/progressBarStyleSmall"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content" />
+		            <TextView
+		                android:id="@+id/loading_process_info"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_marginLeft="5dp"
+		                android:textColor="@color/white"
+		                android:textAppearance="?android:attr/textAppearanceMedium"
+		                android:textSize="22dp" />
+            </LinearLayout>
+        </LinearLayout>
+    </io.vov.vitamio.widget.CenterLayout>	
+</LinearLayout>
diff --git a/showkeyHelper/res/layout/joyplusvideoview.xml b/showkeyHelper/res/layout/joyplusvideoview.xml
new file mode 100644
index 0000000..8c4e553
--- /dev/null
+++ b/showkeyHelper/res/layout/joyplusvideoview.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/joyplusvideoview_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black">
+          <!-- Level 3 :the bottom layout use to videoview -->
+          <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:orientation="horizontal">
+		        <view class="com.joyplus.mediaplayer.JoyplusVideoView"
+			        android:id="@+id/JoyplusVideoView"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+		            android:focusable="false"
+		            android:focusableInTouchMode="false"
+		            android:layout_centerVertical="true"
+			        android:layout_centerHorizontal="true"
+			        android:layout_centerInParent="true"
+		            android:configChanges="orientation">
+			        <ViewStub android:id="@+id/system_mediaplayer_videoview_stub"
+			            android:layout="@layout/system_mediaplayer_videoview"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:layout_centerInParent="true"
+			            android:layout_gravity="center"
+			            android:orientation="vertical"/>
+			        <ViewStub android:id="@+id/system_vitamioplayer_videoview_stub"
+			            android:layout="@layout/system_vitamioplayer_videoview"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:layout_centerInParent="true"
+			            android:orientation="vertical"/>
+			    </view>
+	    </RelativeLayout>
+	    <!--  Subtitle Layer -->	
+	   <com.joyplus.SubTitleView
+	       android:id="@+id/tv_subtitle"
+	       android:layout_width="match_parent"
+	       android:layout_height="wrap_content"
+	       android:layout_alignParentBottom="true"
+	       android:layout_marginBottom="15dp"
+	       android:background="@android:color/transparent"
+	       android:gravity="center"
+	       android:maxLines="6"
+	       android:shadowColor="#000000"
+	       android:shadowDx="1"
+	       android:shadowDy="1"
+	       android:shadowRadius="2"
+	       android:text=""
+	       android:textColor="#ffffff"
+	       android:textSize="36dp" />	
+	    <!-- Level 2 : the layout of middel layout  which show control  -->
+          <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:orientation="horizontal">
+			    <view class="com.joyplus.JoyplusMediaPlayerMiddleControl"
+			        android:id="@+id/JoyplusMediaPlayerMiddleControl"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+		            android:focusable="true"
+		            android:focusableInTouchMode="true"
+		            android:layout_centerVertical="true"
+			        android:layout_centerHorizontal="true"
+			        android:layout_centerInParent="true"
+		            android:configChanges="orientation">
+			        <ViewStub android:id="@+id/joyplusvideoview_loading_stub"
+			            android:layout="@layout/joyplusvideoview_loading"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:layout_centerInParent="true"
+			            android:orientation="vertical"/>
+			        <ViewStub android:id="@+id/joyplusvideoview_audio_stub"
+			            android:layout="@layout/joyplusvideoview_audio"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:layout_centerInParent="true"
+			            android:orientation="vertical"/>
+			        <ViewStub android:id="@+id/joyplusvideoview_mini_stub"
+			            android:layout="@layout/joyplusvideoview_mini"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:layout_centerInParent="true"
+			            android:orientation="vertical"/>
+			    </view>
+        </RelativeLayout>
+	    <!-- Level 1 : the Mediaplayer bar layout. include top and bottom  -->
+	    <RelativeLayout
+		        android:id="@+id/mediacontroller_bar"
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent" >
+			    <!-- Top mask -->
+		        <TextView
+		            android:id="@+id/mediacontroller_mask_top"
+		            android:layout_width="match_parent"
+		            android:layout_height="wrap_content"
+		            android:layout_alignParentTop="true"
+		            android:background="@drawable/player_mask_top" />
+		        <!-- Top bar XML  Control it in JoyplusMediaPlayerBar.VideoViewTopBar -->
+		        <LinearLayout
+		            android:id="@+id/mediacontroller_topbar"
+		            android:layout_width="fill_parent"
+		            android:layout_height="50dp"
+		            android:layout_alignParentTop="true">
+					 <ImageView
+		                android:id="@+id/mediacontroller_topbar_resolution"
+		                android:layout_width="65dp"
+		                android:layout_height="wrap_content"
+		                android:layout_centerVertical="true"
+		                android:layout_marginLeft="20dp"
+		                android:layout_marginTop="4dp"
+		                />
+		            <TextView
+		                android:id="@+id/mediacontroller_topbar_playname"
+		                android:layout_width="0dp"
+		                android:layout_height="wrap_content"
+		                android:layout_centerVertical="true"
+		                android:layout_marginLeft="10dp"
+		                android:paddingRight="10dp"
+		                android:layout_weight="1"
+		                android:text=""
+		                android:singleLine="true"
+		                android:ellipsize="middle"
+		                android:textColor="@color/white"
+		                android:layout_toRightOf="@id/mediacontroller_topbar_resolution"
+		                android:textSize="26dp" />
+		            <TextView
+		                android:id="@+id/mediacontroller_topbar_time"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentRight="true"
+		                android:layout_centerVertical="true"
+		                android:layout_marginRight="30dp"
+		                android:textSize="26dp"
+		                android:textColor="@color/white" />
+		        </LinearLayout>
+		        <!-- end Top Bar XML --> 
+		        
+		        <!-- Bottom mask -->
+		        <TextView
+		            android:id="@+id/mediacontroller_mask_bottom"
+		            android:layout_width="match_parent"
+		            android:layout_height="wrap_content"
+		            android:layout_alignParentBottom="true"
+		            android:background="@drawable/player_mask_bottom" />
+		        <!-- Bottom Bar XML Control it in JoyplusMediaPlayerBar.VideoViewController -->
+		        <RelativeLayout
+		            android:id="@+id/mediacontroller_bottombar"
+		            android:layout_width="wrap_content"
+		            android:layout_height="wrap_content"
+		            android:layout_alignParentBottom="true"
+		            android:layout_marginBottom="30dp"
+		            android:layout_marginLeft="33dp" >
+		      
+		            <RelativeLayout
+		                android:id="@+id/mediacontroller_bottombar_time"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:background="@drawable/player_time" >
+		                <TextView
+		                    android:id="@+id/mediacontroller_bottombar_current_time"
+		                    android:layout_width="wrap_content"
+		                    android:layout_height="wrap_content"
+		                    android:layout_marginLeft="28dp"
+		                    android:layout_marginTop="10dp"
+		                    android:text="00:00:00"
+		                    android:textColor="@color/white"
+		                    android:textSize="22dp" />
+		            </RelativeLayout>
+		            <RelativeLayout
+		                android:id="@+id/mediacontroller_bottombar_time_fast"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentLeft="true"
+		                android:layout_marginBottom="19dp"
+		                android:layout_marginLeft="126dp"
+		                android:background="@drawable/play_time_right"
+		                android:visibility="gone" >
+		                <TextView
+		                    android:id="@+id/mediacontroller_bottombar_time_fasttext"
+		                    android:layout_width="wrap_content"
+		                    android:layout_height="wrap_content"
+		                    android:layout_alignParentLeft="true"
+		                    android:layout_marginLeft="30dp"
+		                    android:layout_marginTop="10dp"
+		                    android:text="×2"
+		                    android:textColor="@color/white"
+		                    android:textSize="20dp" />
+		            </RelativeLayout>
+		        </RelativeLayout>
+		        <RelativeLayout
+		            android:id="@+id/mediacontroller_bottombar_seek"
+		            android:layout_width="fill_parent"
+		            android:layout_height="50dp"
+		            android:layout_alignParentBottom="true" >
+		            <TextView
+		                android:layout_width="fill_parent"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentBottom="true"
+		                android:layout_alignParentLeft="true"
+		                android:layout_alignParentRight="true"
+		                android:layout_marginBottom="10dp"
+		                android:layout_marginLeft="10dp"
+		                android:layout_marginRight="185dp"
+		                android:background="@drawable/player_time_jindu" />
+		            <LinearLayout
+		                android:layout_width="fill_parent"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentBottom="true"
+		                android:layout_marginBottom="11dp"
+		                android:paddingLeft="20dp"
+		                android:paddingRight="195dp" >
+		                <SeekBar
+		                    android:id="@+id/mediacontroller_bottombar_seekbar"
+		                    android:layout_width="fill_parent"
+		                    android:layout_height="wrap_content"
+		                    android:layout_gravity="center"
+		                    android:clickable="true"
+		                    android:focusable="true"
+		                    android:max="1000"
+		                    android:paddingLeft="10dp"
+		                    android:paddingRight="10dp"
+		                    android:progress="0"
+		                    android:progressDrawable="@drawable/player_seekbar_img"
+		                    android:thumb="@drawable/player_progress_thumb"
+		                    android:thumbOffset="14dp" />
+		            </LinearLayout>
+		            <TextView
+		                android:id="@+id/mediacontroller_bottombar_total_time"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentRight="true"
+		                android:layout_centerVertical="true"
+		                android:layout_marginRight="60dp"
+		                android:paddingBottom="19dp"
+		                android:text="--:--"
+		                android:textColor="@color/white"
+		                android:textSize="24dp" />
+		        </RelativeLayout>
+		        <!-- end Bottom Bar -->
+        </RelativeLayout>     
+        <!-- Level 4 : nothing  -->     
+        <RelativeLayout                
+		        android:layout_width="match_parent"
+                android:layout_height="match_parent"		        
+		        android:layout_centerInParent="true"		        
+                android:orientation="horizontal">	    
+	            <LinearLayout
+	                    android:id="@+id/joyplus_videoview_buffer"
+			            android:layout_width="match_parent"
+			            android:layout_height="match_parent"
+			            android:gravity="center"
+			            android:visibility="gone"
+			            android:orientation="vertical" >
+		                <LinearLayout
+				            android:layout_width="wrap_content"
+				            android:layout_height="wrap_content"
+				            android:gravity="center"
+				            android:visibility="visible"
+				            android:orientation="horizontal" 
+				            android:layout_marginTop="300dp">
+				            <ProgressBar
+				                android:layout_width="40dp"
+				                android:layout_height="40dp" />
+				            <TextView
+				                android:id="@+id/joyplus_videoview_buffer_info"
+				                android:layout_width="wrap_content"
+				                android:layout_height="wrap_content"
+				                android:layout_marginLeft="5dp"
+				                android:shadowColor="#000000"
+						        android:shadowDx="1"
+						        android:shadowDy="1"
+						        android:shadowRadius="2"
+				                android:textColor="@color/white"
+				                android:text="@string/meidaplayer_loading_string_buffer_loading"
+				                android:textAppearance="?android:attr/textAppearanceMedium"
+				                android:textSize="30dp" />
+				       </LinearLayout>
+				       <TextView
+				                android:id="@+id/joyplus_videoview_buffer_notify"
+				                android:layout_width="wrap_content"
+				                android:layout_height="wrap_content"
+				                android:layout_marginLeft="5dp"
+				                android:visibility="gone"
+				                android:shadowColor="#000000"
+						        android:shadowDx="1"
+						        android:shadowDy="1"
+						        android:shadowRadius="2"
+				                android:textColor="@color/white"
+				                android:text="@string/meidaplayer_loading_string_buffer_notify"
+				                android:textAppearance="?android:attr/textAppearanceMedium"
+				                android:textSize="30dp" />
+	            </LinearLayout>
+		</RelativeLayout>
+		
+		<!-- Level 5 : Ad -->
+		<RelativeLayout                
+		        android:layout_width="match_parent"
+                android:layout_height="match_parent"	
+		        android:id="@+id/joyplusmediaplayer_advideoView_layout"	
+		        android:visibility="gone"	        
+                android:orientation="horizontal"
+			    android:background="@color/black">
+	            <io.vov.vitamio.widget.CenterLayout
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+			        android:orientation="vertical" >
+				    <VideoView
+					    android:id="@+id/joyplusmediaplayer_advideoView"
+					    android:layout_width="wrap_content"
+					    android:layout_height="wrap_content" />
+				</io.vov.vitamio.widget.CenterLayout>
+			    <TextView
+	                android:id="@+id/joyplusmediaplayer_advideoView_time"
+	                android:layout_width="wrap_content"
+	                android:layout_height="wrap_content"
+	                android:layout_alignParentTop="true"
+	                android:layout_alignParentRight="true"
+		            android:layout_marginRight="30dp"           
+	                android:shadowColor="#000000"
+			        android:shadowDx="1"
+			        android:shadowDy="1"
+			        android:shadowRadius="2"
+	                android:textColor="@color/white"
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textSize="30dp" />	            
+	    </RelativeLayout> 
+	    <LinearLayout android:layout_width="fill_parent"
+	        android:layout_height="fill_parent"
+	        android:visibility="gone"
+	        android:gravity="center"
+	        android:orientation="vertical"
+	        android:id="@+id/joyplus_videoview_notify_near_end"
+	        android:paddingTop="250dp">
+	        <TextView
+	                android:layout_width="800dp"
+	                android:layout_height="wrap_content"
+	                android:shadowColor="#000000"
+	                android:gravity="center"
+			        android:shadowDx="1"
+			        android:shadowDy="1"
+			        android:shadowRadius="2"
+	                android:textColor="@color/white"
+	                android:text="即将播放:"
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textSize="30dp"/>
+	        <TextView
+	                android:layout_width="fill_parent"
+	                android:id="@+id/bt_next_ep_name"
+	                android:layout_height="wrap_content"
+	                android:shadowColor="#000000"
+	                android:gravity="center"
+			        android:shadowDx="1"
+			        android:shadowDy="1"
+			        android:shadowRadius="2"
+			        android:singleLine="true"
+			        android:ellipsize="middle"
+	                android:textColor="@color/white"
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textSize="30dp"/>
+	        <TextView
+	                android:layout_width="800dp"
+	                android:layout_height="wrap_content"
+	                android:shadowColor="#000000"
+	                android:gravity="center"
+			        android:shadowDx="1"
+			        android:shadowDy="1"
+			        android:shadowRadius="2"
+	                android:textColor="@color/white"
+	                android:text="按【OK】键直接播放"
+	                android:textAppearance="?android:attr/textAppearanceMedium"
+	                android:textSize="30dp"/>
+	    </LinearLayout>
+</RelativeLayout>
diff --git a/showkeyHelper/res/layout/joyplusvideoview_audio.xml b/showkeyHelper/res/layout/joyplusvideoview_audio.xml
new file mode 100644
index 0000000..ed39814
--- /dev/null
+++ b/showkeyHelper/res/layout/joyplusvideoview_audio.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.joyplus.JoyplusMediaPlayerMiddleControlAudio xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/joyplusvideoview_audio"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+	    <com.joyplus.ArcView
+	            android:id="@+id/joyplusvideoview_audio_arcview"
+	            android:layout_width="133dp"
+	            android:layout_height="133dp"
+	            android:layout_gravity="center"
+	            android:background="@drawable/player_volume" />
+    </io.vov.vitamio.widget.CenterLayout>
+</com.joyplus.JoyplusMediaPlayerMiddleControlAudio>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/joyplusvideoview_loading.xml b/showkeyHelper/res/layout/joyplusvideoview_loading.xml
new file mode 100644
index 0000000..8adb428
--- /dev/null
+++ b/showkeyHelper/res/layout/joyplusvideoview_loading.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.joyplus.JoyplusMediaPlayerMiddleControlLoading xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/joyplusvideoview_loading"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/player_bg"
+    android:orientation="vertical" >
+    <!--   android:textAppearance="?android:attr/textAppearanceLarge" -->
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+        <LinearLayout
+            android:id="@+id/MiddleControlLoading"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:gravity="center"
+            android:orientation="vertical" >
+            <LinearLayout
+		            android:layout_width="match_parent"
+		            android:layout_height="wrap_content"
+		            android:layout_marginTop="50dp"
+		            android:gravity="center"
+		            android:orientation="horizontal" >
+		            <ProgressBar
+		                android:id="@+id/MiddleControlLoading_progressbar"
+		                style="?android:attr/progressBarStyleSmall"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content" />
+		            <TextView
+		                android:id="@+id/MiddleControlLoading_info"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_marginLeft="5dp"
+		                android:textColor="@color/white"
+		                android:textAppearance="?android:attr/textAppearanceMedium"
+		                android:textSize="22dp" />
+            </LinearLayout>
+            <TextView
+                android:id="@+id/MiddleControlLoading_lasttime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="22dp" />
+            <TextView
+                android:id="@+id/MiddleControlLoading_from"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:textColor="@color/white"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="22dp" />
+        </LinearLayout>
+    </io.vov.vitamio.widget.CenterLayout>
+</com.joyplus.JoyplusMediaPlayerMiddleControlLoading>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/joyplusvideoview_mini.xml b/showkeyHelper/res/layout/joyplusvideoview_mini.xml
new file mode 100644
index 0000000..4513d35
--- /dev/null
+++ b/showkeyHelper/res/layout/joyplusvideoview_mini.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.joyplus.JoyplusMediaPlayerMiddleControlMini xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/joyplusvideoview_mini"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+        <!-- show of switch -->
+	    <LinearLayout
+		        android:id="@+id/joyplusvideoview_mini_switch"
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent"
+		        android:gravity="center" 
+		        android:focusable="true"
+		        android:focusableInTouchMode="true"
+		        android:visibility="gone" >
+		        <RelativeLayout
+		            android:layout_width="314dp"
+		            android:layout_height="314dp">
+		            <ImageButton
+		                android:id="@+id/joyplusvideoview_mini_switch_center"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_centerInParent="true"
+		                android:focusable="true"
+		                android:focusableInTouchMode="true"
+		                android:background="@drawable/player_btn_finish"
+		                android:nextFocusDown="@+id/joyplusvideoview_mini_switch_bottom"
+		                android:nextFocusLeft="@+id/joyplusvideoview_mini_switch_left"
+		                android:nextFocusRight="@+id/joyplusvideoview_mini_switch_right"
+		                android:nextFocusUp="@+id/joyplusvideoview_mini_switch_top"/>
+		            <ImageButton
+		                android:id="@+id/joyplusvideoview_mini_switch_left"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentLeft="true"
+		                android:layout_centerVertical="true"
+		                android:focusable="true"
+		                android:focusableInTouchMode="true"
+		                android:background="@drawable/player_btn_pre"
+		                android:nextFocusDown="@+id/joyplusvideoview_mini_switch_bottom"
+		                android:nextFocusLeft="@+id/joyplusvideoview_mini_switch_left"
+		                android:nextFocusRight="@+id/joyplusvideoview_mini_switch_center"
+		                android:nextFocusUp="@+id/joyplusvideoview_mini_switch_top"/>
+		
+		            <ImageButton
+		                android:id="@+id/joyplusvideoview_mini_switch_top"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentTop="true"
+		                android:layout_centerHorizontal="true"
+		                android:focusable="true"
+		                android:focusableInTouchMode="true"
+		                android:background="@drawable/player_btn_continue"
+		                android:nextFocusDown="@+id/joyplusvideoview_mini_switch_center"
+		                android:nextFocusLeft="@+id/joyplusvideoview_mini_switch_left"
+		                android:nextFocusRight="@+id/joyplusvideoview_mini_switch_right"
+		                android:nextFocusUp="@+id/joyplusvideoview_mini_switch_top"/>
+		
+		            <ImageButton
+		                android:id="@+id/joyplusvideoview_mini_switch_right"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentRight="true"
+		                android:layout_centerVertical="true"
+		                android:focusable="true"
+		                android:focusableInTouchMode="true"
+		                android:background="@drawable/player_btn_next"
+		                android:nextFocusDown="@+id/joyplusvideoview_mini_switch_bottom"
+		                android:nextFocusLeft="@+id/joyplusvideoview_mini_switch_center"
+		                android:nextFocusRight="@+id/joyplusvideoview_mini_switch_right"
+		                android:nextFocusUp="@+id/joyplusvideoview_mini_switch_top"/>
+		
+		            <ImageButton
+		                android:id="@+id/joyplusvideoview_mini_switch_bottom"
+		                android:layout_width="wrap_content"
+		                android:layout_height="wrap_content"
+		                android:layout_alignParentBottom="true"
+		                android:layout_centerHorizontal="true"
+		                android:focusable="true"
+		                android:focusableInTouchMode="true"
+		                android:background="@drawable/player_btn_fav"
+		                android:nextFocusDown="@+id/joyplusvideoview_mini_switch_bottom"
+		                android:nextFocusLeft="@+id/joyplusvideoview_mini_switch_left"
+		                android:nextFocusRight="@+id/joyplusvideoview_mini_switch_right"
+		                android:nextFocusUp="@+id/joyplusvideoview_mini_switch_center"/>
+		        </RelativeLayout>
+    		</LinearLayout>
+    		<!-- show of pause play -->
+    		<LinearLayout
+			        android:id="@+id/joyplusvideoview_mini_pauseplay"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+			        android:background="#00000000"
+			        android:gravity="center"
+			        android:orientation="horizontal"
+			        android:focusable="true"
+		            android:focusableInTouchMode="true"
+			        android:padding="0dip"
+			        android:visibility="gone" >
+			        <ImageButton android:layout_width="wrap_content"
+			            android:layout_height="wrap_content"
+			            android:background="@drawable/player_btn_play_play"
+			            android:id="@+id/joyplusvideoview_mini_pauseplay_button"
+			            android:nextFocusDown="@id/joyplusvideoview_mini_pauseplay"
+			            android:nextFocusLeft="@id/joyplusvideoview_mini_pauseplay"
+			            android:nextFocusRight="@id/joyplusvideoview_mini_pauseplay"
+			            android:nextFocusUp="@id/joyplusvideoview_mini_pauseplay"
+			            />
+		    </LinearLayout>
+        
+    </io.vov.vitamio.widget.CenterLayout>
+
+</com.joyplus.JoyplusMediaPlayerMiddleControlMini>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/layout_1.xml b/showkeyHelper/res/layout/layout_1.xml
index d945c72..822f8e5 100644
--- a/showkeyHelper/res/layout/layout_1.xml
+++ b/showkeyHelper/res/layout/layout_1.xml
@@ -191,7 +191,7 @@
             </LinearLayout>
             <TextView android:layout_width="fill_parent"
             android:layout_height="13dp"
-            android:visibility="invisible"/>
+            android:id="@+id/layout_divider_3"/>
             <LinearLayout android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:focusable="true"
diff --git a/showkeyHelper/res/layout/layout_1_simple.xml b/showkeyHelper/res/layout/layout_1_simple.xml
new file mode 100644
index 0000000..463618b
--- /dev/null
+++ b/showkeyHelper/res/layout/layout_1_simple.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="1170dp"
+    android:paddingRight="17dp"
+    android:paddingLeft="127dp"
+    android:layout_height="match_parent" >
+    <LinearLayout android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="20dp"
+        android:orientation="horizontal">
+        <LinearLayout android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:id="@+id/layout_1_1"
+            android:focusable="true"
+            android:background="@color/bg_color_showtui">
+            <RelativeLayout android:layout_width="fill_parent"
+	                        android:layout_height="fill_parent"
+	                        android:id="@+id/main_content_2"
+	                        android:paddingBottom="30dp">
+	                        <LinearLayout android:layout_width="fill_parent"
+	                            android:layout_height="fill_parent"
+	                            android:orientation="vertical"
+	                            android:gravity="center">
+	                            <LinearLayout android:layout_width="fill_parent"
+	                                android:layout_height="fill_parent"
+	                                android:layout_weight="1"
+	                                android:orientation="vertical"
+	                                android:paddingBottom="6dp">
+	                                <LinearLayout android:layout_width="fill_parent"
+	                                    android:layout_height="fill_parent"
+	                                    android:gravity="center"
+	                                    android:orientation="vertical"
+	                                    android:layout_weight="1">
+	                                    <TextView android:layout_width="fill_parent"
+	                                        android:layout_height="wrap_content"
+	                                        android:gravity="center_horizontal"
+	                                        android:textColor="#000000"
+	                                    	android:textSize="20dp"
+	                                        android:text="Web端访问网址 "/>
+	                                    <TextView android:layout_width="fill_parent"
+	                                        android:layout_height="wrap_content"
+	                                        android:gravity="center_horizontal"
+	                                        android:textColor="#000000"
+	                                        android:textStyle="bold"
+	                                    	android:textSize="30dp"
+	                                    	android:singleLine="true"
+	                                    	android:id="@+id/web_url_text"
+	                                        android:text=""/>
+	                                </LinearLayout>
+	                                <TextView android:layout_width="fill_parent"
+	                                    android:layout_height="wrap_content"
+	                                    android:gravity="center"
+	                                    android:textColor="#000000"
+	                                    android:textSize="20dp"
+	                                    android:text="并输入PIN"/>
+	                            </LinearLayout>
+	                            <TextView android:layout_width="210dp"
+	                                android:layout_height="wrap_content"
+	                                android:background="#22ffffff"
+	                                android:gravity="center_horizontal"
+	                                android:textColor="#000000"
+	                                android:textStyle="bold"
+	                                android:textSize="30dp"
+	                                android:id="@+id/pincodeText"/>
+	                            <LinearLayout android:layout_width="fill_parent"
+	                                android:layout_height="fill_parent"
+	                                android:gravity="center"
+	                                android:layout_weight="1">
+	                                <ImageView android:layout_width="wrap_content"
+		                                android:src="@drawable/main_icon_showtui"
+		                                android:layout_marginTop="10dp"
+		                                android:layout_height="wrap_content"/>
+	                            </LinearLayout>
+	                        </LinearLayout>
+	                        <TextView android:layout_width="fill_parent"
+	                            android:layout_height="wrap_content"
+	                            android:textColor="#f0f0f0"
+	                            android:textSize="35dp"
+	                            android:visibility="gone"
+	                            android:gravity="center_horizontal"
+	                            android:layout_alignParentBottom="true"
+	                            android:text="软件推送记录"/>
+	                    </RelativeLayout>
+        </LinearLayout>
+        <TextView android:layout_width="13dp"
+            android:layout_height="fill_parent"
+            android:visibility="invisible"/>
+        <LinearLayout android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:id="@+id/sencond_layout"
+            android:orientation="vertical"
+            >
+            <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:id="@+id/layout_1_2"
+                android:focusable="true"
+                android:layout_weight="1"
+                android:background="@color/bg_color_tuisong"
+                android:gravity="center">
+                <ImageView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/main_icon_yuntui"/>
+                 <TextView android:layout_width="fill_parent"
+	                            android:layout_height="wrap_content"
+	                            android:textColor="#f0f0f0"
+	                            android:textSize="35dp"
+	                            android:layout_marginTop="20dp"
+	                            android:gravity="center_horizontal"
+	                            android:layout_alignParentBottom="true"
+	                            android:text="视频推送记录"/>
+            </LinearLayout>
+            <!-- <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/bg_color_tuisong"
+                android:focusable="true"
+                android:orientation="vertical"
+                android:gravity="center_horizontal"
+                android:paddingBottom="10dp"
+                android:id="@+id/layout_1_2"
+                android:layout_weight="1">
+                <ImageView android:layout_width="wrap_content"
+	                android:layout_height="fill_parent"
+	                android:layout_weight="1"
+	                android:src="@drawable/main_icon_yuntui"/>
+	            <TextView android:layout_width="fill_parent"
+                           android:layout_height="wrap_content"
+                           android:textColor="#f0f0f0"
+                           android:textSize="35dp"
+                           android:gravity="center_horizontal"
+                           android:layout_alignParentBottom="true"
+                           android:text="推送记录"/>
+            </LinearLayout> -->
+            <TextView android:layout_width="fill_parent"
+            android:layout_height="13dp"
+            android:visibility="gone"/>
+            <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:focusable="true"
+                android:visibility="gone"
+                android:id="@+id/layout_1_3"
+                android:orientation="vertical"
+                android:gravity="center_horizontal"
+                android:paddingBottom="10dp"
+                android:background="@color/bg_color_xunlei"
+                android:layout_weight="1">
+	            <ImageView android:layout_width="wrap_content"
+	                android:layout_height="fill_parent"
+	                android:layout_weight="1"
+	                android:src="@drawable/main_icon_xunlei"/>
+	            <TextView android:layout_width="fill_parent"
+                           android:layout_height="wrap_content"
+                           android:textColor="#f0f0f0"
+                           android:textSize="35dp"
+                           android:gravity="center_horizontal"
+                           android:layout_alignParentBottom="true"
+                           android:text="迅雷云播"/>
+            </LinearLayout>
+        </LinearLayout>
+        <TextView android:layout_width="13dp"
+            android:layout_height="fill_parent"
+            android:visibility="invisible"/>
+        <LinearLayout android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:id="@+id/third_layout"
+            android:orientation="vertical"
+            >
+            <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:focusable="true"
+                android:id="@+id/layout_1_4"
+                android:orientation="vertical"
+                android:gravity="center_horizontal"
+                android:paddingBottom="10dp"
+                android:background="@color/bg_color_xunlei"
+                android:layout_weight="1">
+	            <ImageView android:layout_width="wrap_content"
+	                android:layout_height="fill_parent"
+	                android:layout_weight="1"
+	                android:src="@drawable/main_icon_xunlei"/>
+	            <TextView android:layout_width="fill_parent"
+                           android:layout_height="wrap_content"
+                           android:textColor="#f0f0f0"
+                           android:textSize="35dp"
+                           android:gravity="center_horizontal"
+                           android:layout_alignParentBottom="true"
+                           android:text="迅雷云播"/>
+            </LinearLayout>
+            <TextView android:layout_width="fill_parent"
+            android:layout_height="13dp"
+            android:id="@+id/layout_divider_3"/>
+            <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:focusable="true"
+                android:id="@+id/layout_1_5"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:paddingBottom="10dp"
+                android:background="@color/bg_color_setting"
+                android:layout_weight="1">
+	            <ImageView android:layout_width="wrap_content"
+	                android:layout_height="wrap_content"
+	                android:src="@drawable/main_icon_setting"/>
+	            <TextView android:layout_width="fill_parent"
+                           android:layout_height="wrap_content"
+                           android:textColor="#f0f0f0"
+                           android:textSize="35dp"
+                           android:layout_marginTop="25dp"
+                           android:gravity="center_horizontal"
+                           android:layout_alignParentBottom="true"
+                           android:text="设置"/>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+    <FrameLayout android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/relative_layout">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:visibility="invisible"
+            android:id="@+id/image_1_1"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:visibility="invisible"
+            android:id="@+id/image_1_2"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:visibility="invisible"
+            android:id="@+id/image_1_3"/>
+		<ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:visibility="invisible"
+            android:id="@+id/image_1_4"/>
+		<ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            android:visibility="invisible"
+            android:id="@+id/image_1_5"/>
+    </FrameLayout>
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/layout_clear_dialog.xml b/showkeyHelper/res/layout/layout_clear_dialog.xml
new file mode 100644
index 0000000..c35ece4
--- /dev/null
+++ b/showkeyHelper/res/layout/layout_clear_dialog.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+    <LinearLayout android:layout_width="340dp"
+        android:layout_height="190dp"
+        android:background="#f0f0f0"
+        android:orientation="vertical">
+        <TextView android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="提示"
+            android:textSize="16dp"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            android:background="#d1d1d1"
+            android:textColor="#000000"/>
+        <TextView android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="20dp"
+			android:text="是否清空播放纪录"
+            android:textColor="#000000"/>
+        <LinearLayout android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:padding="10dp"
+            android:orientation="horizontal">
+            <Button android:layout_width="75dp"
+            android:layout_height="30dp"
+            android:id="@+id/btn_canle"
+            android:textSize="16dp"
+            android:textColor="@color/common_black_btn_textcolor"
+            android:background="@drawable/bg_btn_band"
+            android:text="取消"/>
+	        <Button android:layout_width="75dp"
+	            android:layout_height="30dp"
+	            android:layout_marginLeft="10dp"
+	            android:id="@+id/btn_ok"
+	            android:textSize="16dp"
+	            android:textColor="@color/common_black_btn_textcolor"
+	            android:background="@drawable/bg_btn_band"
+	            android:text="清空"/>
+        </LinearLayout>
+    </LinearLayout>
+	
+</LinearLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/media_metadata.xml b/showkeyHelper/res/layout/media_metadata.xml
new file mode 100644
index 0000000..2a69d46
--- /dev/null
+++ b/showkeyHelper/res/layout/media_metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Metadata: " />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/mediacontroller.xml b/showkeyHelper/res/layout/mediacontroller.xml
new file mode 100644
index 0000000..952988e
--- /dev/null
+++ b/showkeyHelper/res/layout/mediacontroller.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="74dip"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="0.0dip"
+                android:layout_marginLeft="0.0dip"
+                android:layout_marginRight="0.0dip"
+                android:background="@drawable/mediacontroller_bg"
+                android:orientation="horizontal">
+
+    <ImageButton
+            android:id="@+id/mediacontroller_play_pause"
+            android:layout_width="54.6dip"
+            android:layout_height="32dip"
+            android:layout_alignParentRight="true"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="7.0dip"
+            android:background="#00000000"
+            android:contentDescription="@string/mediacontroller_play_pause"
+            android:gravity="center"
+            android:src="@drawable/mediacontroller_pause_button"/>
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dip"
+            android:layout_marginLeft="7.0dip"
+            android:layout_marginRight="7.0dip"
+            android:layout_marginTop="2dip"
+            android:layout_toLeftOf="@+id/mediacontroller_play_pause">
+
+        <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:id="@+id/mediacontroller_time_current"
+                    style="@style/MediaController_Text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"/>
+
+            <TextView
+                    android:id="@+id/mediacontroller_time_total"
+                    style="@style/MediaController_Text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentTop="true"/>
+        </RelativeLayout>
+
+        <SeekBar
+                android:id="@+id/mediacontroller_seekbar"
+                style="@style/MediaController_SeekBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:focusable="true"
+                android:max="1000"/>
+
+        <TextView
+                android:id="@+id/mediacontroller_file_name"
+                style="@style/MediaController_Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:ellipsize="marquee"
+                android:singleLine="true"/>
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/player_menu_dialog.xml b/showkeyHelper/res/layout/player_menu_dialog.xml
new file mode 100644
index 0000000..a86d7c0
--- /dev/null
+++ b/showkeyHelper/res/layout/player_menu_dialog.xml
@@ -0,0 +1,131 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"/>
+    <RelativeLayout android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="7">
+       	 	<ImageView android:layout_width="wrap_content"
+       	 	    android:layout_height="wrap_content"
+       	 	    android:layout_marginTop="95dp"
+       	 	    android:layout_marginLeft="15dp"
+       	 	    android:id="@+id/title_selected_background"
+       	 	    android:src="@drawable/player_menu_title_hl"/>
+		    <LinearLayout android:layout_width="fill_parent"
+		        android:layout_height="fill_parent"
+		        android:background="@drawable/player_menu_bg"
+		        android:orientation="vertical">
+		        <LinearLayout android:layout_width="fill_parent"
+				    android:layout_height="wrap_content" 
+				    android:paddingLeft="60dp"
+		        	android:paddingRight="60dp"
+				    android:gravity="center_vertical">
+				    <ImageView android:layout_width="wrap_content"
+				        android:layout_height="wrap_content"
+				        android:src="@drawable/player_menu"/>
+				    <TextView android:layout_width="wrap_content"
+				        android:layout_height="wrap_content"
+				        android:text="菜单"
+				        android:textSize="30dp"
+				        android:textColor="#ffffff"
+				        android:shadowColor="#000000"
+				        android:shadowDx="1"
+				        android:shadowRadius="3"
+				        android:shadowDy="1"/>
+				</LinearLayout>
+				<LinearLayout android:layout_width="fill_parent"
+				    android:layout_height="wrap_content"
+				    android:layout_marginTop="50dp"
+				    android:paddingLeft="25dp"
+				    android:paddingRight="25dp"
+				    android:orientation="horizontal">
+				    <TextView android:layout_width="165dp"
+				        android:layout_height="wrap_content"
+				        android:textSize="25dp"
+				        android:textColor="#ffffff"
+				        android:shadowColor="#000000"
+				        android:shadowDx="1"
+				        android:shadowDy="1"
+				        android:shadowRadius="2"
+				        android:paddingTop="10dp"
+				        android:paddingBottom="10dp"
+				        android:text="选集"
+				        android:gravity="center_horizontal"
+				        android:id="@+id/title_xuanji"
+				        />
+				    <TextView android:layout_width="165dp"
+				        android:layout_height="wrap_content"
+				        android:textSize="25dp"
+				        android:textColor="#ffffff"
+				        android:shadowColor="#000000"
+				        android:shadowDx="1"
+				        android:shadowDy="1"
+				        android:shadowRadius="2"
+				        android:paddingTop="10dp"
+				        android:paddingBottom="10dp"
+				        android:text="字幕"
+				        android:id="@+id/title_zimu"
+				        android:gravity="center_horizontal"
+				        />
+				    <TextView android:layout_width="165dp"
+				        android:layout_height="wrap_content"
+				        android:textSize="25dp"
+				        android:textColor="#ffffff"
+				        android:shadowColor="#000000"
+				        android:shadowDx="1"
+				        android:shadowDy="1"
+				        android:shadowRadius="2"
+				        android:paddingTop="10dp"
+				        android:paddingBottom="10dp"
+				        android:text="清晰度"
+				        android:id="@+id/title_definition"
+				        android:gravity="center_horizontal"
+				        />
+				    <TextView android:layout_width="165dp"
+				        android:layout_height="wrap_content"
+				        android:textSize="25dp"
+				        android:textColor="#ffffff"
+				        android:shadowColor="#000000"
+				        android:shadowDx="1"
+				        android:shadowDy="1"
+				        android:shadowRadius="2"
+				        android:paddingTop="10dp"
+				        android:paddingBottom="10dp"
+				        android:text="画面比例"
+				        android:id="@+id/title_size"
+				        android:gravity="center_horizontal"
+				        />
+				</LinearLayout>
+				<TextView android:layout_width="fill_parent"
+				    android:layout_height="1px"
+				    android:background="@drawable/player_menu_divider"/>
+				<RelativeLayout android:layout_width="fill_parent"
+				    android:layout_height="fill_parent"
+				    android:paddingLeft="50dp"
+				    android:paddingRight="50dp">
+				    <ImageView android:layout_width="fill_parent"
+				        android:layout_height="130dp"
+				        android:background="@drawable/player_menu_item_bg"
+				        android:id="@+id/highlight_bg"
+				        android:visibility="invisible"
+				        android:layout_marginTop="-15dp"
+				        android:alpha="0.8"
+				        />
+				    <ListView android:layout_width="fill_parent"
+				    android:layout_height="fill_parent"
+				    android:id="@+id/list_choice"
+				    android:layout_marginTop="20dp"
+				    android:layout_marginBottom="20dp"
+				    android:scrollbars="none"
+				    android:listSelector="@android:color/transparent"
+				    android:divider="@null">
+				    </ListView>
+				</RelativeLayout>
+		    </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/showkeyHelper/res/layout/system_mediaplayer_videoview.xml b/showkeyHelper/res/layout/system_mediaplayer_videoview.xml
new file mode 100644
index 0000000..e77e24a
--- /dev/null
+++ b/showkeyHelper/res/layout/system_mediaplayer_videoview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.joyplus.mediaplayer.SystemMediaPlayerVideoView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/system_mediaplayer_videoview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_centerInParent="true"
+    android:gravity="center"
+    android:orientation="vertical" >
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+	    <com.joyplus.mediaplayer.SystemVideoView
+	        android:id="@+id/systemvideoView"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content" />
+   </io.vov.vitamio.widget.CenterLayout>
+</com.joyplus.mediaplayer.SystemMediaPlayerVideoView>
diff --git a/showkeyHelper/res/layout/system_vitamioplayer_videoview.xml b/showkeyHelper/res/layout/system_vitamioplayer_videoview.xml
new file mode 100644
index 0000000..a9516e2
--- /dev/null
+++ b/showkeyHelper/res/layout/system_vitamioplayer_videoview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.joyplus.mediaplayer.SystemVitamioPlayerVideoView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/system_vitamioplayer_videoview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_centerInParent="true"
+    android:gravity="center"
+    android:orientation="vertical" >
+    <io.vov.vitamio.widget.CenterLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+	    <com.joyplus.mediaplayer.VitamioVideoView
+	        android:id="@+id/VitamioVideoView"
+	        android:layout_width="match_parent"
+	        android:layout_height="match_parent" />
+    </io.vov.vitamio.widget.CenterLayout>
+
+</com.joyplus.mediaplayer.SystemVitamioPlayerVideoView>
diff --git a/showkeyHelper/res/raw/libarm.so b/showkeyHelper/res/raw/libarm.so
new file mode 100644
index 0000000..e69de29
diff --git a/showkeyHelper/res/values/JoyplusMediaPlayerConfig.xml b/showkeyHelper/res/values/JoyplusMediaPlayerConfig.xml
new file mode 100644
index 0000000..a2f507b
--- /dev/null
+++ b/showkeyHelper/res/values/JoyplusMediaPlayerConfig.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+     
+
+    <!-- The Decode values -->
+    <!-- the default decode type,value  -->
+    <string translatable="false" name="Default_Decode">HW</string>
+    <string translatable="false" name="Decode_HW">HW</string>
+    <string translatable="false" name="Decode_SW">SW</string>
+    
+    <!-- MediaPlayer Config  --> 
+    <!-- name , TYPE , EN , Decode_HW , Decode_SW , PRIORIRY_HW , PRIORITY_SW 
+         name : the player which used
+         TYPE : the player used type, don't change this for it depends on JoyplusMediaPlayerManager
+         EN   : the player usable. true-use false-disable
+         Decode_HW : the player support HW decode, support-true else false
+         Decode_SW : the player support SW decode, support-false else false
+         PRIORIRY_HW : prioriry of HW decode, it usable when Decode_HW is true
+         PRIORITY_SW : prioriry of SW decode, it usable when Decode_SW is true -->
+    <string-array translatable="false" name="mediaplayerconfig">
+        <item>"mediaplayer,0,true,true,false,1,0"</item>
+        <item>"vitamio,1,false,false,true,0,1"</item>        
+    </string-array>
+    
+    <!-- default time to report mediaplayer state MIN =300 MAX =800 (ms)
+         it use to report current player state which can register listener in JoyplusMediaPlayerManager
+         Typical values is 500ms -->
+    <string name="defaultUpdateTime">500</string>
+    
+    <!-- Config support switch player internal, you can change it to false or true -->
+    <string name="switch_internal">true</string>
+    
+    <!-- Sub dir in SDCard 
+         default dir is "mnt/sdcard/Joyplus/sub/"-->
+    <string name="sun_dir">Joyplus/sub/</string>
+</resources>
diff --git a/showkeyHelper/res/values/JoyplusMediaPlayerString.xml b/showkeyHelper/res/values/JoyplusMediaPlayerString.xml
new file mode 100644
index 0000000..8cf5ae7
--- /dev/null
+++ b/showkeyHelper/res/values/JoyplusMediaPlayerString.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    
+    <string name="vitamio_library_app_name">Vitamio库</string>
+    <string name="vitamio_init_decoders">初始化解码文件。。。</string>
+    <string name="permission_group_tools_label">Vitamio工具</string>
+    <string name="permission_group_tools_description">访问Vitamio包和资源文件</string>
+    <string name="permission_receive_messages_label">接收Vitamio的消息</string>
+    <string name="permission_receive_messages_description">接收Vitamio服务的所有广播</string>
+    <string name="permission_write_providers_label">写Vitamio数据库</string>
+    <string name="permission_write_providers_description">在Vitamio数据库中删除,刷新或者插入一条新的记录 </string>
+    <string name="VideoView_error_title">无法播放该视频文件</string>
+    <string name="VideoView_error_text_invalid_progressive_playback">糟糕，设备不支持该流媒体文件</string>
+    <string name="VideoView_error_text_unknown">糟糕，视频文件无法播放</string>
+    <string name="VideoView_error_button">OK</string>
+    <string name="mediacontroller_play_pause">播放/暂停</string>
+    <string name="vitamio_demo_name">VitamioDemo</string>
+	<string name="local_video">播放本地视频文件</string>
+    <string name="stream_video">播放流媒体视频文件</string>
+    <string name="local_audio">播放本地音频文件</string>
+    <string name="res_audio">播放资源音频文件</string>
+    
+    <string name="meidaplayer_loading_string">"载入中...( <xliff:g id="speed">%s</xliff:g> KB/S ) ，已完成  <xliff:g id="finished">%s</xliff:g> %%"</string>
+    <string name="meidaplayer_loading_string_loading">载入中...</string>
+    <string name="meidaplayer_loading_string_lasttime">上次播放到：%1$s\n按【OK】键从头开始播放</string>
+    <string name="meidaplayer_loading_string_from">网络来源：</string>
+    <string name="meidaplayer_loading_string_loadingprogress">努力加载中...</string>
+    <string name="meidaplayer_loading_string_buffer">缓冲中...( <xliff:g id="speed">%s</xliff:g> KB/S )</string>
+    <string name="meidaplayer_loading_string_buffer_loading">缓冲中...</string>
+    <string name="meidaplayer_loading_string_buffer_notify">网速不给力，可按 菜单 键切换清晰度</string>
+    
+    <string name="meidaplayer_sub_string_nosub">暂无字幕</string>
+    <string name="meidaplayer_sub_string_sub"> 字幕  <xliff:g id="speed">%s</xliff:g> </string>
+    <string name="meidaplayer_sub_string_closesub">字幕关</string>
+    
+</resources>
diff --git a/showkeyHelper/res/values/JoyplusMediaPlayerStyle.xml b/showkeyHelper/res/values/JoyplusMediaPlayerStyle.xml
new file mode 100644
index 0000000..c451e43
--- /dev/null
+++ b/showkeyHelper/res/values/JoyplusMediaPlayerStyle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+     <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+    <style name="MediaController_SeekBar">
+        <item name="android:minHeight">16dip</item>
+        <item name="android:maxHeight">16dip</item>
+        <item name="android:progressDrawable">@drawable/mediacontroller_seekbar</item>
+        <item name="android:thumb">@drawable/mediacontroller_seekbar_thumb</item>
+    </style>
+
+    <style name="MediaController_Text">
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+</resources>
diff --git a/showkeyHelper/res/values/JoyplusSubConfig.xml b/showkeyHelper/res/values/JoyplusSubConfig.xml
new file mode 100644
index 0000000..e71df0a
--- /dev/null
+++ b/showkeyHelper/res/values/JoyplusSubConfig.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Sub dir in SDCard 
+         default dir is "mnt/sdcard/Joyplus/sub/"-->
+<!--     <string name="sub_dir">/Android/data/com.joyplus.tv/sub/</string> -->
+    <string name="sub_dir">/Android/data/<xliff:g>%s</xliff:g>/sub/</string>
+    
+    <!-- Sub EN Default -->
+    <string name="sub_en_default">true</string>
+    
+    <!-- Sub mode Default 
+         1 SETONLY 
+         2 ADDONLY 
+         3 AETANDADD -->
+    <string name="sub_mode_default">3</string>
+    
+    <!-- Sub Max Local  -->
+    <string name="sub_max_local">5</string>
+    
+</resources>
\ No newline at end of file
diff --git a/showkeyHelper/res/values/styles.xml b/showkeyHelper/res/values/styles.xml
index f3bf798..6f0edeb 100644
--- a/showkeyHelper/res/values/styles.xml
+++ b/showkeyHelper/res/values/styles.xml
@@ -35,4 +35,18 @@
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowBackground">@android:color/transparent</item>
 	</style>
+	
+    <style name="Transparent">  
+    <item name="android:windowBackground">@android:color/transparent</item>  
+    <item name="android:windowNoTitle">true</item>  
+    <item name="android:windowFullscreen">true</item>
+    <item name="android:windowIsTranslucent">true</item>     
+    <item name="android:windowAnimationStyle">@style/dilogAnimation</item>  
+  </style>
+  
+    <style name="dilogAnimation" parent="android:Animation">
+        <item name="@android:windowEnterAnimation">@anim/alpha_appear_dialog</item>
+        <item name="android:windowExitAnimation">@anim/alpha_disappear_dialog</item>
+    </style>
+    
 </resources>
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotation.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotation.java
deleted file mode 100644
index 4e80094..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotation.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Meta-annotation (annotations used on other annotations)
- * used for marking all annotations that are
- * part of Jackson package. Can be used for recognizing all
- * Jackson annotations generically, and in future also for
- * passing other generic annotation configuration.
- */
-@Target({ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface JacksonAnnotation
-{
-    // for now, a pure tag annotation, no parameters
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotationsInside.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotationsInside.java
deleted file mode 100644
index 5211432..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonAnnotationsInside.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Meta-annotation (annotations used on other annotations)
- * used for indicating that instead of using target annotation
- * (annotation annotated with this annotation),
- * Jackson should use meta-annotations it has.
- * This can be useful in creating "combo-annotations" by having
- * a container annotation, which needs to be annotated with this
- * annotation as well as all annotations it 'contains'.
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JacksonAnnotationsInside
-{
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonInject.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonInject.java
deleted file mode 100644
index dc03135..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JacksonInject.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.annotation.JacksonAnnotation;
-
-/**
- * Jackson-specific annotation used for indicating that value of
- * annotated property will be "injected", i.e. set based on value
- * configured by <code>ObjectMapper</code> (usually on per-call basis).
- * Usually property is not deserialized from JSON, although it possible
- * to have injected value as default and still allow optional override
- * from JSON.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JacksonInject
-{
-    /**
-     * Logical id of the value to inject; if not specified (or specified
-     * as empty String), will use id based on declared type of property.
-     */
-    public String value() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnyGetter.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnyGetter.java
deleted file mode 100644
index 42199b3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnyGetter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define a non-static,
- * no-argument method or member field as something of a reverse of
- * {@link JsonAnySetter} method; basically being used like a
- * getter but such that contents of the returned Map (type <b>must</b> be
- * {@link java.util.Map}) are serialized as if they were actual properties
- * of the bean that contains method/field with this annotations.
- * As with {@link JsonAnySetter}, only one property should be annotated
- * with this annotation.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonAnyGetter
-{
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnySetter.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnySetter.java
deleted file mode 100644
index 8aefdf7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAnySetter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define a non-static,
- * two-argument method (first argument name of property, second value
- * to set), to be used as a "fallback" handler
- * for all otherwise unrecognized properties found from JSON content.
- * It is similar to {@link javax.xml.bind.annotation.XmlAnyElement}
- * in behavior; and can only be used to denote a single property
- * per type.
- *<p>
- * If used, all otherwise unmapped key-value pairs from JSON Object values
- * are added to the property (of type Map or bean).
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonAnySetter
-{
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAutoDetect.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAutoDetect.java
deleted file mode 100644
index 66af2ae..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonAutoDetect.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Member;
-import java.lang.reflect.Modifier;
-
-/**
- * Class annotation that can be used to define which kinds of Methods
- * are to be detected by auto-detection.
- * Auto-detection means using name conventions
- * and/or signature templates to find methods to use for data binding.
- * For example, so-called "getters" can be auto-detected by looking for
- * public member methods that return a value, do not take argument,
- * and have prefix "get" in their name.
- *<p>
- * Pseudo-value <code>NONE</code> means that all auto-detection is disabled
- * for the <b>specific</b> class that annotation is applied to (including
- * its super-types, but only when resolving that class).
- * Pseudo-value <code>ALWAYS</code> means that auto-detection is enabled
- * for all method types for the class in similar way.
- *<p>
- * The default value is <code>ALWAYS</code>: that is, by default, auto-detection
- * is enabled for all classes unless instructed otherwise.
- *<p>
- * Starting with version 1.5, it is also possible to use more fine-grained
- * definitions, to basically define minimum visibility level needed. Defaults
- * are different for different types (getters need to be public; setters can
- * have any access modifier, for example).
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonAutoDetect
-{
-    /**
-     * Enumeration for possible visibility thresholds (minimum visibility)
-     * that can be used to limit which methods (and fields) are
-     * auto-detected.
-     */
-    public enum Visibility {
-        /**
-         * Value that means that all kinds of access modifiers are acceptable,
-         * from private to public.
-         */
-        ANY,
-        /**
-         * Value that means that any other access modifier other than 'private'
-         * is considered auto-detectable.
-         */
-        NON_PRIVATE,
-        /**
-         * Value that means access modifiers 'protected' and 'public' are
-         * auto-detectable (and 'private' and "package access" == no modifiers
-         * are not)
-         */
-        PROTECTED_AND_PUBLIC,
-        /**
-         * Value to indicate that only 'public' access modifier is considered
-         * auto-detectable.
-         */
-        PUBLIC_ONLY,
-        /**
-         * Value that indicates that no access modifiers are auto-detectable:
-         * this can be used to explicitly disable auto-detection for specified
-         * types.
-         */
-        NONE,
-        
-        /**
-         * Value that indicates that default visibility level (whatever it is,
-         * depends on context) is to be used. This usually means that inherited
-         * value (from parent visibility settings) is to be used.
-         */
-        DEFAULT;
-
-        public boolean isVisible(Member m) {
-            switch (this) {
-            case ANY:
-                return true;
-            case NONE:
-                return false;
-            case NON_PRIVATE:
-                return !Modifier.isPrivate(m.getModifiers());
-            case PROTECTED_AND_PUBLIC:
-                if (Modifier.isProtected(m.getModifiers())) {
-                    return true;
-                }
-                // fall through to public case:
-            case PUBLIC_ONLY:
-                return Modifier.isPublic(m.getModifiers());
-            }
-            return false;
-        }
-    }
-    
-    /**
-     * Minimum visibility required for auto-detecting regular getter methods.
-     */
-    Visibility getterVisibility() default Visibility.DEFAULT;
-
-    /**
-     * Minimum visibility required for auto-detecting is-getter methods.
-     */
-    Visibility isGetterVisibility() default Visibility.DEFAULT;
-    
-    /**
-     * Minimum visibility required for auto-detecting setter methods.
-     */    
-    Visibility setterVisibility() default Visibility.DEFAULT;
-
-    /**
-     * Minimum visibility required for auto-detecting Creator methods,
-     * except for no-argument constructors (which are always detected
-     * no matter what).
-     */
-    Visibility creatorVisibility() default Visibility.DEFAULT;
-
-    /**
-     * Minimum visibility required for auto-detecting member fields.
-     */ 
-    Visibility fieldVisibility() default Visibility.DEFAULT;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonBackReference.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonBackReference.java
deleted file mode 100644
index 0ffe1c1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonBackReference.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate that associated property is part of
- * two-way linkage between fields; and that its role is "child" (or "back") link.
- * Value type of the property must be a bean: it can not be a Collection, Map,
- * Array or enumeration.
- * Linkage is handled such that the property
- * annotated with this annotation is not serialized; and during deserialization,
- * its value is set to instance that has the "managed" (forward) link.
- *<p>
- * All references have logical name to allow handling multiple linkages; typical case
- * would be that where nodes have both parent/child and sibling linkages. If so,
- * pairs of references should be named differently.
- * It is an error for a class to have multiple back references with same name,
- * even if types pointed are different.
- *<p>
- * Note: only methods and fields can be annotated with this annotation: constructor
- * arguments should NOT be annotated, as they can not be either managed or back
- * references.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonBackReference
-{
-    /**
-     * Logical have for the reference property pair; used to link managed and
-     * back references. Default name can be used if there is just single
-     * reference pair (for example, node class that just has parent/child linkage,
-     * consisting of one managed reference and matching back reference)
-     */
-    public String value() default "defaultReference";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonCreator.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonCreator.java
deleted file mode 100644
index 0888d70..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonCreator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define constructors and factory
- * methods as one to use for instantiating new instances of the associated
- * class.
- *<p>
- * NOTE: when annotating creator methods (constructors, factory methods),
- * method must either be:
- *<ul>
- * <li>Single-argument constructor/factory method without {@link JsonProperty}
- *    annotation for the argument: if so, this is so-called "delegate creator",
- *    in which case Jackson first binds JSON into type of the argument, and
- *    then calls creator
- *   </li>
- * <li>Constructor/factory method where <b>every argument</b> is annotated with
- *   either {@link JsonProperty} or {@link JacksonInject}, to indicate name
- *   of property to bind to
- *  </li>
- * </ul>
- * Also note that all {@link JsonProperty} annotations MUST use actual name
- * (NOT empty String for "default"): this because Java bytecode does not
- * retain names of method or constructor arguments.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonCreator
-{
-    // no values, since there's no property
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFilter.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFilter.java
deleted file mode 100644
index 6f952c2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate which logical filter is to be used
- * for filtering out properties of type (class) annotated;
- * association made by this annotation declaring ids of filters,
- * and  <code>com.fasterxml.jackson.databind.ObjectMapper</code> (or objects
- * it delegates to) providing matching filters by id.
- *<p>
- * Filters to use are usually of type
- * <code>com.fasterxml.jackson.databind.ser.BeanPropertyFilter</code> and
- * are registered through <code>com.fasterxml.jackson.databind.ObjectMapper</code>
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonFilter
-{
-    /**
-     * Id of filter to use; if empty String (""), no filter is to be used.
-     */
-    public String value();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFormat.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFormat.java
deleted file mode 100644
index 0efce6c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonFormat.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * General-purpose annotation used for configuring details of how
- * values of properties are to be serialized.
- * Unlike most other Jackson annotations, annotation does not
- * have specific universal interpretation: instead, effect depends on datatype
- * of property being annotated (or more specifically, deserializer
- * and serializer being used).
- *<p>
- * Common uses include choosing between alternate representations -- for example,
- * whether {@link java.util.Date} is to be serialized as number (Java timestamp)
- * or String (such as ISO-8601 compatible time value) -- as well as configuring
- * exact details with {@link #pattern} property.
- *<p>
- * As of Jackson 2.1, known special handling include:
- *<ul>
- * <li>{@link java.util.Date}: Shape can  be {@link Shape#STRING} or {@link Shape#NUMBER};
- *    pattern may contain {@link java.text.SimpleDateFormat}-compatible pattern definition.
- *   </li>
- *</ul>
- * Jackson 2.1 added following new features:
- *<ul>
- * <li>Can now be used on Classes (types) as well, for modified default behavior, possibly
- *   overridden by per-property annotation
- *   </li>
- * <li>{@link java.lang.Enum}s: Shapes {@link Shape#STRING} and {@link Shape#NUMBER} can be
- *    used to change between numeric (index) and textual (name or <code>toString()</code>);
- *    but it is also possible to use {@link Shape#OBJECT} to serialize (but not deserialize)
- *    {@link java.lang.Enum}s as JSON Objects (as if they were POJOs). NOTE: serialization
- *     as JSON Object only works with class annotation; 
- *    will not work as per-property annotation.
- *   </li>
- * <li>{@link java.util.Collection}s can be serialized as (and deserialized from) JSON Objects,
- *    if {@link Shape#OBJECT} is used. NOTE: can ONLY be used as class annotation;
- *    will not work as per-property annotation.
- *   </li>
- *</ul>
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER,
-    ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonFormat
-{
-    /**
-     * Value that indicates that default {@link java.util.Locale}
-     * (from deserialization or serialization context) should be used:
-     * annotation does not define value to use.
-     */
-    public final static String DEFAULT_LOCALE = "##default";
-
-    /**
-     * Value that indicates that default {@link java.util.TimeZone}
-     * (from deserialization or serialization context) should be used:
-     * annotation does not define value to use.
-     */
-    public final static String DEFAULT_TIMEZONE = "##default";
-    
-    /**
-     * Datatype-specific additional piece of configuration that may be used
-     * to further refine formatting aspects. This may, for example, determine
-     * low-level format String used for {@link java.util.Date} serialization;
-     * however, exact use is determined by specific <code>JsonSerializer</code>
-     */
-    public String pattern() default "";
-
-    /**
-     * Structure to use for serialization: definition of mapping depends on datatype,
-     * but usually has straight-forward counterpart in data format (JSON).
-     * Note that commonly only a subset of shapes is available; and if 'invalid' value
-     * is chosen, defaults are usually used.
-     */
-    public Shape shape() default Shape.ANY;
-
-    /**
-     * {@link java.util.Locale} to use for serialization (if needed).
-     * Special value of {@link #DEFAULT_LOCALE}
-     * can be used to mean "just use the default", where default is specified
-     * by the serialization context, which in turn defaults to system
-     * defaults ({@link java.util.Locale#getDefault()}) unless explicitly
-     * set to another locale.
-     */
-    public String locale() default DEFAULT_LOCALE;
-    
-    /**
-     * {@link java.util.TimeZone} to use for serialization (if needed).
-     * Special value of {@link #DEFAULT_TIMEZONE}
-     * can be used to mean "just use the default", where default is specified
-     * by the serialization context, which in turn defaults to system
-     * defaults ({@link java.util.TimeZone#getDefault()}) unless explicitly
-     * set to another locale.
-     */
-    public String timezone() default DEFAULT_TIMEZONE;
-    
-    /*
-    /**********************************************************
-    /* Value enumeration(s), value class(es)
-    /**********************************************************
-     */
-
-    /**
-     * Value enumeration used for indicating preferred Shape; translates
-     * loosely to JSON types, with some extra values to indicate less precise
-     * choices (i.e. allowing one of multiple actual shapes)
-     */
-    public enum Shape
-    {
-        /**
-         * Marker enum value that indicates "default" (or "whatever") choice; needed
-         * since Annotations can not have null values for enums.
-         */
-        ANY,
-
-        /**
-         * Value that indicates shape should not be structural (that is, not
-         * {@link #ARRAY} or {@link #OBJECT}, but can be any other shape.
-         */
-        SCALAR,
-
-        /**
-         * Value that indicates that (JSON) Array type should be used.
-         */
-        ARRAY,
-        
-        /**
-         * Value that indicates that (JSON) Object type should be used.
-         */
-        OBJECT,
-
-        /**
-         * Value that indicates that a numeric (JSON) type should be used
-         * (but does not specify whether integer or floating-point representation
-         * should be used)
-         */
-        NUMBER,
-
-        /**
-         * Value that indicates that floating-point numeric type should be used
-         */
-        NUMBER_FLOAT,
-
-        /**
-         * Value that indicates that integer number type should be used
-         * (and not {@link #NUMBER_FLOAT}).
-         */
-        NUMBER_INT,
-
-        /**
-         * Value that indicates that (JSON) String type should be used.
-         */
-        STRING,
-        
-        /**
-         * Value that indicates that (JSON) boolean type
-         * (true, false) should be used.
-         */
-        BOOLEAN
-        ;
-
-        public boolean isNumeric() {
-            return (this == NUMBER) || (this == NUMBER_INT) || (this == NUMBER_FLOAT);
-        }
-
-        public boolean isStructured() {
-            return (this == OBJECT) || (this == ARRAY);
-        }
-    }
-
-    /**
-     * Helper class used to contain information from a single {@link JsonFormat}
-     * annotation.
-     */
-    public static class Value
-    {
-        private final String pattern;
-        private final Shape shape;
-        private final Locale locale;
-        private final TimeZone timezone;
-
-        public Value() {
-            this("", Shape.ANY, "", "");
-        }
-        
-        public Value(JsonFormat ann) {
-            this(ann.pattern(), ann.shape(), ann.locale(), ann.timezone());
-        }
-
-        public Value(String p, Shape sh, String localeStr, String tzStr)
-        {
-            this(p, sh
-                    ,(localeStr == null || localeStr.length() == 0 || DEFAULT_LOCALE.equals(localeStr)) ?
-                            null : new Locale(localeStr)
-                    ,(tzStr == null || tzStr.length() == 0 || DEFAULT_TIMEZONE.equals(tzStr)) ?
-                            null : TimeZone.getTimeZone(tzStr)
-            );
-        }
-
-        /**
-         * @since 2.1
-         */
-        public Value(String p, Shape sh, Locale l, TimeZone tz)
-        {
-            pattern = p;
-            shape = sh;
-            locale = l;
-            timezone = tz;
-        }
-
-        /**
-         * @since 2.1
-         */
-        public Value withPattern(String p) {
-            return new Value(p, shape, locale, timezone);
-        }
-
-        /**
-         * @since 2.1
-         */
-        public Value withShape(Shape s) {
-            return new Value(pattern, s, locale, timezone);
-        }
-
-        /**
-         * @since 2.1
-         */
-        public Value withLocale(Locale l) {
-            return new Value(pattern, shape, l, timezone);
-        }
-
-        /**
-         * @since 2.1
-         */
-        public Value withTimeZone(TimeZone tz) {
-            return new Value(pattern, shape, locale, tz);
-        }
-        
-        public String getPattern() { return pattern; }
-        public Shape getShape() { return shape; }
-        public Locale getLocale() { return locale; }
-        public TimeZone getTimeZone() { return timezone; }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonGetter.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonGetter.java
deleted file mode 100644
index 677b32a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonGetter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define a non-static,
- * no-argument value-returning (non-void) method to be used as a "getter"
- * for a logical property.
- * It can be used as an alternative to more general
- * {@link JsonProperty} annotation (which is the recommended choice in
- * general case).
- *<p>
- * Getter means that when serializing Object instance of class that has
- * this method (possibly inherited from a super class), a call is made
- * through the method, and return value will be serialized as value of
- * the property.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonGetter
-{
-    /**
-     * Defines name of the logical property this
-     * method is used to access ("get"); empty String means that
-     * name should be derived from the underlying method (using
-     * standard Bean name detection rules)
-     */
-    String value() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityInfo.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityInfo.java
deleted file mode 100644
index 9ccde66..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used for indicating that values of annotated type
- * or property should be serializing so that instances either
- * contain additional object identifier (in addition actual object
- * properties), or as a reference that consists of an object id
- * that refers to a full serialization. In practice this is done
- * by serializing the first instance as full object and object
- * identity, and other references to the object as reference values.
- *<p>
- * There are two main approaches to generating object identifier:
- * either using a generator (either one of standard ones, or a custom
- * generator), or using a value of a property. The latter case is
- * indicated by using a placeholder generator marker
- * {@link ObjectIdGenerators.PropertyGenerator}; former by using explicit generator.
- * Object id has to be serialized as a property in case of POJOs;
- * object identity is currently NOT support for JSON Array types
- * (Java arrays or Lists) or Java Map types.
- *<p>
- * Finally, note that generator type of {@link ObjectIdGenerators.None}
- * indicates that no Object Id should be included or used: it is included
- * to allow suppressing Object Ids using mix-in annotations.
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE,
-    ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonIdentityInfo
-{
-    /**
-     * Name of JSON property in which Object Id will reside: also,
-     * if "from property" marker generator is used, identifies
-     * property that will be accessed to get type id.
-     * If a property is used, name must match its external
-     * name (one defined by annotation, or derived from accessor
-     * name as per Java Bean Introspection rules).
-     *<p>
-     * Default value is <code>@id</code>.
-     */
-    public String property() default "@id";
-
-    /**
-     * Generator to use for producing Object Identifier for objects:
-     * either one of pre-defined generators from
-     * {@link ObjectIdGenerator}, or a custom generator.
-     * Defined as class to instantiate.
-     *<p>
-     * Note that special type
-     * {@link ObjectIdGenerators.None}
-     * can be used to disable inclusion of Object Ids.
-     */
-    public Class<? extends ObjectIdGenerator<?>> generator();
-
-    /**
-     * Scope is used to define applicability of an Object Id: all ids
-     * must be unique within their scope; where scope is defined
-     * as combination of this value and generator type.
-     * Comparison is simple equivalence, meaning that both type
-     * generator type and scope class must be the same.
-     *<p>
-     * Scope is used for determining how many generators are needed;
-     * more than one scope is typically only needed if external Object Ids
-     * have overlapping value domains (i.e. are only unique within some
-     * limited scope)
-     */
-    public Class<?> scope() default Object.class;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityReference.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityReference.java
deleted file mode 100644
index 27d97c0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIdentityReference.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Optional annotation that can be used for customizing details of a reference
- * to Objects for which "Object Identity" is enabled (see {@link JsonIdentityInfo}).
- * The main use case is that of enforcing use of Object Id even for the first
- * time an Object is referenced, instead of first instance being serialized
- * as full POJO.
- * 
- * @since 2.1
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE,
-    ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonIdentityReference
-{
-    /**
-     * Marker to indicate whether all referenced values are to
-     * be serialized as ids (true); or by serializing the
-     * first encountered reference as POJO and only then as id (false).
-     *<p>
-     * Note that if value of 'true' is used, deserialization may require
-     * additional contextual information, and possibly using a custom
-     * id resolver -- the default handling may not be sufficient.
-     * 
-     * @since 2.1
-     */
-    public boolean alwaysAsId() default false;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnore.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnore.java
deleted file mode 100644
index 3471a51..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnore.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that indicates that the annotated method or field is to be
- * ignored by introspection-based
- * serialization and deserialization functionality. That is, it should
- * not be consider a "getter", "setter" or "creator".
- *<p>
- * In addition, starting with Jackson 1.9, if this is the only annotation
- * associated with a property, it will also cause cause the whole
- * property to be ignored: that is, if setter has this annotation and
- * getter has no annotations, getter is also effectively ignored.
- * It is still possible for different accessors to use different
- * annotations; so if only "getter" is to be ignored, other accessors
- * (setter or field) would need explicit annotation to prevent
- * ignoral (usually {@link JsonProperty}).
- * <p>
- * For example, a "getter" method that would otherwise denote
- * a property (like, say, "getValue" to suggest property "value")
- * to serialize, would be ignored and no such property would
- * be output unless another annotation defines alternative method to use.
- *<p>
- * Before version 1.9, this annotation worked purely on method-by-method (or field-by-field)
- * basis; annotation on one method or field did not imply ignoring other methods
- * or fields. However, with version 1.9 and above, annotations associated
- * with various accessors (getter, setter, field, constructor parameter) of
- * a logical property are combined; meaning that annotations in one (say, setter)
- * can have effects on all of them (if getter or field has nothing indicating
- * otherwise).
- *<p>
- * Annotation is usually used just a like a marker annotation, that
- * is, without explicitly defining 'value' argument (which defaults
- * to <code>true</code>): but argument can be explicitly defined.
- * This can be done to override an existing JsonIgnore by explicitly
- * defining one with 'false' argument.
- *<p>
- * Annotation is similar to {@link javax.xml.bind.annotation.XmlTransient} 
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonIgnore
-{
-    /**
-     * Optional argument that defines whether this annotation is active
-     * or not. The only use for value 'false' if for overriding purposes
-     * (which is not needed often); most likely it is needed for use
-     * with "mix-in annotations" (aka "annotation overrides").
-     * For most cases, however, default value of "true" is just fine
-     * and should be omitted.
-     */
-    boolean value() default true;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreProperties.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreProperties.java
deleted file mode 100644
index 87978d6..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreProperties.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be used to either suppress serialization of
- * properties (during serialization), or ignore processing of
- * JSON properties read (during deserialization).
- *<p>
- * Example:
- *<pre>
- * // to prevent specified fields from being serialized or deserialized
- * // (i.e. not include in JSON output; or being set even if they were included)
- * &#064;JsonIgnoreProperties({ "internalId", "secretKey" })
- * // To ignore any unknown properties in JSON input without exception:
- * &#064;JsonIgnoreProperties(ignoreUnknown=true)
- *</pre>
- *<p>
- * Starting with 2.0, this annotation can be applied both to classes and
- * to properties. If used for both, actual set will be union of all
- * ignorals: that is, you can only add properties to ignore, not remove
- * or override. So you can not remove properties to ignore using
- * per-property annotation.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE,
-    ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonIgnoreProperties
-{
-    /**
-     * Names of properties to ignore.
-     */
-    public String[] value() default { };
-
-    /**
-     * Property that defines whether it is ok to just ignore any
-     * unrecognized properties during deserialization.
-     * If true, all properties that are unrecognized -- that is,
-     * there are no setters or creators that accept them -- are
-     * ignored without warnings (although handlers for unknown
-     * properties, if any, will still be called) without
-     * exception.
-     *<p>
-     * Does not have any effect on serialization.
-     */
-    public boolean ignoreUnknown() default false;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreType.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreType.java
deleted file mode 100644
index c05877e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonIgnoreType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that indicates that all properties of annotated
- * type are to be ignored during serialization and deserialization.
- *<p>
- * Note: annotation does have boolean 'value' property (which defaults
- * to 'true'), so that it is actually possible to override value
- * using mix-in annotations.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonIgnoreType
-{
-    /**
-     * Optional argument that defines whether this annotation is active
-     * or not. The only use for value 'false' if for overriding purposes
-     * (which is not needed often); most likely it is needed for use
-     * with "mix-in annotations" ("annotation overrides").
-     * For most cases, however, default value of "true" is just fine
-     * and should be omitted.
-     */
-    boolean value() default true;
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonInclude.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonInclude.java
deleted file mode 100644
index 3d2db1e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonInclude.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate when value of the annotated property (when
- * used for a field, method or constructor parameter), or all 
- * properties of the annotated class, is to be serialized.
- * Without annotation property values are always included, but by using
- * this annotation one can specify simple exclusion rules to reduce
- * amount of properties to write out.
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD,
-    ElementType.TYPE, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonInclude
-{
-    /**
-     * Inclusion rule to use.
-     */
-    public Include value() default Include.ALWAYS;
-    
-    /*
-    /**********************************************************
-    /* Value enumerations needed
-    /**********************************************************
-     */
-
-    /**
-     * Enumeration used with {@link JsonInclude}
-     * to define which properties
-     * of Java Beans are to be included in serialization.
-     *<p>
-     * Note: Jackson 1.x had similarly named ("Inclusion") enumeration included
-     * in <code>JsonSerialize</code> annotation: it is not deprecated
-     * and this value used instead.
-     */
-    public enum Include
-    {
-        /**
-         * Value that indicates that property is to be always included,
-         * independent of value of the property.
-         */
-        ALWAYS,
-
-        /**
-         * Value that indicates that only properties with non-null
-         * values are to be included.
-         */
-        NON_NULL,
-
-        /**
-         * Value that indicates that only properties that have values
-         * that differ from default settings (meaning values they have
-         * when Bean is constructed with its no-arguments constructor)
-         * are to be included. Value is generally not useful with
-         * {@link java.util.Map}s, since they have no default values;
-         * and if used, works same as {@link #ALWAYS}.
-         */
-        NON_DEFAULT,
-
-        /**
-         * Value that indicates that only properties that have values
-         * that values that are null or what is considered empty are
-         * not to be included.
-         *<p>
-         * Default emptiness is defined for following type:
-         *<ul>
-         * <li>For {@link java.util.Collection}s and {@link java.util.Map}s,
-         *    method <code>isEmpty()</code> is called;
-         *   </li>
-         * <li>For Java arrays, empty arrays are ones with length of 0
-         *   </li>
-         * <li>For Java {@link java.lang.String}s, <code>length()</code> is called,
-         *   and return value of 0 indicates empty String (note that <code>String.isEmpty()</code>
-         *   was added in Java 1.6 and as such can not be used by Jackson
-         *   </li>
-         * <ul>
-         *  and for other types, non-null values are to be included.
-         *<p>
-         * Note that this default handling can be overridden by custom
-         * <code>JsonSerializer</code> implementation: if method <code>isEmpty()</code>
-         * is overridden, it will be called to see if non-null values are
-         * considered empty (null is always considered empty).
-         */
-        NON_EMPTY
-        ;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonManagedReference.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonManagedReference.java
deleted file mode 100644
index 71d1cb7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonManagedReference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate that annotated property is part of
- * two-way linkage between fields; and that its role is "parent" (or "forward") link.
- * Value type (class) of property must have a single compatible property annotated with
- * {@link JsonBackReference}. Linkage is handled such that the property
- * annotated with this annotation is handled normally (serialized normally, no
- * special handling for deserialization); it is the matching back reference
- * that requires special handling
- *<p>
- * All references have logical name to allow handling multiple linkages; typical case
- * would be that where nodes have both parent/child and sibling linkages. If so,
- * pairs of references should be named differently.
- * It is an error for a class too have multiple managed references with same name,
- * even if types pointed are different.
- *<p>
- * Note: only methods and fields can be annotated with this annotation: constructor
- * arguments should NOT be annotated, as they can not be either managed or back
- * references.
- * 
- * @author tatu
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonManagedReference
-{
-    /**
-     * Logical have for the reference property pair; used to link managed and
-     * back references. Default name can be used if there is just single
-     * reference pair (for example, node class that just has parent/child linkage,
-     * consisting of one managed reference and matching back reference)
-     */
-    public String value() default "defaultReference";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonProperty.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonProperty.java
deleted file mode 100644
index 242c7b7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonProperty.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define a non-static
- * method as a "setter" or "getter" for a logical property
- * (depending on its signature),
- * or non-static object field to be used (serialized, deserialized) as
- * a logical property.
- *<p>
- * Default value ("") indicates that the field name is used
- * as the property name without any modifications, but it
- * can be specified to non-empty value to specify different
- * name. Property name refers to name used externally, as
- * the field name in JSON objects.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonProperty
-{
-    /**
-     * Special value that indicates that handlers should use the default
-     * name (derived from method or field name) for property.
-     * 
-     * @since 2.1
-     */
-    public final static String USE_DEFAULT_NAME = "";
-
-    /**
-     * Defines name of the logical property, i.e. JSON object field
-     * name to use for the property. If value is empty String (which is the
-     * default), will try to use name of the field that is annotated.
-     * Note that there is
-     * <b>no default name available for constructor arguments</b>,
-     * meaning that
-     * <b>Empty String is not a valid value for constructor arguments</b>.
-     */
-    String value() default USE_DEFAULT_NAME;
-
-    /**
-     * Property that indicates whether a value (which may be explicit
-     * null) is expected for property during deserialization or not.
-     * If expected, <code>BeanDeserialized</code> should indicate
-     * this as a validity problem (usually by throwing an exception,
-     * but this may be sent via problem handlers that can try to
-     * rectify the problem, for example, by supplying a default
-     * value).
-     *<p>
-     * Note that as of 2.0, this property is NOT used by
-     * <code>BeanDeserializer</code>: support is expected to be
-     * added for a later minor version.
-     * 
-     * @since 2.0
-     */
-    boolean required() default false;
-
-    /* NOTE: considering of adding ability to specify default
-     * String value -- would work well for scalar types, most of
-     * which can coerce from Strings. But won't add for 2.0 yet.
-     */
-    //String defaultValue() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonPropertyOrder.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonPropertyOrder.java
deleted file mode 100644
index 861b798..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonPropertyOrder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be used to define ordering (possibly partial) to use
- * when serializing object properties. Properties included in annotation
- * declaration will be serialized first (in defined order), followed by
- * any properties not included in the definition.
- * Annotation definition will override any implicit orderings (such as
- * guarantee that Creator-properties are serialized before non-creator
- * properties)
- *<p>
- * Examples:
- *<pre>
- *  // ensure that "id" and "name" are output before other properties
- *  <div>@</div>JsonPropertyOrder({ "id", "name" })
- *  // order any properties that don't have explicit setting using alphabetic order
- *  <div>@</div>JsonPropertyOrder(alphabetic=true)
- *</pre>
- *<p>
- * This annotation may or may not have effect on deserialization: for basic JSON
- * handling there is no effect, but for other supported data types (or structural
- * conventions) there may be.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonPropertyOrder
-{
-    /**
-     * Order in which properties of annotated object are to be serialized in.
-     */
-    public String[] value() default { };
-
-    /**
-     * Property that defines what to do regarding ordering of properties
-     * not explicitly included in annotation instance. If set to true,
-     * they will be alphabetically ordered; if false, order is
-     * undefined (default setting)
-     */
-    public boolean alphabetic() default false;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRawValue.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRawValue.java
deleted file mode 100644
index e33d123..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRawValue.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that indicates that the annotated method
- * or field should be serialized by including literal String value
- * of the property as is, without quoting of characters.
- * This can be useful for injecting values already serialized in JSON or 
- * passing javascript function definitions from server to a javascript client.
- *<p>
- * Warning: the resulting JSON stream may be invalid depending on your input value.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonRawValue
-{
-    /**
-     * Optional argument that defines whether this annotation is active
-     * or not. The only use for value 'false' if for overriding purposes
-     * (which is not needed often); most likely it is needed for use
-     * with "mix-in annotations" (aka "annotation overrides").
-     * For most cases, however, default value of "true" is just fine
-     * and should be omitted.
-     */
-    boolean value() default true;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRootName.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRootName.java
deleted file mode 100644
index e8e5732..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonRootName.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation similar to {@link javax.xml.bind.annotation.XmlRootElement},
- * used to indicate name to use for root-level wrapping, if wrapping is
- * enabled. Annotation itself does not indicate that wrapping should
- * be used; but if it is, name used for serialization should be name
- * specified here, and deserializer will expect the name as well.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonRootName
-{
-    /**
-     * Root name to use if root-level wrapping is enabled.
-     */
-    public String value();
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSetter.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSetter.java
deleted file mode 100644
index ada41d3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSetter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used to define a non-static,
- * single-argument method to be used as a "setter" for a logical property
- * as an alternative to recommended
- * {@link JsonProperty} annotation (which was introduced in version 1.1).
- *<p>
- * Setter means that when a property with matching name is encountered in
- * JSON content, this method will be used to set value of the property.
- *<p>
- * NOTE: this annotation was briefly deprecated for version 1.5; but has
- * since been un-deprecated to both allow for asymmetric naming (possibly
- * different name when reading and writing JSON), and more importantly to
- * allow multi-argument setter method in future.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonSetter
-{
-    /**
-     * Optional default argument that defines logical property this
-     * method is used to modify ("set"); this is the property
-     * name used in JSON content.
-     */
-    String value() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSubTypes.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSubTypes.java
deleted file mode 100644
index 861e522..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonSubTypes.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used with {@link JsonTypeInfo} to indicate sub types of serializable
- * polymorphic types, and to associate logical names used within JSON content
- * (which is more portable than using physical Java class names).
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.FIELD,
-    ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonSubTypes {
-    /**
-     * Subtypes of the annotated type (annotated class, or property value type
-     * associated with the annotated method). These will be checked recursively
-     * so that types can be defined by only including direct subtypes.
-     */
-    public Type[] value();
-
-    /**
-     * Definition of a subtype, along with optional name. If name is missing, class
-     * of the type will be checked for {@link JsonTypeName} annotation; and if that
-     * is also missing or empty, a default
-     * name will be constructed by type id mechanism.
-     * Default name is usually based on class name.
-     */
-    public @interface Type {
-        /**
-         * Class of the subtype
-         */
-        public Class<?> value();
-
-        /**
-         * Logical type name used as the type identifier for the class
-         */
-        public String name() default "";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeId.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeId.java
deleted file mode 100644
index 4a875a2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeId.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation that can be used on a property accessor
- * (field, getter or setter, constructor parameter) to indicate that
- * the property is to contain type id to use when including
- * polymorphic type information.
- * Annotation should <b>only be used</b> if the intent is to override
- * generation of standard type id: if so, value of the property will be
- * accessed during serialization and used as the type id.
- *<p>
- * On deserialization annotation has no effect, as visibility of type id
- * is governed by value of {@link JsonTypeInfo#visible}; properties with
- * this annotation get no special handling.
- *<p>
- * On serialization, this annotation will exclude property from being
- * serialized along other properties; instead, its value is serialized
- * as the type identifier. Since type identifier may be included in
- * various places, it may still appear like 'normal' property (when using
- * {@link JsonTypeInfo.As#PROPERTY}), but is more commonly embedded
- * in a different place, as per inclusion rules (see {@link JsonTypeInfo}
- * for details).
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonTypeId
-{
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeInfo.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeInfo.java
deleted file mode 100644
index b20111f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeInfo.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Annotation used for configuring details of if and how type information is
- * used with JSON serialization and deserialization, to preserve information
- * about actual class of Object instances. This is necessarily for polymorphic
- * types, and may also be needed to link abstract declared types and matching
- * concrete implementation.
- *<p>
- * Some examples of typical annotations:
- *<pre>
- *  // Include Java class name ("com.myempl.ImplClass") as JSON property "class"
- *  &#064;JsonTypeInfo(use=Id.CLASS, include=As.PROPERTY, property="class")
- *  
- *  // Include logical type name (defined in impl classes) as wrapper; 2 annotations
- *  &#064;JsonTypeInfo(use=Id.NAME, include=As.WRAPPER_OBJECT)
- *  &#064;JsonSubTypes({com.myemp.Impl1.class, com.myempl.Impl2.class})
- *</pre>
- * Alternatively you can also define fully customized type handling by using
- * <code>&#064;JsonTypeResolver</code> annotation (from databind package).
- *<p>
- * This annotation can be used both for types (classes) and properties.
- * If both exist, annotation on property has precedence, as it is
- * considered more specific.
- *<p>
- * When used for properties (fields, methods), this annotation applies
- * to <b>values</b>: so when applied to structure types
- * (like {@link java.util.Collection}, {@link java.util.Map}, arrays),
- * will apply to contained values, not the container;
- * for non-structured types there is no difference.
- * This is identical to how JAXB handles type information
- * annotations; and is chosen since it is the dominant use case.
- * There is no per-property way to force type information to be included
- * for type of container (structured type); for container types one has
- * to use annotation for type declaration.
- *<p>
- * Note on visibility of type identifier: by default, deserialization
- * (use during reading of JSON) of type identifier
- * is completely handled by Jackson, and is <b>not passed to</b>
- * deserializers. However, if so desired,
- * it is possible to define property <code>visible = true</code>
- * in which case property will be passed as-is to deserializers
- * (and set via setter or field) on deserialization.
- *<p>
- * On serialization side, Jackson will generate type id by itself,
- * except if there is a property with name that matches
- * {@link #property()}, in which case value of that property is
- * used instead.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE,
-    ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonTypeInfo
-{    
-    /*
-    /**********************************************************
-    /* Value enumerations used for properties
-    /**********************************************************
-     */
-    
-    /**
-     * Definition of different type identifiers that can be included in JSON
-     * during serialization, and used for deserialization.
-     */
-    public enum Id {
-        /**
-         * This means that no explicit type metadata is included, and typing is
-         * purely done using contextual information possibly augmented with other
-         * annotations.
-         */
-        NONE(null),
-
-        /**
-         * Means that fully-qualified Java class name is used as the type identifier.
-         */
-        CLASS("@class"),
-
-        /**
-         * Means that Java class name with minimal path is used as the type identifier.
-         * Minimal means that only the class name, and that part of preceding Java
-         * package name is included that is needed to construct fully-qualified name
-         * given fully-qualified name of the declared supertype; additionally a single
-         * leading dot ('.') must be used to indicate that partial class name is used.
-         * For example, for supertype "com.foobar.Base", and concrete type
-         * "com.foo.Impl", only ".Impl" would be included; and for "com.foo.impl.Impl2"
-         * only ".impl.Impl2" would be included.<br />
-         * <b>NOTE</b>: leading dot ('.') MUST be used to denote partial (minimal) name;
-         * if it is missing, value is assumed to be fully-qualified name. Fully-qualified
-         * name is used in cases where subtypes are not in same package (or sub-package
-         * thereof) as base class.
-         *<p>
-         * If all related classes are in the same Java package, this option can reduce
-         * amount of type information overhead, especially for small types.
-         * However, please note that using this alternative is inherently risky since it
-         * assumes that the
-         * supertype can be reliably detected. Given that it is based on declared type
-         * (since ultimate supertype, <code>java.lang.Object</code> would not be very
-         * useful reference point), this may not always work as expected.
-         */
-        MINIMAL_CLASS("@c"),
-
-        /**
-         * Means that logical type name is used as type information; name will then need
-         * to be separately resolved to actual concrete type (Class).
-         */
-        NAME("@type"),
-
-        /**
-         * Means that typing mechanism uses customized handling, with possibly
-         * custom configuration. This means that semantics of other properties is
-         * not defined by Jackson package, but by the custom implementation.
-         */
-        CUSTOM(null)
-        ;
-
-        private final String _defaultPropertyName;
-
-        private Id(String defProp) {
-            _defaultPropertyName = defProp;
-        }
-
-        public String getDefaultPropertyName() { return _defaultPropertyName; }
-    }
-
-    /**
-     * Definition of standard type inclusion mechanisms for type metadata.
-     * Used for standard metadata types, except for {@link Id#NONE}.
-     * May or may not be used for custom types ({@link Id#CUSTOM}).
-     */
-    public enum As {
-        /**
-         * Inclusion mechanism that uses a single configurable property, included
-         * along with actual data (POJO properties) as a separate meta-property.
-         * <p>
-         * Default choice for inclusion.
-         */
-        PROPERTY,
-
-        /**
-         * Inclusion mechanism that wraps typed JSON value (POJO
-         * serialized as JSON) in
-         * a JSON Object that has a single entry,
-         * where field name is serialized type identifier,
-         * and value is the actual JSON value.
-         *<p>
-         * Note: can only be used if type information can be serialized as
-         * String. This is true for standard type metadata types, but not
-         * necessarily for custom types.
-         */
-        WRAPPER_OBJECT,
-
-        /**
-         * Inclusion mechanism that wraps typed JSON value (POJO
-         * serialized as JSON) in
-         * a 2-element JSON array: first element is the serialized
-         * type identifier, and second element the serialized POJO
-         * as JSON Object.
-         */
-        WRAPPER_ARRAY,
-        
-        /**
-         * Inclusion mechanism similar to <code>PROPERTY</code>, except that
-         * property is included one-level higher in hierarchy, i.e. as sibling
-         * property at same level as JSON Object to type.
-         * Note that this choice <b>can only be used for properties</b>, not
-         * for types (classes). Trying to use it for classes will result in
-         * inclusion strategy of basic <code>PROPERTY</code> instead.
-         */
-        EXTERNAL_PROPERTY
-        ;
-    }
-    
-    /*
-    /**********************************************************
-    /* Annotation properties
-    /**********************************************************
-     */
-    
-    /**
-     * What kind of type metadata is to be used for serializing and deserializing
-     * type information for instances of annotated type (and its subtypes
-     * unless overridden)
-     */
-    public Id use();    
-    
-    /**
-     * What mechanism is used for including type metadata (if any; for
-     * {@link Id#NONE} nothing is included). Default
-     *<p>
-     * Note that for type metadata type of {@link Id#CUSTOM},
-     * this setting may or may not have any effect.
-     */
-    public As include() default As.PROPERTY;
-
-    /**
-     * Property names used when type inclusion method ({@link As#PROPERTY}) is used
-     * (or possibly when using type metadata of type {@link Id#CUSTOM}).
-     * If POJO itself has a property with same name, value of property
-     * will be set with type id metadata: if no such property exists, type id
-     * is only used for determining actual type.
-     *<p>
-     * Default property name used if this property is not explicitly defined
-     * (or is set to empty String) is based on
-     * type metadata type ({@link #use}) used.
-     */
-    public String property() default "";
-
-    /**
-     * Optional property that can be used to specify default implementation
-     * class to use if type identifier is either not present, or can not
-     * be mapped to a registered type (which can occur for ids, but not when
-     * specifying explicit class to use).
-     *<p>
-     * Note that while this property allows specification of the default
-     * implementation to use, it does not help with structural issues that
-     * may arise if type information is missing. This means that most often
-     * this is used with type-name -based resolution, to cover cases
-     * where new sub-types are added, but base type is not changed to
-     * reference new sub-types.
-     */
-    public Class<?> defaultImpl() default None.class;
-
-    /**
-     * Property that defines whether type identifier value will be passed
-     * as part of JSON stream to deserializer (true), or handled and
-     * removed by <code>TypeDeserializer</code> (false).
-     *<p>
-     * Default value is false, meaning that Jackson handles and removes
-     * the type identifier from JSON content that is passed to
-     * <code>JsonDeserializer</code>.
-     * 
-     * @since 2.0
-     */
-    public boolean visible() default false;
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * This marker class that is only to be used with <code>defaultImpl</code>
-     * annotation property, to indicate that there is no default implementation
-     * specified.
-     */
-    public abstract static class None { }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeName.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeName.java
deleted file mode 100644
index 45d6713..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonTypeName.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * Annotation used for binding logical name that the annotated class
- * has. Used with {@link JsonTypeInfo} (and specifically its
- * {@link JsonTypeInfo#use} property) to establish relationship
- * between type names and types.
- * 
- * @author tatu
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonTypeName {
-    /**
-     * Logical type name for annotated type. If missing (or defined as Empty String),
-     * defaults to using non-qualified class name as the type.
-     */
-    public String value() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonUnwrapped.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonUnwrapped.java
deleted file mode 100644
index a3cca4d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonUnwrapped.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate that a property should be serialized
- * "unwrapped"; that is, if it would be serialized as JSON Object, its
- * properties are instead included as properties of its containing
- * Object. For example, consider case of POJO like:
- * 
- *<pre>
- *  public class Parent {
- *    public int age;
- *    public Name name;
- *  }
- *  public class Name {
- *    public String first, last;
- *  }
- *</pre>  
- * which would normally be serialized as follows (assuming @JsonUnwrapped
- * had no effect):
- *<pre>
- *  {
- *    "age" : 18,
- *    "name" : {
- *      "first" : "Joey",
- *      "last" : "Sixpack"
- *    }
- *  }
- *</pre>
- * can be changed to this:
- *<pre>
- *  {
- *    "age" : 18,
- *    "first" : "Joey",
- *    "last" : "Sixpack"
- *  }
- *</pre>
- * by changing Parent class to:
- *<pre>
- *  public class Parent {
- *    public int age;
- *    \@JsonUnwrapped
- *    public Name name;
- *  }
- *</pre>
- * Annotation can only be added to properties, and not classes, as it is contextual.
- *<p>
- * Also note that annotation only applies if
- *<ul>
- * <li>Value is serialized as JSON Object (can not unwrap JSON arrays using this
- *   mechanism)
- *   </li>
- * <li>Serialization is done using <code>BeanSerializer</code>, not a custom serializer
- *   </li>
- * <li>No type information is added; if type information needs to be added, structure can
- *   not be altered regardless of inclusion strategy; so annotation is basically ignored.
- *   </li>
- * </ul>
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonUnwrapped
-{
-    /**
-     * Property that is usually only used when overriding (masking) annotations,
-     * using mix-in annotations. Otherwise default value of 'true' is fine, and
-     * value need not be explicitly included.
-     */
-    boolean enabled() default true;
-
-    /**
-     * Optional property that can be used to add prefix String to use in front
-     * of names of properties that are unwrapped: this can be done for example to prevent
-     * name collisions.
-     */
-    String prefix() default "";
-
-    /**
-     * Optional property that can be used to add suffix String to append at the end
-     * of names of properties that are unwrapped: this can be done for example to prevent
-     * name collisions.
-     */
-    String suffix() default "";
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonValue.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonValue.java
deleted file mode 100644
index 9286d2a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonValue.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker annotation similar to
- * {@link javax.xml.bind.annotation.XmlValue} 
- * that indicates that results of the annotated "getter" method
- * (which means signature must be that of getters; non-void return
- * type, no args) is to be used as the single value to serialize
- * for the instance. Usually value will be of a simple scalar type
- * (String or Number), but it can be any serializable type (Collection,
- * Map or Bean).
- *<p>
- * At most one method of a <code>Class</code> can be annotated with this annotation;
- * if more than one is found, an exception may be thrown.
- * Also, if method signature is not compatible with Getters, an exception
- * may be thrown (whether exception is thrown or not is an implementation detail (due
- * to filtering during introspection, some annotations may be skipped)
- * and applications should not rely on specific behavior).
- *<p>
- * A typical usage is that of annotating <code>toString()</code>
- * method so that returned String value is used as the JSON serialization;
- * and if deserialization is needed, there is matching constructor
- * or factory method annotated with {@link JsonCreator} annotation.
- *<p>
- * Boolean argument is only used so that sub-classes can "disable"
- * annotation if necessary.
- *<p>
- * NOTE: when use for Java <code>enum</code>s, one additional feature is
- * that value returned by annotated method is also considered to be the
- * value to deserialize from, not just JSON String to serialize as.
- * This is possible since set of Enum values is constant and it is possible
- * to define mapping, but can not be done in general for POJO types; as such,
- * this is not used for POJO deserialization.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonValue
-{
-    /**
-     * Optional argument that defines whether this annotation is active
-     * or not. The only use for value 'false' if for overriding purposes.
-     * Overriding may be necessary when used
-     * with "mix-in annotations" (aka "annotation overrides").
-     * For most cases, however, default value of "true" is just fine
-     * and should be omitted.
-     */
-    boolean value() default true;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonView.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonView.java
deleted file mode 100644
index 0043bce..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/JsonView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.annotation.JacksonAnnotation;
-
-/**
- * Annotation used for indicating view(s) that the property
- * that is defined by method or field annotated is part of.
- *<p>
- * An example annotation would be:
- *<pre>
- *  \@JsonView(BasicView.class)
- *</pre>
- * which would specify that property annotated would be included
- * when processing (serializing, deserializing) View identified
- * by <code>BasicView.class</code> (or its sub-class).
- * If multiple View class identifiers are included, property will
- * be part of all of them.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonView {
-    /**
-     * View or views that annotated element is part of. Views are identified
-     * by classes, and use expected class inheritance relationship: child
-     * views contain all elements parent views have, for example.
-     */
-    public Class<?>[] value() default { };
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerator.java
deleted file mode 100644
index 7b793ef..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-/**
- * Definition of API used for constructing Object Identifiers
- * (as annotated using {@link JsonIdentityInfo}).
- * Also defines factory methods used for creating instances
- * for serialization, deserialization.
- *
- * @param <T> Type of Object Identifiers produced.
- */
-public abstract class ObjectIdGenerator<T>
-{
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    public abstract Class<?> getScope();
-
-    /**
-     * Method called to check whether this generator instance can
-     * be used for Object Ids of specific generator type and
-     * scope; determination is based by passing a configured
-     * "blueprint" (prototype) instance; from which the actual
-     * instances are created (using {@link #newForSerialization}).
-     * 
-     * @return True if this instance can be used as-is; false if not
-     */
-    public abstract boolean canUseFor(ObjectIdGenerator<?> gen);
-    
-    /*
-    /**********************************************************
-    /* Factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Factory method to create a blueprint instance for specified
-     * scope. Generators that do not use scope may return 'this'.
-     */
-    public abstract ObjectIdGenerator<T> forScope(Class<?> scope);
-    
-    /**
-     * Factory method called to create a new instance to use for
-     * serialization: needed since generators may have state
-     * (next id to produce).
-     *<p>
-     * Note that actual type of 'context' is
-     * <code>com.fasterxml.jackson.databind.SerializerProvider</code>,
-     * but can not be declared here as type itself (as well as call
-     * to this object) comes from databind package.
-     * 
-     * @param context Serialization context object used (of type
-     *    <code>com.fasterxml.jackson.databind.SerializerProvider</code>;
-     *    may be needed by more complex generators to access contextual
-     *    information such as configuration.
-     */
-    public abstract ObjectIdGenerator<T> newForSerialization(Object context);
-
-    /**
-     * Method for constructing key to use for ObjectId-to-POJO maps.
-     */
-    public abstract IdKey key(Object key);
-    
-    /*
-    /**********************************************************
-    /* Methods for serialization
-    /**********************************************************
-     */
-    
-    /**
-     * Method used for generating a new Object Identifier to serialize
-     * for given POJO.
-     * 
-     * @param forPojo POJO for which identifier is needed
-     * 
-     * @return Object Identifier to use.
-     */
-    public abstract T generateId(Object forPojo);
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Simple key class that can be used as a key for
-     * ObjectId-to-POJO mappings, when multiple ObjectId types
-     * and scopes are used.
-     */
-    public final static class IdKey
-    {
-        /**
-         * Type of {@link ObjectIdGenerator} used for generating Object Id
-         */
-        private final Class<?> type;
-
-        /**
-         * Scope of the Object Id (may be null, to denote global)
-         */
-        private final Class<?> scope;
-
-        /**
-         * Object for which Object Id was generated: can NOT be null.
-         */
-        private final Object key;
-
-        /**
-         * Hash code
-         */
-        private final int hashCode;
-        
-        public IdKey(Class<?> type, Class<?> scope, Object key) {
-            this.type = type;
-            this.scope = scope;
-            this.key = key;
-            
-            int h = key.hashCode() + type.getName().hashCode();
-            if (scope != null) {
-                h ^= scope.getName().hashCode();
-            }
-            hashCode = h;
-        }
-
-        @Override
-        public int hashCode() { return hashCode; }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (o == this) return true;
-            if (o == null) return false;
-            if (o.getClass() != getClass()) return false;
-            IdKey other = (IdKey) o;
-            return (other.key.equals(key)) && (other.type == type) && (other.scope == scope);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerators.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerators.java
deleted file mode 100644
index 3317fba..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/ObjectIdGenerators.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-import java.util.UUID;
-
-/**
- * Container class for standard {@link ObjectIdGenerator} implementations.
- */
-public class ObjectIdGenerators
-{
-    /*
-    /**********************************************************
-    /* Shared base class for concrete implementations
-    /**********************************************************
-     */
-
-    /**
-     * Helper class for implementations contained.
-     */
-    private abstract static class Base<T> extends ObjectIdGenerator<T>
-    {
-        protected final Class<?> _scope;
-
-        protected Base(Class<?> scope) {
-            _scope = scope;
-        }
-
-        @Override
-        public final Class<?> getScope() {
-            return _scope;
-        }
-        
-        @Override
-        public boolean canUseFor(ObjectIdGenerator<?> gen) {
-            return (gen.getClass() == getClass()) && (gen.getScope() == _scope);
-        }
-        
-        @Override
-        public abstract T generateId(Object forPojo);
-    }
-
-    /*
-    /**********************************************************
-    /* Implementation classes
-    /**********************************************************
-     */
-    
-    /**
-     * Abstract marker class used to allow explicitly specifying
-     * that no generator is used; which also implies that no
-     * Object Id is to be included or used.
-     */
-    public abstract static class None extends ObjectIdGenerator<Object> { }
-    
-    /**
-     * Abstract place-holder class which is used to denote case
-     * where Object Identifier to use comes from a POJO property
-     * (getter method or field). If so, value is written directly
-     * during serialization, and used as-is during deserialization.
-     *<p>
-     * Actual implementation class is part of <code>databind</code>
-     * package.
-     */
-    public abstract static class PropertyGenerator extends Base<Object> {
-        protected PropertyGenerator(Class<?> scope) { super(scope); }
-    }
-    
-    /**
-     * Simple sequence-number based generator, which uses basic Java
-     * <code>int</code>s (starting with value 1) as Object Identifiers.
-     */
-    public final static class IntSequenceGenerator extends Base<Integer>
-    {
-        protected int _nextValue;
-
-        public IntSequenceGenerator() { this(Object.class, -1); }
-        public IntSequenceGenerator(Class<?> scope, int fv) {
-            super(scope);
-            _nextValue = fv;
-        }
-
-        protected int initialValue() { return 1; }
-        
-        @Override
-        public ObjectIdGenerator<Integer> forScope(Class<?> scope) {
-            return (_scope == scope) ? this : new IntSequenceGenerator(scope, _nextValue);
-        }
-        
-        @Override
-        public ObjectIdGenerator<Integer> newForSerialization(Object context) {
-            return new IntSequenceGenerator(_scope, initialValue());
-        }
-
-        @Override
-        public IdKey key(Object key) {
-            return new IdKey(getClass(), _scope, key);
-        }
-        
-        @Override
-        public Integer generateId(Object forPojo) {
-            int id = _nextValue;
-            ++_nextValue;
-            return id;
-        }
-    }
-
-    /**
-     * Implementation that just uses {@link java.util.UUID}s as reliably
-     * unique identifiers: downside is that resulting String is
-     * 36 characters long.
-     *<p>
-     * One difference to other generators is that scope is always
-     * set as <code>Object.class</code> (regardless of arguments): this
-     * because UUIDs are globally unique, and scope has no meaning.
-     */
-    public final static class UUIDGenerator extends Base<UUID>
-    {
-        public UUIDGenerator() { this(Object.class); }
-        private UUIDGenerator(Class<?> scope) {
-            super(Object.class);
-        }
-
-        /**
-         * Can just return base instance since this is essentially scopeless
-         */
-        @Override
-        public ObjectIdGenerator<UUID> forScope(Class<?> scope) {
-            return this;
-        }
-        
-        /**
-         * Can just return base instance since this is essentially scopeless
-         */
-        @Override
-        public ObjectIdGenerator<UUID> newForSerialization(Object context) {
-            return this;
-        }
-
-        @Override
-        public UUID generateId(Object forPojo) {
-            return UUID.randomUUID();
-        }
-
-        @Override
-        public IdKey key(Object key) {
-            return new IdKey(getClass(), null, key);
-        }
-
-        /**
-         * Since UUIDs are always unique, let's fully ignore scope definition
-         */
-        @Override
-        public boolean canUseFor(ObjectIdGenerator<?> gen) {
-            return (gen.getClass() == getClass());
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/PropertyAccessor.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/PropertyAccessor.java
deleted file mode 100644
index ef4b846..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/PropertyAccessor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.fasterxml.jackson.annotation;
-
-/**
- * Enumeration used to define kinds of elements (called "property accessors")
- * that annotations like {@link JsonAutoDetect} apply to.
- *<p>
- * In addition to method types (GETTER/IS_GETTER, SETTER, CREATOR) and the
- * field type (FIELD), 2 pseudo-types
- * are defined for convenience: <code>ALWAYS</code> and <code>NONE</code>. These
- * can be used to indicate, all or none of available method types (respectively),
- * for use by annotations that takes <code>JsonMethod</code> argument.
- */
-public enum PropertyAccessor
-{
-    /**
-     * Getters are methods used to get a POJO field value for serialization,
-     * or, under certain conditions also for de-serialization. Latter
-     * can be used for effectively setting Collection or Map values
-     * in absence of setters, iff returned value is not a copy but
-     * actual value of the logical property.
-     *<p>
-     * Since version 1.3, this does <b>NOT</b> include "is getters" (methods
-     * that return boolean and named 'isXxx' for property 'xxx'); instead,
-     * {@link #IS_GETTER} is used}.
-     */
-    GETTER,
-
-    /**
-     * Setters are methods used to set a POJO value for deserialization.
-     */
-    SETTER,
-
-    /**
-     * Creators are constructors and (static) factory methods used to
-     * construct POJO instances for deserialization
-     */
-    CREATOR,
-
-    /**
-     * Field refers to fields of regular Java objects. Although
-     * they are not really methods, addition of optional field-discovery
-     * in version 1.1 meant that there was need to enable/disable
-     * their auto-detection, and this is the place to add it in.
-     */
-    FIELD,
-
-    /**
-     * "Is getters" are getter-like methods that are named "isXxx"
-     * (instead of "getXxx" for getters) and return boolean value
-     * (either primitive, or {@link java.lang.Boolean}).
-     *
-     */
-    IS_GETTER,
-
-    /**
-     * This pseudo-type indicates that none of accessors if affected.
-     */
-    NONE,
-
-    /**
-     * This pseudo-type indicates that all accessors are affected.
-     */
-    ALL
-    ;
-
-    private PropertyAccessor() { }
-
-    public boolean creatorEnabled() {
-        return (this == CREATOR) || (this == ALL);
-    }
-
-    public boolean getterEnabled() {
-        return (this == GETTER) || (this == ALL);
-    }
-
-    public boolean isGetterEnabled() {
-        return (this == IS_GETTER) || (this == ALL);
-    }
-
-    public boolean setterEnabled() {
-        return (this == SETTER) || (this == ALL);
-    }
-
-    public boolean fieldEnabled() {
-        return (this == FIELD) || (this == ALL);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/annotation/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/annotation/package-info.java
deleted file mode 100644
index f88c1ea..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/annotation/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Public core annotations, most of which are used to configure how
- * Data Mapping/Binding works. Annotations in this package can only
- * have dependencies to non-annotation classes in Core package;
- * annotations that have dependencies to Mapper classes are included
- * in Mapper module (under <code>org.codehaus.jackson.map.annotate</code>).
- * Also contains parameter types (mostly enums) needed by annotations.
- *<p>
- * Note that prior versions (1.x) contained these annotations within
- * 'core' jar, as part of Streaming API.
- */
-package com.fasterxml.jackson.annotation;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variant.java b/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variant.java
deleted file mode 100644
index 417741f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variant.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.fasterxml.jackson.core;
-
-import java.util.Arrays;
-
-/**
- * Abstract base class used to define specific details of which
- * variant of Base64 encoding/decoding is to be used. Although there is
- * somewhat standard basic version (so-called "MIME Base64"), other variants
- * exists, see <a href="http://en.wikipedia.org/wiki/Base64">Base64 Wikipedia entry</a> for details.
- * 
- * @author Tatu Saloranta
- */
-public final class Base64Variant
-    implements java.io.Serializable
-{
-    // We'll only serialize name
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Placeholder used by "no padding" variant, to be used when a character
-     * value is needed.
-     */
-    final static char PADDING_CHAR_NONE = '\0';
-
-    /**
-     * Marker used to denote ascii characters that do not correspond
-     * to a 6-bit value (in this variant), and is not used as a padding
-     * character.
-     */
-    public final static int BASE64_VALUE_INVALID = -1;
-
-    /**
-     * Marker used to denote ascii character (in decoding table) that
-     * is the padding character using this variant (if any).
-     */
-    public final static int BASE64_VALUE_PADDING = -2;
-
-    /*
-    /**********************************************************
-    /* Encoding/decoding tables
-    /**********************************************************
-     */
-
-    /**
-     * Decoding table used for base 64 decoding.
-     */
-    private final transient int[] _asciiToBase64 = new int[128];
-
-    /**
-     * Encoding table used for base 64 decoding when output is done
-     * as characters.
-     */
-    private final transient char[] _base64ToAsciiC = new char[64];
-
-    /**
-     * Alternative encoding table used for base 64 decoding when output is done
-     * as ascii bytes.
-     */
-    private final transient byte[] _base64ToAsciiB = new byte[64];
-
-    /*
-    /**********************************************************
-    /* Other configuration
-    /**********************************************************
-     */
-
-    /**
-     * Symbolic name of variant; used for diagnostics/debugging.
-     *<p>
-     * Note that this is the only non-transient field; used when reading
-     * back from serialized state
-     */
-    protected final String _name;
-
-    /**
-     * Whether this variant uses padding or not.
-     */
-    protected final transient boolean _usesPadding;
-
-    /**
-     * Characted used for padding, if any ({@link #PADDING_CHAR_NONE} if not).
-     */
-    protected final transient char _paddingChar;
-    
-    /**
-     * Maximum number of encoded base64 characters to output during encoding
-     * before adding a linefeed, if line length is to be limited
-     * ({@link java.lang.Integer#MAX_VALUE} if not limited).
-     *<p>
-     * Note: for some output modes (when writing attributes) linefeeds may
-     * need to be avoided, and this value ignored.
-     */
-    protected final transient int _maxLineLength;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public Base64Variant(String name, String base64Alphabet, boolean usesPadding, char paddingChar, int maxLineLength)
-    {
-        _name = name;
-        _usesPadding = usesPadding;
-        _paddingChar = paddingChar;
-        _maxLineLength = maxLineLength;
-
-        // Ok and then we need to create codec tables.
-
-        // First the main encoding table:
-        int alphaLen = base64Alphabet.length();
-        if (alphaLen != 64) {
-            throw new IllegalArgumentException("Base64Alphabet length must be exactly 64 (was "+alphaLen+")");
-        }
-
-        // And then secondary encoding table and decoding table:
-        base64Alphabet.getChars(0, alphaLen, _base64ToAsciiC, 0);
-        Arrays.fill(_asciiToBase64, BASE64_VALUE_INVALID);
-        for (int i = 0; i < alphaLen; ++i) {
-            char alpha = _base64ToAsciiC[i];
-            _base64ToAsciiB[i] = (byte) alpha;
-            _asciiToBase64[alpha] = i;
-        }
-
-        // Plus if we use padding, add that in too
-        if (usesPadding) {
-            _asciiToBase64[(int) paddingChar] = BASE64_VALUE_PADDING;
-        }
-    }
-
-    /**
-     * "Copy constructor" that can be used when the base alphabet is identical
-     * to one used by another variant except for the maximum line length
-     * (and obviously, name).
-     */
-    public Base64Variant(Base64Variant base, String name, int maxLineLength)
-    {
-        this(base, name, base._usesPadding, base._paddingChar, maxLineLength);
-    }
-
-    /**
-     * "Copy constructor" that can be used when the base alphabet is identical
-     * to one used by another variant, but other details (padding, maximum
-     * line length) differ
-     */
-    public Base64Variant(Base64Variant base, String name, boolean usesPadding, char paddingChar, int maxLineLength)
-    {
-        _name = name;
-        byte[] srcB = base._base64ToAsciiB;
-        System.arraycopy(srcB, 0, this._base64ToAsciiB, 0, srcB.length);
-        char[] srcC = base._base64ToAsciiC;
-        System.arraycopy(srcC, 0, this._base64ToAsciiC, 0, srcC.length);
-        int[] srcV = base._asciiToBase64;
-        System.arraycopy(srcV, 0, this._asciiToBase64, 0, srcV.length);
-
-        _usesPadding = usesPadding;
-        _paddingChar = paddingChar;
-        _maxLineLength = maxLineLength;
-    }
-
-    /*
-    /**********************************************************
-    /* Serializable overrides
-    /**********************************************************
-     */
-
-    /**
-     * Method used to "demote" deserialized instances back to 
-     * canonical ones
-     */
-    protected Object readResolve() {
-        return Base64Variants.valueOf(_name);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public accessors
-    /**********************************************************
-     */
-
-    public String getName() { return _name; }
-
-    public boolean usesPadding() { return _usesPadding; }
-    public boolean usesPaddingChar(char c) { return c == _paddingChar; }
-    public boolean usesPaddingChar(int ch) { return ch == (int) _paddingChar; }
-    public char getPaddingChar() { return _paddingChar; }
-    public byte getPaddingByte() { return (byte)_paddingChar; }
-
-    public int getMaxLineLength() { return _maxLineLength; }
-
-    /*
-    /**********************************************************
-    /* Decoding support
-    /**********************************************************
-     */
-
-    /**
-     * @return 6-bit decoded value, if valid character; 
-     */
-    public int decodeBase64Char(char c)
-    {
-        int ch = (int) c;
-        return (ch <= 127) ? _asciiToBase64[ch] : BASE64_VALUE_INVALID;
-    }
-
-    public int decodeBase64Char(int ch)
-    {
-        return (ch <= 127) ? _asciiToBase64[ch] : BASE64_VALUE_INVALID;
-    }
-
-    public int decodeBase64Byte(byte b)
-    {
-        int ch = (int) b;
-        return (ch <= 127) ? _asciiToBase64[ch] : BASE64_VALUE_INVALID;
-    }
-
-    /*
-    /**********************************************************
-    /* Encoding support
-    /**********************************************************
-     */
-
-    public char encodeBase64BitsAsChar(int value)
-    {
-        /* Let's assume caller has done necessary checks; this
-         * method must be fast and inlinable
-         */
-        return _base64ToAsciiC[value];
-    }
-
-    /**
-     * Method that encodes given right-aligned (LSB) 24-bit value
-     * into 4 base64 characters, stored in given result buffer.
-     */
-    public int encodeBase64Chunk(int b24, char[] buffer, int ptr)
-    {
-        buffer[ptr++] = _base64ToAsciiC[(b24 >> 18) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiC[(b24 >> 12) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiC[(b24 >> 6) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiC[b24 & 0x3F];
-        return ptr;
-    }
-
-    public void encodeBase64Chunk(StringBuilder sb, int b24)
-    {
-        sb.append(_base64ToAsciiC[(b24 >> 18) & 0x3F]);
-        sb.append(_base64ToAsciiC[(b24 >> 12) & 0x3F]);
-        sb.append(_base64ToAsciiC[(b24 >> 6) & 0x3F]);
-        sb.append(_base64ToAsciiC[b24 & 0x3F]);
-    }
-
-    /**
-     * Method that outputs partial chunk (which only encodes one
-     * or two bytes of data). Data given is still aligned same as if
-     * it as full data; that is, missing data is at the "right end"
-     * (LSB) of int.
-     *
-     * @param outputBytes Number of encoded bytes included (either 1 or 2)
-     */
-    public int encodeBase64Partial(int bits, int outputBytes, char[] buffer, int outPtr)
-    {
-        buffer[outPtr++] = _base64ToAsciiC[(bits >> 18) & 0x3F];
-        buffer[outPtr++] = _base64ToAsciiC[(bits >> 12) & 0x3F];
-        if (_usesPadding) {
-            buffer[outPtr++] = (outputBytes == 2) ?
-                _base64ToAsciiC[(bits >> 6) & 0x3F] : _paddingChar;
-            buffer[outPtr++] = _paddingChar;
-        } else {
-            if (outputBytes == 2) {
-                buffer[outPtr++] = _base64ToAsciiC[(bits >> 6) & 0x3F];
-            }
-        }
-        return outPtr;
-    }
-
-    public void encodeBase64Partial(StringBuilder sb, int bits, int outputBytes)
-    {
-        sb.append(_base64ToAsciiC[(bits >> 18) & 0x3F]);
-        sb.append(_base64ToAsciiC[(bits >> 12) & 0x3F]);
-        if (_usesPadding) {
-            sb.append((outputBytes == 2) ?
-                      _base64ToAsciiC[(bits >> 6) & 0x3F] : _paddingChar);
-            sb.append(_paddingChar);
-        } else {
-            if (outputBytes == 2) {
-                sb.append(_base64ToAsciiC[(bits >> 6) & 0x3F]);
-            }
-        }
-    }
-
-    public byte encodeBase64BitsAsByte(int value)
-    {
-        // As with above, assuming it is 6-bit value
-        return _base64ToAsciiB[value];
-    }
-
-    /**
-     * Method that encodes given right-aligned (LSB) 24-bit value
-     * into 4 base64 bytes (ascii), stored in given result buffer.
-     */
-    public int encodeBase64Chunk(int b24, byte[] buffer, int ptr)
-    {
-        buffer[ptr++] = _base64ToAsciiB[(b24 >> 18) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiB[(b24 >> 12) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiB[(b24 >> 6) & 0x3F];
-        buffer[ptr++] = _base64ToAsciiB[b24 & 0x3F];
-        return ptr;
-    }
-
-    /**
-     * Method that outputs partial chunk (which only encodes one
-     * or two bytes of data). Data given is still aligned same as if
-     * it as full data; that is, missing data is at the "right end"
-     * (LSB) of int.
-     *
-     * @param outputBytes Number of encoded bytes included (either 1 or 2)
-     */
-    public int encodeBase64Partial(int bits, int outputBytes, byte[] buffer, int outPtr)
-    {
-        buffer[outPtr++] = _base64ToAsciiB[(bits >> 18) & 0x3F];
-        buffer[outPtr++] = _base64ToAsciiB[(bits >> 12) & 0x3F];
-        if (_usesPadding) {
-            byte pb = (byte) _paddingChar;
-            buffer[outPtr++] = (outputBytes == 2) ?
-                _base64ToAsciiB[(bits >> 6) & 0x3F] : pb;
-            buffer[outPtr++] = pb;
-        } else {
-            if (outputBytes == 2) {
-                buffer[outPtr++] = _base64ToAsciiB[(bits >> 6) & 0x3F];
-            }
-        }
-        return outPtr;
-    }
-
-    /**
-     * Convenience method for converting given byte array as base64 encoded
-     * String using this variant's settings.
-     * Resulting value is "raw", that is, not enclosed in double-quotes.
-     * 
-     * @param input Byte array to encode
-     */
-    public String encode(byte[] input)
-    {
-        return encode(input, false);
-    }
-
-    /**
-     * Convenience method for converting given byte array as base64 encoded
-     * String using this variant's settings, optionally enclosed in
-     * double-quotes.
-     * 
-     * @param input Byte array to encode
-     * @param addQuotes Whether to surround resulting value in double quotes or not
-     */
-    public String encode(byte[] input, boolean addQuotes)
-    {
-        int inputEnd = input.length;
-        StringBuilder sb;
-        {
-            // let's approximate... 33% overhead, ~= 3/8 (0.375)
-            int outputLen = inputEnd + (inputEnd >> 2) + (inputEnd >> 3);
-            sb = new StringBuilder(outputLen);
-        }
-        if (addQuotes) {
-            sb.append('"');
-        }
-
-        int chunksBeforeLF = getMaxLineLength() >> 2;
-
-        // Ok, first we loop through all full triplets of data:
-        int inputPtr = 0;
-        int safeInputEnd = inputEnd-3; // to get only full triplets
-
-        while (inputPtr <= safeInputEnd) {
-            // First, mash 3 bytes into lsb of 32-bit int
-            int b24 = ((int) input[inputPtr++]) << 8;
-            b24 |= ((int) input[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) input[inputPtr++]) & 0xFF);
-            encodeBase64Chunk(sb, b24);
-            if (--chunksBeforeLF <= 0) {
-                // note: must quote in JSON value, so not really useful...
-                sb.append('\\');
-                sb.append('n');
-                chunksBeforeLF = getMaxLineLength() >> 2;
-            }
-        }
-
-        // And then we may have 1 or 2 leftover bytes to encode
-        int inputLeft = inputEnd - inputPtr; // 0, 1 or 2
-        if (inputLeft > 0) { // yes, but do we have room for output?
-            int b24 = ((int) input[inputPtr++]) << 16;
-            if (inputLeft == 2) {
-                b24 |= (((int) input[inputPtr++]) & 0xFF) << 8;
-            }
-            encodeBase64Partial(sb, b24, inputLeft);
-        }
-
-        if (addQuotes) {
-            sb.append('"');
-        }
-        return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* other methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString() { return _name; }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variants.java b/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variants.java
deleted file mode 100644
index 0e379f2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/Base64Variants.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.fasterxml.jackson.core;
-
-/**
- * Container for commonly used Base64 variants:
- *<ul>
- * <li> {@link #MIME}
- * <li> {@link #MIME_NO_LINEFEEDS}
- * <li> {@link #PEM}
- * <li> {@link #MODIFIED_FOR_URL}
- * </ul>
- * 
- * @author Tatu Saloranta
- */
-public final class Base64Variants
-{
-    final static String STD_BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    /**
-     * This variant is what most people would think of "the standard"
-     * Base64 encoding.
-     *<p>
-     * See <a href="">wikipedia Base64 entry</a> for details.
-     *<p>
-     * Note that although this can be thought of as the standard variant,
-     * it is <b>not</b> the default for Jackson: no-linefeeds alternative
-     * is because of JSON requirement of escaping all linefeeds.
-     */
-    public final static Base64Variant MIME;
-    static {
-        MIME = new Base64Variant("MIME", STD_BASE64_ALPHABET, true, '=', 76);
-    }
-
-    /**
-     * Slightly non-standard modification of {@link #MIME} which does not
-     * use linefeeds (max line length set to infinite). Useful when linefeeds
-     * wouldn't work well (possibly in attributes), or for minor space savings
-     * (save 1 linefeed per 76 data chars, ie. ~1.4% savings).
-     */
-    public final static Base64Variant MIME_NO_LINEFEEDS;
-    static {
-        MIME_NO_LINEFEEDS = new Base64Variant(MIME, "MIME-NO-LINEFEEDS", Integer.MAX_VALUE);
-    }
-
-    /**
-     * This variant is the one that predates {@link #MIME}: it is otherwise
-     * identical, except that it mandates shorter line length.
-     */
-    public final static Base64Variant PEM = new Base64Variant(MIME, "PEM", true, '=', 64);
-
-    /**
-     * This non-standard variant is usually used when encoded data needs to be
-     * passed via URLs (such as part of GET request). It differs from the
-     * base {@link #MIME} variant in multiple ways.
-     * First, no padding is used: this also means that it generally can not
-     * be written in multiple separate but adjacent chunks (which would not
-     * be the usual use case in any case). Also, no linefeeds are used (max
-     * line length set to infinite). And finally, two characters (plus and
-     * slash) that would need quoting in URLs are replaced with more
-     * optimal alternatives (hyphen and underscore, respectively).
-     */
-    public final static Base64Variant MODIFIED_FOR_URL;
-    static {
-        StringBuffer sb = new StringBuffer(STD_BASE64_ALPHABET);
-        // Replace plus with hyphen, slash with underscore (and no padding)
-        sb.setCharAt(sb.indexOf("+"), '-');
-        sb.setCharAt(sb.indexOf("/"), '_');
-        /* And finally, let's not split lines either, wouldn't work too
-         * well with URLs
-         */
-        MODIFIED_FOR_URL = new Base64Variant("MODIFIED-FOR-URL", sb.toString(), false, Base64Variant.PADDING_CHAR_NONE, Integer.MAX_VALUE);
-    }
-
-    /**
-     * Method used to get the default variant ("MIME_NO_LINEFEEDS") for cases
-     * where caller does not explicitly specify the variant.
-     * We will prefer no-linefeed version because linefeeds in JSON values
-     * must be escaped, making linefeed-containing variants sub-optimal.
-     */
-    public static Base64Variant getDefaultVariant() {
-        return MIME_NO_LINEFEEDS;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public static Base64Variant valueOf(String name) throws IllegalArgumentException
-    {
-        if (MIME._name.equals(name)) {
-            return MIME;
-        }
-        if (MIME_NO_LINEFEEDS._name.equals(name)) {
-            return MIME_NO_LINEFEEDS;
-        }
-        if (PEM._name.equals(name)) {
-            return PEM;
-        }
-        if (MODIFIED_FOR_URL._name.equals(name)) {
-            return MODIFIED_FOR_URL;
-        }
-        if (name == null) {
-            name = "<null>";
-        } else {
-            name = "'"+name+"'";
-        }
-        throw new IllegalArgumentException("No Base64Variant with name "+name);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/FormatSchema.java b/showkeyHelper/src/com/fasterxml/jackson/core/FormatSchema.java
deleted file mode 100644
index b1e0402..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/FormatSchema.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Simple tag interface used to mark schema objects that are used by some
- * {@link JsonParser} and {@link JsonGenerator} implementations to further
- * specify structure of expected format.
- * Basic JSON-based parsers and generators do not use schemas, but some data
- * formats (like many binary data formats like Thrift, protobuf) mandate
- * use of schemas.
- *<p>
- * Since there is little commonality between schemas for different data formats,
- * this interface does not define much meaningful functionality for accessing
- * schema details; rather, specific parser and generator implementations need
- * to cast to schema implementations they use. This marker interface is mostly
- * used for tagging "some kind of schema" -- instead of passing opaque
- * {@link java.lang.Object} -- for documentation purposes.
- */
-public interface FormatSchema
-{
-    /**
-     * Method that can be used to get an identifier that can be used for diagnostics
-     * purposes, to indicate what kind of data format this schema is used for: typically
-     * it is a short name of format itself, but it can also contain additional information
-     * in cases where data format supports multiple types of schemas.
-     */
-    String getSchemaType();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonEncoding.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonEncoding.java
deleted file mode 100644
index 7d78fb2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonEncoding.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Enumeration that defines legal encodings that can be used
- * for JSON content, based on list of allowed encodings from
- * <a href="http://www.ietf.org/rfc/rfc4627.txt">JSON specification</a>.
- *<p>
- * Note: if application want to explicitly disregard Encoding
- * limitations (to read in JSON encoded using an encoding not
- * listed as allowed), they can use {@link java.io.Reader} /
- * {@link java.io.Writer} instances as input
- */
-public enum JsonEncoding {
-    UTF8("UTF-8", false), // N/A for big-endian, really
-        UTF16_BE("UTF-16BE", true),
-        UTF16_LE("UTF-16LE", false),
-        UTF32_BE("UTF-32BE", true),
-        UTF32_LE("UTF-32LE", false)
-        ;
-    
-    protected final String _javaName;
-
-    protected final boolean _bigEndian;
-    
-    JsonEncoding(String javaName, boolean bigEndian)
-    {
-        _javaName = javaName;
-        _bigEndian = bigEndian;
-    }
-
-    /**
-     * Method for accessing encoding name that JDK will support.
-     *
-     * @return Matching encoding name that JDK will support.
-     */
-    public String getJavaName() { return _javaName; }
-
-    /**
-     * Whether encoding is big-endian (if encoding supports such
-     * notion). If no such distinction is made (as is the case for
-     * {@link #UTF8}), return value is undefined.
-     *
-     * @return True for big-endian encodings; false for little-endian
-     *   (or if not applicable)
-     */
-    public boolean isBigEndian() { return _bigEndian; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonFactory.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonFactory.java
deleted file mode 100644
index b51504a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonFactory.java
+++ /dev/null
@@ -1,1402 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.fasterxml.jackson.core;
-
-import java.io.*;
-import java.lang.ref.SoftReference;
-import java.net.URL;
-
-import com.fasterxml.jackson.core.format.InputAccessor;
-import com.fasterxml.jackson.core.format.MatchStrength;
-import com.fasterxml.jackson.core.io.*;
-import com.fasterxml.jackson.core.json.*;
-import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
-import com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer;
-import com.fasterxml.jackson.core.util.BufferRecycler;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-
-/**
- * The main factory class of Jackson package, used to configure and
- * construct reader (aka parser, {@link JsonParser})
- * and writer (aka generator, {@link JsonGenerator})
- * instances.
- *<p>
- * Factory instances are thread-safe and reusable after configuration
- * (if any). Typically applications and services use only a single
- * globally shared factory instance, unless they need differently
- * configured factories. Factory reuse is important if efficiency matters;
- * most recycling of expensive construct is done on per-factory basis.
- *<p>
- * Creation of a factory instance is a light-weight operation,
- * and since there is no need for pluggable alternative implementations
- * (as there is no "standard" JSON processor API to implement),
- * the default constructor is used for constructing factory
- * instances.
- *
- * @author Tatu Saloranta
- */
-public class JsonFactory
-    implements Versioned,
-        java.io.Serializable // since 2.1 (for Android, mostly)
-{
-    /**
-     * Computed for Jackson 2.1.0 release
-     */
-    private static final long serialVersionUID = 8726401676402117450L;
-
-    /**
-     * Name used to identify JSON format
-     * (and returned by {@link #getFormatName()}
-     */
-    public final static String FORMAT_NAME_JSON = "JSON";
-    
-    /**
-     * Bitfield (set of flags) of all factory features that are enabled by default.
-     */
-    protected final static int DEFAULT_FACTORY_FEATURE_FLAGS = JsonFactory.Feature.collectDefaults();
-
-    /**
-     * Bitfield (set of flags) of all parser features that are enabled
-     * by default.
-     */
-    protected final static int DEFAULT_PARSER_FEATURE_FLAGS = JsonParser.Feature.collectDefaults();
-    
-    /**
-     * Bitfield (set of flags) of all generator features that are enabled
-     * by default.
-     */
-    protected final static int DEFAULT_GENERATOR_FEATURE_FLAGS = JsonGenerator.Feature.collectDefaults();
-
-    private final static SerializableString DEFAULT_ROOT_VALUE_SEPARATOR = DefaultPrettyPrinter.DEFAULT_ROOT_VALUE_SEPARATOR;
-    
-    /**
-     * Enumeration that defines all on/off features that can only be
-     * changed for {@link JsonFactory}.
-     */
-    public enum Feature {
-        
-        // // // Symbol handling (interning etc)
-        
-        /**
-         * Feature that determines whether JSON object field names are
-         * to be canonicalized using {@link String#intern} or not:
-         * if enabled, all field names will be intern()ed (and caller
-         * can count on this being true for all such names); if disabled,
-         * no intern()ing is done. There may still be basic
-         * canonicalization (that is, same String will be used to represent
-         * all identical object property names for a single document).
-         *<p>
-         * Note: this setting only has effect if
-         * {@link #CANONICALIZE_FIELD_NAMES} is true -- otherwise no
-         * canonicalization of any sort is done.
-         *<p>
-         * This setting is enabled by default.
-         */
-        INTERN_FIELD_NAMES(true),
-
-        /**
-         * Feature that determines whether JSON object field names are
-         * to be canonicalized (details of how canonicalization is done
-         * then further specified by
-         * {@link #INTERN_FIELD_NAMES}).
-         *<p>
-         * This setting is enabled by default.
-         */
-        CANONICALIZE_FIELD_NAMES(true)
-
-        ;
-
-        /**
-         * Whether feature is enabled or disabled by default.
-         */
-        private final boolean _defaultState;
-        
-        /**
-         * Method that calculates bit set (flags) of all features that
-         * are enabled by default.
-         */
-        public static int collectDefaults()
-        {
-            int flags = 0;
-            for (Feature f : values()) {
-                if (f.enabledByDefault()) {
-                    flags |= f.getMask();
-                }
-            }
-            return flags;
-        }
-        
-        private Feature(boolean defaultState)
-        {
-            _defaultState = defaultState;
-        }
-        
-        public boolean enabledByDefault() { return _defaultState; }
-
-        public boolean enabledIn(int flags) { return (flags & getMask()) != 0; }
-        
-        public int getMask() { return (1 << ordinal()); }
-    }    
-    /*
-    /**********************************************************
-    /* Buffer, symbol table management
-    /**********************************************************
-     */
-
-    /**
-     * This <code>ThreadLocal</code> contains a {@link java.lang.ref.SoftReference}
-     * to a {@link BufferRecycler} used to provide a low-cost
-     * buffer recycling between reader and writer instances.
-     */
-    final protected static ThreadLocal<SoftReference<BufferRecycler>> _recyclerRef
-        = new ThreadLocal<SoftReference<BufferRecycler>>();
-
-    /**
-     * Each factory comes equipped with a shared root symbol table.
-     * It should not be linked back to the original blueprint, to
-     * avoid contents from leaking between factories.
-     */
-    protected final transient CharsToNameCanonicalizer _rootCharSymbols = CharsToNameCanonicalizer.createRoot();
-
-    /**
-     * Alternative to the basic symbol table, some stream-based
-     * parsers use different name canonicalization method.
-     *<p>
-     * TODO: should clean up this; looks messy having 2 alternatives
-     * with not very clear differences.
-     */
-    protected final transient BytesToNameCanonicalizer _rootByteSymbols = BytesToNameCanonicalizer.createRoot();
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Object that implements conversion functionality between
-     * Java objects and JSON content. For base JsonFactory implementation
-     * usually not set by default, but can be explicitly set.
-     * Sub-classes (like @link org.codehaus.jackson.map.MappingJsonFactory}
-     * usually provide an implementation.
-     */
-    protected ObjectCodec _objectCodec;
-
-    /**
-     * Currently enabled factory features.
-     */
-    protected int _factoryFeatures = DEFAULT_FACTORY_FEATURE_FLAGS;
-    
-    /**
-     * Currently enabled parser features.
-     */
-    protected int _parserFeatures = DEFAULT_PARSER_FEATURE_FLAGS;
-
-    /**
-     * Currently enabled generator features.
-     */
-    protected int _generatorFeatures = DEFAULT_GENERATOR_FEATURE_FLAGS;
-
-    /**
-     * Definition of custom character escapes to use for generators created
-     * by this factory, if any. If null, standard data format specific
-     * escapes are used.
-     */
-    protected CharacterEscapes _characterEscapes;
-
-    /**
-     * Optional helper object that may decorate input sources, to do
-     * additional processing on input during parsing.
-     */
-    protected InputDecorator _inputDecorator;
-
-    /**
-     * Optional helper object that may decorate output object, to do
-     * additional processing on output during content generation.
-     */
-    protected OutputDecorator _outputDecorator;
-
-    /**
-     * Separator used between root-level values, if any; null indicates
-     * "do not add separator".
-     * Default separator is a single space character.
-     * 
-     * @since 2.1
-     */
-    protected SerializableString _rootValueSeparator = DEFAULT_ROOT_VALUE_SEPARATOR;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-    
-    /**
-     * Default constructor used to create factory instances.
-     * Creation of a factory instance is a light-weight operation,
-     * but it is still a good idea to reuse limited number of
-     * factory instances (and quite often just a single instance):
-     * factories are used as context for storing some reused
-     * processing objects (such as symbol tables parsers use)
-     * and this reuse only works within context of a single
-     * factory instance.
-     */
-    public JsonFactory() { this(null); }
-
-    public JsonFactory(ObjectCodec oc) { _objectCodec = oc; }
-
-    /**
-     * Method for constructing a new {@link JsonFactory} that has
-     * the same settings as this instance, but is otherwise
-     * independent (i.e. nothing is actually shared, symbol tables
-     * are separate).
-     * Note that {@link ObjectCodec} reference is not copied but is
-     * set to null; caller typically needs to set it after calling
-     * this method.
-     * 
-     * @since 2.1
-     */
-    public JsonFactory copy()
-    {
-        _checkInvalidCopy(JsonFactory.class);
-        return new JsonFactory(null);
-    }
-
-    /**
-     * @since 2.1
-     * @param exp
-     */
-    protected void _checkInvalidCopy(Class<?> exp)
-    {
-        if (getClass() != exp) {
-            throw new IllegalStateException("Failed copy(): "+getClass().getName()
-                    +" (version: "+version()+") does not override copy(); it has to");
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Serializable overrides
-    /**********************************************************
-     */
-
-    /**
-     * Method that we need to override to actually make restoration go
-     * through constructors etc.
-     * Also: must be overridden by sub-classes as well.
-     */
-    protected Object readResolve() {
-        return new JsonFactory(_objectCodec);
-    }
-    
-    /*
-    /**********************************************************
-    /* Format detection functionality (since 1.8)
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to quickly check whether given schema
-     * is something that parsers and/or generators constructed by this
-     * factory could use. Note that this means possible use, at the level
-     * of data format (i.e. schema is for same data format as parsers and
-     * generators this factory constructs); individual schema instances
-     * may have further usage restrictions.
-     * 
-     * @since 2.1
-     */
-    public boolean canUseSchema(FormatSchema schema) {
-        String ourFormat = getFormatName();
-        return (ourFormat != null) && ourFormat.equals(schema.getSchemaType());
-    }
-
-    /**
-     * Method that returns short textual id identifying format
-     * this factory supports.
-     *<p>
-     * Note: sub-classes should override this method; default
-     * implementation will return null for all sub-classes
-     */
-    public String getFormatName()
-    {
-        /* Somewhat nasty check: since we can't make this abstract
-         * (due to backwards compatibility concerns), need to prevent
-         * format name "leakage"
-         */
-        if (getClass() == JsonFactory.class) {
-            return FORMAT_NAME_JSON;
-        }
-        return null;
-    }
-
-    public MatchStrength hasFormat(InputAccessor acc) throws IOException
-    {
-        // since we can't keep this abstract, only implement for "vanilla" instance
-        if (getClass() == JsonFactory.class) {
-            return hasJSONFormat(acc);
-        }
-        return null;
-    }
-
-    /**
-     * Method that can be called to determine if a custom
-     * {@link ObjectCodec} is needed for binding data parsed
-     * using {@link JsonParser} constructed by this factory
-     * (which typically also implies the same for serialization
-     * with {@link JsonGenerator}).
-     * 
-     * @return True if custom codec is needed with parsers and
-     *   generators created by this factory; false if a general
-     *   {@link ObjectCodec} is enough
-     * 
-     * @since 2.1
-     */
-    public boolean requiresCustomCodec() {
-        return false;
-    }
-    
-    /**
-     * Helper method that can be called to determine if content accessed
-     * using given accessor seems to be JSON content.
-     */
-    protected MatchStrength hasJSONFormat(InputAccessor acc) throws IOException
-    {
-        return ByteSourceJsonBootstrapper.hasJSONFormat(acc);
-    }
-
-    /*
-    /**********************************************************
-    /* Versioned
-    /**********************************************************
-     */
-
-//  @Override
-    public Version version() {
-        return CoreVersion.instance.version();
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration, factory features
-    /**********************************************************
-     */
-
-    /**
-     * Method for enabling or disabling specified parser feature
-     * (check {@link JsonParser.Feature} for list of features)
-     */
-    public final JsonFactory configure(JsonFactory.Feature f, boolean state) {
-        return state ? enable(f) : disable(f);
-    }
-
-    /**
-     * Method for enabling specified parser feature
-     * (check {@link JsonFactory.Feature} for list of features)
-     */
-    public JsonFactory enable(JsonFactory.Feature f) {
-        _factoryFeatures |= f.getMask();
-        return this;
-    }
-
-    /**
-     * Method for disabling specified parser features
-     * (check {@link JsonFactory.Feature} for list of features)
-     */
-    public JsonFactory disable(JsonFactory.Feature f) {
-        _factoryFeatures &= ~f.getMask();
-        return this;
-    }
-
-    /**
-     * Checked whether specified parser feature is enabled.
-     */
-    public final boolean isEnabled(JsonFactory.Feature f) {
-        return (_factoryFeatures & f.getMask()) != 0;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, parser configuration
-    /**********************************************************
-     */
-    
-    /**
-     * Method for enabling or disabling specified parser feature
-     * (check {@link JsonParser.Feature} for list of features)
-     */
-    public final JsonFactory configure(JsonParser.Feature f, boolean state) {
-        return state ? enable(f) : disable(f);
-    }
-
-    /**
-     * Method for enabling specified parser feature
-     * (check {@link JsonParser.Feature} for list of features)
-     */
-    public JsonFactory enable(JsonParser.Feature f) {
-        _parserFeatures |= f.getMask();
-        return this;
-    }
-
-    /**
-     * Method for disabling specified parser features
-     * (check {@link JsonParser.Feature} for list of features)
-     */
-    public JsonFactory disable(JsonParser.Feature f) {
-        _parserFeatures &= ~f.getMask();
-        return this;
-    }
-
-    /**
-     * Checked whether specified parser feature is enabled.
-     */
-    public final boolean isEnabled(JsonParser.Feature f) {
-        return (_parserFeatures & f.getMask()) != 0;
-    }
-
-    /**
-     * Method for getting currently configured input decorator (if any;
-     * there is no default decorator).
-     */
-    public InputDecorator getInputDecorator() {
-        return _inputDecorator;
-    }
-
-    /**
-     * Method for overriding currently configured input decorator
-     */
-    public JsonFactory setInputDecorator(InputDecorator d) {
-        _inputDecorator = d;
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, generator settings
-    /**********************************************************
-     */
-
-    /**
-     * Method for enabling or disabling specified generator feature
-     * (check {@link JsonGenerator.Feature} for list of features)
-     */
-    public final JsonFactory configure(JsonGenerator.Feature f, boolean state) {
-        return state ? enable(f) : disable(f);
-    }
-
-
-    /**
-     * Method for enabling specified generator features
-     * (check {@link JsonGenerator.Feature} for list of features)
-     */
-    public JsonFactory enable(JsonGenerator.Feature f) {
-        _generatorFeatures |= f.getMask();
-        return this;
-    }
-
-    /**
-     * Method for disabling specified generator feature
-     * (check {@link JsonGenerator.Feature} for list of features)
-     */
-    public JsonFactory disable(JsonGenerator.Feature f) {
-        _generatorFeatures &= ~f.getMask();
-        return this;
-    }
-
-    /**
-     * Check whether specified generator feature is enabled.
-     */
-    public final boolean isEnabled(JsonGenerator.Feature f) {
-        return (_generatorFeatures & f.getMask()) != 0;
-    }
-
-    /**
-     * Method for accessing custom escapes factory uses for {@link JsonGenerator}s
-     * it creates.
-     */
-    public CharacterEscapes getCharacterEscapes() {
-        return _characterEscapes;
-    }
-
-    /**
-     * Method for defining custom escapes factory uses for {@link JsonGenerator}s
-     * it creates.
-     */
-    public JsonFactory setCharacterEscapes(CharacterEscapes esc) {
-        _characterEscapes = esc;
-        return this;
-    }
-
-    /**
-     * Method for getting currently configured output decorator (if any;
-     * there is no default decorator).
-     */
-    public OutputDecorator getOutputDecorator() {
-        return _outputDecorator;
-    }
-
-    /**
-     * Method for overriding currently configured output decorator
-     */
-    public JsonFactory setOutputDecorator(OutputDecorator d) {
-        _outputDecorator = d;
-        return this;
-    }
-
-    /**
-     * Method that allows overriding String used for separating root-level
-     * JSON values (default is single space character)
-     * 
-     * @param sep Separator to use, if any; null means that no separator is
-     *   automatically added
-     * 
-     * @since 2.1
-     */
-    public JsonFactory setRootValueSeparator(String sep) {
-        _rootValueSeparator = (sep == null) ? null : new SerializedString(sep);
-        return this;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public String getRootValueSeparator() {
-        return (_rootValueSeparator == null) ? null : _rootValueSeparator.getValue();
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, other
-    /**********************************************************
-     */
-
-    /**
-     * Method for associating a {@link ObjectCodec} (typically
-     * a <code>com.fasterxml.jackson.databind.ObjectMapper</code>)
-     * with this factory (and more importantly, parsers and generators
-     * it constructs). This is needed to use data-binding methods
-     * of {@link JsonParser} and {@link JsonGenerator} instances.
-     */
-    public JsonFactory setCodec(ObjectCodec oc) {
-        _objectCodec = oc;
-        return this;
-    }
-
-    public ObjectCodec getCodec() { return _objectCodec; }
-
-    /*
-    /**********************************************************
-    /* Parser factories (new ones, as per [Issue-25])
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * contents of specified file. Encoding is auto-detected
-     * from contents according to JSON specification recommended
-     * mechanism.
-     *<p>
-     * Underlying input stream (needed for reading contents)
-     * will be <b>owned</b> (and managed, i.e. closed as need be) by
-     * the parser, since caller has no access to it.
-     *
-     * @param f File that contains JSON content to parse
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(File f)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(f);
-    }
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * contents of resource reference by given URL.
-     * Encoding is auto-detected
-     * from contents according to JSON specification recommended
-     * mechanism.
-     *<p>
-     * Underlying input stream (needed for reading contents)
-     * will be <b>owned</b> (and managed, i.e. closed as need be) by
-     * the parser, since caller has no access to it.
-     *
-     * @param url URL pointing to resource that contains JSON content to parse
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(URL url)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(url);
-    }
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * the contents accessed via specified input stream.
-     *<p>
-     * The input stream will <b>not be owned</b> by
-     * the parser, it will still be managed (i.e. closed if
-     * end-of-stream is reacher, or parser close method called)
-     * if (and only if) {@link com.fasterxml.jackson.core.JsonParser.Feature#AUTO_CLOSE_SOURCE}
-     * is enabled.
-     *<p>
-     * Note: no encoding argument is taken since it can always be
-     * auto-detected as suggested by JSON RFC.
-     *
-     * @param in InputStream to use for reading JSON content to parse
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(InputStream in)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(in);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents accessed via specified Reader.
-     <p>
-     * The read stream will <b>not be owned</b> by
-     * the parser, it will still be managed (i.e. closed if
-     * end-of-stream is reacher, or parser close method called)
-     * if (and only if) {@link com.fasterxml.jackson.core.JsonParser.Feature#AUTO_CLOSE_SOURCE}
-     * is enabled.
-     *
-     * @param r Reader to use for reading JSON content to parse
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(Reader r)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(r);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents of given byte array.
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(byte[] data)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(data);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents of given byte array.
-     * 
-     * @param data Buffer that contains data to parse
-     * @param offset Offset of the first data byte within buffer
-     * @param len Length of contents to parse within buffer
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(byte[] data, int offset, int len)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(data, offset, len);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * contents of given String.
-     * 
-     * @since 2.1
-     */
-    public JsonParser createParser(String content)
-        throws IOException, JsonParseException
-    {
-        // Must delegate to old version, until 2.2
-        // TODO: change direction in 2.2; after ensuring impls support new method
-        return createJsonParser(content);
-    }
-
-    /*
-    /**********************************************************
-    /* Parser factories (old ones, as per [Issue-25])
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * contents of specified file. Encoding is auto-detected
-     * from contents according to JSON specification recommended
-     * mechanism.
-     *<p>
-     * Underlying input stream (needed for reading contents)
-     * will be <b>owned</b> (and managed, i.e. closed as need be) by
-     * the parser, since caller has no access to it.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     *
-     * @param f File that contains JSON content to parse
-     */
-    public JsonParser createJsonParser(File f)
-        throws IOException, JsonParseException
-    {
-        // true, since we create InputStream from File
-        IOContext ctxt = _createContext(f, true);
-        InputStream in = new FileInputStream(f);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            in = _inputDecorator.decorate(ctxt, in);
-        }
-        return _createParser(in, ctxt);
-    }
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * contents of resource reference by given URL.
-     * Encoding is auto-detected
-     * from contents according to JSON specification recommended
-     * mechanism.
-     *<p>
-     * Underlying input stream (needed for reading contents)
-     * will be <b>owned</b> (and managed, i.e. closed as need be) by
-     * the parser, since caller has no access to it.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     *
-     * @param url URL pointing to resource that contains JSON content to parse
-     */
-    public JsonParser createJsonParser(URL url)
-        throws IOException, JsonParseException
-    {
-        // true, since we create InputStream from URL
-        IOContext ctxt = _createContext(url, true);
-        InputStream in = _optimizedStreamFromURL(url);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            in = _inputDecorator.decorate(ctxt, in);
-        }
-        return _createParser(in, ctxt);
-    }
-
-    /**
-     * Method for constructing JSON parser instance to parse
-     * the contents accessed via specified input stream.
-     *<p>
-     * The input stream will <b>not be owned</b> by
-     * the parser, it will still be managed (i.e. closed if
-     * end-of-stream is reacher, or parser close method called)
-     * if (and only if) {@link com.fasterxml.jackson.core.JsonParser.Feature#AUTO_CLOSE_SOURCE}
-     * is enabled.
-     *<p>
-     * Note: no encoding argument is taken since it can always be
-     * auto-detected as suggested by JSON RFC.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     *
-     * @param in InputStream to use for reading JSON content to parse
-     */
-    public JsonParser createJsonParser(InputStream in)
-        throws IOException, JsonParseException
-    {
-        IOContext ctxt = _createContext(in, false);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            in = _inputDecorator.decorate(ctxt, in);
-        }
-        return _createParser(in, ctxt);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents accessed via specified Reader.
-     <p>
-     * The read stream will <b>not be owned</b> by
-     * the parser, it will still be managed (i.e. closed if
-     * end-of-stream is reacher, or parser close method called)
-     * if (and only if) {@link com.fasterxml.jackson.core.JsonParser.Feature#AUTO_CLOSE_SOURCE}
-     * is enabled.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     *
-     * @param r Reader to use for reading JSON content to parse
-     */
-    public JsonParser createJsonParser(Reader r)
-        throws IOException, JsonParseException
-    {
-        // false -> we do NOT own Reader (did not create it)
-        IOContext ctxt = _createContext(r, false);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            r = _inputDecorator.decorate(ctxt, r);
-        }
-        return _createParser(r, ctxt);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents of given byte array.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     */
-    public JsonParser createJsonParser(byte[] data)
-        throws IOException, JsonParseException
-    {
-        IOContext ctxt = _createContext(data, true);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            InputStream in = _inputDecorator.decorate(ctxt, data, 0, data.length);
-            if (in != null) {
-                return _createParser(in, ctxt);
-            }
-        }
-        return _createParser(data, 0, data.length, ctxt);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * the contents of given byte array.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     * 
-     * @param data Buffer that contains data to parse
-     * @param offset Offset of the first data byte within buffer
-     * @param len Length of contents to parse within buffer
-     */
-    public JsonParser createJsonParser(byte[] data, int offset, int len)
-        throws IOException, JsonParseException
-    {
-        IOContext ctxt = _createContext(data, true);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            InputStream in = _inputDecorator.decorate(ctxt, data, offset, len);
-            if (in != null) {
-                return _createParser(in, ctxt);
-            }
-        }
-	return _createParser(data, offset, len, ctxt);
-    }
-
-    /**
-     * Method for constructing parser for parsing
-     * contents of given String.
-     *<p>
-     * NOTE: as of 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createParser</code>.
-     */
-    public JsonParser createJsonParser(String content)
-        throws IOException, JsonParseException
-    {
-        Reader r = new StringReader(content);
-        // true -> we own the Reader (and must close); not a big deal
-        IOContext ctxt = _createContext(r, true);
-        // [JACKSON-512]: allow wrapping with InputDecorator
-        if (_inputDecorator != null) {
-            r = _inputDecorator.decorate(ctxt, r);
-        }
-        return _createParser(r, ctxt);
-    }
-
-    /*
-    /**********************************************************
-    /* Generator factories, new (as per [Issue-25]
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * using specified output stream.
-     * Encoding to use must be specified, and needs to be one of available
-     * types (as per JSON specification).
-     *<p>
-     * Underlying stream <b>is NOT owned</b> by the generator constructed,
-     * so that generator will NOT close the output stream when
-     * {@link JsonGenerator#close} is called (unless auto-closing
-     * feature,
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature#AUTO_CLOSE_TARGET}
-     * is enabled).
-     * Using application needs to close it explicitly if this is the case.
-     *<p>
-     * Note: there are formats that use fixed encoding (like most binary data formats)
-     * and that ignore passed in encoding.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     * 
-     * @since 2.1 Will eventually replace <code>createJsonGenerator</code> variant.
-     *
-     * @param out OutputStream to use for writing JSON content 
-     * @param enc Character encoding to use
-     */
-    public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc)
-        throws IOException
-    {
-        return createJsonGenerator(out, enc);
-    }
-
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * using specified Writer.
-     *<p>
-     * Underlying stream <b>is NOT owned</b> by the generator constructed,
-     * so that generator will NOT close the Reader when
-     * {@link JsonGenerator#close} is called (unless auto-closing
-     * feature,
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature#AUTO_CLOSE_TARGET} is enabled).
-     * Using application needs to close it explicitly.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     * 
-     * @since 2.1 Will eventually replace <code>createJsonGenerator</code> variant.
-     *
-     * @param out Writer to use for writing JSON content 
-     */
-    public JsonGenerator createGenerator(Writer out)
-        throws IOException
-    {
-        return createJsonGenerator(out);
-    }
-
-    /**
-     * Convenience method for constructing generator that uses default
-     * encoding of the format (UTF-8 for JSON and most other data formats).
-     *<p>
-     * Note: there are formats that use fixed encoding (like most binary data formats).
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     * 
-     * @since 2.1 Will eventually replace <code>createJsonGenerator</code> variant.
-     */
-    public JsonGenerator createGenerator(OutputStream out) throws IOException {
-        return createJsonGenerator(out);
-    }
-    
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * to specified file, overwriting contents it might have (or creating
-     * it if such file does not yet exist).
-     * Encoding to use must be specified, and needs to be one of available
-     * types (as per JSON specification).
-     *<p>
-     * Underlying stream <b>is owned</b> by the generator constructed,
-     * i.e. generator will handle closing of file when
-     * {@link JsonGenerator#close} is called.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     * 
-     * @since 2.1 Will eventually replace <code>createJsonGenerator</code> variant.
-     *
-     * @param f File to write contents to
-     * @param enc Character encoding to use
-     */
-    public JsonGenerator createGenerator(File f, JsonEncoding enc)
-        throws IOException
-    {
-        return createJsonGenerator(f, enc);
-    }    
-
-    /*
-    /**********************************************************
-    /* Generator factories, old (as per [Issue-25]
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * using specified output stream.
-     * Encoding to use must be specified, and needs to be one of available
-     * types (as per JSON specification).
-     *<p>
-     * Underlying stream <b>is NOT owned</b> by the generator constructed,
-     * so that generator will NOT close the output stream when
-     * {@link JsonGenerator#close} is called (unless auto-closing
-     * feature,
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature#AUTO_CLOSE_TARGET}
-     * is enabled).
-     * Using application needs to close it explicitly if this is the case.
-     *<p>
-     * Note: there are formats that use fixed encoding (like most binary data formats)
-     * and that ignore passed in encoding.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     *
-     * @param out OutputStream to use for writing JSON content 
-     * @param enc Character encoding to use
-     */
-    public JsonGenerator createJsonGenerator(OutputStream out, JsonEncoding enc)
-        throws IOException
-    {
-	// false -> we won't manage the stream unless explicitly directed to
-        IOContext ctxt = _createContext(out, false);
-        ctxt.setEncoding(enc);
-        if (enc == JsonEncoding.UTF8) {
-            // [JACKSON-512]: allow wrapping with _outputDecorator
-            if (_outputDecorator != null) {
-                out = _outputDecorator.decorate(ctxt, out);
-            }
-            return _createUTF8JsonGenerator(out, ctxt);
-        }
-        Writer w = _createWriter(out, enc, ctxt);
-        // [JACKSON-512]: allow wrapping with _outputDecorator
-        if (_outputDecorator != null) {
-            w = _outputDecorator.decorate(ctxt, w);
-        }
-	return _createGenerator(w, ctxt);
-    }
-
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * using specified Writer.
-     *<p>
-     * Underlying stream <b>is NOT owned</b> by the generator constructed,
-     * so that generator will NOT close the Reader when
-     * {@link JsonGenerator#close} is called (unless auto-closing
-     * feature,
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature#AUTO_CLOSE_TARGET} is enabled).
-     * Using application needs to close it explicitly.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     *
-     * @param out Writer to use for writing JSON content 
-     */
-    public JsonGenerator createJsonGenerator(Writer out)
-        throws IOException
-    {
-        IOContext ctxt = _createContext(out, false);
-        // [JACKSON-512]: allow wrapping with _outputDecorator
-        if (_outputDecorator != null) {
-            out = _outputDecorator.decorate(ctxt, out);
-        }
-	return _createGenerator(out, ctxt);
-    }
-
-    /**
-     * Convenience method for constructing generator that uses default
-     * encoding of the format (UTF-8 for JSON and most other data formats).
-     *<p>
-     * Note: there are formats that use fixed encoding (like most binary data formats).
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     */
-    public JsonGenerator createJsonGenerator(OutputStream out) throws IOException {
-        return createJsonGenerator(out, JsonEncoding.UTF8);
-    }
-    
-    /**
-     * Method for constructing JSON generator for writing JSON content
-     * to specified file, overwriting contents it might have (or creating
-     * it if such file does not yet exist).
-     * Encoding to use must be specified, and needs to be one of available
-     * types (as per JSON specification).
-     *<p>
-     * Underlying stream <b>is owned</b> by the generator constructed,
-     * i.e. generator will handle closing of file when
-     * {@link JsonGenerator#close} is called.
-     *<p>
-     * NOTE: starting with 2.1, should not be used (will be deprecated in 2.2);
-     * instead, should call <code>createGenerator</code>.
-     *
-     * @param f File to write contents to
-     * @param enc Character encoding to use
-     */
-    public JsonGenerator createJsonGenerator(File f, JsonEncoding enc)
-        throws IOException
-    {
-	OutputStream out = new FileOutputStream(f);
-	// true -> yes, we have to manage the stream since we created it
-        IOContext ctxt = _createContext(out, true);
-        ctxt.setEncoding(enc);
-        if (enc == JsonEncoding.UTF8) {
-            // [JACKSON-512]: allow wrapping with _outputDecorator
-            if (_outputDecorator != null) {
-                out = _outputDecorator.decorate(ctxt, out);
-            }
-            return _createUTF8JsonGenerator(out, ctxt);
-        }
-        Writer w = _createWriter(out, enc, ctxt);
-        // [JACKSON-512]: allow wrapping with _outputDecorator
-        if (_outputDecorator != null) {
-            w = _outputDecorator.decorate(ctxt, w);
-        }
-	return _createGenerator(w, ctxt);
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods used by factory for creating parser instances,
-    /* overridable by sub-classes
-    /**********************************************************
-     */
-
-    /**
-     * Overridable factory method that actually instantiates desired parser
-     * given {@link InputStream} and context object.
-     *<p>
-     * This method is specifically designed to remain
-     * compatible between minor versions so that sub-classes can count
-     * on it being called as expected. That is, it is part of official
-     * interface from sub-class perspective, although not a public
-     * method available to users of factory implementations.
-     * 
-     * @since 2.1
-     */
-    protected JsonParser _createParser(InputStream in, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        /* NOTE: MUST call the deprecated method until it is deleted, just so
-         * that override still works as expected, for now.
-         */
-        return _createJsonParser(in, ctxt);
-    }
-
-    /**
-     * @deprecated since 2.1 -- use {@link #_createParser(InputStream, IOContext)} instead
-     */
-    @Deprecated
-    protected JsonParser _createJsonParser(InputStream in, IOContext ctxt) throws IOException, JsonParseException {
-        // As per [JACKSON-259], may want to fully disable canonicalization:
-        return new ByteSourceJsonBootstrapper(ctxt, in).constructParser(_parserFeatures,
-                _objectCodec, _rootByteSymbols, _rootCharSymbols,
-                isEnabled(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES),
-                isEnabled(JsonFactory.Feature.INTERN_FIELD_NAMES));
-    }
-    
-    /**
-     * Overridable factory method that actually instantiates parser
-     * using given {@link Reader} object for reading content.
-     *<p>
-     * This method is specifically designed to remain
-     * compatible between minor versions so that sub-classes can count
-     * on it being called as expected. That is, it is part of official
-     * interface from sub-class perspective, although not a public
-     * method available to users of factory implementations.
-     * 
-     * @since 2.1
-     */
-    protected JsonParser _createParser(Reader r, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        /* NOTE: MUST call the deprecated method until it is deleted, just so
-         * that override still works as expected, for now.
-         */
-        return _createJsonParser(r, ctxt);
-    }
-
-    /**
-     * @deprecated since 2.1 -- use {@link #_createParser(Reader, IOContext)} instead
-     */
-    @Deprecated
-    protected JsonParser _createJsonParser(Reader r, IOContext ctxt) throws IOException, JsonParseException {
-        return new ReaderBasedJsonParser(ctxt, _parserFeatures, r, _objectCodec,
-                _rootCharSymbols.makeChild(isEnabled(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES),
-                    isEnabled(JsonFactory.Feature.INTERN_FIELD_NAMES)));
-    }
-
-    /**
-     * Overridable factory method that actually instantiates parser
-     * using given {@link Reader} object for reading content
-     * passed as raw byte array.
-     *<p>
-     * This method is specifically designed to remain
-     * compatible between minor versions so that sub-classes can count
-     * on it being called as expected. That is, it is part of official
-     * interface from sub-class perspective, although not a public
-     * method available to users of factory implementations.
-     */
-    protected JsonParser _createParser(byte[] data, int offset, int len, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        /* NOTE: MUST call the deprecated method until it is deleted, just so
-         * that override still works as expected, for now.
-         */
-        return _createJsonParser(data, offset, len, ctxt);
-    }
-
-    /**
-     * @deprecated since 2.1 -- use {@link #_createParser(byte[], int, int, IOContext)} instead
-     */
-    @Deprecated
-    protected JsonParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt) throws IOException, JsonParseException {
-        return new ByteSourceJsonBootstrapper(ctxt, data, offset, len).constructParser(_parserFeatures,
-                _objectCodec, _rootByteSymbols, _rootCharSymbols,
-                isEnabled(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES),
-                isEnabled(JsonFactory.Feature.INTERN_FIELD_NAMES));
-    }
-    
-    /*
-    /**********************************************************
-    /* Factory methods used by factory for creating generator instances,
-    /* overridable by sub-classes
-    /**********************************************************
-     */
-    
-    /**
-     * Overridable factory method that actually instantiates generator for
-     * given {@link Writer} and context object.
-     *<p>
-     * This method is specifically designed to remain
-     * compatible between minor versions so that sub-classes can count
-     * on it being called as expected. That is, it is part of official
-     * interface from sub-class perspective, although not a public
-     * method available to users of factory implementations.
-     */
-    protected JsonGenerator _createGenerator(Writer out, IOContext ctxt)
-        throws IOException
-    {
-        /* NOTE: MUST call the deprecated method until it is deleted, just so
-         * that override still works as expected, for now.
-         */
-        return _createJsonGenerator(out, ctxt);
-    }
-
-    /**
-     * @deprecated since 2.1 -- use {@link #_createGenerator(Writer, IOContext)} instead
-     */
-    @Deprecated
-    protected JsonGenerator _createJsonGenerator(Writer out, IOContext ctxt)
-        throws IOException
-    {
-        WriterBasedJsonGenerator gen = new WriterBasedJsonGenerator(ctxt,
-                _generatorFeatures, _objectCodec, out);
-        if (_characterEscapes != null) {
-            gen.setCharacterEscapes(_characterEscapes);
-        }
-        SerializableString rootSep = _rootValueSeparator;
-        if (rootSep != DEFAULT_ROOT_VALUE_SEPARATOR) {
-            gen.setRootValueSeparator(rootSep);
-        }
-        return gen;
-    }
-
-    /**
-     * Overridable factory method that actually instantiates generator for
-     * given {@link OutputStream} and context object, using UTF-8 encoding.
-     *<p>
-     * This method is specifically designed to remain
-     * compatible between minor versions so that sub-classes can count
-     * on it being called as expected. That is, it is part of official
-     * interface from sub-class perspective, although not a public
-     * method available to users of factory implementations.
-     */
-    protected JsonGenerator _createUTF8Generator(OutputStream out, IOContext ctxt) throws IOException {
-        return _createUTF8JsonGenerator(out, ctxt);
-    }
-
-    /**
-     * @deprecated since 2.1
-     */
-    @Deprecated
-    protected JsonGenerator _createUTF8JsonGenerator(OutputStream out, IOContext ctxt)
-        throws IOException
-    {
-        UTF8JsonGenerator gen = new UTF8JsonGenerator(ctxt,
-                _generatorFeatures, _objectCodec, out);
-        if (_characterEscapes != null) {
-            gen.setCharacterEscapes(_characterEscapes);
-        }
-        SerializableString rootSep = _rootValueSeparator;
-        if (rootSep != DEFAULT_ROOT_VALUE_SEPARATOR) {
-            gen.setRootValueSeparator(rootSep);
-        }
-        return gen;
-    }
-
-    protected Writer _createWriter(OutputStream out, JsonEncoding enc, IOContext ctxt) throws IOException
-    {
-        // note: this should not get called any more (caller checks, dispatches)
-        if (enc == JsonEncoding.UTF8) { // We have optimized writer for UTF-8
-            return new UTF8Writer(ctxt, out);
-        }
-        // not optimal, but should do unless we really care about UTF-16/32 encoding speed
-        return new OutputStreamWriter(out, enc.getJavaName());
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal factory methods, other
-    /**********************************************************
-     */
-
-    /**
-     * Overridable factory method that actually instantiates desired
-     * context object.
-     */
-    protected IOContext _createContext(Object srcRef, boolean resourceManaged)
-    {
-        return new IOContext(_getBufferRecycler(), srcRef, resourceManaged);
-    }
-
-    /**
-     * Method used by factory to create buffer recycler instances
-     * for parsers and generators.
-     *<p>
-     * Note: only public to give access for <code>ObjectMapper</code>
-     */
-    public BufferRecycler _getBufferRecycler()
-    {
-        SoftReference<BufferRecycler> ref = _recyclerRef.get();
-        BufferRecycler br = (ref == null) ? null : ref.get();
-
-        if (br == null) {
-            br = new BufferRecycler();
-            _recyclerRef.set(new SoftReference<BufferRecycler>(br));
-        }
-        return br;
-    }
-    
-    /**
-     * Helper methods used for constructing an optimal stream for
-     * parsers to use, when input is to be read from an URL.
-     * This helps when reading file content via URL.
-     */
-    protected InputStream _optimizedStreamFromURL(URL url)
-        throws IOException
-    {
-        if ("file".equals(url.getProtocol())) {
-            /* Can not do this if the path refers
-             * to a network drive on windows. This fixes the problem;
-             * might not be needed on all platforms (NFS?), but should not
-             * matter a lot: performance penalty of extra wrapping is more
-             * relevant when accessing local file system.
-             */
-            String host = url.getHost();
-            if (host == null || host.length() == 0) {
-                return new FileInputStream(url.getPath());
-            }
-        }
-        return url.openStream();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerationException.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerationException.java
deleted file mode 100644
index 7338d92..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerationException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Exception type for exceptions during JSON writing, such as trying
- * to output  content in wrong context (non-matching end-array or end-object,
- * for example).
- */
-public class JsonGenerationException
-    extends JsonProcessingException
-{
-    private final static long serialVersionUID = 123; // Stupid eclipse...
-    
-    public JsonGenerationException(Throwable rootCause)
-    {
-        super(rootCause);
-    }
-
-    public JsonGenerationException(String msg)
-    {
-        super(msg, (JsonLocation)null);
-    }
-
-    public JsonGenerationException(String msg, Throwable rootCause)
-    {
-        super(msg, (JsonLocation)null, rootCause);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerator.java
deleted file mode 100644
index 47eed84..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonGenerator.java
+++ /dev/null
@@ -1,1216 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.fasterxml.jackson.core;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.io.CharacterEscapes;
-
-/**
- * Base class that defines public API for writing JSON content.
- * Instances are created using factory methods of
- * a {@link JsonFactory} instance.
- *
- * @author Tatu Saloranta
- */
-public abstract class JsonGenerator
-    implements Closeable, Flushable, // as of 2.1
-        Versioned
-{
-    /**
-     * Enumeration that defines all togglable features for generators.
-     */
-    public enum Feature {
-        /**
-         * Feature that determines whether generator will automatically
-         * close underlying output target that is NOT owned by the
-         * generator.
-         * If disabled, calling application has to separately
-         * close the underlying {@link OutputStream} and {@link Writer}
-         * instances used to create the generator. If enabled, generator
-         * will handle closing, as long as generator itself gets closed:
-         * this happens when end-of-input is encountered, or generator
-         * is closed by a call to {@link JsonGenerator#close}.
-         *<p>
-         * Feature is enabled by default.
-         */
-        AUTO_CLOSE_TARGET(true),
-
-        /**
-         * Feature that determines what happens when the generator is
-         * closed while there are still unmatched
-         * {@link JsonToken#START_ARRAY} or {@link JsonToken#START_OBJECT}
-         * entries in output content. If enabled, such Array(s) and/or
-         * Object(s) are automatically closed; if disabled, nothing
-         * specific is done.
-         *<p>
-         * Feature is enabled by default.
-         */
-        AUTO_CLOSE_JSON_CONTENT(true),
-
-        /**
-         * Feature that determines whether JSON Object field names are
-         * quoted using double-quotes, as specified by JSON specification
-         * or not. Ability to disable quoting was added to support use
-         * cases where they are not usually expected, which most commonly
-         * occurs when used straight from Javascript.
-         *<p>
-         * Feature is enabled by default (since it is required by JSON specification).
-         */
-        QUOTE_FIELD_NAMES(true),
-
-        /**
-         * Feature that determines whether "exceptional" (not real number)
-         * float/double values are output as quoted strings.
-         * The values checked are Double.Nan,
-         * Double.POSITIVE_INFINITY and Double.NEGATIVE_INIFINTY (and 
-         * associated Float values).
-         * If feature is disabled, these numbers are still output using
-         * associated literal values, resulting in non-conformant
-         * output.
-         *<p>
-         * Feature is enabled by default.
-         */
-        QUOTE_NON_NUMERIC_NUMBERS(true),
-
-        /**
-         * Feature that forces all Java numbers to be written as JSON strings.
-         * Default state is 'false', meaning that Java numbers are to
-         * be serialized using basic numeric serialization (as JSON
-         * numbers, integral or floating point). If enabled, all such
-         * numeric values are instead written out as JSON Strings.
-         *<p>
-         * One use case is to avoid problems with Javascript limitations:
-         * since Javascript standard specifies that all number handling
-         * should be done using 64-bit IEEE 754 floating point values,
-         * result being that some 64-bit integer values can not be
-         * accurately represent (as mantissa is only 51 bit wide).
-         *<p>
-         * Feature is disabled by default.
-         */
-        WRITE_NUMBERS_AS_STRINGS(false),
-
-        /**
-         * Feature that specifies that calls to {@link #flush} will cause
-         * matching <code>flush()</code> to underlying {@link OutputStream}
-         * or {@link Writer}; if disabled this will not be done.
-         * Main reason to disable this feature is to prevent flushing at
-         * generator level, if it is not possible to prevent method being
-         * called by other code (like <code>ObjectMapper</code> or third
-         * party libraries).
-         *<p>
-         * Feature is enabled by default.
-         */
-        FLUSH_PASSED_TO_STREAM(true),
-        
-        /**
-         * Feature that specifies that all characters beyond 7-bit ASCII
-         * range (i.e. code points of 128 and above) need to be output
-         * using format-specific escapes (for JSON, backslash escapes),
-         * if format uses escaping mechanisms (which is generally true
-         * for textual formats but not for binary formats).
-         *<p>
-         * Feature is disabled by default.
-         */
-        ESCAPE_NON_ASCII(false),
-        
-            ;
-
-        private final boolean _defaultState;
-        
-        private final int _mask;
-        
-        /**
-         * Method that calculates bit set (flags) of all features that
-         * are enabled by default.
-         */
-        public static int collectDefaults()
-        {
-            int flags = 0;
-            for (Feature f : values()) {
-                if (f.enabledByDefault()) {
-                    flags |= f.getMask();
-                }
-            }
-            return flags;
-        }
-        
-        private Feature(boolean defaultState) {
-            _mask = (1 << ordinal());
-            _defaultState = defaultState;
-        }
-        
-        public boolean enabledByDefault() { return _defaultState; }
-        public int getMask() { return _mask; }
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Object that handles pretty-printing (usually additional
-     * white space to make results more human-readable) during
-     * output. If null, no pretty-printing is done.
-     */
-    protected PrettyPrinter _cfgPrettyPrinter;
-
-    /*
-    /**********************************************************
-    /* Construction, configuration, initialization
-    /**********************************************************
-     */
-    
-    protected JsonGenerator() { }
-
-    /**
-     * Method to call to make this generator use specified schema.
-     * Method must be called before generating any content, right after instance
-     * has been created.
-     * Note that not all generators support schemas; and those that do usually only
-     * accept specific types of schemas: ones defined for data format this generator
-     * produces.
-     *<p>
-     * If generator does not support specified schema, {@link UnsupportedOperationException}
-     * is thrown.
-     * 
-     * @param schema Schema to use
-     * 
-     * @throws UnsupportedOperationException if generator does not support schema
-     */
-    public void setSchema(FormatSchema schema)
-    {
-        throw new UnsupportedOperationException("Generator of type "+getClass().getName()+" does not support schema of type '"
-                +schema.getSchemaType()+"'");
-    }
-
-    /**
-     * Method for accessing Schema that this parser uses, if any.
-     * Default implementation returns null.
-     *
-     * @since 2.1
-     */
-    public FormatSchema getSchema() {
-	return null;
-    }
-    
-    /**
-     * Method that can be used to verify that given schema can be used with
-     * this generator (using {@link #setSchema}).
-     * 
-     * @param schema Schema to check
-     * 
-     * @return True if this generator can use given schema; false if not
-     */
-    public boolean canUseSchema(FormatSchema schema) {
-        return false;
-    }
-    
-    /**
-     * Accessor for finding out version of the bundle that provided this generator instance.
-     */
-//  @Override
-    public abstract Version version();
-
-    /**
-     * Method that can be used to get access to object that is used
-     * as target for generated output; this is usually either
-     * {@link OutputStream} or {@link Writer}, depending on what
-     * generator was constructed with.
-     * Note that returned value may be null in some cases; including
-     * case where implementation does not want to exposed raw
-     * source to caller.
-     * In cases where output has been decorated, object returned here
-     * is the decorated version; this allows some level of interaction
-     * between users of generator and decorator object.
-     *<p>
-     * In general use of this accessor should be considered as
-     * "last effort", i.e. only used if no other mechanism is applicable.
-     */
-    public Object getOutputTarget() {
-        return null;
-    }
-
-    /**
-     * Method that allows overriding String used for separating root-level
-     * JSON values (default is single space character)
-     * 
-     * @param sep Separator to use, if any; null means that no separator is
-     *   automatically added
-     * 
-     * @since 2.1
-     */
-    public JsonGenerator setRootValueSeparator(SerializableString sep) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, configuration
-    /**********************************************************
-     */
-
-    /**
-     * Method for enabling specified parser features:
-     * check {@link Feature} for list of available features.
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public abstract JsonGenerator enable(Feature f);
-
-    /**
-     * Method for disabling specified  features
-     * (check {@link Feature} for list of features)
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public abstract JsonGenerator disable(Feature f);
-
-    /**
-     * Method for enabling or disabling specified feature:
-     * check {@link Feature} for list of available features.
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public final JsonGenerator configure(Feature f, boolean state)
-    {
-        if (state) {
-            enable(f);
-        } else {
-            disable(f);
-        }
-        return this;
-    }
-
-    /**
-     * Method for checking whether given feature is enabled.
-     * Check {@link Feature} for list of available features.
-     */
-    public abstract boolean isEnabled(Feature f);
-
-    /**
-     * Method that can be called to set or reset the object to
-     * use for writing Java objects as JsonContent
-     * (using method {@link #writeObject}).
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public abstract JsonGenerator setCodec(ObjectCodec oc);
-
-    /**
-     * Method for accessing the object used for writing Java
-     * object as Json content
-     * (using method {@link #writeObject}).
-     */
-    public abstract ObjectCodec getCodec();
-
-    /*
-    /**********************************************************
-    /* Configuring generator
-    /**********************************************************
-      */
-
-    /**
-     * Method for setting a custom pretty printer, which is usually
-     * used to add indentation for improved human readability.
-     * By default, generator does not do pretty printing.
-     *<p>
-     * To use the default pretty printer that comes with core
-     * Jackson distribution, call {@link #useDefaultPrettyPrinter}
-     * instead.
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public JsonGenerator setPrettyPrinter(PrettyPrinter pp) {
-        _cfgPrettyPrinter = pp;
-        return this;
-    }
-
-    /**
-     * Accessor for checking whether this generator has a configured
-     * {@link PrettyPrinter}; returns it if so, null if none configured.
-     * 
-     * @since 2.1
-     */
-    public PrettyPrinter getPrettyPrinter() {
-        return _cfgPrettyPrinter;
-    }
-    
-    /**
-     * Convenience method for enabling pretty-printing using
-     * the default pretty printer
-     * ({@link com.fasterxml.jackson.core.util.DefaultPrettyPrinter}).
-     *
-     * @return Generator itself (this), to allow chaining
-     */
-    public abstract JsonGenerator useDefaultPrettyPrinter();
-
-    /**
-     * Method that can be called to request that generator escapes
-     * all character codes above specified code point (if positive value);
-     * or, to not escape any characters except for ones that must be
-     * escaped for the data format (if -1).
-     * To force escaping of all non-ASCII characters, for example,
-     * this method would be called with value of 127.
-     *<p>
-     * Note that generators are NOT required to support setting of value
-     * higher than 127, because there are other ways to affect quoting
-     * (or lack thereof) of character codes between 0 and 127.
-     * Not all generators support concept of escaping, either; if so,
-     * calling this method will have no effect.
-     *<p>
-     * Default implementation does nothing; sub-classes need to redefine
-     * it according to rules of supported data format.
-     * 
-     * @param charCode Either -1 to indicate that no additional escaping
-     *   is to be done; or highest code point not to escape (meaning higher
-     *   ones will be), if positive value.
-     */
-    public JsonGenerator setHighestNonEscapedChar(int charCode) {
-        return this;
-    }
-
-    /**
-     * Accessor method for testing what is the highest unescaped character
-     * configured for this generator. This may be either positive value
-     * (when escaping configuration has been set and is in effect), or
-     * 0 to indicate that no additional escaping is in effect.
-     * Some generators may not support additional escaping: for example,
-     * generators for binary formats that do not use escaping should
-     * simply return 0.
-     * 
-     * @return Currently active limitation for highest non-escaped character,
-     *   if defined; or -1 to indicate no additional escaping is performed.
-     */
-    public int getHighestEscapedChar() {
-        return 0;
-    }
-    /**
-     * Method for accessing custom escapes factory uses for {@link JsonGenerator}s
-     * it creates.
-     */
-    public CharacterEscapes getCharacterEscapes() {
-        return null;
-    }
-
-    /**
-     * Method for defining custom escapes factory uses for {@link JsonGenerator}s
-     * it creates.
-     */
-    public JsonGenerator setCharacterEscapes(CharacterEscapes esc) {
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, structural
-    /**********************************************************
-     */
-
-    /**
-     * Method for writing starting marker of a JSON Array value
-     * (character '['; plus possible white space decoration
-     * if pretty-printing is enabled).
-     *<p>
-     * Array values can be written in any context where values
-     * are allowed: meaning everywhere except for when
-     * a field name is expected.
-     */
-    public abstract void writeStartArray()
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for writing closing marker of a JSON Array value
-     * (character ']'; plus possible white space decoration
-     * if pretty-printing is enabled).
-     *<p>
-     * Marker can be written if the innermost structured type
-     * is Array.
-     */
-    public abstract void writeEndArray()
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for writing starting marker of a JSON Object value
-     * (character '{'; plus possible white space decoration
-     * if pretty-printing is enabled).
-     *<p>
-     * Object values can be written in any context where values
-     * are allowed: meaning everywhere except for when
-     * a field name is expected.
-     */
-    public abstract void writeStartObject()
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for writing closing marker of a JSON Object value
-     * (character '}'; plus possible white space decoration
-     * if pretty-printing is enabled).
-     *<p>
-     * Marker can be written if the innermost structured type
-     * is Object, and the last written event was either a
-     * complete value, or START-OBJECT marker (see JSON specification
-     * for more details).
-     */
-    public abstract void writeEndObject()
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for writing a field name (JSON String surrounded by
-     * double quotes: syntactically identical to a JSON String value),
-     * possibly decorated by white space if pretty-printing is enabled.
-     *<p>
-     * Field names can only be written in Object context (check out
-     * JSON specification for details), when field name is expected
-     * (field names alternate with values).
-     */
-    public abstract void writeFieldName(String name)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method similar to {@link #writeFieldName(String)}, main difference
-     * being that it may perform better as some of processing (such as
-     * quoting of certain characters, or encoding into external encoding
-     * if supported by generator) can be done just once and reused for
-     * later calls.
-     *<p>
-     * Default implementation simple uses unprocessed name container in
-     * serialized String; implementations are strongly encouraged to make
-     * use of more efficient methods argument object has.
-     */
-    public abstract void writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException;
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, text/String values
-    /**********************************************************
-     */
-
-    /**
-     * Method for outputting a String value. Depending on context
-     * this means either array element, (object) field value or
-     * a stand alone String; but in all cases, String will be
-     * surrounded in double quotes, and contents will be properly
-     * escaped as required by JSON specification.
-     */
-    public abstract void writeString(String text)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting a String value. Depending on context
-     * this means either array element, (object) field value or
-     * a stand alone String; but in all cases, String will be
-     * surrounded in double quotes, and contents will be properly
-     * escaped as required by JSON specification.
-     */
-    public abstract void writeString(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method similar to {@link #writeString(String)}, but that takes
-     * {@link SerializableString} which can make this potentially
-     * more efficient to call as generator may be able to reuse
-     * quoted and/or encoded representation.
-     *<p>
-     * Default implementation just calls {@link #writeString(String)};
-     * sub-classes should override it with more efficient implementation
-     * if possible.
-     */
-    public abstract void writeString(SerializableString text)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method similar to {@link #writeString(String)} but that takes as
-     * its input a UTF-8 encoded String that is to be output as-is, without additional
-     * escaping (type of which depends on data format; backslashes for JSON).
-     * However, quoting that data format requires (like double-quotes for JSON) will be added
-     * around the value if and as necessary.
-     *<p>
-     * Note that some backends may choose not to support this method: for
-     * example, if underlying destination is a {@link java.io.Writer}
-     * using this method would require UTF-8 decoding.
-     * If so, implementation may instead choose to throw a
-     * {@link UnsupportedOperationException} due to ineffectiveness
-     * of having to decode input.
-     */
-    public abstract void writeRawUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method similar to {@link #writeString(String)} but that takes as its input
-     * a UTF-8 encoded String which has <b>not</b> been escaped using whatever
-     * escaping scheme data format requires (for JSON that is backslash-escaping
-     * for control characters and double-quotes; for other formats something else).
-     * This means that textual JSON backends need to check if value needs
-     * JSON escaping, but otherwise can just be copied as is to output.
-     * Also, quoting that data format requires (like double-quotes for JSON) will be added
-     * around the value if and as necessary.
-     *<p>
-     * Note that some backends may choose not to support this method: for
-     * example, if underlying destination is a {@link java.io.Writer}
-     * using this method would require UTF-8 decoding.
-     * In this case
-     * generator implementation may instead choose to throw a
-     * {@link UnsupportedOperationException} due to ineffectiveness
-     * of having to decode input.
-     */
-    public abstract void writeUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException;
-    
-    /*
-    /**********************************************************
-    /* Public API, write methods, binary/raw content
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will force generator to copy
-     * input text verbatim with <b>no</b> modifications (including
-     * that no escaping is done and no separators are added even
-     * if context [array, object] would otherwise require such).
-     * If such separators are desired, use
-     * {@link #writeRawValue(String)} instead.
-     *<p>
-     * Note that not all generator implementations necessarily support
-     * such by-pass methods: those that do not will throw
-     * {@link UnsupportedOperationException}.
-     */
-    public abstract void writeRaw(String text)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method that will force generator to copy
-     * input text verbatim with <b>no</b> modifications (including
-     * that no escaping is done and no separators are added even
-     * if context [array, object] would otherwise require such).
-     * If such separators are desired, use
-     * {@link #writeRawValue(String)} instead.
-     *<p>
-     * Note that not all generator implementations necessarily support
-     * such by-pass methods: those that do not will throw
-     * {@link UnsupportedOperationException}.
-     */
-    public abstract void writeRaw(String text, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method that will force generator to copy
-     * input text verbatim with <b>no</b> modifications (including
-     * that no escaping is done and no separators are added even
-     * if context [array, object] would otherwise require such).
-     * If such separators are desired, use
-     * {@link #writeRawValue(String)} instead.
-     *<p>
-     * Note that not all generator implementations necessarily support
-     * such by-pass methods: those that do not will throw
-     * {@link UnsupportedOperationException}.
-     */
-    public abstract void writeRaw(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method that will force generator to copy
-     * input text verbatim with <b>no</b> modifications (including
-     * that no escaping is done and no separators are added even
-     * if context [array, object] would otherwise require such).
-     * If such separators are desired, use
-     * {@link #writeRawValue(String)} instead.
-     *<p>
-     * Note that not all generator implementations necessarily support
-     * such by-pass methods: those that do not will throw
-     * {@link UnsupportedOperationException}.
-     */
-    public abstract void writeRaw(char c)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method that will force generator to copy
-     * input text verbatim with <b>no</b> modifications (including
-     * that no escaping is done and no separators are added even
-     * if context [array, object] would otherwise require such).
-     * If such separators are desired, use
-     * {@link #writeRawValue(String)} instead.
-     *<p>
-     * Note that not all generator implementations necessarily support
-     * such by-pass methods: those that do not will throw
-     * {@link UnsupportedOperationException}.
-     *<p>
-     * The default implementation delegates to {@link #writeRaw(String)};
-     * other backends that support raw inclusion of text are encouraged
-     * to implement it in more efficient manner (especially if they
-     * use UTF-8 encoding).
-     * 
-     * @since 2.1
-     */
-    public void writeRaw(SerializableString raw)
-        throws IOException, JsonGenerationException {
-        writeRaw(raw.getValue());
-    }
-    
-    /**
-     * Method that will force generator to copy
-     * input text verbatim without any modifications, but assuming
-     * it must constitute a single legal JSON value (number, string,
-     * boolean, null, Array or List). Assuming this, proper separators
-     * are added if and as needed (comma or colon), and generator
-     * state updated to reflect this.
-     */
-    public abstract void writeRawValue(String text)
-        throws IOException, JsonGenerationException;
-
-    public abstract void writeRawValue(String text, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    public abstract void writeRawValue(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method that will output given chunk of binary data as base64
-     * encoded, as a complete String value (surrounded by double quotes).
-     * This method defaults
-     *<p>
-     * Note: because Json Strings can not contain unescaped linefeeds,
-     * if linefeeds are included (as per last argument), they must be
-     * escaped. This adds overhead for decoding without improving
-     * readability.
-     * Alternatively if linefeeds are not included,
-     * resulting String value may violate the requirement of base64
-     * RFC which mandates line-length of 76 characters and use of
-     * linefeeds. However, all {@link JsonParser} implementations
-     * are required to accept such "long line base64"; as do
-     * typical production-level base64 decoders.
-     *
-     * @param b64variant Base64 variant to use: defines details such as
-     *   whether padding is used (and if so, using which character);
-     *   what is the maximum line length before adding linefeed,
-     *   and also the underlying alphabet to use.
-     */
-    public abstract void writeBinary(Base64Variant b64variant,
-            byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Similar to {@link #writeBinary(Base64Variant,byte[],int,int)},
-     * but default to using the Jackson default Base64 variant 
-     * (which is {@link Base64Variants#MIME_NO_LINEFEEDS}).
-     */
-    public void writeBinary(byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        writeBinary(Base64Variants.getDefaultVariant(), data, offset, len);
-    }
-
-    /**
-     * Similar to {@link #writeBinary(Base64Variant,byte[],int,int)},
-     * but assumes default to using the Jackson default Base64 variant 
-     * (which is {@link Base64Variants#MIME_NO_LINEFEEDS}). Also
-     * assumes that whole byte array is to be output.
-     */
-    public void writeBinary(byte[] data)
-        throws IOException, JsonGenerationException
-    {
-        writeBinary(Base64Variants.getDefaultVariant(), data, 0, data.length);
-    }
-
-    /**
-     * Similar to {@link #writeBinary(Base64Variant,InputStream,int)},
-     * but assumes default to using the Jackson default Base64 variant 
-     * (which is {@link Base64Variants#MIME_NO_LINEFEEDS}).
-     * 
-     * @param data InputStream to use for reading binary data to write.
-     *    Will not be closed after successful write operation
-     * @param dataLength (optional) number of bytes that will be available;
-     *    or -1 to be indicate it is not known. Note that implementations
-     *    need not support cases where length is not known in advance; this
-     *    depends on underlying data format: JSON output does NOT require length,
-     *    other formats may
-     */
-    public int writeBinary(InputStream data, int dataLength)
-        throws IOException, JsonGenerationException {
-        return writeBinary(Base64Variants.getDefaultVariant(), data, dataLength);
-    }
-    
-    /**
-     * Method similar to {@link #writeBinary(Base64Variant,byte[],int,int)},
-     * but where input is provided through a stream, allowing for incremental
-     * writes without holding the whole input in memory.
-     * 
-     * @param b64variant Base64 variant to use
-     * @param data InputStream to use for reading binary data to write.
-     *    Will not be closed after successful write operation
-     * @param dataLength (optional) number of bytes that will be available;
-     *    or -1 to be indicate it is not known.
-     *    If a positive length is given, <code>data</code> MUST provide at least
-     *    that many bytes: if not, an exception will be thrown.
-     *    Note that implementations
-     *    need not support cases where length is not known in advance; this
-     *    depends on underlying data format: JSON output does NOT require length,
-     *    other formats may.
-     * 
-     * @return Number of bytes read from <code>data</code> and written as binary payload
-     * 
-     * @since 2.1
-     */
-    public abstract int writeBinary(Base64Variant b64variant,
-            InputStream data, int dataLength)
-        throws IOException, JsonGenerationException;
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, other value types
-    /**********************************************************
-     */
-
-    /**
-     * Method for outputting given value as Json number.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(int v)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting given value as Json number.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(long v)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting given value as Json number.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(BigInteger v)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting indicate Json numeric value.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(double d)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting indicate Json numeric value.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(float f)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting indicate Json numeric value.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNumber(BigDecimal dec)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Write method that can be used for custom numeric types that can
-     * not be (easily?) converted to "standard" Java number types.
-     * Because numbers are not surrounded by double quotes, regular
-     * {@link #writeString} method can not be used; nor
-     * {@link #writeRaw} because that does not properly handle
-     * value separators needed in Array or Object contexts.
-     *<p>
-     * Note: because of lack of type safety, some generator
-     * implementations may not be able to implement this
-     * method. For example, if a binary json format is used,
-     * it may require type information for encoding; similarly
-     * for generator-wrappers around Java objects or Json nodes.
-     * If implementation does not implement this method,
-     * it needs to throw {@link UnsupportedOperationException}.
-     */
-    public abstract void writeNumber(String encodedValue)
-        throws IOException, JsonGenerationException,
-               UnsupportedOperationException;
-
-    /**
-     * Method for outputting literal Json boolean value (one of
-     * Strings 'true' and 'false').
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeBoolean(boolean state)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method for outputting literal Json null value.
-     * Can be called in any context where a value is expected
-     * (Array value, Object field value, root-level value).
-     * Additional white space may be added around the value
-     * if pretty-printing is enabled.
-     */
-    public abstract void writeNull()
-        throws IOException, JsonGenerationException;
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, serializing Java objects
-    /**********************************************************
-     */
-
-    /**
-     * Method for writing given Java object (POJO) as Json.
-     * Exactly how the object gets written depends on object
-     * in question (ad on codec, its configuration); for most
-     * beans it will result in Json object, but for others Json
-     * array, or String or numeric value (and for nulls, Json
-     * null literal.
-     * <b>NOTE</b>: generator must have its <b>object codec</b>
-     * set to non-null value; for generators created by a mapping
-     * factory this is the case, for others not.
-     */
-    public abstract void writeObject(Object pojo)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method for writing given JSON tree (expressed as a tree
-     * where given JsonNode is the root) using this generator.
-     * This will generally just call
-     * {@link #writeObject} with given node, but is added
-     * for convenience and to make code more explicit in cases
-     * where it deals specifically with trees.
-     */
-    public abstract void writeTree(TreeNode rootNode)
-        throws IOException, JsonProcessingException;
-
-    /*
-    /**********************************************************
-    /* Public API, convenience field write methods
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has a String value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeString(value);
-     *</pre>
-     *<p>
-     * Note: many performance-sensitive implementations override this method
-     */
-    public void writeStringField(String fieldName, String value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeString(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has a boolean value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeBoolean(value);
-     *</pre>
-     */
-    public final void writeBooleanField(String fieldName, boolean value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeBoolean(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has JSON literal value null. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNull();
-     *</pre>
-     */
-    public final void writeNullField(String fieldName)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNull();
-    }
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has the specified numeric value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNumber(value);
-     *</pre>
-     */
-    public final void writeNumberField(String fieldName, int value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNumber(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has the specified numeric value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNumber(value);
-     *</pre>
-     */
-    public final void writeNumberField(String fieldName, long value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNumber(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has the specified numeric value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNumber(value);
-     *</pre>
-     */
-    public final void writeNumberField(String fieldName, double value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNumber(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has the specified numeric value. Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNumber(value);
-     *</pre>
-     */
-    public final void writeNumberField(String fieldName, float value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNumber(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has the specified numeric value.
-     * Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeNumber(value);
-     *</pre>
-     */
-    public final void writeNumberField(String fieldName, BigDecimal value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeNumber(value);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that contains specified data in base64-encoded form.
-     * Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeBinary(value);
-     *</pre>
-     */
-    public final void writeBinaryField(String fieldName, byte[] data)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeBinary(data);
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * (that will contain a JSON Array value), and the START_ARRAY marker.
-     * Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeStartArray();
-     *</pre>
-     *<p>
-     * Note: caller still has to take care to close the array
-     * (by calling {#link #writeEndArray}) after writing all values
-     * of the value Array.
-     */
-    public final void writeArrayFieldStart(String fieldName)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeStartArray();
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * (that will contain a JSON Object value), and the START_OBJECT marker.
-     * Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeStartObject();
-     *</pre>
-     *<p>
-     * Note: caller still has to take care to close the Object
-     * (by calling {#link #writeEndObject}) after writing all
-     * entries of the value Object.
-     */
-    public final void writeObjectFieldStart(String fieldName)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeStartObject();
-    }
-
-    /**
-     * Convenience method for outputting a field entry ("member")
-     * that has contents of specific Java object as its value.
-     * Equivalent to:
-     *<pre>
-     *  writeFieldName(fieldName);
-     *  writeObject(pojo);
-     *</pre>
-     */
-    public final void writeObjectField(String fieldName, Object pojo)
-        throws IOException, JsonProcessingException
-    {
-        writeFieldName(fieldName);
-        writeObject(pojo);
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, copy-through methods
-    /**********************************************************
-     */
-
-    /**
-     * Method for copying contents of the current event that
-     * the given parser instance points to.
-     * Note that the method <b>will not</b> copy any other events,
-     * such as events contained within Json Array or Object structures.
-     *<p>
-     * Calling this method will not advance the given
-     * parser, although it may cause parser to internally process
-     * more data (if it lazy loads contents of value events, for example)
-     */
-    public abstract void copyCurrentEvent(JsonParser jp)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method for copying contents of the current event
-     * <b>and following events that it encloses</b>
-     * the given parser instance points to.
-     *<p>
-     * So what constitutes enclosing? Here is the list of
-     * events that have associated enclosed events that will
-     * get copied:
-     *<ul>
-     * <li>{@link JsonToken#START_OBJECT}:
-     *   all events up to and including matching (closing)
-     *   {@link JsonToken#END_OBJECT} will be copied
-     *  </li>
-     * <li>{@link JsonToken#START_ARRAY}
-     *   all events up to and including matching (closing)
-     *   {@link JsonToken#END_ARRAY} will be copied
-     *  </li>
-     * <li>{@link JsonToken#FIELD_NAME} the logical value (which
-     *   can consist of a single scalar value; or a sequence of related
-     *   events for structured types (Json Arrays, Objects)) will
-     *   be copied along with the name itself. So essentially the
-     *   whole <b>field entry</b> (name and value) will be copied.
-     *  </li>
-     *</ul>
-     *<p>
-     * After calling this method, parser will point to the
-     * <b>last event</b> that was copied. This will either be
-     * the event parser already pointed to (if there were no
-     * enclosed events), or the last enclosed event copied.
-     */
-    public abstract void copyCurrentStructure(JsonParser jp)
-        throws IOException, JsonProcessingException;
-
-    /*
-    /**********************************************************
-    /* Public API, context access
-    /**********************************************************
-     */
-
-    /**
-     * @return Context object that can give information about logical
-     *   position within generated json content.
-     */
-    public abstract JsonStreamContext getOutputContext();
-
-    /*
-    /**********************************************************
-    /* Public API, buffer handling
-    /**********************************************************
-     */
-
-    /**
-     * Method called to flush any buffered content to the underlying
-     * target (output stream, writer), and to flush the target itself
-     * as well.
-     */
-    public abstract void flush() throws IOException;
-
-    /**
-     * Method that can be called to determine whether this generator
-     * is closed or not. If it is closed, no more output can be done.
-     */
-    public abstract boolean isClosed();
-
-    /*
-    /**********************************************************
-    /* Closeable implementation
-    /**********************************************************
-     */
-
-    /**
-     * Method called to close this generator, so that no more content
-     * can be written.
-     *<p>
-     * Whether the underlying target (stream, writer) gets closed depends
-     * on whether this generator either manages the target (i.e. is the
-     * only one with access to the target -- case if caller passes a
-     * reference to the resource such as File, but not stream); or
-     * has feature {@link Feature#AUTO_CLOSE_TARGET} enabled.
-     * If either of above is true, the target is also closed. Otherwise
-     * (not managing, feature not enabled), target is not closed.
-     */
-//    @Override
-    public abstract void close() throws IOException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonLocation.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonLocation.java
deleted file mode 100644
index 4b3598b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonLocation.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Object that encapsulates Location information used for reporting
- * parsing (or potentially generation) errors, as well as current location
- * within input streams.
- */
-public class JsonLocation
-    implements java.io.Serializable // as per [JACKSON-168]
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Shared immutable "N/A location" that can be returned to indicate
-     * that no location information is available
-     */
-    public final static JsonLocation NA = new JsonLocation("N/A", -1L, -1L, -1, -1);
-
-    final long _totalBytes;
-    final long _totalChars;
-
-    final int _lineNr;
-    final int _columnNr;
-
-    /**
-     * Displayable description for input source: file path, url
-     */
-    final Object _sourceRef;
-
-    public JsonLocation(Object srcRef, long totalChars, int lineNr, int colNr)
-    {
-        /* Unfortunately, none of legal encodings are straight single-byte
-         * encodings. Could determine offset for UTF-16/UTF-32, but the
-         * most important one is UTF-8...
-         * so for now, we'll just not report any real byte count
-         */
-        this(srcRef, -1L, totalChars, lineNr, colNr);
-    }
-
-    public JsonLocation(Object sourceRef, long totalBytes, long totalChars,
-            int lineNr, int columnNr)
-    {
-        _sourceRef = sourceRef;
-        _totalBytes = totalBytes;
-        _totalChars = totalChars;
-        _lineNr = lineNr;
-        _columnNr = columnNr;
-    }
-
-    /**
-     * Reference to the original resource being read, if one available.
-     * For example, when a parser has been constructed by passing
-     * a {@link java.io.File} instance, this method would return
-     * that File. Will return null if no such reference is available,
-     * for example when {@link java.io.InputStream} was used to
-     * construct the parser instance.
-     */
-    public Object getSourceRef() { return _sourceRef; }
-
-    /**
-     * @return Line number of the location (1-based)
-     */
-    public int getLineNr() { return _lineNr; }
-
-    /**
-     * @return Column number of the location (1-based)
-     */
-    public int getColumnNr() { return _columnNr; }
-
-    /**
-     * @return Character offset within underlying stream, reader or writer,
-     *   if available; -1 if not.
-     */
-    public long getCharOffset() { return _totalChars; }
-
-    /**
-     * @return Byte offset within underlying stream, reader or writer,
-     *   if available; -1 if not.
-     */
-    public long getByteOffset()
-    {
-        return _totalBytes;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(80);
-        sb.append("[Source: ");
-        if (_sourceRef == null) {
-            sb.append("UNKNOWN");
-        } else {
-            sb.append(_sourceRef.toString());
-        }
-        sb.append("; line: ");
-        sb.append(_lineNr);
-        sb.append(", column: ");
-        sb.append(_columnNr);
-        sb.append(']');
-        return sb.toString();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int hash = (_sourceRef == null) ? 1 : _sourceRef.hashCode();
-        hash ^= _lineNr;
-        hash += _columnNr;
-        hash ^= (int) _totalChars;
-        hash += (int) _totalBytes;
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object other)
-    {
-        if (other == this) return true;
-        if (other == null) return false;
-        if (!(other instanceof JsonLocation)) return false;
-        JsonLocation otherLoc = (JsonLocation) other;
-
-        if (_sourceRef == null) {
-            if (otherLoc._sourceRef != null) return false;
-        } else if (!_sourceRef.equals(otherLoc._sourceRef)) return false;
-
-        return (_lineNr == otherLoc._lineNr)
-            && (_columnNr == otherLoc._columnNr)
-            && (_totalChars == otherLoc._totalChars)
-            && (getByteOffset() == otherLoc.getByteOffset())
-            ;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonParseException.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonParseException.java
deleted file mode 100644
index d1f53c8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonParseException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Exception type for parsing problems, used when non-well-formed content
- * (content that does not conform to JSON syntax as per specification)
- * is encountered.
- */
-public class JsonParseException
-    extends JsonProcessingException
-{
-    final static long serialVersionUID = 123; // Stupid eclipse...
-
-    public JsonParseException(String msg, JsonLocation loc)
-    {
-        super(msg, loc);
-    }
-
-    public JsonParseException(String msg, JsonLocation loc, Throwable root)
-    {
-        super(msg, loc, root);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonParser.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonParser.java
deleted file mode 100644
index 4b80579..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonParser.java
+++ /dev/null
@@ -1,1390 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.fasterxml.jackson.core;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Iterator;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
-/**
- * Base class that defines public API for reading JSON content.
- * Instances are created using factory methods of
- * a {@link JsonFactory} instance.
- *
- * @author Tatu Saloranta
- */
-public abstract class JsonParser
-    implements Closeable, Versioned
-{
-    private final static int MIN_BYTE_I = (int) Byte.MIN_VALUE;
-    // as per [JACKSON-804], allow range up to and including 255
-    private final static int MAX_BYTE_I = (int) 255;
-
-    private final static int MIN_SHORT_I = (int) Short.MIN_VALUE;
-    private final static int MAX_SHORT_I = (int) Short.MAX_VALUE;
-
-    /**
-     * Enumeration of possible "native" (optimal) types that can be
-     * used for numbers.
-     */
-    public enum NumberType {
-        INT, LONG, BIG_INTEGER, FLOAT, DOUBLE, BIG_DECIMAL
-    };
-
-    /**
-     * Enumeration that defines all on/off features for parsers.
-     */
-    public enum Feature {
-        
-        // // // Low-level I/O handling features:
-        
-        /**
-         * Feature that determines whether parser will automatically
-         * close underlying input source that is NOT owned by the
-         * parser. If disabled, calling application has to separately
-         * close the underlying {@link InputStream} and {@link Reader}
-         * instances used to create the parser. If enabled, parser
-         * will handle closing, as long as parser itself gets closed:
-         * this happens when end-of-input is encountered, or parser
-         * is closed by a call to {@link JsonParser#close}.
-         *<p>
-         * Feature is enabled by default.
-         */
-        AUTO_CLOSE_SOURCE(true),
-            
-        // // // Support for non-standard data format constructs
-
-        /**
-         * Feature that determines whether parser will allow use
-         * of Java/C++ style comments (both '/'+'*' and
-         * '//' varieties) within parsed content or not.
-         *<p>
-         * Since JSON specification does not mention comments as legal
-         * construct,
-         * this is a non-standard feature; however, in the wild
-         * this is extensively used. As such, feature is
-         * <b>disabled by default</b> for parsers and must be
-         * explicitly enabled.
-         */
-        ALLOW_COMMENTS(false),
-
-        /**
-         * Feature that determines whether parser will allow use
-         * of unquoted field names (which is allowed by Javascript,
-         * but not by JSON specification).
-         *<p>
-         * Since JSON specification requires use of double quotes for
-         * field names,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-        ALLOW_UNQUOTED_FIELD_NAMES(false),
-
-        /**
-         * Feature that determines whether parser will allow use
-         * of single quotes (apostrophe, character '\'') for
-         * quoting Strings (names and String values). If so,
-         * this is in addition to other acceptabl markers.
-         * but not by JSON specification).
-         *<p>
-         * Since JSON specification requires use of double quotes for
-         * field names,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-        ALLOW_SINGLE_QUOTES(false),
-
-        /**
-         * Feature that determines whether parser will allow
-         * JSON Strings to contain unquoted control characters
-         * (ASCII characters with value less than 32, including
-         * tab and line feed characters) or not.
-         * If feature is set false, an exception is thrown if such a
-         * character is encountered.
-         *<p>
-         * Since JSON specification requires quoting for all control characters,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-        ALLOW_UNQUOTED_CONTROL_CHARS(false),
-
-        /**
-         * Feature that can be enabled to accept quoting of all character
-         * using backslash qooting mechanism: if not enabled, only characters
-         * that are explicitly listed by JSON specification can be thus
-         * escaped (see JSON spec for small list of these characters)
-         *<p>
-         * Since JSON specification requires quoting for all control characters,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-        ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER(false),
-
-        /**
-         * Feature that determines whether parser will allow
-         * JSON integral numbers to start with additional (ignorable) 
-         * zeroes (like: 000001). If enabled, no exception is thrown, and extra
-         * nulls are silently ignored (and not included in textual representation
-         * exposed via {@link JsonParser#getText}).
-         *<p>
-         * Since JSON specification does not allow leading zeroes,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-        ALLOW_NUMERIC_LEADING_ZEROS(false),
-        
-        /**
-         * Feature that allows parser to recognize set of
-         * "Not-a-Number" (NaN) tokens as legal floating number
-         * values (similar to how many other data formats and
-         * programming language source code allows it).
-         * Specific subset contains values that
-         * <a href="http://www.w3.org/TR/xmlschema-2/">XML Schema</a>
-         * (see section 3.2.4.1, Lexical Representation)
-         * allows (tokens are quoted contents, not including quotes):
-         *<ul>
-         *  <li>"INF" (for positive infinity), as well as alias of "Infinity"
-         *  <li>"-INF" (for negative infinity), alias "-Infinity"
-         *  <li>"NaN" (for other not-a-numbers, like result of division by zero)
-         *</ul>
-         *<p>
-         * Since JSON specification does not allow use of such values,
-         * this is a non-standard feature, and as such disabled by default.
-         */
-         ALLOW_NON_NUMERIC_NUMBERS(false),
-        
-            ;
-
-        /**
-         * Whether feature is enabled or disabled by default.
-         */
-        private final boolean _defaultState;
-        
-        /**
-         * Method that calculates bit set (flags) of all features that
-         * are enabled by default.
-         */
-        public static int collectDefaults()
-        {
-            int flags = 0;
-            for (Feature f : values()) {
-                if (f.enabledByDefault()) {
-                    flags |= f.getMask();
-                }
-            }
-            return flags;
-        }
-        
-        private Feature(boolean defaultState) {
-            _defaultState = defaultState;
-        }
-        
-        public boolean enabledByDefault() { return _defaultState; }
-//        public boolean enabledIn(int flags) { return (flags & getMask()) != 0; }
-        public int getMask() { return (1 << ordinal()); }
-    }
-
-    /*
-    /**********************************************************
-    /* Minimal configuration state
-    /**********************************************************
-     */
-
-    /**
-     * Bit flag composed of bits that indicate which
-     * {@link com.fasterxml.jackson.core.JsonParser.Feature}s
-     * are enabled.
-     */
-    protected int _features;
-
-    /*
-    /**********************************************************
-    /* Construction, configuration, initialization
-    /**********************************************************
-     */
-
-    protected JsonParser() { }
-    protected JsonParser(int features) {
-        _features = features;
-    }
-
-    /**
-     * Accessor for {@link ObjectCodec} associated with this
-     * parser, if any. Codec is used by {@link #readValueAs(Class)}
-     * method (and its variants).
-     */
-    public abstract ObjectCodec getCodec();
-
-    /**
-     * Setter that allows defining {@link ObjectCodec} associated with this
-     * parser, if any. Codec is used by {@link #readValueAs(Class)}
-     * method (and its variants).
-     */
-    public abstract void setCodec(ObjectCodec c);
-
-    /**
-     * Method that can be used to get access to object that is used
-     * to access input being parsed; this is usually either
-     * {@link InputStream} or {@link Reader}, depending on what
-     * parser was constructed with.
-     * Note that returned value may be null in some cases; including
-     * case where parser implementation does not want to exposed raw
-     * source to caller.
-     * In cases where input has been decorated, object returned here
-     * is the decorated version; this allows some level of interaction
-     * between users of parser and decorator object.
-     *<p>
-     * In general use of this accessor should be considered as
-     * "last effort", i.e. only used if no other mechanism is applicable.
-     */
-    public Object getInputSource() {
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Format support
-    /**********************************************************
-     */
-    
-    /**
-     * Method to call to make this parser use specified schema. Method must
-     * be called before trying to parse any content, right after parser instance
-     * has been created.
-     * Note that not all parsers support schemas; and those that do usually only
-     * accept specific types of schemas: ones defined for data format parser can read.
-     *<p>
-     * If parser does not support specified schema, {@link UnsupportedOperationException}
-     * is thrown.
-     * 
-     * @param schema Schema to use
-     * 
-     * @throws UnsupportedOperationException if parser does not support schema
-     */
-    public void setSchema(FormatSchema schema)
-    {
-        throw new UnsupportedOperationException("Parser of type "+getClass().getName()+" does not support schema of type '"
-                +schema.getSchemaType()+"'");
-    }
-
-    /**
-     * Method for accessing Schema that this parser uses, if any.
-     * Default implementation returns null.
-     *
-     * @since 2.1
-     */
-    public FormatSchema getSchema() {
-        return null;
-    }
-    
-    /**
-     * Method that can be used to verify that given schema can be used with
-     * this parser (using {@link #setSchema}).
-     * 
-     * @param schema Schema to check
-     * 
-     * @return True if this parser can use given schema; false if not
-     */
-    public boolean canUseSchema(FormatSchema schema) {
-        return false;
-    }
-
-    /**
-     * Method that can be called to determine if a custom
-     * {@link ObjectCodec} is needed for binding data parsed
-     * using {@link JsonParser} constructed by this factory
-     * (which typically also implies the same for serialization
-     * with {@link JsonGenerator}).
-     * 
-     * @return True if custom codec is needed with parsers and
-     *   generators created by this factory; false if a general
-     *   {@link ObjectCodec} is enough
-     * 
-     * @since 2.1
-     */
-    public boolean requiresCustomCodec() {
-        return false;
-    }
-
-    /*
-    /**********************************************************
-    /* Versioned
-    /**********************************************************
-     */
-    
-    /**
-     * Accessor for getting version of the core package, given a parser instance.
-     * Left for sub-classes to implement.
-     */
-//  @Override
-    public abstract Version version();
-    
-    /*
-    /**********************************************************
-    /* Closeable implementation
-    /**********************************************************
-     */
-
-    /**
-     * Closes the parser so that no further iteration or data access
-     * can be made; will also close the underlying input source
-     * if parser either <b>owns</b> the input source, or feature
-     * {@link Feature#AUTO_CLOSE_SOURCE} is enabled.
-     * Whether parser owns the input source depends on factory
-     * method that was used to construct instance (so check
-     * {@link com.fasterxml.jackson.core.JsonFactory} for details,
-     * but the general
-     * idea is that if caller passes in closable resource (such
-     * as {@link InputStream} or {@link Reader}) parser does NOT
-     * own the source; but if it passes a reference (such as
-     * {@link java.io.File} or {@link java.net.URL} and creates
-     * stream or reader it does own them.
-     */
-//  @Override
-    public abstract void close() throws IOException;
-
-    /*
-    /**********************************************************
-    /* Buffer handling
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to push back any content that
-     * has been read but not consumed by the parser. This is usually
-     * done after reading all content of interest using parser.
-     * Content is released by writing it to given stream if possible;
-     * if underlying input is byte-based it can released, if not (char-based)
-     * it can not.
-     * 
-     * @return -1 if the underlying content source is not byte based
-     *    (that is, input can not be sent to {@link OutputStream};
-     *    otherwise number of bytes released (0 if there was nothing to release)
-     *    
-     * @throws IOException if write to stream threw exception
-     */    
-    public int releaseBuffered(OutputStream out) throws IOException
-    {
-        return -1;
-    }
-
-    /**
-     * Method that can be called to push back any content that
-     * has been read but not consumed by the parser.
-     * This is usually
-     * done after reading all content of interest using parser.
-     * Content is released by writing it to given writer if possible;
-     * if underlying input is char-based it can released, if not (byte-based)
-     * it can not.
-     * 
-     * @return -1 if the underlying content source is not char-based
-     *    (that is, input can not be sent to {@link Writer};
-     *    otherwise number of chars released (0 if there was nothing to release)
-     *    
-     * @throws IOException if write using Writer threw exception
-     */    
-    public int releaseBuffered(Writer w) throws IOException
-    {
-        return -1;
-    }
-    
-    /*
-    /***************************************************
-    /* Public API, configuration
-    /***************************************************
-     */
-
-    /**
-     * Method for enabling specified parser feature
-     * (check {@link Feature} for list of features)
-     */
-    public JsonParser enable(Feature f)
-    {
-        _features |= f.getMask();
-        return this;
-    }
-
-    /**
-     * Method for disabling specified  feature
-     * (check {@link Feature} for list of features)
-     */
-    public JsonParser disable(Feature f)
-    {
-        _features &= ~f.getMask();
-        return this;
-    }
-
-    /**
-     * Method for enabling or disabling specified feature
-     * (check {@link Feature} for list of features)
-     */
-    public JsonParser configure(Feature f, boolean state)
-    {
-        if (state) {
-            enable(f);
-        } else {
-            disable(f);
-        }
-        return this;
-    }
-    
-    /**
-     * Method for checking whether specified {@link Feature} is enabled.
-     */
-    public boolean isEnabled(Feature f) {
-        return (_features & f.getMask()) != 0;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, traversal
-    /**********************************************************
-     */
-
-    /**
-     * Main iteration method, which will advance stream enough
-     * to determine type of the next token, if any. If none
-     * remaining (stream has no content other than possible
-     * white space before ending), null will be returned.
-     *
-     * @return Next token from the stream, if any found, or null
-     *   to indicate end-of-input
-     */
-    public abstract JsonToken nextToken()
-        throws IOException, JsonParseException;
-
-    /**
-     * Iteration method that will advance stream enough
-     * to determine type of the next token that is a value type
-     * (including JSON Array and Object start/end markers).
-     * Or put another way, nextToken() will be called once,
-     * and if {@link JsonToken#FIELD_NAME} is returned, another
-     * time to get the value for the field.
-     * Method is most useful for iterating over value entries
-     * of JSON objects; field name will still be available
-     * by calling {@link #getCurrentName} when parser points to
-     * the value.
-     *
-     * @return Next non-field-name token from the stream, if any found,
-     *   or null to indicate end-of-input (or, for non-blocking
-     *   parsers, {@link JsonToken#NOT_AVAILABLE} if no tokens were
-     *   available yet)
-     */
-    public abstract JsonToken nextValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Method that fetches next token (as if calling {@link #nextToken}) and
-     * verifies whether it is {@link JsonToken#FIELD_NAME} with specified name
-     * and returns result of that comparison.
-     * It is functionally equivalent to:
-     *<pre>
-     *  return (nextToken() == JsonToken.FIELD_NAME) && str.getValue().equals(getCurrentName());
-     *</pre>
-     * but may be faster for parser to verify, and can therefore be used if caller
-     * expects to get such a property name from input next.
-     * 
-     * @param str Property name to compare next token to (if next token is <code>JsonToken.FIELD_NAME<code>)
-     */
-    public boolean nextFieldName(SerializableString str)
-        throws IOException, JsonParseException
-    {
-        return (nextToken() == JsonToken.FIELD_NAME) && str.getValue().equals(getCurrentName());
-    }
-
-    /**
-     * Method that fetches next token (as if calling {@link #nextToken}) and
-     * if it is {@link JsonToken#VALUE_STRING} returns contained String value;
-     * otherwise returns null.
-     * It is functionally equivalent to:
-     *<pre>
-     *  return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
-     *</pre>
-     * but may be faster for parser to process, and can therefore be used if caller
-     * expects to get a String value next from input.
-     */
-    public String nextTextValue()
-        throws IOException, JsonParseException
-    {
-        return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
-    }
-
-    /**
-     * Method that fetches next token (as if calling {@link #nextToken}) and
-     * if it is {@link JsonToken#VALUE_NUMBER_INT} returns 32-bit int value;
-     * otherwise returns specified default value
-     * It is functionally equivalent to:
-     *<pre>
-     *  return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
-     *</pre>
-     * but may be faster for parser to process, and can therefore be used if caller
-     * expects to get a String value next from input.
-     */
-    public int nextIntValue(int defaultValue)
-        throws IOException, JsonParseException
-    {
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
-    }
-
-    /**
-     * Method that fetches next token (as if calling {@link #nextToken}) and
-     * if it is {@link JsonToken#VALUE_NUMBER_INT} returns 64-bit long value;
-     * otherwise returns specified default value
-     * It is functionally equivalent to:
-     *<pre>
-     *  return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
-     *</pre>
-     * but may be faster for parser to process, and can therefore be used if caller
-     * expects to get a String value next from input.
-     */
-    public long nextLongValue(long defaultValue)
-        throws IOException, JsonParseException
-    {
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
-    }
-
-    /**
-     * Method that fetches next token (as if calling {@link #nextToken}) and
-     * if it is {@link JsonToken#VALUE_TRUE} or {@link JsonToken#VALUE_FALSE}
-     * returns matching Boolean value; otherwise return null.
-     * It is functionally equivalent to:
-     *<pre>
-     *  JsonToken t = nextToken();
-     *  if (t == JsonToken.VALUE_TRUE) return Boolean.TRUE;
-     *  if (t == JsonToken.VALUE_FALSE) return Boolean.FALSE;
-     *  return null;
-     *</pre>
-     * but may be faster for parser to process, and can therefore be used if caller
-     * expects to get a String value next from input.
-     */
-    public Boolean nextBooleanValue()
-        throws IOException, JsonParseException
-    {
-        switch (nextToken()) {
-        case VALUE_TRUE:
-            return Boolean.TRUE;
-        case VALUE_FALSE:
-            return Boolean.FALSE;
-        }
-        return null;
-    }
-    
-    /**
-     * Method that will skip all child tokens of an array or
-     * object token that the parser currently points to,
-     * iff stream points to 
-     * {@link JsonToken#START_OBJECT} or {@link JsonToken#START_ARRAY}.
-     * If not, it will do nothing.
-     * After skipping, stream will point to <b>matching</b>
-     * {@link JsonToken#END_OBJECT} or {@link JsonToken#END_ARRAY}
-     * (possibly skipping nested pairs of START/END OBJECT/ARRAY tokens
-     * as well as value tokens).
-     * The idea is that after calling this method, application
-     * will call {@link #nextToken} to point to the next
-     * available token, if any.
-     */
-    public abstract JsonParser skipChildren()
-        throws IOException, JsonParseException;
-    
-    /**
-     * Method that can be called to determine whether this parser
-     * is closed or not. If it is closed, no new tokens can be
-     * retrieved by calling {@link #nextToken} (and the underlying
-     * stream may be closed). Closing may be due to an explicit
-     * call to {@link #close} or because parser has encountered
-     * end of input.
-     */
-    public abstract boolean isClosed();
-    
-    /*
-    /**********************************************************
-    /* Public API, token accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor to find which token parser currently points to, if any;
-     * null will be returned if none.
-     * If return value is non-null, data associated with the token
-     * is available via other accessor methods.
-     *
-     * @return Type of the token this parser currently points to,
-     *   if any: null before any tokens have been read, and
-     *   after end-of-input has been encountered, as well as
-     *   if the current token has been explicitly cleared.
-     */
-    public abstract JsonToken getCurrentToken();
-
-    /**
-     * Method for checking whether parser currently points to
-     * a token (and data for that token is available).
-     * Equivalent to check for <code>parser.getCurrentToken() != null</code>.
-     *
-     * @return True if the parser just returned a valid
-     *   token via {@link #nextToken}; false otherwise (parser
-     *   was just constructed, encountered end-of-input
-     *   and returned null from {@link #nextToken}, or the token
-     *   has been consumed)
-     */
-    public abstract boolean hasCurrentToken();
-
-    /**
-     * Method that can be called to get the name associated with
-     * the current token: for {@link JsonToken#FIELD_NAME}s it will
-     * be the same as what {@link #getText} returns;
-     * for field values it will be preceding field name;
-     * and for others (array values, root-level values) null.
-     */
-    public abstract String getCurrentName()
-        throws IOException, JsonParseException;
-
-    /**
-     * Method that can be used to access current parsing context reader
-     * is in. There are 3 different types: root, array and object contexts,
-     * with slightly different available information. Contexts are
-     * hierarchically nested, and can be used for example for figuring
-     * out part of the input document that correspond to specific
-     * array or object (for highlighting purposes, or error reporting).
-     * Contexts can also be used for simple xpath-like matching of
-     * input, if so desired.
-     */
-    public abstract JsonStreamContext getParsingContext();
-
-    /**
-     * Method that return the <b>starting</b> location of the current
-     * token; that is, position of the first character from input
-     * that starts the current token.
-     */
-    public abstract JsonLocation getTokenLocation();
-
-    /**
-     * Method that returns location of the last processed character;
-     * usually for error reporting purposes.
-     */
-    public abstract JsonLocation getCurrentLocation();
-
-    /**
-     * Specialized accessor that can be used to verify that the current
-     * token indicates start array (usually meaning that current token
-     * is {@link JsonToken#START_ARRAY}) when start array is expected.
-     * For some specialized parsers this can return true for other cases
-     * as well; this is usually done to emulate arrays.
-     *<p>
-     * Default implementation is equivalent to:
-     *<pre>
-     *   getCurrentToken() == JsonToken.START_ARRAY
-     *</pre>
-     * but may be overridden by custom parser implementations.
-     *
-     * @return True if the current token can be considered as a
-     *   start-array marker (such {@link JsonToken#START_ARRAY});
-     *   false if not.
-     */
-    public boolean isExpectedStartArrayToken() {
-        return getCurrentToken() == JsonToken.START_ARRAY;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, token state overrides
-    /**********************************************************
-     */
-
-    /**
-     * Method called to "consume" the current token by effectively
-     * removing it so that {@link #hasCurrentToken} returns false, and
-     * {@link #getCurrentToken} null).
-     * Cleared token value can still be accessed by calling
-     * {@link #getLastClearedToken} (if absolutely needed), but
-     * usually isn't.
-     *<p>
-     * Method was added to be used by the optional data binder, since
-     * it has to be able to consume last token used for binding (so that
-     * it will not be used again).
-     */
-    public abstract void clearCurrentToken();
-
-    /**
-     * Method that can be called to get the last token that was
-     * cleared using {@link #clearCurrentToken}. This is not necessarily
-     * the latest token read.
-     * Will return null if no tokens have been cleared,
-     * or if parser has been closed.
-     */
-    public abstract JsonToken getLastClearedToken();
-    
-    /**
-     * Method that can be used to change what is considered to be
-     * the current (field) name.
-     * May be needed to support non-JSON data formats or unusual binding
-     * conventions; not needed for typical processing.
-     *<p>
-     * Note that use of this method should only be done as sort of last
-     * resort, as it is a work-around for regular operation.
-     * 
-     * @param name Name to use as the current name; may be null.
-     * 
-     * @since 2.0
-     */
-    public abstract void overrideCurrentName(String name);
-    
-    /*
-    /**********************************************************
-    /* Public API, access to token information, text
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing textual representation of the current token;
-     * if no current token (before first call to {@link #nextToken}, or
-     * after encountering end-of-input), returns null.
-     * Method can be called for any token type.
-     */
-    public abstract String getText()
-        throws IOException, JsonParseException;
-
-    /**
-     * Method similar to {@link #getText}, but that will return
-     * underlying (unmodifiable) character array that contains
-     * textual value, instead of constructing a String object
-     * to contain this information.
-     * Note, however, that:
-     *<ul>
-     * <li>Textual contents are not guaranteed to start at
-     *   index 0 (rather, call {@link #getTextOffset}) to
-     *   know the actual offset
-     *  </li>
-     * <li>Length of textual contents may be less than the
-     *  length of returned buffer: call {@link #getTextLength}
-     *  for actual length of returned content.
-     *  </li>
-     * </ul>
-     *<p>
-     * Note that caller <b>MUST NOT</b> modify the returned
-     * character array in any way -- doing so may corrupt
-     * current parser state and render parser instance useless.
-     *<p>
-     * The only reason to call this method (over {@link #getText})
-     * is to avoid construction of a String object (which
-     * will make a copy of contents).
-     */
-    public abstract char[] getTextCharacters()
-        throws IOException, JsonParseException;
-
-    /**
-     * Accessor used with {@link #getTextCharacters}, to know length
-     * of String stored in returned buffer.
-     *
-     * @return Number of characters within buffer returned
-     *   by {@link #getTextCharacters} that are part of
-     *   textual content of the current token.
-     */
-    public abstract int getTextLength()
-        throws IOException, JsonParseException;
-
-    /**
-     * Accessor used with {@link #getTextCharacters}, to know offset
-     * of the first text content character within buffer.
-     *
-     * @return Offset of the first character within buffer returned
-     *   by {@link #getTextCharacters} that is part of
-     *   textual content of the current token.
-     */
-    public abstract int getTextOffset()
-        throws IOException, JsonParseException;
-
-    /**
-     * Method that can be used to determine whether calling of
-     * {@link #getTextCharacters} would be the most efficient
-     * way to access textual content for the event parser currently
-     * points to.
-     *<p> 
-     * Default implementation simply returns false since only actual
-     * implementation class has knowledge of its internal buffering
-     * state.
-     * Implementations are strongly encouraged to properly override
-     * this method, to allow efficient copying of content by other
-     * code.
-     * 
-     * @return True if parser currently has character array that can
-     *   be efficiently returned via {@link #getTextCharacters}; false
-     *   means that it may or may not exist
-     */
-    public abstract boolean hasTextCharacters();
-    
-    /*
-    /**********************************************************
-    /* Public API, access to token information, numeric
-    /**********************************************************
-     */
-
-    /**
-     * Generic number value accessor method that will work for
-     * all kinds of numeric values. It will return the optimal
-     * (simplest/smallest possible) wrapper object that can
-     * express the numeric value just parsed.
-     */
-    public abstract Number getNumberValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * If current token is of type 
-     * {@link JsonToken#VALUE_NUMBER_INT} or
-     * {@link JsonToken#VALUE_NUMBER_FLOAT}, returns
-     * one of {@link NumberType} constants; otherwise returns null.
-     */
-    public abstract NumberType getNumberType()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_INT} and
-     * it can be expressed as a value of Java byte primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_FLOAT};
-     * if so, it is equivalent to calling {@link #getDoubleValue}
-     * and then casting; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the resulting integer value falls outside range of
-     * Java byte, a {@link JsonParseException}
-     * will be thrown to indicate numeric overflow/underflow.
-     */
-    public byte getByteValue()
-        throws IOException, JsonParseException
-    {
-        int value = getIntValue();
-        // So far so good: but does it fit?
-        // [JACKSON-804]: Let's actually allow range of [-128, 255], as those are uniquely mapped
-        //  (instead of just signed range of [-128, 127])
-        if (value < MIN_BYTE_I || value > MAX_BYTE_I) {
-            throw _constructError("Numeric value ("+getText()+") out of range of Java byte");
-        }
-        return (byte) value;
-    }
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_INT} and
-     * it can be expressed as a value of Java short primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_FLOAT};
-     * if so, it is equivalent to calling {@link #getDoubleValue}
-     * and then casting; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the resulting integer value falls outside range of
-     * Java short, a {@link JsonParseException}
-     * will be thrown to indicate numeric overflow/underflow.
-     */
-    public short getShortValue()
-        throws IOException, JsonParseException
-    {
-        int value = getIntValue();
-        if (value < MIN_SHORT_I || value > MAX_SHORT_I) {
-            throw _constructError("Numeric value ("+getText()+") out of range of Java short");
-        }
-        return (short) value;
-    }
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_INT} and
-     * it can be expressed as a value of Java int primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_FLOAT};
-     * if so, it is equivalent to calling {@link #getDoubleValue}
-     * and then casting; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the resulting integer value falls outside range of
-     * Java int, a {@link JsonParseException}
-     * may be thrown to indicate numeric overflow/underflow.
-     */
-    public abstract int getIntValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_INT} and
-     * it can be expressed as a Java long primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_FLOAT};
-     * if so, it is equivalent to calling {@link #getDoubleValue}
-     * and then casting to int; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the token is an integer, but its value falls
-     * outside of range of Java long, a {@link JsonParseException}
-     * may be thrown to indicate numeric overflow/underflow.
-     */
-    public abstract long getLongValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_INT} and
-     * it can not be used as a Java long primitive type due to its
-     * magnitude.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_FLOAT};
-     * if so, it is equivalent to calling {@link #getDecimalValue}
-     * and then constructing a {@link BigInteger} from that value.
-     */
-    public abstract BigInteger getBigIntegerValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_FLOAT} and
-     * it can be expressed as a Java float primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_INT};
-     * if so, it is equivalent to calling {@link #getLongValue}
-     * and then casting; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the value falls
-     * outside of range of Java float, a {@link JsonParseException}
-     * will be thrown to indicate numeric overflow/underflow.
-     */
-    public abstract float getFloatValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_FLOAT} and
-     * it can be expressed as a Java double primitive type.
-     * It can also be called for {@link JsonToken#VALUE_NUMBER_INT};
-     * if so, it is equivalent to calling {@link #getLongValue}
-     * and then casting; except for possible overflow/underflow
-     * exception.
-     *<p>
-     * Note: if the value falls
-     * outside of range of Java double, a {@link JsonParseException}
-     * will be thrown to indicate numeric overflow/underflow.
-     */
-    public abstract double getDoubleValue()
-        throws IOException, JsonParseException;
-
-    /**
-     * Numeric accessor that can be called when the current
-     * token is of type {@link JsonToken#VALUE_NUMBER_FLOAT} or
-     * {@link JsonToken#VALUE_NUMBER_INT}. No under/overflow exceptions
-     * are ever thrown.
-     */
-    public abstract BigDecimal getDecimalValue()
-        throws IOException, JsonParseException;
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, other
-    /**********************************************************
-     */
-    
-    /**
-     * Convenience accessor that can be called when the current
-     * token is {@link JsonToken#VALUE_TRUE} or
-     * {@link JsonToken#VALUE_FALSE}.
-     *<p>
-     * Note: if the token is not of above-mentioned boolean types,
- an integer, but its value falls
-     * outside of range of Java long, a {@link JsonParseException}
-     * may be thrown to indicate numeric overflow/underflow.
-     */
-    public boolean getBooleanValue()
-        throws IOException, JsonParseException
-    {
-        JsonToken t = getCurrentToken();
-        if (t == JsonToken.VALUE_TRUE) return true;
-        if (t == JsonToken.VALUE_FALSE) return false;
-        throw new JsonParseException("Current token ("+t+") not of boolean type", getCurrentLocation());
-    }
-
-    /**
-     * Accessor that can be called if (and only if) the current token
-     * is {@link JsonToken#VALUE_EMBEDDED_OBJECT}. For other token types,
-     * null is returned.
-     *<p>
-     * Note: only some specialized parser implementations support
-     * embedding of objects (usually ones that are facades on top
-     * of non-streaming sources, such as object trees).
-     */
-    public abstract Object getEmbeddedObject()
-        throws IOException, JsonParseException;
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, binary
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to read (and consume -- results
-     * may not be accessible using other methods after the call)
-     * base64-encoded binary data
-     * included in the current textual JSON value.
-     * It works similar to getting String value via {@link #getText}
-     * and decoding result (except for decoding part),
-     * but should be significantly more performant.
-     *<p>
-     * Note that non-decoded textual contents of the current token
-     * are not guaranteed to be accessible after this method
-     * is called. Current implementation, for example, clears up
-     * textual content during decoding.
-     * Decoded binary content, however, will be retained until
-     * parser is advanced to the next event.
-     *
-     * @param b64variant Expected variant of base64 encoded
-     *   content (see {@link Base64Variants} for definitions
-     *   of "standard" variants).
-     *
-     * @return Decoded binary data
-     */
-    public abstract byte[] getBinaryValue(Base64Variant b64variant) throws IOException, JsonParseException;
-
-    /**
-     * Convenience alternative to {@link #getBinaryValue(Base64Variant)}
-     * that defaults to using
-     * {@link Base64Variants#getDefaultVariant} as the default encoding.
-     */
-    public byte[] getBinaryValue() throws IOException, JsonParseException {
-        return getBinaryValue(Base64Variants.getDefaultVariant());
-    }
-
-    /**
-     * Method that can be used as an alternative to {@link #getBigIntegerValue()},
-     * especially when value can be large. The main difference (beyond method
-     * of returning content using {@link OutputStream} instead of as byte array)
-     * is that content will NOT remain accessible after method returns: any content
-     * processed will be consumed and is not buffered in any way. If caller needs
-     * buffering, it has to implement it.
-     * 
-     * @param out Output stream to use for passing decoded binary data
-     * 
-     * @return Number of bytes that were decoded and written via {@link OutputStream}
-     * 
-     * @since 2.1
-     */
-    public int readBinaryValue(OutputStream out) throws IOException, JsonParseException {
-        return readBinaryValue(Base64Variants.getDefaultVariant(), out);
-    }
-
-    /**
-     * Similar to {@link #readBinaryValue(OutputStream)} but allows explicitly
-     * specifying base64 variant to use.
-     * 
-     * @param b64variant base64 variant to use
-     * @param out Output stream to use for passing decoded binary data
-     * 
-     * @return Number of bytes that were decoded and written via {@link OutputStream}
-     * 
-     * @since 2.1
-     */
-    public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-            throws IOException, JsonParseException
-    {
-        _reportUnsupportedOperation();
-        return 0; // never gets here
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, access to token information, coercion/conversion
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>int</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured type
-     * markers like start/end Object/Array)
-     * default value of <b>0</b> will be returned; no exceptions are thrown.
-     */
-    public int getValueAsInt() throws IOException, JsonParseException {
-        return getValueAsInt(0);
-    }
-    
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>int</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured type
-     * markers like start/end Object/Array)
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public int getValueAsInt(int defaultValue) throws IOException, JsonParseException {
-        return defaultValue;
-    }
-
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>long</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured type
-     * markers like start/end Object/Array)
-     * default value of <b>0</b> will be returned; no exceptions are thrown.
-     */
-    public long getValueAsLong() throws IOException, JsonParseException {
-        return getValueAsLong(0);
-    }
-    
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>long</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured type
-     * markers like start/end Object/Array)
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public long getValueAsLong(long defaultValue) throws IOException, JsonParseException {
-        return defaultValue;
-    }
-    
-    /**
-     * Method that will try to convert value of current token to a Java
-     * <b>double</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0.0 (false)
-     * and 1.0 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * default value of <b>0.0</b> will be returned; no exceptions are thrown.
-     */
-    public double getValueAsDouble() throws IOException, JsonParseException {
-        return getValueAsDouble(0.0);
-    }
-    
-    /**
-     * Method that will try to convert value of current token to a
-     * Java <b>double</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0.0 (false)
-     * and 1.0 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public double getValueAsDouble(double defaultValue) throws IOException, JsonParseException {
-        return defaultValue;
-    }
-
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>boolean</b>.
-     * JSON booleans map naturally; integer numbers other than 0 map to true, and
-     * 0 maps to false
-     * and Strings 'true' and 'false' map to corresponding values.
-     *<p>
-     * If representation can not be converted to a boolean value (including structured types
-     * like Objects and Arrays),
-     * default value of <b>false</b> will be returned; no exceptions are thrown.
-     */
-    public boolean getValueAsBoolean() throws IOException, JsonParseException {
-        return getValueAsBoolean(false);
-    }
-
-    /**
-     * Method that will try to convert value of current token to a
-     * <b>boolean</b>.
-     * JSON booleans map naturally; integer numbers other than 0 map to true, and
-     * 0 maps to false
-     * and Strings 'true' and 'false' map to corresponding values.
-     *<p>
-     * If representation can not be converted to a boolean value (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public boolean getValueAsBoolean(boolean defaultValue) throws IOException, JsonParseException {
-        return defaultValue;
-    }
-
-    /**
-     * Method that will try to convert value of current token to a
-     * {@link java.lang.String}.
-     * JSON Strings map naturally; scalar values get converted to
-     * their textual representation.
-     * If representation can not be converted to a String value (including structured types
-     * like Objects and Arrays and null token), default value of
-     * <b>null</b> will be returned; no exceptions are thrown.
-     * 
-     * @since 2.1
-     */
-    public String getValueAsString() throws IOException, JsonParseException {
-        return getValueAsString(null);
-    }
-    
-    /**
-     * Method that will try to convert value of current token to a
-     * {@link java.lang.String}.
-     * JSON Strings map naturally; scalar values get converted to
-     * their textual representation.
-     * If representation can not be converted to a String value (including structured types
-     * like Objects and Arrays and null token), specified default value
-     * will be returned; no exceptions are thrown.
-     * 
-     * @since 2.1
-     */
-    public abstract String getValueAsString(String defaultValue)
-        throws IOException, JsonParseException;
-    
-    /*
-    /**********************************************************
-    /* Public API, optional data binding functionality
-    /**********************************************************
-     */
-
-    /**
-     * Method to deserialize JSON content into a non-container
-     * type (it can be an array type, however): typically a bean, array
-     * or a wrapper type (like {@link java.lang.Boolean}).
-     * <b>Note</b>: method can only be called if the parser has
-     * an object codec assigned; this is true for parsers constructed
-     * by <code>MappingJsonFactory</code> (from "jackson-databind" jar)
-     * but not for {@link JsonFactory} (unless its <code>setCodec</code>
-     * method has been explicitly called).
-     *<p>
-     * This method may advance the event stream, for structured types
-     * the current token will be the closing end marker (END_ARRAY,
-     * END_OBJECT) of the bound structure. For non-structured Json types
-     * (and for {@link JsonToken#VALUE_EMBEDDED_OBJECT})
-     * stream is not advanced.
-     *<p>
-     * Note: this method should NOT be used if the result type is a
-     * container ({@link java.util.Collection} or {@link java.util.Map}.
-     * The reason is that due to type erasure, key and value types
-     * can not be introspected when using this method.
-     */
-    public <T> T readValueAs(Class<T> valueType)
-        throws IOException, JsonProcessingException
-    {
-        ObjectCodec codec = getCodec();
-        if (codec == null) {
-            throw new IllegalStateException("No ObjectCodec defined for the parser, can not deserialize JSON into Java objects");
-        }
-        return codec.readValue(this, valueType);
-    }
-
-    /**
-     * Method to deserialize JSON content into a Java type, reference
-     * to which is passed as argument. Type is passed using so-called
-     * "super type token"
-     * and specifically needs to be used if the root type is a 
-     * parameterized (generic) container type.
-     * <b>Note</b>: method can only be called if the parser has
-     * an object codec assigned; this is true for parsers constructed
-     * by <code>MappingJsonFactory</code> (defined in 'jackson-databind' bundle)
-     * but not for {@link JsonFactory} (unless its <code>setCodec</code>
-     * method has been explicitly called).
-     *<p>
-     * This method may advance the event stream, for structured types
-     * the current token will be the closing end marker (END_ARRAY,
-     * END_OBJECT) of the bound structure. For non-structured Json types
-     * (and for {@link JsonToken#VALUE_EMBEDDED_OBJECT})
-     * stream is not advanced.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValueAs(TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException
-    {
-        ObjectCodec codec = getCodec();
-        if (codec == null) {
-            throw new IllegalStateException("No ObjectCodec defined for the parser, can not deserialize JSON into Java objects");
-        }
-        /* Ugh. Stupid Java type erasure... can't just chain call,s
-         * must cast here also.
-         */
-        return (T) codec.readValue(this, valueTypeRef);
-    }
-
-    /**
-     * Method for reading sequence of Objects from parser stream,
-     * all with same specified value type.
-     */
-    public <T> Iterator<T> readValuesAs(Class<T> valueType)
-        throws IOException, JsonProcessingException
-    {
-        ObjectCodec codec = getCodec();
-        if (codec == null) {
-            throw new IllegalStateException("No ObjectCodec defined for the parser, can not deserialize JSON into Java objects");
-        }
-        return codec.readValues(this, valueType);
-    }
-
-    /**
-     * Method for reading sequence of Objects from parser stream,
-     * all with same specified value type.
-     */
-    public <T> Iterator<T> readValuesAs(TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException
-    {
-        ObjectCodec codec = getCodec();
-        if (codec == null) {
-            throw new IllegalStateException("No ObjectCodec defined for the parser, can not deserialize JSON into Java objects");
-        }
-        return codec.readValues(this, valueTypeRef);
-    }
-    
-    /**
-     * Method to deserialize JSON content into equivalent "tree model",
-     * represented by root {@link TreeNode} of resulting model.
-     * For JSON Arrays it will an array node (with child nodes),
-     * for objects object node (with child nodes), and for other types
-     * matching leaf node type
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends TreeNode> T readValueAsTree()
-        throws IOException, JsonProcessingException
-    {
-        ObjectCodec codec = getCodec();
-        if (codec == null) {
-            throw new IllegalStateException("No ObjectCodec defined for the parser, can not deserialize JSON into JsonNode tree");
-        }
-        return (T) codec.readTree(this);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    /**
-     * Helper method for constructing {@link JsonParseException}s
-     * based on current state of the parser
-     */
-    protected JsonParseException _constructError(String msg)
-    {
-        return new JsonParseException(msg, getCurrentLocation());
-    }
-
-    /**
-     * Helper method to call for operations that are not supported by
-     * parser implementation.
-     *
-     * @since 2.1
-     */
-    protected void _reportUnsupportedOperation() {
-        throw new UnsupportedOperationException("Operation not supported by parser of type "+getClass().getName());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonProcessingException.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonProcessingException.java
deleted file mode 100644
index 04454a2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonProcessingException.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Intermediate base class for all problems encountered when
- * processing (parsing, generating) JSON content
- * that are not pure I/O problems.
- * Regular {@link java.io.IOException}s will be passed through as is.
- * Sub-class of {@link java.io.IOException} for convenience.
- */
-public class JsonProcessingException
-    extends java.io.IOException
-{
-    final static long serialVersionUID = 123; // Stupid eclipse...
-	
-    protected JsonLocation _location;
-
-    protected JsonProcessingException(String msg, JsonLocation loc, Throwable rootCause)
-    {
-        /* Argh. IOException(Throwable,String) is only available starting
-         * with JDK 1.6...
-         */
-        super(msg);
-        if (rootCause != null) {
-            initCause(rootCause);
-        }
-        _location = loc;
-    }
-
-    protected JsonProcessingException(String msg)
-    {
-        super(msg);
-    }
-
-    protected JsonProcessingException(String msg, JsonLocation loc)
-    {
-        this(msg, loc, null);
-    }
-
-    protected JsonProcessingException(String msg, Throwable rootCause)
-    {
-        this(msg, null, rootCause);
-    }
-
-    protected JsonProcessingException(Throwable rootCause)
-    {
-        this(null, null, rootCause);
-    }
-
-    public JsonLocation getLocation() {
-        return _location;
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Method that allows accessing the original "message" argument,
-     * without additional decorations (like location information)
-     * that overridden {@link #getMessage} adds.
-     * 
-     * @since 2.1
-     */
-    public String getOriginalMessage()
-    {
-        return super.getMessage();
-    }
-
-    /*
-    /**********************************************************
-    /* Methods for sub-classes to use, override
-    /**********************************************************
-     */
-    
-    /**
-     * Accessor that sub-classes can override to append additional
-     * information right after the main message, but before
-     * source location information.
-     */
-    protected String getMessageSuffix() {
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Overrides of standard methods
-    /**********************************************************
-     */
-    
-    /**
-     * Default method overridden so that we can add location information
-     */
-    @Override
-    public String getMessage()
-    {
-        String msg = super.getMessage();
-        if (msg == null) {
-            msg = "N/A";
-        }
-        JsonLocation loc = getLocation();
-        String suffix = getMessageSuffix();
-        // mild optimization, if nothing extra is needed:
-        if (loc != null || suffix != null) {
-            StringBuilder sb = new StringBuilder(100);
-            sb.append(msg);
-            if (suffix != null) {
-                sb.append(suffix);
-            }
-            if (loc != null) {
-                sb.append('\n');
-                sb.append(" at ");
-                sb.append(loc.toString());
-            }
-            msg = sb.toString();
-        }
-        return msg;
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getName()+": "+getMessage();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonStreamContext.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonStreamContext.java
deleted file mode 100644
index 118f899..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonStreamContext.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.fasterxml.jackson.core;
-
-/**
- * Shared base class for streaming processing contexts used during
- * reading and writing of Json content using Streaming API.
- * This context is also exposed to applications:
- * context object can be used by applications to get an idea of
- * relative position of the parser/generator within json content
- * being processed. This allows for some contextual processing: for
- * example, output within Array context can differ from that of
- * Object context.
- */
-public abstract class JsonStreamContext
-{
-    // // // Type constants used internally
-
-    protected final static int TYPE_ROOT = 0;
-    protected final static int TYPE_ARRAY = 1;
-    protected final static int TYPE_OBJECT = 2;
-
-    protected int _type;
-
-    /**
-     * Index of the currently processed entry. Starts with -1 to signal
-     * that no entries have been started, and gets advanced each
-     * time a new entry is started, either by encountering an expected
-     * separator, or with new values if no separators are expected
-     * (the case for root context).
-     */
-    protected int _index;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected JsonStreamContext() { }
-
-    /*
-    /**********************************************************
-    /* Public API, accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for finding parent context of this context; will
-     * return null for root context.
-     */
-    public abstract JsonStreamContext getParent();
-
-    /**
-     * Method that returns true if this context is an Array context;
-     * that is, content is being read from or written to a Json Array.
-     */
-    public final boolean inArray() { return _type == TYPE_ARRAY; }
-
-    /**
-     * Method that returns true if this context is a Root context;
-     * that is, content is being read from or written to without
-     * enclosing array or object structure.
-     */
-    public final boolean inRoot() { return _type == TYPE_ROOT; }
-
-    /**
-     * Method that returns true if this context is an Object context;
-     * that is, content is being read from or written to a Json Object.
-     */
-    public final boolean inObject() { return _type == TYPE_OBJECT; }
-
-    /**
-     * Method for accessing simple type description of current context;
-     * either ROOT (for root-level values), OBJECT (for field names and
-     * values of JSON Objects) or ARRAY (for values of JSON Arrays)
-     */
-    public final String getTypeDesc() {
-        switch (_type) {
-        case TYPE_ROOT: return "ROOT";
-        case TYPE_ARRAY: return "ARRAY";
-        case TYPE_OBJECT: return "OBJECT";
-        }
-        return "?";
-    }
-
-    /**
-     * @return Number of entries that are complete and started.
-     */
-    public final int getEntryCount()
-    {
-        return _index + 1;
-    }
-
-    /**
-     * @return Index of the currently processed entry, if any
-     */
-    public final int getCurrentIndex()
-    {
-        return (_index < 0) ? 0 : _index;
-    }
-
-    /**
-     * Method for accessing name associated with the current location.
-     * Non-null for <code>FIELD_NAME</code> and value events that directly
-     * follow field names; null for root level and array values.
-     */
-    public abstract String getCurrentName();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/JsonToken.java b/showkeyHelper/src/com/fasterxml/jackson/core/JsonToken.java
deleted file mode 100644
index 6ef2c58..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/JsonToken.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Enumeration for basic token types used for returning results
- * of parsing JSON content.
- */
-public enum JsonToken
-{
-    /* Some notes on implementation:
-     *
-     * - Entries are to be ordered such that start/end array/object
-     *   markers come first, then field name marker (if any), and
-     *   finally scalar value tokens. This is assumed by some
-     *   typing checks.
-     */
-
-    /**
-     * NOT_AVAILABLE can be returned if {@link JsonParser}
-     * implementation can not currently return the requested
-     * token (usually next one), or even if any will be
-     * available, but that may be able to determine this in
-     * future. This is the case with non-blocking parsers --
-     * they can not block to wait for more data to parse and
-     * must return something.
-     */
-    NOT_AVAILABLE(null),
-
-    /**
-     * START_OBJECT is returned when encountering '{'
-     * which signals starting of an Object value.
-     */
-    START_OBJECT("{"),
-        
-    /**
-     * START_OBJECT is returned when encountering '}'
-     * which signals ending of an Object value
-     */
-    END_OBJECT("}"),
-        
-    /**
-     * START_OBJECT is returned when encountering '['
-     * which signals starting of an Array value
-     */
-    START_ARRAY("["),
-
-    /**
-     * START_OBJECT is returned when encountering ']'
-     * which signals ending of an Array value
-     */
-    END_ARRAY("]"),
-        
-    /**
-     * FIELD_NAME is returned when a String token is encountered
-     * as a field name (same lexical value, different function)
-     */
-    FIELD_NAME(null),
-        
-    /**
-     * Placeholder token returned when the input source has a concept
-     * of embedded Object that are not accessible as usual structure
-     * (of starting with {@link #START_OBJECT}, having values, ending with
-     * {@link #END_OBJECT}), but as "raw" objects.
-     *<p>
-     * Note: this token is never returned by regular JSON readers, but
-     * only by readers that expose other kinds of source (like
-     * <code>JsonNode</code>-based JSON trees, Maps, Lists and such).
-     */
-    VALUE_EMBEDDED_OBJECT(null),
-
-    /**
-     * VALUE_STRING is returned when a String token is encountered
-     * in value context (array element, field value, or root-level
-     * stand-alone value)
-     */
-    VALUE_STRING(null),
-
-    /**
-     * VALUE_NUMBER_INT is returned when an integer numeric token is
-     * encountered in value context: that is, a number that does
-     * not have floating point or exponent marker in it (consists
-     * only of an optional sign, followed by one or more digits)
-     */
-    VALUE_NUMBER_INT(null),
-
-    /**
-     * VALUE_NUMBER_INT is returned when a numeric token other
-     * that is not an integer is encountered: that is, a number that does
-     * have floating point or exponent marker in it, in addition
-     * to one or more digits.
-     */
-    VALUE_NUMBER_FLOAT(null),
-
-    /**
-     * VALUE_TRUE is returned when encountering literal "true" in
-     * value context
-     */
-    VALUE_TRUE("true"),
-
-    /**
-     * VALUE_FALSE is returned when encountering literal "false" in
-     * value context
-     */
-    VALUE_FALSE("false"),
-
-    /**
-     * VALUE_NULL is returned when encountering literal "null" in
-     * value context
-     */
-    VALUE_NULL("null")
-        ;
-
-    final String _serialized;
-
-    final char[] _serializedChars;
-
-    final byte[] _serializedBytes;
-
-    /**
-     * @param token representation for this token, if there is a
-     *   single static representation; null otherwise
-     */
-    JsonToken(String token)
-    {
-        if (token == null) {
-            _serialized = null;
-            _serializedChars = null;
-            _serializedBytes = null;
-        } else {
-            _serialized = token;
-            _serializedChars = token.toCharArray();
-            // It's all in ascii, can just case...
-            int len = _serializedChars.length;
-            _serializedBytes = new byte[len];
-            for (int i = 0; i < len; ++i) {
-                _serializedBytes[i] = (byte) _serializedChars[i];
-            }
-        }
-    }
-
-    public String asString() { return _serialized; }
-    public char[] asCharArray() { return _serializedChars; }
-    public byte[] asByteArray() { return _serializedBytes; }
-
-    public boolean isNumeric() {
-        return (this == VALUE_NUMBER_INT) || (this == VALUE_NUMBER_FLOAT);
-    }
-
-    /**
-     * Method that can be used to check whether this token represents
-     * a valid non-structured value. This means all tokens other than
-     * Object/Array start/end markers all field names.
-     */
-    public boolean isScalarValue() {
-        // note: up to 1.5, VALUE_EMBEDDED_OBJECT was incorrectly considered non-scalar!
-        return ordinal() >= VALUE_EMBEDDED_OBJECT.ordinal();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/ObjectCodec.java b/showkeyHelper/src/com/fasterxml/jackson/core/ObjectCodec.java
deleted file mode 100644
index c249d9e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/ObjectCodec.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.fasterxml.jackson.core;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import com.fasterxml.jackson.core.type.ResolvedType;
-import com.fasterxml.jackson.core.type.TypeReference;
-
-/**
- * Abstract class that defines the interface that {@link JsonParser} and
- * {@link JsonGenerator} use to serialize and deserialize regular
- * Java objects (POJOs aka Beans).
- *<p>
- * The standard implementation of this class is
- * <code>com.fasterxml.jackson.databind.ObjectMapper</code>,
- * defined in the "jackson-databind".
- */
-public abstract class ObjectCodec
-{
-    protected ObjectCodec() { }
-
-    /*
-    /**********************************************************
-    /* API for de-serialization (JSON-to-Object)
-    /**********************************************************
-     */
-
-    /**
-     * Method to deserialize JSON content into a non-container
-     * type (it can be an array type, however): typically a bean, array
-     * or a wrapper type (like {@link java.lang.Boolean}).
-     *<p>
-     * Note: this method should NOT be used if the result type is a
-     * container ({@link java.util.Collection} or {@link java.util.Map}.
-     * The reason is that due to type erasure, key and value types
-     * can not be introspected when using this method.
-     */
-    public abstract <T> T readValue(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method to deserialize JSON content into a Java type, reference
-     * to which is passed as argument. Type is passed using so-called
-     * "super type token" 
-     * and specifically needs to be used if the root type is a 
-     * parameterized (generic) container type.
-     */
-    public abstract <T> T readValue(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method to deserialize JSON content into a POJO, type specified
-     * with fully resolved type object (so it can be a generic type,
-     * including containers like {@link java.util.Collection} and
-     * {@link java.util.Map}).
-     */
-    public abstract <T> T readValue(JsonParser jp, ResolvedType valueType)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method to deserialize JSON content as tree expressed
-     * using set of {@link TreeNode} instances. Returns
-     * root of the resulting tree (where root can consist
-     * of just a single node if the current event is a
-     * value event, not container).
-     */
-    public abstract <T extends TreeNode> T readTree(JsonParser jp)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method for reading sequence of Objects from parser stream,
-     * all with same specified value type.
-     */
-    public abstract <T> Iterator<T> readValues(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method for reading sequence of Objects from parser stream,
-     * all with same specified value type.
-     */
-    public abstract <T> Iterator<T> readValues(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException;
-    
-    /**
-     * Method for reading sequence of Objects from parser stream,
-     * all with same specified value type.
-     */
-    public abstract <T> Iterator<T> readValues(JsonParser jp, ResolvedType valueType)
-        throws IOException, JsonProcessingException;
-    
-    /*
-    /**********************************************************
-    /* API for serialization (Object-to-JSON)
-    /**********************************************************
-     */
-
-    /**
-     * Method to serialize given Java Object, using generator
-     * provided.
-     */
-    public abstract void writeValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonProcessingException;
-
-    /*
-    /**********************************************************
-    /* API for Tree Model handling
-    /**********************************************************
-     */
-
-    /**
-     * Method for construct root level Object nodes
-     * for Tree Model instances.
-     */
-    public abstract TreeNode createObjectNode();
-
-    /**
-     * Method for construct root level Array nodes
-     * for Tree Model instances.
-     */
-    public abstract TreeNode createArrayNode();
-
-    /**
-     * Method for constructing a {@link JsonParser} for reading
-     * contents of a JSON tree, as if it was external serialized
-     * JSON content.
-     */
-    public abstract JsonParser treeAsTokens(TreeNode n);
-
-    /**
-     * Convenience method for converting given JSON tree into instance of specified
-     * value type. This is equivalent to first constructing a {@link JsonParser} to
-     * iterate over contents of the tree, and using that parser for data binding.
-     */
-    public abstract <T> T treeToValue(TreeNode n, Class<T> valueType)
-        throws JsonProcessingException;
-
-    /*
-    /**********************************************************
-    /* Basic accessors
-    /**********************************************************
-     */
-
-    /**
-     * @deprecated Since 2.1: Use {@link #getFactory} instead.
-     */
-    @Deprecated
-    public abstract JsonFactory getJsonFactory();
-
-    /**
-     * Accessor for finding underlying data format factory
-     * ({@link JsonFactory}) codec will use for data binding.
-     * 
-     * @since 2.1
-     */
-    public JsonFactory getFactory() {
-        return getJsonFactory();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/PrettyPrinter.java b/showkeyHelper/src/com/fasterxml/jackson/core/PrettyPrinter.java
deleted file mode 100644
index acf35ff..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/PrettyPrinter.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.fasterxml.jackson.core;
-
-import java.io.IOException;
-
-/**
- * Interface for objects that implement pretty printer functionality, such
- * as indentation.
- * Pretty printers are used to add white space in output JSON content,
- * to make results more human readable. Usually this means things like adding
- * linefeeds and indentation.
- *<p>
- * Note: since Jackson 2.1, stateful implementations MUST implement
- * {@link com.fasterxml.jackson.core.util.Instantiatable} interface,
- * to allow for constructing  per-generation instances and avoid
- * state corruption (see [JACKSON-851] for details).
- * Stateless implementations need not do this; but those are less common.
- */
-public interface PrettyPrinter
-{
-    /*
-    /**********************************************************
-    /* First methods that act both as events, and expect
-    /* output for correct functioning (i.e something gets
-    /* output even when not pretty-printing)
-    /**********************************************************
-     */
-
-    // // // Root-level handling:
-
-    /**
-     * Method called after a root-level value has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default
-     * handling (without pretty-printing) will output a space, to
-     * allow values to be parsed correctly. Pretty-printer is
-     * to output some other suitable and nice-looking separator
-     * (tab(s), space(s), linefeed(s) or any combination thereof).
-     */
-    void writeRootValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    // // Object handling
-
-    /**
-     * Method called when an Object value is to be output, before
-     * any fields are output.
-     *<p>
-     * Default handling (without pretty-printing) will output
-     * the opening curly bracket.
-     * Pretty-printer is
-     * to output a curly bracket as well, but can surround that
-     * with other (white-space) decoration.
-     */
-    void writeStartObject(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after an Object value has been completely output
-     * (minus closing curly bracket).
-     *<p>
-     * Default handling (without pretty-printing) will output
-     * the closing curly bracket.
-     * Pretty-printer is
-     * to output a curly bracket as well, but can surround that
-     * with other (white-space) decoration.
-     *
-     * @param nrOfEntries Number of direct members of the array that
-     *   have been output
-     */
-    void writeEndObject(JsonGenerator jg, int nrOfEntries)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after an object entry (field:value) has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate the two. Pretty-printer is
-     * to output a comma as well, but can surround that with other
-     * (white-space) decoration.
-     */
-    void writeObjectEntrySeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after an object field has been output, but
-     * before the value is output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * colon to separate the two. Pretty-printer is
-     * to output a colon as well, but can surround that with other
-     * (white-space) decoration.
-     */
-    void writeObjectFieldValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    // // // Array handling
-
-    /**
-     * Method called when an Array value is to be output, before
-     * any member/child values are output.
-     *<p>
-     * Default handling (without pretty-printing) will output
-     * the opening bracket.
-     * Pretty-printer is
-     * to output a bracket as well, but can surround that
-     * with other (white-space) decoration.
-     */
-    void writeStartArray(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after an Array value has been completely output
-     * (minus closing bracket).
-     *<p>
-     * Default handling (without pretty-printing) will output
-     * the closing bracket.
-     * Pretty-printer is
-     * to output a bracket as well, but can surround that
-     * with other (white-space) decoration.
-     *
-     * @param nrOfValues Number of direct members of the array that
-     *   have been output
-     */
-    void writeEndArray(JsonGenerator jg, int nrOfValues)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after an array value has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate the two. Pretty-printer is
-     * to output a comma as well, but can surround that with other
-     * (white-space) decoration.
-     */
-    void writeArrayValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    /*
-    /**********************************************************
-    /* Then events that by default do not produce any output
-    /* but that are often overridden to add white space
-    /* in pretty-printing mode
-    /**********************************************************
-     */
-
-    /**
-     * Method called after array start marker has been output,
-     * and right before the first value is to be output.
-     * It is <b>not</b> called for arrays with no values.
-     *<p>
-     * Default handling does not output anything, but pretty-printer
-     * is free to add any white space decoration.
-     */
-    void beforeArrayValues(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-
-    /**
-     * Method called after object start marker has been output,
-     * and right before the field name of the first entry is
-     * to be output.
-     * It is <b>not</b> called for objects without entries.
-     *<p>
-     * Default handling does not output anything, but pretty-printer
-     * is free to add any white space decoration.
-     */
-    void beforeObjectEntries(JsonGenerator jg)
-        throws IOException, JsonGenerationException;
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/SerializableString.java b/showkeyHelper/src/com/fasterxml/jackson/core/SerializableString.java
deleted file mode 100644
index 0e795ef..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/SerializableString.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.fasterxml.jackson.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Interface that defines how Jackson package can interact with efficient
- * pre-serialized or lazily-serialized and reused String representations.
- * Typically implementations store possible serialized version(s) so that
- * serialization of String can be done more efficiently, especially when
- * used multiple times.
- * 
- * @see com.fasterxml.jackson.core.io.SerializedString
- */
-public interface SerializableString
-{
-    /**
-     * Returns unquoted String that this object represents (and offers
-     * serialized forms for)
-     */
-    String getValue();
-    
-    /**
-     * Returns length of the (unquoted) String as characters.
-     * Functionally equvalent to:
-     *<pre>
-     *   getValue().length();
-     *</pre>
-     */
-    int charLength();
-
-    
-    /*
-    /**********************************************************
-    /* Accessors for byte sequences
-    /**********************************************************
-     */
-    
-    /**
-     * Returns JSON quoted form of the String, as character array. Result
-     * can be embedded as-is in textual JSON as property name or JSON String.
-     */
-    char[] asQuotedChars();
-
-    /**
-     * Returns UTF-8 encoded version of unquoted String.
-     * Functionally equivalent to (but more efficient than):
-     *<pre>
-     * getValue().getBytes("UTF-8");
-     *</pre>
-     */
-    byte[] asUnquotedUTF8();
-
-    /**
-     * Returns UTF-8 encoded version of JSON-quoted String.
-     * Functionally equivalent to (but more efficient than):
-     *<pre>
-     * new String(asQuotedChars()).getBytes("UTF-8");
-     *</pre>
-     */
-    byte[] asQuotedUTF8();
-
-    /*
-    /**********************************************************
-    /* Helper methods for appending byte/char sequences
-    /**********************************************************
-     */
-
-    /**
-     * Method that will append quoted UTF-8 bytes of this String into given
-     * buffer, if there is enough room; if not, returns -1.
-     * Functionally equivalent to:
-     *<pre>
-     *  byte[] bytes = str.asQuotedUTF8();
-     *  System.arraycopy(bytes, 0, buffer, offset, bytes.length);
-     *  return bytes.length;
-     *</pre>
-     * 
-     * @return Number of bytes appended, if successful, otherwise -1
-     */
-    int appendQuotedUTF8(byte[] buffer, int offset);
-
-    /**
-     * Method that will append quoted characters of this String into given
-     * buffer. Functionally equivalent to:
-     *<pre>
-     *  char[] ch = str.asQuotedChars();
-     *  System.arraycopy(ch, 0, buffer, offset, ch.length);
-     *  return ch.length;
-     *</pre>
-     * 
-     * @return Number of characters appended, if successful, otherwise -1
-     */
-    int appendQuoted(char[] buffer, int offset);
-    
-    /**
-     * Method that will append unquoted ('raw') UTF-8 bytes of this String into given
-     * buffer. Functionally equivalent to:
-     *<pre>
-     *  byte[] bytes = str.asUnquotedUTF8();
-     *  System.arraycopy(bytes, 0, buffer, offset, bytes.length);
-     *  return bytes.length;
-     *</pre>
-     * 
-     * @return Number of bytes appended, if successful, otherwise -1
-     */
-    int appendUnquotedUTF8(byte[] buffer, int offset);
-
-    
-    /**
-     * Method that will append unquoted characters of this String into given
-     * buffer. Functionally equivalent to:
-     *<pre>
-     *  char[] ch = str.getValue().toCharArray();
-     *  System.arraycopy(bytes, 0, buffer, offset, ch.length);
-     *  return ch.length;
-     *</pre>
-     * 
-     * @return Number of characters appended, if successful, otherwise -1
-     */
-    int appendUnquoted(char[] buffer, int offset);
-
-    /*
-    /**********************************************************
-    /* Helper methods for writing out byte sequences
-    /**********************************************************
-     */
-
-    /**
-     * @return Number of bytes written
-     */
-    int writeQuotedUTF8(OutputStream out) throws IOException;
-
-    /**
-     * @return Number of bytes written
-     */
-    int writeUnquotedUTF8(OutputStream out) throws IOException;
-
-    /**
-     * @return Number of bytes put, if successful, otherwise -1
-     */
-    int putQuotedUTF8(ByteBuffer buffer) throws IOException;
-
-    /**
-     * @return Number of bytes put, if successful, otherwise -1
-     */
-    int putUnquotedUTF8(ByteBuffer out) throws IOException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/TreeNode.java b/showkeyHelper/src/com/fasterxml/jackson/core/TreeNode.java
deleted file mode 100644
index 02e24ba..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/TreeNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Marker interface used to denote JSON Tree nodes, as far as
- * the core package knows them (which is very little): mostly
- * needed to allow {@link ObjectCodec} to have some level
- * of interoperability.
- * All real functionality is within <code>JsonNode</code>
- * base class in <code>mapper</code> package.
- *<p>
- * Note that in Jackson 1.x <code>JsonNode</code> itself
- * was part of core package: Jackson 2.x refactored this
- * since conceptually Tree Model is part of mapper package,
- * and so part visible to <code>core</code> package should
- * be minimized.
- */
-public interface TreeNode
-{
-    /*
-    /**********************************************************
-    /* Minimal introspection methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be used for efficient type detection
-     * when using stream abstraction for traversing nodes.
-     * Will return the first {@link JsonToken} that equivalent
-     * stream event would produce (for most nodes there is just
-     * one token but for structured/container types multiple)
-     */
-    JsonToken asToken();
-
-    /**
-     * If this node is a numeric type (as per {@link JsonToken#isNumeric}),
-     * returns native type that node uses to store the numeric value;
-     * otherwise returns null.
-     * 
-     * @return Type of number contained, if any; or null if node does not
-     *  contain numeric value.
-     */
-    JsonParser.NumberType numberType();
-
-    /*
-    /**********************************************************
-    /* Public API: converting to/from Streaming API
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing a {@link JsonParser} instance for
-     * iterating over contents of the tree that this node is root of.
-     * Functionally equivalent to first serializing tree using
-     * {@link ObjectCodec} and then re-parsing but
-     * more efficient.
-     */
-    JsonParser traverse();
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/Version.java b/showkeyHelper/src/com/fasterxml/jackson/core/Version.java
deleted file mode 100644
index 48e5110..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/Version.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Object that encapsulates versioning information of a component.
- * Version information includes not just version number but also
- * optionally group and artifact ids of the component being versioned.
- *<p>
- * Note that optional group and artifact id properties are new with Jackson 2.0:
- * if provided, they should align with Maven artifact information.
- */
-public class Version
-    implements Comparable<Version>,
-        java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    private final static Version UNKNOWN_VERSION = new Version(0, 0, 0, null, null, null);
-    
-    protected final int _majorVersion;
-
-    protected final int _minorVersion;
-
-    protected final int _patchLevel;
-
-    protected final String _groupId;
-    
-    protected final String _artifactId;
-    
-    /**
-     * Additional information for snapshot versions; null for non-snapshot
-     * (release) versions.
-     */
-    protected final String _snapshotInfo;
-
-    /**
-     * @deprecated Use variant that takes group and artifact ids
-     * 
-     * @since 2.1
-     */
-    @Deprecated
-    public Version(int major, int minor, int patchLevel, String snapshotInfo)
-    {
-        this(major, minor, patchLevel, snapshotInfo, null, null);
-    }
-    
-    public Version(int major, int minor, int patchLevel, String snapshotInfo,
-            String groupId, String artifactId)
-    {
-        _majorVersion = major;
-        _minorVersion = minor;
-        _patchLevel = patchLevel;
-        _snapshotInfo = snapshotInfo;
-        _groupId = (groupId == null) ? "" : groupId;
-        _artifactId = (artifactId == null) ? "" : artifactId;
-    }
-
-    /**
-     * Method returns canonical "not known" version, which is used as version
-     * in cases where actual version information is not known (instead of null).
-     */
-    public static Version unknownVersion() { return UNKNOWN_VERSION; }
-
-    public boolean isUknownVersion() { return (this == UNKNOWN_VERSION); }
-    public boolean isSnapshot() { return (_snapshotInfo != null && _snapshotInfo.length() > 0); }
-    
-    public int getMajorVersion() { return _majorVersion; }
-    public int getMinorVersion() { return _minorVersion; }
-    public int getPatchLevel() { return _patchLevel; }
-
-    public String getGroupId() { return _groupId; }
-    public String getArtifactId() { return _artifactId; }
-    
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append(_majorVersion).append('.');
-        sb.append(_minorVersion).append('.');
-        sb.append(_patchLevel);
-        if (isSnapshot()) {
-            sb.append('-').append(_snapshotInfo);
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public int hashCode() {
-        return _artifactId.hashCode() ^ _groupId.hashCode() + _majorVersion - _minorVersion + _patchLevel;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-        Version other = (Version) o;
-        return (other._majorVersion == _majorVersion)
-            && (other._minorVersion == _minorVersion)
-            && (other._patchLevel == _patchLevel)
-            && other._artifactId.equals(_artifactId)
-            && other._groupId.equals(_groupId)
-            ;
-    }
-
-//  @Override
-    public int compareTo(Version other)
-    {
-        if (other == this) return 0;
-        
-        int diff = _groupId.compareTo(other._groupId);
-        if (diff == 0) {
-            diff = _artifactId.compareTo(other._artifactId);
-            if (diff == 0) {
-                diff = _majorVersion - other._majorVersion;
-                if (diff == 0) {
-                    diff = _minorVersion - other._minorVersion;
-                    if (diff == 0) {
-                        diff = _patchLevel - other._patchLevel;
-                    }
-                }
-            }
-        }
-        return diff;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/Versioned.java b/showkeyHelper/src/com/fasterxml/jackson/core/Versioned.java
deleted file mode 100644
index 5a7df64..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/Versioned.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.fasterxml.jackson.core;
-
-/**
- * Interface that those Jackson components that are explicitly versioned will implement.
- * Intention is to allow both plug-in components (custom extensions) and applications and
- * frameworks that use Jackson to detect exact version of Jackson in use.
- * This may be useful for example for ensuring that proper Jackson version is deployed
- * (beyond mechanisms that deployment system may have), as well as for possible
- * workarounds.
- */
-public interface Versioned {
-    /**
-     * Method called to detect version of the component that implements this interface;
-     * returned version should never be null, but may return specific "not available"
-     * instance (see {@link Version} for details).
-     */
-    Version version();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/base/GeneratorBase.java b/showkeyHelper/src/com/fasterxml/jackson/core/base/GeneratorBase.java
deleted file mode 100644
index aba4f1b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/base/GeneratorBase.java
+++ /dev/null
@@ -1,511 +0,0 @@
-package com.fasterxml.jackson.core.base;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.json.JsonWriteContext;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * This base class implements part of API that a JSON generator exposes
- * to applications, adds shared internal methods that sub-classes
- * can use and adds some abstract methods sub-classes must implement.
- */
-public abstract class GeneratorBase
-    extends JsonGenerator
-{
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    protected ObjectCodec _objectCodec;
-
-    /**
-     * Bit flag composed of bits that indicate which
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature}s
-     * are enabled.
-     */
-    protected int _features;
-
-    /**
-     * Flag set to indicate that implicit conversion from number
-     * to JSON String is needed (as per
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature#WRITE_NUMBERS_AS_STRINGS}).
-     */
-    protected boolean _cfgNumbersAsStrings;
-    
-    /*
-    /**********************************************************
-    /* State
-    /**********************************************************
-     */
-
-    /**
-     * Object that keeps track of the current contextual state
-     * of the generator.
-     */
-    protected JsonWriteContext _writeContext;
-
-    /**
-     * Flag that indicates whether generator is closed or not. Gets
-     * set when it is closed by an explicit call
-     * ({@link #close}).
-     */
-    protected boolean _closed;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected GeneratorBase(int features, ObjectCodec codec)
-    {
-        super();
-        _features = features;
-        _writeContext = JsonWriteContext.createRootContext();
-        _objectCodec = codec;
-        _cfgNumbersAsStrings = isEnabled(Feature.WRITE_NUMBERS_AS_STRINGS);
-    }
-    /**
-     * Implemented with detection that tries to find "VERSION.txt" in same
-     * package as the implementation class.
-     */
-    @Override
-    public Version version() {
-        return VersionUtil.versionFor(getClass());
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    @Override
-    public JsonGenerator enable(Feature f) {
-        _features |= f.getMask();
-        if (f == Feature.WRITE_NUMBERS_AS_STRINGS) {
-            _cfgNumbersAsStrings = true;
-        } else if (f == Feature.ESCAPE_NON_ASCII) {
-            setHighestNonEscapedChar(127);
-        }
-        return this;
-    }
-
-    @Override
-    public JsonGenerator disable(Feature f) {
-        _features &= ~f.getMask();
-        if (f == Feature.WRITE_NUMBERS_AS_STRINGS) {
-            _cfgNumbersAsStrings = false;
-        } else if (f == Feature.ESCAPE_NON_ASCII) {
-            setHighestNonEscapedChar(0);
-        }
-        return this;
-    }
-
-    //public JsonGenerator configure(Feature f, boolean state) { }
-
-    @Override
-    public final boolean isEnabled(Feature f) {
-        return (_features & f.getMask()) != 0;
-    }
-    
-    @Override
-    public JsonGenerator useDefaultPrettyPrinter() {
-        /* 28-Sep-2012, tatu: As per [Issue#84], should not override a
-         *  pretty printer if one already assigned.
-         */
-        if (getPrettyPrinter() != null) {
-            return this;
-        }
-        return setPrettyPrinter(new DefaultPrettyPrinter());
-    }
-    
-    @Override
-    public JsonGenerator setCodec(ObjectCodec oc) {
-        _objectCodec = oc;
-        return this;
-    }
-
-    @Override
-    public final ObjectCodec getCodec() { return _objectCodec; }
-
-    /*
-    /**********************************************************
-    /* Public API, accessors
-    /**********************************************************
-     */
-
-    /**
-     * Note: co-variant return type.
-     */
-    @Override
-    public final JsonWriteContext getOutputContext() { return _writeContext; }
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, structural
-    /**********************************************************
-     */
-
-    //public void writeStartArray() throws IOException, JsonGenerationException
-    //public void writeEndArray() throws IOException, JsonGenerationException
-    //public void writeStartObject() throws IOException, JsonGenerationException
-    //public void writeEndObject() throws IOException, JsonGenerationException
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, textual
-    /**********************************************************
-     */
-
-    @Override
-    public void writeFieldName(SerializableString name) throws IOException, JsonGenerationException {
-        writeFieldName(name.getValue());
-    }
-    
-    //public abstract void writeString(String text) throws IOException, JsonGenerationException;
-
-    //public abstract void writeString(char[] text, int offset, int len) throws IOException, JsonGenerationException;
-
-    //public abstract void writeRaw(String text) throws IOException, JsonGenerationException;
-
-    //public abstract void writeRaw(char[] text, int offset, int len) throws IOException, JsonGenerationException;
-
-    @Override
-    public void writeString(SerializableString text) throws IOException, JsonGenerationException {
-        writeString(text.getValue());
-    }
-    
-    @Override
-    public void writeRawValue(String text) throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write raw value");
-        writeRaw(text);
-    }
-
-    @Override
-    public void writeRawValue(String text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write raw value");
-        writeRaw(text, offset, len);
-    }
-
-    @Override
-    public void writeRawValue(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write raw value");
-        writeRaw(text, offset, len);
-    }
-
-    @Override
-    public int writeBinary(Base64Variant b64variant, InputStream data, int dataLength)
-        throws IOException, JsonGenerationException {
-        // Let's implement this as "unsupported" to make it easier to add new parser impls
-        _reportUnsupportedOperation();
-        return 0;
-    }
-
-    /*
-   /**********************************************************
-   /* Public API, write methods, primitive
-   /**********************************************************
-    */
-
-    // Not implemented at this level, added as placeholders
-
-     /*
-    public abstract void writeNumber(int i)
-    public abstract void writeNumber(long l)
-    public abstract void writeNumber(double d)
-    public abstract void writeNumber(float f)
-    public abstract void writeNumber(BigDecimal dec)
-    public abstract void writeBoolean(boolean state)
-    public abstract void writeNull()
-    */
-
-    /*
-    /**********************************************************
-    /* Public API, write methods, POJOs, trees
-    /**********************************************************
-     */
-
-    @Override
-    public void writeObject(Object value)
-        throws IOException, JsonProcessingException
-    {
-        if (value == null) {
-            // important: call method that does check value write:
-            writeNull();
-        } else {
-            /* 02-Mar-2009, tatu: we are NOT to call _verifyValueWrite here,
-             *   because that will be done when codec actually serializes
-             *   contained POJO. If we did call it it would advance state
-             *   causing exception later on
-             */
-            if (_objectCodec != null) {
-                _objectCodec.writeValue(this, value);
-                return;
-            }
-            _writeSimpleObject(value);
-        }
-    }
-
-    @Override
-    public void writeTree(TreeNode rootNode)
-        throws IOException, JsonProcessingException
-    {
-        // As with 'writeObject()', we are not check if write would work
-        if (rootNode == null) {
-            writeNull();
-        } else {
-            if (_objectCodec == null) {
-                throw new IllegalStateException("No ObjectCodec defined for the generator, can not serialize JsonNode-based trees");
-            }
-            _objectCodec.writeValue(this, rootNode);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, low-level output handling
-    /**********************************************************
-     */
-
-    @Override
-    public abstract void flush() throws IOException;
-
-    @Override
-    public void close() throws IOException
-    {
-        _closed = true;
-    }
-
-    @Override
-    public boolean isClosed() { return _closed; }
-
-    /*
-    /**********************************************************
-    /* Public API, copy-through methods
-    /**********************************************************
-     */
-
-    @Override
-    public final void copyCurrentEvent(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        // sanity check; what to do?
-        if (t == null) {
-            _reportError("No current event to copy");
-        }
-        switch(t) {
-        case START_OBJECT:
-            writeStartObject();
-            break;
-        case END_OBJECT:
-            writeEndObject();
-            break;
-        case START_ARRAY:
-            writeStartArray();
-            break;
-        case END_ARRAY:
-            writeEndArray();
-            break;
-        case FIELD_NAME:
-            writeFieldName(jp.getCurrentName());
-            break;
-        case VALUE_STRING:
-            if (jp.hasTextCharacters()) {
-                writeString(jp.getTextCharacters(), jp.getTextOffset(), jp.getTextLength());
-            } else {
-                writeString(jp.getText());
-            }
-            break;
-        case VALUE_NUMBER_INT:
-            switch (jp.getNumberType()) {
-            case INT:
-                writeNumber(jp.getIntValue());
-                break;
-            case BIG_INTEGER:
-                writeNumber(jp.getBigIntegerValue());
-                break;
-            default:
-                writeNumber(jp.getLongValue());
-            }
-            break;
-        case VALUE_NUMBER_FLOAT:
-            switch (jp.getNumberType()) {
-            case BIG_DECIMAL:
-                writeNumber(jp.getDecimalValue());
-                break;
-            case FLOAT:
-                writeNumber(jp.getFloatValue());
-                break;
-            default:
-                writeNumber(jp.getDoubleValue());
-            }
-            break;
-        case VALUE_TRUE:
-            writeBoolean(true);
-            break;
-        case VALUE_FALSE:
-            writeBoolean(false);
-            break;
-        case VALUE_NULL:
-            writeNull();
-            break;
-        case VALUE_EMBEDDED_OBJECT:
-            writeObject(jp.getEmbeddedObject());
-            break;
-        default:
-            _cantHappen();
-        }
-    }
-
-    @Override
-    public final void copyCurrentStructure(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-
-        // Let's handle field-name separately first
-        if (t == JsonToken.FIELD_NAME) {
-            writeFieldName(jp.getCurrentName());
-            t = jp.nextToken();
-            // fall-through to copy the associated value
-        }
-
-        switch (t) {
-        case START_ARRAY:
-            writeStartArray();
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                copyCurrentStructure(jp);
-            }
-            writeEndArray();
-            break;
-        case START_OBJECT:
-            writeStartObject();
-            while (jp.nextToken() != JsonToken.END_OBJECT) {
-                copyCurrentStructure(jp);
-            }
-            writeEndObject();
-            break;
-        default: // others are simple:
-            copyCurrentEvent(jp);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Package methods for this, sub-classes
-    /**********************************************************
-     */
-
-    protected abstract void _releaseBuffers();
-
-    protected abstract void _verifyValueWrite(String typeMsg)
-        throws IOException, JsonGenerationException;
-
-    protected void _reportError(String msg)
-        throws JsonGenerationException
-    {
-        throw new JsonGenerationException(msg);
-    }
-
-    protected void _cantHappen()
-    {
-        throw new RuntimeException("Internal error: should never end up through this code path");
-    }
-
-    /**
-     * Helper method to try to call appropriate write method for given
-     * untyped Object. At this point, no structural conversions should be done,
-     * only simple basic types are to be coerced as necessary.
-     *
-     * @param value Non-null value to write
-     */
-    protected void _writeSimpleObject(Object value) 
-        throws IOException, JsonGenerationException
-    {
-        /* 31-Dec-2009, tatu: Actually, we could just handle some basic
-         *    types even without codec. This can improve interoperability,
-         *    and specifically help with TokenBuffer.
-         */
-        if (value == null) {
-            writeNull();
-            return;
-        }
-        if (value instanceof String) {
-            writeString((String) value);
-            return;
-        }
-        if (value instanceof Number) {
-            Number n = (Number) value;
-            if (n instanceof Integer) {
-                writeNumber(n.intValue());
-                return;
-            } else if (n instanceof Long) {
-                writeNumber(n.longValue());
-                return;
-            } else if (n instanceof Double) {
-                writeNumber(n.doubleValue());
-                return;
-            } else if (n instanceof Float) {
-                writeNumber(n.floatValue());
-                return;
-            } else if (n instanceof Short) {
-                writeNumber(n.shortValue());
-                return;
-            } else if (n instanceof Byte) {
-                writeNumber(n.byteValue());
-                return;
-            } else if (n instanceof BigInteger) {
-                writeNumber((BigInteger) n);
-                return;
-            } else if (n instanceof BigDecimal) {
-                writeNumber((BigDecimal) n);
-                return;
-                
-            // then Atomic types
-                
-            } else if (n instanceof AtomicInteger) {
-                writeNumber(((AtomicInteger) n).get());
-                return;
-            } else if (n instanceof AtomicLong) {
-                writeNumber(((AtomicLong) n).get());
-                return;
-            }
-        } else if (value instanceof byte[]) {
-            writeBinary((byte[]) value);
-            return;
-        } else if (value instanceof Boolean) {
-            writeBoolean((Boolean) value);
-            return;
-        } else if (value instanceof AtomicBoolean) {
-            writeBoolean(((AtomicBoolean) value).get());
-            return;
-        }
-        throw new IllegalStateException("No ObjectCodec defined for the generator, can only serialize simple wrapper types (type passed "
-                +value.getClass().getName()+")");
-    }    
-
-    protected final void _throwInternal() {
-        throw new RuntimeException("Internal error: this code path should never get executed");
-    }
-
-    protected void _reportUnsupportedOperation() {
-        throw new UnsupportedOperationException("Operation not supported by generator of type "+getClass().getName());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserBase.java b/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserBase.java
deleted file mode 100644
index 1ee06a8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserBase.java
+++ /dev/null
@@ -1,1085 +0,0 @@
-package com.fasterxml.jackson.core.base;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.io.NumberInput;
-import com.fasterxml.jackson.core.json.JsonReadContext;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.core.util.TextBuffer;
-
-/**
- * Intermediate base class used by all Jackson {@link JsonParser}
- * implementations. Contains most common things that are independent
- * of actual underlying input source
- *
- * @author Tatu Saloranta
- */
-public abstract class ParserBase
-    extends ParserMinimalBase
-{
-    /*
-    /**********************************************************
-    /* Generic I/O state
-    /**********************************************************
-     */
-
-    /**
-     * I/O context for this reader. It handles buffer allocation
-     * for the reader.
-     */
-    final protected IOContext _ioContext;
-
-    /**
-     * Flag that indicates whether parser is closed or not. Gets
-     * set when parser is either closed by explicit call
-     * ({@link #close}) or when end-of-input is reached.
-     */
-    protected boolean _closed;
-
-    /*
-    /**********************************************************
-    /* Current input data
-    /**********************************************************
-     */
-
-    // Note: type of actual buffer depends on sub-class, can't include
-
-    /**
-     * Pointer to next available character in buffer
-     */
-    protected int _inputPtr = 0;
-
-    /**
-     * Index of character after last available one in the buffer.
-     */
-    protected int _inputEnd = 0;
-    
-    /*
-    /**********************************************************
-    /* Current input location information
-    /**********************************************************
-     */
-
-    /**
-     * Number of characters/bytes that were contained in previous blocks
-     * (blocks that were already processed prior to the current buffer).
-     */
-    protected long _currInputProcessed = 0L;
-
-    /**
-     * Current row location of current point in input buffer, starting
-     * from 1, if available.
-     */
-    protected int _currInputRow = 1;
-
-    /**
-     * Current index of the first character of the current row in input
-     * buffer. Needed to calculate column position, if necessary; benefit
-     * of not having column itself is that this only has to be updated
-     * once per line.
-     */
-    protected int _currInputRowStart = 0;
-
-    /*
-    /**********************************************************
-    /* Information about starting location of event
-    /* Reader is pointing to; updated on-demand
-    /**********************************************************
-     */
-
-    // // // Location info at point when current token was started
-
-    /**
-     * Total number of bytes/characters read before start of current token.
-     * For big (gigabyte-sized) sizes are possible, needs to be long,
-     * unlike pointers and sizes related to in-memory buffers.
-     */
-    protected long _tokenInputTotal = 0; 
-
-    /**
-     * Input row on which current token starts, 1-based
-     */
-    protected int _tokenInputRow = 1;
-
-    /**
-     * Column on input row that current token starts; 0-based (although
-     * in the end it'll be converted to 1-based)
-     */
-    protected int _tokenInputCol = 0;
-
-    /*
-    /**********************************************************
-    /* Parsing state
-    /**********************************************************
-     */
-
-    /**
-     * Information about parser context, context in which
-     * the next token is to be parsed (root, array, object).
-     */
-    protected JsonReadContext _parsingContext;
-    
-    /**
-     * Secondary token related to the next token after current one;
-     * used if its type is known. This may be value token that
-     * follows FIELD_NAME, for example.
-     */
-    protected JsonToken _nextToken;
-
-    /*
-    /**********************************************************
-    /* Buffer(s) for local name(s) and text content
-    /**********************************************************
-     */
-
-    /**
-     * Buffer that contains contents of String values, including
-     * field names if necessary (name split across boundary,
-     * contains escape sequence, or access needed to char array)
-     */
-    protected final TextBuffer _textBuffer;
-
-    /**
-     * Temporary buffer that is needed if field name is accessed
-     * using {@link #getTextCharacters} method (instead of String
-     * returning alternatives)
-     */
-    protected char[] _nameCopyBuffer = null;
-
-    /**
-     * Flag set to indicate whether the field name is available
-     * from the name copy buffer or not (in addition to its String
-     * representation  being available via read context)
-     */
-    protected boolean _nameCopied = false;
-
-    /**
-     * ByteArrayBuilder is needed if 'getBinaryValue' is called. If so,
-     * we better reuse it for remainder of content.
-     */
-    protected ByteArrayBuilder _byteArrayBuilder = null;
-
-    /**
-     * We will hold on to decoded binary data, for duration of
-     * current event, so that multiple calls to
-     * {@link #getBinaryValue} will not need to decode data more
-     * than once.
-     */
-    protected byte[] _binaryValue;
-
-    /*
-    /**********************************************************
-    /* Constants and fields of former 'JsonNumericParserBase'
-    /**********************************************************
-     */
-
-    final protected static int NR_UNKNOWN = 0;
-
-    // First, integer types
-
-    final protected static int NR_INT = 0x0001;
-    final protected static int NR_LONG = 0x0002;
-    final protected static int NR_BIGINT = 0x0004;
-
-    // And then floating point types
-
-    final protected static int NR_DOUBLE = 0x008;
-    final protected static int NR_BIGDECIMAL = 0x0010;
-
-    // Also, we need some numeric constants
-
-    final static BigInteger BI_MIN_INT = BigInteger.valueOf(Integer.MIN_VALUE);
-    final static BigInteger BI_MAX_INT = BigInteger.valueOf(Integer.MAX_VALUE);
-
-    final static BigInteger BI_MIN_LONG = BigInteger.valueOf(Long.MIN_VALUE);
-    final static BigInteger BI_MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
-    
-    final static BigDecimal BD_MIN_LONG = new BigDecimal(BI_MIN_LONG);
-    final static BigDecimal BD_MAX_LONG = new BigDecimal(BI_MAX_LONG);
-
-    final static BigDecimal BD_MIN_INT = new BigDecimal(BI_MIN_INT);
-    final static BigDecimal BD_MAX_INT = new BigDecimal(BI_MAX_INT);
-
-    final static long MIN_INT_L = (long) Integer.MIN_VALUE;
-    final static long MAX_INT_L = (long) Integer.MAX_VALUE;
-
-    // These are not very accurate, but have to do... (for bounds checks)
-
-    final static double MIN_LONG_D = (double) Long.MIN_VALUE;
-    final static double MAX_LONG_D = (double) Long.MAX_VALUE;
-
-    final static double MIN_INT_D = (double) Integer.MIN_VALUE;
-    final static double MAX_INT_D = (double) Integer.MAX_VALUE;
-    
-    
-    // Digits, numeric
-    final protected static int INT_0 = '0';
-    final protected static int INT_1 = '1';
-    final protected static int INT_2 = '2';
-    final protected static int INT_3 = '3';
-    final protected static int INT_4 = '4';
-    final protected static int INT_5 = '5';
-    final protected static int INT_6 = '6';
-    final protected static int INT_7 = '7';
-    final protected static int INT_8 = '8';
-    final protected static int INT_9 = '9';
-
-    final protected static int INT_MINUS = '-';
-    final protected static int INT_PLUS = '+';
-    final protected static int INT_DECIMAL_POINT = '.';
-
-    final protected static int INT_e = 'e';
-    final protected static int INT_E = 'E';
-
-    final protected static char CHAR_NULL = '\0';
-    
-    // Numeric value holders: multiple fields used for
-    // for efficiency
-
-    /**
-     * Bitfield that indicates which numeric representations
-     * have been calculated for the current type
-     */
-    protected int _numTypesValid = NR_UNKNOWN;
-
-    // First primitives
-
-    protected int _numberInt;
-
-    protected long _numberLong;
-
-    protected double _numberDouble;
-
-    // And then object types
-
-    protected BigInteger _numberBigInt;
-
-    protected BigDecimal _numberBigDecimal;
-
-    // And then other information about value itself
-
-    /**
-     * Flag that indicates whether numeric value has a negative
-     * value. That is, whether its textual representation starts
-     * with minus character.
-     */
-    protected boolean _numberNegative;
-
-    /**
-     * Length of integer part of the number, in characters
-     */
-    protected int _intLength;
-
-    /**
-     * Length of the fractional part (not including decimal
-     * point or exponent), in characters.
-     * Not used for  pure integer values.
-     */
-    protected int _fractLength;
-
-    /**
-     * Length of the exponent part of the number, if any, not
-     * including 'e' marker or sign, just digits. 
-     * Not used for  pure integer values.
-     */
-    protected int _expLength;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected ParserBase(IOContext ctxt, int features)
-    {
-        super();
-        _features = features;
-        _ioContext = ctxt;
-        _textBuffer = ctxt.constructTextBuffer();
-        _parsingContext = JsonReadContext.createRootContext();
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonParser impl
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to get the name associated with
-     * the current event.
-     */
-    @Override
-    public String getCurrentName()
-        throws IOException, JsonParseException
-    {
-        // [JACKSON-395]: start markers require information from parent
-        if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-            JsonReadContext parent = _parsingContext.getParent();
-            return parent.getCurrentName();
-        }
-        return _parsingContext.getCurrentName();
-    }
-
-    @Override
-    public void overrideCurrentName(String name)
-    {
-        // Simple, but need to look for START_OBJECT/ARRAY's "off-by-one" thing:
-        JsonReadContext ctxt = _parsingContext;
-        if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-            ctxt = ctxt.getParent();
-        }
-        ctxt.setCurrentName(name);
-    }
-    
-    @Override
-    public void close() throws IOException
-    {
-        if (!_closed) {
-            _closed = true;
-            try {
-                _closeInput();
-            } finally {
-                // as per [JACKSON-324], do in finally block
-                // Also, internal buffer(s) can now be released as well
-                _releaseBuffers();
-            }
-        }
-    }
-
-    @Override
-    public boolean isClosed() { return _closed; }
-
-    @Override
-    public JsonReadContext getParsingContext()
-    {
-        return _parsingContext;
-    }
-
-    /**
-     * Method that return the <b>starting</b> location of the current
-     * token; that is, position of the first character from input
-     * that starts the current token.
-     */
-    @Override
-    public JsonLocation getTokenLocation()
-    {
-        return new JsonLocation(_ioContext.getSourceReference(),
-                                getTokenCharacterOffset(),
-                                getTokenLineNr(),
-                                getTokenColumnNr());
-    }
-
-    /**
-     * Method that returns location of the last processed character;
-     * usually for error reporting purposes
-     */
-    @Override
-    public JsonLocation getCurrentLocation()
-    {
-        int col = _inputPtr - _currInputRowStart + 1; // 1-based
-        return new JsonLocation(_ioContext.getSourceReference(),
-                                _currInputProcessed + _inputPtr - 1,
-                                _currInputRow, col);
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, text
-    /**********************************************************
-     */
-
-    @Override
-    public boolean hasTextCharacters()
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            return true; // usually true
-        }        
-        if (_currToken == JsonToken.FIELD_NAME) {
-            return _nameCopied;
-        }
-        return false;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public low-level accessors
-    /**********************************************************
-     */
-
-    public long getTokenCharacterOffset() { return _tokenInputTotal; }
-    public int getTokenLineNr() { return _tokenInputRow; }
-    public int getTokenColumnNr() {
-        // note: value of -1 means "not available"; otherwise convert from 0-based to 1-based
-        int col = _tokenInputCol;
-        return (col < 0) ? col : (col + 1);
-    }
-
-    /*
-    /**********************************************************
-    /* Low-level reading, other
-    /**********************************************************
-     */
-
-    protected final void loadMoreGuaranteed()
-        throws IOException
-    {
-        if (!loadMore()) {
-            _reportInvalidEOF();
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Abstract methods needed from sub-classes
-    /**********************************************************
-     */
-
-    protected abstract boolean loadMore() throws IOException;
-    
-    protected abstract void _finishString() throws IOException, JsonParseException;
-
-    protected abstract void _closeInput() throws IOException;
-    
-    /*
-    /**********************************************************
-    /* Low-level reading, other
-    /**********************************************************
-     */
-
-    /**
-     * Method called to release internal buffers owned by the base
-     * reader. This may be called along with {@link #_closeInput} (for
-     * example, when explicitly closing this reader instance), or
-     * separately (if need be).
-     */
-    protected void _releaseBuffers() throws IOException
-    {
-        _textBuffer.releaseBuffers();
-        char[] buf = _nameCopyBuffer;
-        if (buf != null) {
-            _nameCopyBuffer = null;
-            _ioContext.releaseNameCopyBuffer(buf);
-        }
-    }
-    
-    /**
-     * Method called when an EOF is encountered between tokens.
-     * If so, it may be a legitimate EOF, but only iff there
-     * is no open non-root context.
-     */
-    @Override
-    protected void _handleEOF() throws JsonParseException
-    {
-        if (!_parsingContext.inRoot()) {
-            _reportInvalidEOF(": expected close marker for "+_parsingContext.getTypeDesc()+" (from "+_parsingContext.getStartLocation(_ioContext.getSourceReference())+")");
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal/package methods: Error reporting
-    /**********************************************************
-     */
-    
-    protected void _reportMismatchedEndMarker(int actCh, char expCh)
-        throws JsonParseException
-    {
-        String startDesc = ""+_parsingContext.getStartLocation(_ioContext.getSourceReference());
-        _reportError("Unexpected close marker '"+((char) actCh)+"': expected '"+expCh+"' (for "+_parsingContext.getTypeDesc()+" starting at "+startDesc+")");
-    }
-
-    /*
-    /**********************************************************
-    /* Internal/package methods: shared/reusable builders
-    /**********************************************************
-     */
-    
-    public ByteArrayBuilder _getByteArrayBuilder()
-    {
-        if (_byteArrayBuilder == null) {
-            _byteArrayBuilder = new ByteArrayBuilder();
-        } else {
-            _byteArrayBuilder.reset();
-        }
-        return _byteArrayBuilder;
-    }
-
-    /*
-    /**********************************************************
-    /* Methods from former JsonNumericParserBase
-    /**********************************************************
-     */
-
-    // // // Life-cycle of number-parsing
-    
-    protected final JsonToken reset(boolean negative, int intLen, int fractLen, int expLen)
-    {
-        if (fractLen < 1 && expLen < 1) { // integer
-            return resetInt(negative, intLen);
-        }
-        return resetFloat(negative, intLen, fractLen, expLen);
-    }
-        
-    protected final JsonToken resetInt(boolean negative, int intLen)
-    {
-        _numberNegative = negative;
-        _intLength = intLen;
-        _fractLength = 0;
-        _expLength = 0;
-        _numTypesValid = NR_UNKNOWN; // to force parsing
-        return JsonToken.VALUE_NUMBER_INT;
-    }
-    
-    protected final JsonToken resetFloat(boolean negative, int intLen, int fractLen, int expLen)
-    {
-        _numberNegative = negative;
-        _intLength = intLen;
-        _fractLength = fractLen;
-        _expLength = expLen;
-        _numTypesValid = NR_UNKNOWN; // to force parsing
-        return JsonToken.VALUE_NUMBER_FLOAT;
-    }
-    
-    protected final JsonToken resetAsNaN(String valueStr, double value)
-    {
-        _textBuffer.resetWithString(valueStr);
-        _numberDouble = value;
-        _numTypesValid = NR_DOUBLE;
-        return JsonToken.VALUE_NUMBER_FLOAT;
-    }
-    
-    /*
-    /**********************************************************
-    /* Numeric accessors of public API
-    /**********************************************************
-     */
-    
-    @Override
-    public Number getNumberValue() throws IOException, JsonParseException
-    {
-        if (_numTypesValid == NR_UNKNOWN) {
-            _parseNumericValue(NR_UNKNOWN); // will also check event type
-        }
-        // Separate types for int types
-        if (_currToken == JsonToken.VALUE_NUMBER_INT) {
-            if ((_numTypesValid & NR_INT) != 0) {
-                return _numberInt;
-            }
-            if ((_numTypesValid & NR_LONG) != 0) {
-                return _numberLong;
-            }
-            if ((_numTypesValid & NR_BIGINT) != 0) {
-                return _numberBigInt;
-            }
-            // Shouldn't get this far but if we do
-            return _numberBigDecimal;
-        }
-    
-        /* And then floating point types. But here optimal type
-         * needs to be big decimal, to avoid losing any data?
-         */
-        if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            return _numberBigDecimal;
-        }
-        if ((_numTypesValid & NR_DOUBLE) == 0) { // sanity check
-            _throwInternal();
-        }
-        return _numberDouble;
-    }
-    
-    @Override
-    public NumberType getNumberType() throws IOException, JsonParseException
-    {
-        if (_numTypesValid == NR_UNKNOWN) {
-            _parseNumericValue(NR_UNKNOWN); // will also check event type
-        }
-        if (_currToken == JsonToken.VALUE_NUMBER_INT) {
-            if ((_numTypesValid & NR_INT) != 0) {
-                return NumberType.INT;
-            }
-            if ((_numTypesValid & NR_LONG) != 0) {
-                return NumberType.LONG;
-            }
-            return NumberType.BIG_INTEGER;
-        }
-    
-        /* And then floating point types. Here optimal type
-         * needs to be big decimal, to avoid losing any data?
-         * However... using BD is slow, so let's allow returning
-         * double as type if no explicit call has been made to access
-         * data as BD?
-         */
-        if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            return NumberType.BIG_DECIMAL;
-        }
-        return NumberType.DOUBLE;
-    }
-    
-    @Override
-    public int getIntValue() throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_INT) == 0) {
-            if (_numTypesValid == NR_UNKNOWN) { // not parsed at all
-                _parseNumericValue(NR_INT); // will also check event type
-            }
-            if ((_numTypesValid & NR_INT) == 0) { // wasn't an int natively?
-                convertNumberToInt(); // let's make it so, if possible
-            }
-        }
-        return _numberInt;
-    }
-    
-    @Override
-    public long getLongValue() throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_LONG) == 0) {
-            if (_numTypesValid == NR_UNKNOWN) {
-                _parseNumericValue(NR_LONG);
-            }
-            if ((_numTypesValid & NR_LONG) == 0) {
-                convertNumberToLong();
-            }
-        }
-        return _numberLong;
-    }
-    
-    @Override
-    public BigInteger getBigIntegerValue() throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_BIGINT) == 0) {
-            if (_numTypesValid == NR_UNKNOWN) {
-                _parseNumericValue(NR_BIGINT);
-            }
-            if ((_numTypesValid & NR_BIGINT) == 0) {
-                convertNumberToBigInteger();
-            }
-        }
-        return _numberBigInt;
-    }
-    
-    @Override
-    public float getFloatValue() throws IOException, JsonParseException
-    {
-        double value = getDoubleValue();
-        /* 22-Jan-2009, tatu: Bounds/range checks would be tricky
-         *   here, so let's not bother even trying...
-         */
-        /*
-        if (value < -Float.MAX_VALUE || value > MAX_FLOAT_D) {
-            _reportError("Numeric value ("+getText()+") out of range of Java float");
-        }
-        */
-        return (float) value;
-    }
-    
-    @Override
-    public double getDoubleValue() throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_DOUBLE) == 0) {
-            if (_numTypesValid == NR_UNKNOWN) {
-                _parseNumericValue(NR_DOUBLE);
-            }
-            if ((_numTypesValid & NR_DOUBLE) == 0) {
-                convertNumberToDouble();
-            }
-        }
-        return _numberDouble;
-    }
-    
-    @Override
-    public BigDecimal getDecimalValue() throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_BIGDECIMAL) == 0) {
-            if (_numTypesValid == NR_UNKNOWN) {
-                _parseNumericValue(NR_BIGDECIMAL);
-            }
-            if ((_numTypesValid & NR_BIGDECIMAL) == 0) {
-                convertNumberToBigDecimal();
-            }
-        }
-        return _numberBigDecimal;
-    }
-
-    /*
-    /**********************************************************
-    /* Conversion from textual to numeric representation
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will parse actual numeric value out of a syntactically
-     * valid number value. Type it will parse into depends on whether
-     * it is a floating point number, as well as its magnitude: smallest
-     * legal type (of ones available) is used for efficiency.
-     *
-     * @param expType Numeric type that we will immediately need, if any;
-     *   mostly necessary to optimize handling of floating point numbers
-     */
-    protected void _parseNumericValue(int expType)
-        throws IOException, JsonParseException
-    {
-        // Int or float?
-        if (_currToken == JsonToken.VALUE_NUMBER_INT) {
-            char[] buf = _textBuffer.getTextBuffer();
-            int offset = _textBuffer.getTextOffset();
-            int len = _intLength;
-            if (_numberNegative) {
-                ++offset;
-            }
-            if (len <= 9) { // definitely fits in int
-                int i = NumberInput.parseInt(buf, offset, len);
-                _numberInt = _numberNegative ? -i : i;
-                _numTypesValid = NR_INT;
-                return;
-            }
-            if (len <= 18) { // definitely fits AND is easy to parse using 2 int parse calls
-                long l = NumberInput.parseLong(buf, offset, len);
-                if (_numberNegative) {
-                    l = -l;
-                }
-                // [JACKSON-230] Could still fit in int, need to check
-                if (len == 10) {
-                    if (_numberNegative) {
-                        if (l >= MIN_INT_L) {
-                            _numberInt = (int) l;
-                            _numTypesValid = NR_INT;
-                            return;
-                        }
-                    } else {
-                        if (l <= MAX_INT_L) {
-                            _numberInt = (int) l;
-                            _numTypesValid = NR_INT;
-                            return;
-                        }
-                    }
-                }
-                _numberLong = l;
-                _numTypesValid = NR_LONG;
-                return;
-            }
-            _parseSlowIntValue(expType, buf, offset, len);
-            return;
-        }
-        if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
-            _parseSlowFloatValue(expType);
-            return;
-        }
-        _reportError("Current token ("+_currToken+") not numeric, can not use numeric value accessors");
-    }
-    
-    private void _parseSlowFloatValue(int expType)
-        throws IOException, JsonParseException
-    {
-        /* Nope: floating point. Here we need to be careful to get
-         * optimal parsing strategy: choice is between accurate but
-         * slow (BigDecimal) and lossy but fast (Double). For now
-         * let's only use BD when explicitly requested -- it can
-         * still be constructed correctly at any point since we do
-         * retain textual representation
-         */
-        try {
-            if (expType == NR_BIGDECIMAL) {
-                _numberBigDecimal = _textBuffer.contentsAsDecimal();
-                _numTypesValid = NR_BIGDECIMAL;
-            } else {
-                // Otherwise double has to do
-                _numberDouble = _textBuffer.contentsAsDouble();
-                _numTypesValid = NR_DOUBLE;
-            }
-        } catch (NumberFormatException nex) {
-            // Can this ever occur? Due to overflow, maybe?
-            _wrapError("Malformed numeric value '"+_textBuffer.contentsAsString()+"'", nex);
-        }
-    }
-    
-    private void _parseSlowIntValue(int expType, char[] buf, int offset, int len)
-        throws IOException, JsonParseException
-    {
-        String numStr = _textBuffer.contentsAsString();
-        try {
-            // [JACKSON-230] Some long cases still...
-            if (NumberInput.inLongRange(buf, offset, len, _numberNegative)) {
-                // Probably faster to construct a String, call parse, than to use BigInteger
-                _numberLong = Long.parseLong(numStr);
-                _numTypesValid = NR_LONG;
-            } else {
-                // nope, need the heavy guns... (rare case)
-                _numberBigInt = new BigInteger(numStr);
-                _numTypesValid = NR_BIGINT;
-            }
-        } catch (NumberFormatException nex) {
-            // Can this ever occur? Due to overflow, maybe?
-            _wrapError("Malformed numeric value '"+numStr+"'", nex);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Numeric conversions
-    /**********************************************************
-     */    
-    
-    protected void convertNumberToInt()
-        throws IOException, JsonParseException
-    {
-        // First, converting from long ought to be easy
-        if ((_numTypesValid & NR_LONG) != 0) {
-            // Let's verify it's lossless conversion by simple roundtrip
-            int result = (int) _numberLong;
-            if (((long) result) != _numberLong) {
-                _reportError("Numeric value ("+getText()+") out of range of int");
-            }
-            _numberInt = result;
-        } else if ((_numTypesValid & NR_BIGINT) != 0) {
-            if (BI_MIN_INT.compareTo(_numberBigInt) > 0 
-                    || BI_MAX_INT.compareTo(_numberBigInt) < 0) {
-                reportOverflowInt();
-            }
-            _numberInt = _numberBigInt.intValue();
-        } else if ((_numTypesValid & NR_DOUBLE) != 0) {
-            // Need to check boundaries
-            if (_numberDouble < MIN_INT_D || _numberDouble > MAX_INT_D) {
-                reportOverflowInt();
-            }
-            _numberInt = (int) _numberDouble;
-        } else if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            if (BD_MIN_INT.compareTo(_numberBigDecimal) > 0 
-                || BD_MAX_INT.compareTo(_numberBigDecimal) < 0) {
-                reportOverflowInt();
-            }
-            _numberInt = _numberBigDecimal.intValue();
-        } else {
-            _throwInternal(); // should never get here
-        }
-    
-        _numTypesValid |= NR_INT;
-    }
-    
-    protected void convertNumberToLong()
-        throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_INT) != 0) {
-            _numberLong = (long) _numberInt;
-        } else if ((_numTypesValid & NR_BIGINT) != 0) {
-            if (BI_MIN_LONG.compareTo(_numberBigInt) > 0 
-                    || BI_MAX_LONG.compareTo(_numberBigInt) < 0) {
-                reportOverflowLong();
-            }
-            _numberLong = _numberBigInt.longValue();
-        } else if ((_numTypesValid & NR_DOUBLE) != 0) {
-            // Need to check boundaries
-            if (_numberDouble < MIN_LONG_D || _numberDouble > MAX_LONG_D) {
-                reportOverflowLong();
-            }
-            _numberLong = (long) _numberDouble;
-        } else if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            if (BD_MIN_LONG.compareTo(_numberBigDecimal) > 0 
-                || BD_MAX_LONG.compareTo(_numberBigDecimal) < 0) {
-                reportOverflowLong();
-            }
-            _numberLong = _numberBigDecimal.longValue();
-        } else {
-            _throwInternal(); // should never get here
-        }
-    
-        _numTypesValid |= NR_LONG;
-    }
-    
-    protected void convertNumberToBigInteger()
-        throws IOException, JsonParseException
-    {
-        if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            // here it'll just get truncated, no exceptions thrown
-            _numberBigInt = _numberBigDecimal.toBigInteger();
-        } else if ((_numTypesValid & NR_LONG) != 0) {
-            _numberBigInt = BigInteger.valueOf(_numberLong);
-        } else if ((_numTypesValid & NR_INT) != 0) {
-            _numberBigInt = BigInteger.valueOf(_numberInt);
-        } else if ((_numTypesValid & NR_DOUBLE) != 0) {
-            _numberBigInt = BigDecimal.valueOf(_numberDouble).toBigInteger();
-        } else {
-            _throwInternal(); // should never get here
-        }
-        _numTypesValid |= NR_BIGINT;
-    }
-    
-    protected void convertNumberToDouble()
-        throws IOException, JsonParseException
-    {
-        /* 05-Aug-2008, tatus: Important note: this MUST start with
-         *   more accurate representations, since we don't know which
-         *   value is the original one (others get generated when
-         *   requested)
-         */
-    
-        if ((_numTypesValid & NR_BIGDECIMAL) != 0) {
-            _numberDouble = _numberBigDecimal.doubleValue();
-        } else if ((_numTypesValid & NR_BIGINT) != 0) {
-            _numberDouble = _numberBigInt.doubleValue();
-        } else if ((_numTypesValid & NR_LONG) != 0) {
-            _numberDouble = (double) _numberLong;
-        } else if ((_numTypesValid & NR_INT) != 0) {
-            _numberDouble = (double) _numberInt;
-        } else {
-            _throwInternal(); // should never get here
-        }
-    
-        _numTypesValid |= NR_DOUBLE;
-    }
-    
-    protected void convertNumberToBigDecimal()
-        throws IOException, JsonParseException
-    {
-        /* 05-Aug-2008, tatus: Important note: this MUST start with
-         *   more accurate representations, since we don't know which
-         *   value is the original one (others get generated when
-         *   requested)
-         */
-    
-        if ((_numTypesValid & NR_DOUBLE) != 0) {
-            /* Let's actually parse from String representation,
-             * to avoid rounding errors that non-decimal floating operations
-             * would incur
-             */
-            _numberBigDecimal = new BigDecimal(getText());
-        } else if ((_numTypesValid & NR_BIGINT) != 0) {
-            _numberBigDecimal = new BigDecimal(_numberBigInt);
-        } else if ((_numTypesValid & NR_LONG) != 0) {
-            _numberBigDecimal = BigDecimal.valueOf(_numberLong);
-        } else if ((_numTypesValid & NR_INT) != 0) {
-            _numberBigDecimal = BigDecimal.valueOf((long) _numberInt);
-        } else {
-            _throwInternal(); // should never get here
-        }
-        _numTypesValid |= NR_BIGDECIMAL;
-    }
-    
-    /*
-    /**********************************************************
-    /* Number handling exceptions
-    /**********************************************************
-     */    
-    
-    protected void reportUnexpectedNumberChar(int ch, String comment)
-        throws JsonParseException
-    {
-        String msg = "Unexpected character ("+_getCharDesc(ch)+") in numeric value";
-        if (comment != null) {
-            msg += ": "+comment;
-        }
-        _reportError(msg);
-    }
-    
-    protected void reportInvalidNumber(String msg)
-        throws JsonParseException
-    {
-        _reportError("Invalid numeric value: "+msg);
-    }
-    
-    protected void reportOverflowInt()
-        throws IOException, JsonParseException
-    {
-        _reportError("Numeric value ("+getText()+") out of range of int ("+Integer.MIN_VALUE+" - "+Integer.MAX_VALUE+")");
-    }
-    
-    protected void reportOverflowLong()
-        throws IOException, JsonParseException
-    {
-        _reportError("Numeric value ("+getText()+") out of range of long ("+Long.MIN_VALUE+" - "+Long.MAX_VALUE+")");
-    }    
-
-    /*
-    /**********************************************************
-    /* Base64 handling support
-    /**********************************************************
-     */
-
-    /**
-     * Method that sub-classes must implement to support escaped sequences
-     * in base64-encoded sections.
-     * Sub-classes that do not need base64 support can leave this as is
-     */
-    protected char _decodeEscaped()
-        throws IOException, JsonParseException {
-        throw new UnsupportedOperationException();
-    }
-    
-    protected final int _decodeBase64Escape(Base64Variant b64variant, int ch, int index)
-        throws IOException, JsonParseException
-    {
-        // 17-May-2011, tatu: As per [JACKSON-xxx], need to handle escaped chars
-        if (ch != '\\') {
-            throw reportInvalidBase64Char(b64variant, ch, index);
-        }
-        int unescaped = _decodeEscaped();
-        // if white space, skip if first triplet; otherwise errors
-        if (unescaped <= INT_SPACE) {
-            if (index == 0) { // whitespace only allowed to be skipped between triplets
-                return -1;
-            }
-        }
-        // otherwise try to find actual triplet value
-        int bits = b64variant.decodeBase64Char(unescaped);
-        if (bits < 0) {
-            throw reportInvalidBase64Char(b64variant, unescaped, index);
-        }
-        return bits;
-    }
-    
-    protected final int _decodeBase64Escape(Base64Variant b64variant, char ch, int index)
-        throws IOException, JsonParseException
-    {
-        // 17-May-2011, tatu: As per [JACKSON-xxx], need to handle escaped chars
-        if (ch != '\\') {
-            throw reportInvalidBase64Char(b64variant, ch, index);
-        }
-        char unescaped = _decodeEscaped();
-        // if white space, skip if first triplet; otherwise errors
-        if (unescaped <= INT_SPACE) {
-            if (index == 0) { // whitespace only allowed to be skipped between triplets
-                return -1;
-            }
-        }
-        // otherwise try to find actual triplet value
-        int bits = b64variant.decodeBase64Char(unescaped);
-        if (bits < 0) {
-            throw reportInvalidBase64Char(b64variant, unescaped, index);
-        }
-        return bits;
-    }
-    
-    protected IllegalArgumentException reportInvalidBase64Char(Base64Variant b64variant, int ch, int bindex)
-        throws IllegalArgumentException
-    {
-        return reportInvalidBase64Char(b64variant, ch, bindex, null);
-    }
-
-    /**
-     * @param bindex Relative index within base64 character unit; between 0
-     *   and 3 (as unit has exactly 4 characters)
-     */
-    protected IllegalArgumentException reportInvalidBase64Char(Base64Variant b64variant, int ch, int bindex, String msg)
-        throws IllegalArgumentException
-    {
-        String base;
-        if (ch <= INT_SPACE) {
-            base = "Illegal white space character (code 0x"+Integer.toHexString(ch)+") as character #"+(bindex+1)+" of 4-char base64 unit: can only used between units";
-        } else if (b64variant.usesPaddingChar(ch)) {
-            base = "Unexpected padding character ('"+b64variant.getPaddingChar()+"') as character #"+(bindex+1)+" of 4-char base64 unit: padding only legal as 3rd or 4th character";
-        } else if (!Character.isDefined(ch) || Character.isISOControl(ch)) {
-            // Not sure if we can really get here... ? (most illegal xml chars are caught at lower level)
-            base = "Illegal character (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        } else {
-            base = "Illegal character '"+((char)ch)+"' (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        }
-        if (msg != null) {
-            base = base + ": " + msg;
-        }
-        return new IllegalArgumentException(base);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserMinimalBase.java b/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserMinimalBase.java
deleted file mode 100644
index 46a7819..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/base/ParserMinimalBase.java
+++ /dev/null
@@ -1,617 +0,0 @@
-package com.fasterxml.jackson.core.base;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.JsonParser.Feature;
-import com.fasterxml.jackson.core.io.NumberInput;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * Intermediate base class used by all Jackson {@link JsonParser}
- * implementations, but does not add any additional fields that depend
- * on particular method of obtaining input.
- *<p>
- * Note that 'minimal' here mostly refers to minimal number of fields
- * (size) and functionality that is specific to certain types
- * of parser implementations; but not necessarily to number of methods.
- *
- * @author Tatu Saloranta
- */
-public abstract class ParserMinimalBase
-    extends JsonParser
-{
-    // Control chars:
-    protected final static int INT_TAB = '\t';
-    protected final static int INT_LF = '\n';
-    protected final static int INT_CR = '\r';
-    protected final static int INT_SPACE = 0x0020;
-
-    // Markup
-    protected final static int INT_LBRACKET = '[';
-    protected final static int INT_RBRACKET = ']';
-    protected final static int INT_LCURLY = '{';
-    protected final static int INT_RCURLY = '}';
-    protected final static int INT_QUOTE = '"';
-    protected final static int INT_BACKSLASH = '\\';
-    protected final static int INT_SLASH = '/';
-    protected final static int INT_COLON = ':';
-    protected final static int INT_COMMA = ',';
-    protected final static int INT_ASTERISK = '*';
-    protected final static int INT_APOSTROPHE = '\'';
-
-    // Letters we need
-    protected final static int INT_b = 'b';
-    protected final static int INT_f = 'f';
-    protected final static int INT_n = 'n';
-    protected final static int INT_r = 'r';
-    protected final static int INT_t = 't';
-    protected final static int INT_u = 'u';
-
-    /*
-    /**********************************************************
-    /* Minimal generally useful state
-    /**********************************************************
-     */
-    
-    /**
-     * Last token retrieved via {@link #nextToken}, if any.
-     * Null before the first call to <code>nextToken()</code>,
-     * as well as if token has been explicitly cleared
-     * (by call to {@link #clearCurrentToken})
-     */
-    protected JsonToken _currToken;
-
-    /**
-     * Last cleared token, if any: that is, value that was in
-     * effect when {@link #clearCurrentToken} was called.
-     */
-    protected JsonToken _lastClearedToken;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected ParserMinimalBase() { }
-    protected ParserMinimalBase(int features) {
-        super(features);
-    }
-
-    @Override
-    public Version version() {
-        return VersionUtil.versionFor(getClass());
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration overrides if any
-    /**********************************************************
-     */
-
-    // from base class:
-
-    //public void enableFeature(Feature f)
-    //public void disableFeature(Feature f)
-    //public void setFeature(Feature f, boolean state)
-    //public boolean isFeatureEnabled(Feature f)
-
-    /*
-    /**********************************************************
-    /* JsonParser impl
-    /**********************************************************
-     */
-
-    @Override
-    public abstract JsonToken nextToken() throws IOException, JsonParseException;
-
-    @Override
-    public JsonToken getCurrentToken() {
-        return _currToken;
-    }
-
-    @Override
-    public boolean hasCurrentToken() {
-        return _currToken != null;
-    }
-    
-    @Override
-    public JsonToken nextValue()
-        throws IOException, JsonParseException
-    {
-        /* Implementation should be as trivial as follows; only
-         * needs to change if we are to skip other tokens (for
-         * example, if comments were exposed as tokens)
-         */
-        JsonToken t = nextToken();
-        if (t == JsonToken.FIELD_NAME) {
-            t = nextToken();
-        }
-        return t;
-    }
-
-    @Override
-    public JsonParser skipChildren() throws IOException, JsonParseException
-    {
-        if (_currToken != JsonToken.START_OBJECT
-            && _currToken != JsonToken.START_ARRAY) {
-            return this;
-        }
-        int open = 1;
-
-        /* Since proper matching of start/end markers is handled
-         * by nextToken(), we'll just count nesting levels here
-         */
-        while (true) {
-            JsonToken t = nextToken();
-            if (t == null) {
-                _handleEOF();
-                /* given constraints, above should never return;
-                 * however, FindBugs doesn't know about it and
-                 * complains... so let's add dummy break here
-                 */
-                return this;
-            }
-            switch (t) {
-            case START_OBJECT:
-            case START_ARRAY:
-                ++open;
-                break;
-            case END_OBJECT:
-            case END_ARRAY:
-                if (--open == 0) {
-                    return this;
-                }
-                break;
-            }
-        }
-    }
-
-    /**
-     * Method sub-classes need to implement
-     */
-    protected abstract void _handleEOF() throws JsonParseException;
-
-    //public JsonToken getCurrentToken()
-
-    //public boolean hasCurrentToken()
-
-    @Override
-    public abstract String getCurrentName() throws IOException, JsonParseException;
-    
-    @Override
-    public abstract void close() throws IOException;
-
-    @Override
-    public abstract boolean isClosed();
-
-    @Override
-    public abstract JsonStreamContext getParsingContext();
-
-//    public abstract JsonLocation getTokenLocation();
-
-//   public abstract JsonLocation getCurrentLocation();
-
-    /*
-    /**********************************************************
-    /* Public API, token state overrides
-    /**********************************************************
-     */
-
-    @Override
-    public void clearCurrentToken() {
-        if (_currToken != null) {
-            _lastClearedToken = _currToken;
-            _currToken = null;
-        }
-    }
-
-    @Override
-    public JsonToken getLastClearedToken() {
-        return _lastClearedToken;
-    }
-
-    @Override
-    public abstract void overrideCurrentName(String name);
-    
-    /*
-    /**********************************************************
-    /* Public API, access to token information, text
-    /**********************************************************
-     */
-
-    @Override
-    public abstract String getText() throws IOException, JsonParseException;
-
-    @Override
-    public abstract char[] getTextCharacters() throws IOException, JsonParseException;
-
-    @Override
-    public abstract boolean hasTextCharacters();
-
-    @Override
-    public abstract int getTextLength() throws IOException, JsonParseException;
-
-    @Override
-    public abstract int getTextOffset() throws IOException, JsonParseException;  
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, binary
-    /**********************************************************
-     */
-
-    @Override
-    public abstract byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException, JsonParseException;
-
-    /*
-    /**********************************************************
-    /* Public API, access with conversion/coercion
-    /**********************************************************
-     */
-
-    @Override
-    public boolean getValueAsBoolean(boolean defaultValue) throws IOException, JsonParseException
-    {
-        if (_currToken != null) {
-            switch (_currToken) {
-            case VALUE_NUMBER_INT:
-                return getIntValue() != 0;
-            case VALUE_TRUE:
-                return true;
-            case VALUE_FALSE:
-            case VALUE_NULL:
-                return false;
-            case VALUE_EMBEDDED_OBJECT:
-                {
-                    Object value = this.getEmbeddedObject();
-                    if (value instanceof Boolean) {
-                        return (Boolean) value;
-                    }
-                }
-            case VALUE_STRING:
-                String str = getText().trim();
-                if ("true".equals(str)) {
-                    return true;
-                }
-                break;
-            }
-        }
-        return defaultValue;
-    }
-    
-    @Override
-    public int getValueAsInt(int defaultValue) throws IOException, JsonParseException
-    {
-        if (_currToken != null) {
-            switch (_currToken) {
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return getIntValue();
-            case VALUE_TRUE:
-                return 1;
-            case VALUE_FALSE:
-            case VALUE_NULL:
-                return 0;
-            case VALUE_STRING:
-                return NumberInput.parseAsInt(getText(), defaultValue);
-            case VALUE_EMBEDDED_OBJECT:
-                {
-                    Object value = this.getEmbeddedObject();
-                    if (value instanceof Number) {
-                        return ((Number) value).intValue();
-                    }
-                }
-            }
-        }
-        return defaultValue;
-    }
-    
-    @Override
-    public long getValueAsLong(long defaultValue) throws IOException, JsonParseException
-    {
-        if (_currToken != null) {
-            switch (_currToken) {
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return getLongValue();
-            case VALUE_TRUE:
-                return 1;
-            case VALUE_FALSE:
-            case VALUE_NULL:
-                return 0;
-            case VALUE_STRING:
-                return NumberInput.parseAsLong(getText(), defaultValue);
-            case VALUE_EMBEDDED_OBJECT:
-                {
-                    Object value = this.getEmbeddedObject();
-                    if (value instanceof Number) {
-                        return ((Number) value).longValue();
-                    }
-                }
-            }
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public double getValueAsDouble(double defaultValue) throws IOException, JsonParseException
-    {
-        if (_currToken != null) {
-            switch (_currToken) {
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return getDoubleValue();
-            case VALUE_TRUE:
-                return 1;
-            case VALUE_FALSE:
-            case VALUE_NULL:
-                return 0;
-            case VALUE_STRING:
-                return NumberInput.parseAsDouble(getText(), defaultValue);
-            case VALUE_EMBEDDED_OBJECT:
-                {
-                    Object value = this.getEmbeddedObject();
-                    if (value instanceof Number) {
-                        return ((Number) value).doubleValue();
-                    }
-                }
-            }
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public String getValueAsString(String defaultValue) throws IOException, JsonParseException
-    {
-        if (_currToken != JsonToken.VALUE_STRING) {
-            if (_currToken == null || _currToken == JsonToken.VALUE_NULL || !_currToken.isScalarValue()) {
-                return defaultValue;
-            }
-        }
-        return getText();
-    }
-    
-    /*
-    /**********************************************************
-    /* Base64 decoding
-    /**********************************************************
-     */
-
-    /**
-     * Helper method that can be used for base64 decoding in cases where
-     * encoded content has already been read as a String.
-     */
-    protected void _decodeBase64(String str, ByteArrayBuilder builder, Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        int ptr = 0;
-        int len = str.length();
-        
-        main_loop:
-        while (ptr < len) {
-            // first, we'll skip preceding white space, if any
-            char ch;
-            do {
-                ch = str.charAt(ptr++);
-                if (ptr >= len) {
-                    break main_loop;
-                }
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 0, null);
-            }
-            int decodedData = bits;
-            // then second base64 char; can't get padding yet, nor ws
-            if (ptr >= len) {
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 1, null);
-            }
-            decodedData = (decodedData << 6) | bits;
-            // third base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    decodedData >>= 4;
-                    builder.append(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 2, null);
-                }
-                // Ok, must get padding
-                if (ptr >= len) {
-                    _reportBase64EOF();
-                }
-                ch = str.charAt(ptr++);
-                if (!b64variant.usesPaddingChar(ch)) {
-                    _reportInvalidBase64(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                }
-                // Got 12 bits, only need 8, need to shift
-                decodedData >>= 4;
-                builder.append(decodedData);
-                continue;
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    decodedData >>= 2;
-                    builder.appendTwoBytes(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 3, null);
-                }
-                decodedData >>= 2;
-                builder.appendTwoBytes(decodedData);
-            } else {
-                // otherwise, our triple is now complete
-                decodedData = (decodedData << 6) | bits;
-                builder.appendThreeBytes(decodedData);
-            }
-        }
-    }
-
-    /**
-     * @param bindex Relative index within base64 character unit; between 0
-     *   and 3 (as unit has exactly 4 characters)
-     */
-    protected void _reportInvalidBase64(Base64Variant b64variant, char ch, int bindex, String msg)
-        throws JsonParseException
-    {
-        String base;
-        if (ch <= INT_SPACE) {
-            base = "Illegal white space character (code 0x"+Integer.toHexString(ch)+") as character #"+(bindex+1)+" of 4-char base64 unit: can only used between units";
-        } else if (b64variant.usesPaddingChar(ch)) {
-            base = "Unexpected padding character ('"+b64variant.getPaddingChar()+"') as character #"+(bindex+1)+" of 4-char base64 unit: padding only legal as 3rd or 4th character";
-        } else if (!Character.isDefined(ch) || Character.isISOControl(ch)) {
-            // Not sure if we can really get here... ? (most illegal xml chars are caught at lower level)
-            base = "Illegal character (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        } else {
-            base = "Illegal character '"+ch+"' (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        }
-        if (msg != null) {
-            base = base + ": " + msg;
-        }
-        throw _constructError(base);
-    }
-
-    protected void _reportBase64EOF() throws JsonParseException {
-        throw _constructError("Unexpected end-of-String in base64 content");
-    }
-    
-    
-    /*
-    /**********************************************************
-    /* Error reporting
-    /**********************************************************
-     */
-    
-    protected void _reportUnexpectedChar(int ch, String comment)
-        throws JsonParseException
-    {
-        String msg = "Unexpected character ("+_getCharDesc(ch)+")";
-        if (comment != null) {
-            msg += ": "+comment;
-        }
-        _reportError(msg);
-    }
-
-    protected void _reportInvalidEOF()
-        throws JsonParseException
-    {
-        _reportInvalidEOF(" in "+_currToken);
-    }
-
-    protected void _reportInvalidEOF(String msg)
-        throws JsonParseException
-    {
-        _reportError("Unexpected end-of-input"+msg);
-    }
-
-    protected void _reportInvalidEOFInValue() throws JsonParseException
-    {
-        _reportInvalidEOF(" in a value");
-    }
-    
-    protected void _throwInvalidSpace(int i)
-        throws JsonParseException
-    {
-        char c = (char) i;
-        String msg = "Illegal character ("+_getCharDesc(c)+"): only regular white space (\\r, \\n, \\t) is allowed between tokens";
-        _reportError(msg);
-    }
-
-    /**
-     * Method called to report a problem with unquoted control character.
-     * Note: starting with version 1.4, it is possible to suppress
-     * exception by enabling {@link Feature#ALLOW_UNQUOTED_CONTROL_CHARS}.
-     */
-    protected void _throwUnquotedSpace(int i, String ctxtDesc)
-        throws JsonParseException
-    {
-        // JACKSON-208; possible to allow unquoted control chars:
-        if (!isEnabled(Feature.ALLOW_UNQUOTED_CONTROL_CHARS) || i >= INT_SPACE) {
-            char c = (char) i;
-            String msg = "Illegal unquoted character ("+_getCharDesc(c)+"): has to be escaped using backslash to be included in "+ctxtDesc;
-            _reportError(msg);
-        }
-    }
-
-    protected char _handleUnrecognizedCharacterEscape(char ch) throws JsonProcessingException
-    {
-        // as per [JACKSON-300]
-        if (isEnabled(Feature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER)) {
-            return ch;
-        }
-        // and [JACKSON-548]
-        if (ch == '\'' && isEnabled(Feature.ALLOW_SINGLE_QUOTES)) {
-            return ch;
-        }
-        _reportError("Unrecognized character escape "+_getCharDesc(ch));
-        return ch;
-    }
-    
-    /*
-    /**********************************************************
-    /* Error reporting, generic
-    /**********************************************************
-     */
-
-    protected final static String _getCharDesc(int ch)
-    {
-        char c = (char) ch;
-        if (Character.isISOControl(c)) {
-            return "(CTRL-CHAR, code "+ch+")";
-        }
-        if (ch > 255) {
-            return "'"+c+"' (code "+ch+" / 0x"+Integer.toHexString(ch)+")";
-        }
-        return "'"+c+"' (code "+ch+")";
-    }
-
-    protected final void _reportError(String msg)
-        throws JsonParseException
-    {
-        throw _constructError(msg);
-    }
-
-    protected final void _wrapError(String msg, Throwable t)
-        throws JsonParseException
-    {
-        throw _constructError(msg, t);
-    }
-
-    protected final void _throwInternal()
-    {
-        throw new RuntimeException("Internal error: this code path should never get executed");
-    }
-
-    protected final JsonParseException _constructError(String msg, Throwable t)
-    {
-        return new JsonParseException(msg, getCurrentLocation(), t);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/base/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/base/package-info.java
deleted file mode 100644
index ec4adbe..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/base/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Base classes used by concrete Parser and Generator implementations;
- * contain functionality that is not specific to JSON or input
- * abstraction (byte vs char).
- * Most formats extend these types, although it is also possible to
- * directly extend {@link com.fasterxml.jackson.core.JsonParser} or
- * {@link com.fasterxml.jackson.core.JsonGenerator}.
- */
-package com.fasterxml.jackson.core.base;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatDetector.java b/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatDetector.java
deleted file mode 100644
index 516bf3e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatDetector.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.fasterxml.jackson.core.format;
-
-import java.io.*;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Simple helper class that allows data format (content type) auto-detection,
- * given an ordered set of {@link JsonFactory} instances to use for actual low-level
- * detection.
- */
-public class DataFormatDetector
-{
-    /**
-     * By default we will look ahead at most 64 bytes; in most cases,
-     * much less (4 bytes or so) is needed, but we will allow bit more
-     * leniency to support data formats that need more complex heuristics.
-     */
-    public final static int DEFAULT_MAX_INPUT_LOOKAHEAD = 64;
-    
-    /**
-     * Ordered list of factories which both represent data formats to
-     * detect (in precedence order, starting with highest) and are used
-     * for actual detection.
-     */
-    protected final JsonFactory[] _detectors;
-
-    /**
-     * Strength of match we consider to be good enough to be used
-     * without checking any other formats.
-     * Default value is {@link MatchStrength#SOLID_MATCH}, 
-     */
-    protected final MatchStrength _optimalMatch;
-
-    /**
-     * Strength of minimal match we accept as the answer, unless
-     * better matches are found. 
-     * Default value is {@link MatchStrength#WEAK_MATCH}, 
-     */
-    protected final MatchStrength _minimalMatch;
-
-    /**
-     * Maximum number of leading bytes of the input that we can read
-     * to determine data format.
-     *<p>
-     * Default value is {@link #DEFAULT_MAX_INPUT_LOOKAHEAD}.
-     */
-    protected final int _maxInputLookahead;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-    
-    public DataFormatDetector(JsonFactory... detectors) {
-        this(detectors, MatchStrength.SOLID_MATCH, MatchStrength.WEAK_MATCH,
-            DEFAULT_MAX_INPUT_LOOKAHEAD);
-    }
-
-    public DataFormatDetector(Collection<JsonFactory> detectors) {
-        this(detectors.toArray(new JsonFactory[detectors.size()]));
-    }
-
-    /**
-     * Method that will return a detector instance that uses given
-     * optimal match level (match that is considered sufficient to return, without
-     * trying to find stronger matches with other formats).
-     */
-    public DataFormatDetector withOptimalMatch(MatchStrength optMatch) {
-        if (optMatch == _optimalMatch) {
-            return this;
-        }
-        return new DataFormatDetector(_detectors, optMatch, _minimalMatch, _maxInputLookahead);
-    }
-    /**
-     * Method that will return a detector instance that uses given
-     * minimal match level; match that may be returned unless a stronger match
-     * is found with other format detectors.
-     */
-    public DataFormatDetector withMinimalMatch(MatchStrength minMatch) {
-        if (minMatch == _minimalMatch) {
-            return this;
-        }
-        return new DataFormatDetector(_detectors, _optimalMatch, minMatch, _maxInputLookahead);
-    }
-
-    /**
-     * Method that will return a detector instance that allows detectors to
-     * read up to specified number of bytes when determining format match strength.
-     */
-    public DataFormatDetector withMaxInputLookahead(int lookaheadBytes)
-    {
-        if (lookaheadBytes == _maxInputLookahead) {
-            return this;
-        }
-        return new DataFormatDetector(_detectors, _optimalMatch, _minimalMatch, lookaheadBytes);
-    }
-    
-    private DataFormatDetector(JsonFactory[] detectors,
-            MatchStrength optMatch, MatchStrength minMatch,
-            int maxInputLookahead)
-    {
-        _detectors = detectors;
-        _optimalMatch = optMatch;
-        _minimalMatch = minMatch;
-        _maxInputLookahead = maxInputLookahead;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method to call to find format that content (accessible via given
-     * {@link InputStream}) given has, as per configuration of this detector
-     * instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     */
-    public DataFormatMatcher findFormat(InputStream in) throws IOException
-    {
-        return _findFormat(new InputAccessor.Std(in, new byte[_maxInputLookahead]));
-    }
-
-    /**
-     * Method to call to find format that given content (full document)
-     * has, as per configuration of this detector instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     */
-    public DataFormatMatcher findFormat(byte[] fullInputData) throws IOException
-    {
-        return _findFormat(new InputAccessor.Std(fullInputData));
-    }
-
-    /**
-     * Method to call to find format that given content (full document)
-     * has, as per configuration of this detector instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     * 
-     * @since 2.1
-     */
-    public DataFormatMatcher findFormat(byte[] fullInputData, int offset, int len) throws IOException
-    {
-        return _findFormat(new InputAccessor.Std(fullInputData, offset, len));
-    }
-    
-    /*
-    /**********************************************************
-    /* Overrides
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append('[');
-        final int len = _detectors.length;
-        if (len > 0) {
-            sb.append(_detectors[0].getFormatName());
-            for (int i = 1; i < len; ++i) {
-                sb.append(", ");
-                sb.append(_detectors[i].getFormatName());
-            }
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private DataFormatMatcher _findFormat(InputAccessor.Std acc) throws IOException
-    {
-        JsonFactory bestMatch = null;
-        MatchStrength bestMatchStrength = null;
-        for (JsonFactory f : _detectors) {
-            acc.reset();
-            MatchStrength strength = f.hasFormat(acc);
-            // if not better than what we have so far (including minimal level limit), skip
-            if (strength == null || strength.ordinal() < _minimalMatch.ordinal()) {
-                continue;
-            }
-            // also, needs to better match than before
-            if (bestMatch != null) {
-                if (bestMatchStrength.ordinal() >= strength.ordinal()) {
-                    continue;
-                }
-            }
-            // finally: if it's good enough match, we are done
-            bestMatch = f;
-            bestMatchStrength = strength;
-            if (strength.ordinal() >= _optimalMatch.ordinal()) {
-                break;
-            }
-        }
-        return acc.createMatcher(bestMatch, bestMatchStrength);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatMatcher.java b/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatMatcher.java
deleted file mode 100644
index aaab633..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/format/DataFormatMatcher.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.fasterxml.jackson.core.format;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.io.MergedStream;
-
-/**
- * Result object constructed by {@link DataFormatDetector} when requested
- * to detect format of given input data.
- */
-public class DataFormatMatcher
-{
-    protected final InputStream _originalStream;
-
-    /**
-     * Content read during format matching process
-     */
-    protected final byte[] _bufferedData;
-
-    /**
-     * Pointer to the first byte in buffer available for reading
-     */
-    protected final int _bufferedStart;
-    
-    /**
-     * Number of bytes available in buffer.
-     */
-    protected final int _bufferedLength;
-
-    /**
-     * Factory that produced sufficient match (if any)
-     */
-    protected final JsonFactory _match;
-
-    /**
-     * Strength of match with {@link #_match}
-     */
-    protected final MatchStrength _matchStrength;
-    
-    protected DataFormatMatcher(InputStream in, byte[] buffered,
-            int bufferedStart, int bufferedLength,
-            JsonFactory match, MatchStrength strength)
-    {
-        _originalStream = in;
-        _bufferedData = buffered;
-        _bufferedStart = bufferedStart;
-        _bufferedLength = bufferedLength;
-        _match = match;
-        _matchStrength = strength;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, simple accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor to use to see if any formats matched well enough with
-     * the input data.
-     */
-    public boolean hasMatch() { return _match != null; }
-
-    /**
-     * Method for accessing strength of the match, if any; if no match,
-     * will return {@link MatchStrength#INCONCLUSIVE}.
-     */
-    public MatchStrength getMatchStrength() {
-        return (_matchStrength == null) ? MatchStrength.INCONCLUSIVE : _matchStrength;
-    }
-
-    /**
-     * Accessor for {@link JsonFactory} that represents format that data matched.
-     */
-    public JsonFactory getMatch() { return _match; }
-
-    /**
-     * Accessor for getting brief textual name of matched format if any (null
-     * if none). Equivalent to:
-     *<pre>
-     *   return hasMatch() ? getMatch().getFormatName() : null;
-     *</pre>
-     */
-    public String getMatchedFormatName() {
-        return _match.getFormatName();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Convenience method for trying to construct a {@link JsonParser} for
-     * parsing content which is assumed to be in detected data format.
-     * If no match was found, returns null.
-     */
-    public JsonParser createParserWithMatch() throws IOException {
-        if (_match == null) {
-            return null;
-        }
-        if (_originalStream == null) {
-            return _match.createJsonParser(_bufferedData, _bufferedStart, _bufferedLength);
-        }
-        return _match.createJsonParser(getDataStream());
-    }
-    
-    /**
-     * Method to use for accessing input for which format detection has been done.
-     * This <b>must</b> be used instead of using stream passed to detector
-     * unless given stream itself can do buffering.
-     * Stream will return all content that was read during matching process, as well
-     * as remaining contents of the underlying stream.
-     */
-    public InputStream getDataStream() {
-        if (_originalStream == null) {
-            return new ByteArrayInputStream(_bufferedData, _bufferedStart, _bufferedLength);
-        }
-        return new MergedStream(null, _originalStream, _bufferedData, _bufferedStart, _bufferedLength);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/format/InputAccessor.java b/showkeyHelper/src/com/fasterxml/jackson/core/format/InputAccessor.java
deleted file mode 100644
index 074a236..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/format/InputAccessor.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.fasterxml.jackson.core.format;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.JsonFactory;
-
-/**
- * Interface used to expose beginning of a data file to data format
- * detection code.
- */
-public interface InputAccessor
-{
-    /**
-     * Method to call to check if more input is available.
-     * Since this may result in more content to be read (at least
-     * one more byte), a {@link IOException} may get thrown.
-     */
-    boolean hasMoreBytes() throws IOException;
-
-    /**
-     * Returns next byte available, if any; if no more bytes are
-     * available, will throw {@link java.io.EOFException}.
-     */
-    byte nextByte() throws IOException;
-
-    /**
-     * Method that can be called to reset accessor to read from beginning
-     * of input.
-     */
-    void reset();
-
-    /*
-    /**********************************************************
-    /* Standard implementation
-    /**********************************************************
-     */
-
-    /**
-     * Basic implementation that reads data from given
-     * {@link InputStream} and buffers it as necessary.
-     */
-    class Std implements InputAccessor
-    {
-        protected final InputStream _in;
-
-        protected final byte[] _buffer;
-
-        protected final int _bufferedStart;
-
-        /**
-         * End of valid bytes in the buffer (points to one past last valid)
-         */
-        protected int _bufferedEnd;
-        
-        /**
-         * Pointer to next available buffered byte in {@link #_buffer}.
-         */
-        protected int _ptr;
-        
-        /**
-         * Constructor used when content to check is available via
-         * input stream and must be read.
-         */
-        public Std(InputStream in, byte[] buffer)
-        {
-            _in = in;
-            _buffer = buffer;
-            _bufferedStart = 0;
-            _ptr = 0;
-            _bufferedEnd = 0;
-        }
-
-        /**
-         * Constructor used when the full input (or at least enough leading bytes
-         * of full input) is available.
-         */
-        public Std(byte[] inputDocument)
-        {
-            _in = null;
-            _buffer = inputDocument;
-            // we have it all:
-            _bufferedStart = 0;
-            _bufferedEnd = inputDocument.length;
-        }
-
-        /**
-         * Constructor used when the full input (or at least enough leading bytes
-         * of full input) is available.
-         * 
-         * @since 2.1
-         */
-        public Std(byte[] inputDocument, int start, int len)
-        {
-            _in = null;
-            _buffer = inputDocument;
-            _ptr = start;
-            _bufferedStart = start;
-            _bufferedEnd = start+len;
-        }
-        
-//      @Override
-        public boolean hasMoreBytes() throws IOException
-        {
-            if (_ptr < _bufferedEnd) { // already got more
-                return true;
-            }
-            if (_in == null) { // nowhere to read from
-                return false;
-            }
-            int amount = _buffer.length - _ptr;
-            if (amount < 1) { // can not load any more
-                return false;
-            }
-            int count = _in.read(_buffer, _ptr, amount);
-            if (count <= 0) { // EOF
-                return false;
-            }
-            _bufferedEnd += count;
-            return true;
-        }
-
-//      @Override
-        public byte nextByte() throws IOException
-        {
-            // should we just try loading more automatically?
-            if (_ptr >= _bufferedEnd) {
-                if (!hasMoreBytes()) {
-                    throw new EOFException("Failed auto-detect: could not read more than "+_ptr+" bytes (max buffer size: "+_buffer.length+")");
-                }
-            }
-            return _buffer[_ptr++];
-        }
-
-//      @Override
-        public void reset() {
-            _ptr = _bufferedStart;
-        }
-
-        /*
-        /**********************************************************
-        /* Extended API for DataFormatDetector/Matcher
-        /**********************************************************
-         */
-
-        public DataFormatMatcher createMatcher(JsonFactory match, MatchStrength matchStrength)
-        {
-            return new DataFormatMatcher(_in, _buffer, _bufferedStart, (_bufferedEnd - _bufferedStart),
-                    match, matchStrength);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/format/MatchStrength.java b/showkeyHelper/src/com/fasterxml/jackson/core/format/MatchStrength.java
deleted file mode 100644
index d123708..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/format/MatchStrength.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.fasterxml.jackson.core.format;
-
-/**
- * Enumeration used to indicate strength of match between data format
- * and piece of data (typically beginning of a data file).
- * Values are in increasing match strength; and detectors should return
- * "strongest" value: that is, it should start with strongest match
- * criteria, and downgrading if criteria is not fulfilled.
- */
-public enum MatchStrength
-{
-    /**
-     * Value that indicates that given data can not be in given format.
-     */
-    NO_MATCH,
-    
-    /**
-     * Value that indicates that detector can not find out whether could
-     * be a match or not.
-     * This can occur for example for textual data formats t
-     * when there are so many leading spaces that detector can not
-     * find the first data byte (because detectors typically limit lookahead
-     * to some smallish value).
-     */
-    INCONCLUSIVE,
-
-    /**
-     * Value that indicates that given data could be of specified format (i.e.
-     * it can not be ruled out). This can occur for example when seen data
-     * is both not in canonical formats (for example: JSON data should be a JSON Array or Object
-     * not a scalar value, as per JSON specification) and there are known use case
-     * where a format detected is actually used (plain JSON Strings are actually used, even
-     * though specification does not indicate that as valid usage: as such, seeing a leading
-     * double-quote could indicate a JSON String, which plausibly <b>could</b> indicate
-     * non-standard JSON usage).
-     */
-    WEAK_MATCH,
-    
-    /**
-     * Value that indicates that given data conforms to (one of) canonical form(s) of
-     * the data format.
-     *<p>
-     * For example, when testing for XML data format,
-     * seeing a less-than character ("&lt;") alone (with possible leading spaces)
-     * would be a strong indication that data could
-     * be in xml format (but see below for {@link #FULL_MATCH} description for more)
-     */
-    SOLID_MATCH,
-
-    /**
-     * Value that indicates that given data contains a signature that is deemed
-     * specific enough to uniquely indicate data format used.
-     *<p>
-     * For example, when testing for XML data format,
-     * seing "&lt;xml" as the first data bytes ("XML declaration", as per XML specification)
-     * could give full confidence that data is indeed in XML format.
-     * Not all data formats have unique leading identifiers to allow full matches; for example,
-     * JSON only has heuristic matches and can have at most {@link #SOLID_MATCH}) match.
-     */
-    FULL_MATCH
-    ;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/format/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/format/package-info.java
deleted file mode 100644
index a83e41f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/format/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Package that contains interfaces needed for dynamic, pluggable
- * format (auto)detection; as well as basic utility classes for
- * simple format detection functionality.
- */
-package com.fasterxml.jackson.core.format;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/BaseReader.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/BaseReader.java
deleted file mode 100644
index 07ab5b0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/BaseReader.java
+++ /dev/null
@@ -1,116 +0,0 @@
-
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-/**
- * Simple basic class for optimized readers in this package; implements
- * "cookie-cutter" methods that are used by all actual implementations.
- */
-abstract class BaseReader
-    extends Reader
-{
-    /**
-     * JSON actually limits available Unicode range in the high end
-     * to the same as xml (to basically limit UTF-8 max byte sequence
-     * length to 4)
-     */
-    final protected static int LAST_VALID_UNICODE_CHAR = 0x10FFFF;
-
-    final protected static char NULL_CHAR = (char) 0;
-    final protected static char NULL_BYTE = (byte) 0;
-
-    final protected IOContext _context;
-
-    protected InputStream _in;
-
-    protected byte[] _buffer;
-
-    protected int _ptr;
-    protected int _length;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected BaseReader(IOContext context,
-                         InputStream in, byte[] buf, int ptr, int len)
-    {
-        _context = context;
-        _in = in;
-        _buffer = buf;
-        _ptr = ptr;
-        _length = len;
-    }
-
-    /*
-    /**********************************************************
-    /* Reader API
-    /**********************************************************
-     */
-
-    @Override
-    public void close() throws IOException
-    {
-        InputStream in = _in;
-
-        if (in != null) {
-            _in = null;
-            freeBuffers();
-            in.close();
-        }
-    }
-
-    protected char[] _tmpBuf = null;
-
-    /**
-     * Although this method is implemented by the base class, AND it should
-     * never be called by main code, let's still implement it bit more
-     * efficiently just in case
-     */
-    @Override
-    public int read() throws IOException
-    {
-        if (_tmpBuf == null) {
-            _tmpBuf = new char[1];
-        }
-        if (read(_tmpBuf, 0, 1) < 1) {
-            return -1;
-        }
-        return _tmpBuf[0];
-    }
-
-    /*
-    /**********************************************************
-    /* Internal/package methods:
-    /**********************************************************
-     */
-
-    /**
-     * This method should be called along with (or instead of) normal
-     * close. After calling this method, no further reads should be tried.
-     * Method will try to recycle read buffers (if any).
-     */
-    public final void freeBuffers()
-    {
-        byte[] buf = _buffer;
-        if (buf != null) {
-            _buffer = null;
-            _context.releaseReadIOBuffer(buf);
-        }
-    }
-
-    protected void reportBounds(char[] cbuf, int start, int len)
-        throws IOException
-    {
-        throw new ArrayIndexOutOfBoundsException("read(buf,"+start+","+len+"), cbuf["+cbuf.length+"]");
-    }
-
-    protected void reportStrangeStream()
-        throws IOException
-    {
-        throw new IOException("Strange I/O stream, returned 0 bytes on read");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/CharTypes.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/CharTypes.java
deleted file mode 100644
index 4644c5e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/CharTypes.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.util.Arrays;
-
-
-public final class CharTypes
-{
-    private final static char[] HEX_CHARS = "0123456789ABCDEF".toCharArray();
-    private final static byte[] HEX_BYTES;
-    static {
-        int len = HEX_CHARS.length;
-        HEX_BYTES = new byte[len];
-        for (int i = 0; i < len; ++i) {
-            HEX_BYTES[i] = (byte) HEX_CHARS[i];
-        }
-    }
-
-
-    /**
-     * Lookup table used for determining which input characters
-     * need special handling when contained in text segment.
-     */
-    final static int[] sInputCodes;
-    static {
-        /* 96 would do for most cases (backslash is ascii 94)
-         * but if we want to do lookups by raw bytes it's better
-         * to have full table
-         */
-        int[] table = new int[256];
-        // Control chars and non-space white space are not allowed unquoted
-        for (int i = 0; i < 32; ++i) {
-            table[i] = -1;
-        }
-        // And then string end and quote markers are special too
-        table['"'] = 1;
-        table['\\'] = 1;
-        sInputCodes = table;
-    }
-
-    /**
-     * Additionally we can combine UTF-8 decoding info into similar
-     * data table.
-     */
-    final static int[] sInputCodesUtf8;
-    static {
-        int[] table = new int[sInputCodes.length];
-        System.arraycopy(sInputCodes, 0, table, 0, sInputCodes.length);
-        for (int c = 128; c < 256; ++c) {
-            int code;
-
-            // We'll add number of bytes needed for decoding
-            if ((c & 0xE0) == 0xC0) { // 2 bytes (0x0080 - 0x07FF)
-                code = 2;
-            } else if ((c & 0xF0) == 0xE0) { // 3 bytes (0x0800 - 0xFFFF)
-                code = 3;
-            } else if ((c & 0xF8) == 0xF0) {
-                // 4 bytes; double-char with surrogates and all...
-                code = 4;
-            } else {
-                // And -1 seems like a good "universal" error marker...
-                code = -1;
-            }
-            table[c] = code;
-        }
-        sInputCodesUtf8 = table;
-    }
-
-    /**
-     * To support non-default (and -standard) unquoted field names mode,
-     * need to have alternate checking.
-     * Basically this is list of 8-bit ASCII characters that are legal
-     * as part of Javascript identifier
-     */
-    final static int[] sInputCodesJsNames;
-    static {
-        int[] table = new int[256];
-        // Default is "not a name char", mark ones that are
-        Arrays.fill(table, -1);
-        // Assume rules with JS same as Java (change if/as needed)
-        for (int i = 33; i < 256; ++i) {
-            if (Character.isJavaIdentifierPart((char) i)) {
-                table[i] = 0;
-            }
-        }
-        /* As per [JACKSON-267], '@', '#' and '*' are also to be accepted as well.
-         * And '-' (for hyphenated names); and '+' for sake of symmetricity...
-         */
-        table['@'] = 0;
-        table['#'] = 0;
-        table['*'] = 0;
-        table['-'] = 0;
-        table['+'] = 0;
-        sInputCodesJsNames = table;
-    }
-
-    /**
-     * This table is similar to Latin-1, except that it marks all "high-bit"
-     * code as ok. They will be validated at a later point, when decoding
-     * name
-     */
-    final static int[] sInputCodesUtf8JsNames;
-    static {
-        int[] table = new int[256];
-        // start with 8-bit JS names 
-        System.arraycopy(sInputCodesJsNames, 0, table, 0, sInputCodesJsNames.length);
-        Arrays.fill(table, 128, 128, 0);
-        sInputCodesUtf8JsNames = table;
-    }
-
-    /**
-     * Decoding table used to quickly determine characters that are
-     * relevant within comment content
-     */
-    final static int[] sInputCodesComment = new int[256];
-    static {
-        // but first: let's start with UTF-8 multi-byte markers:
-        System.arraycopy(sInputCodesUtf8, 128, sInputCodesComment, 128, 128);
-    
-        // default (0) means "ok" (skip); -1 invalid, others marked by char itself
-        Arrays.fill(sInputCodesComment, 0, 32, -1); // invalid white space
-        sInputCodesComment['\t'] = 0; // tab is still fine
-        sInputCodesComment['\n'] = '\n'; // lf/cr need to be observed, ends cpp comment
-        sInputCodesComment['\r'] = '\r';
-        sInputCodesComment['*'] = '*'; // end marker for c-style comments
-    }
-
-    /**
-     * Lookup table used for determining which output characters in 
-     * 7-bit ASCII range need to be quoted.
-     */
-    final static int[] sOutputEscapes128;
-    static {
-        int[] table = new int[128];
-        // Control chars need generic escape sequence
-        for (int i = 0; i < 32; ++i) {
-            // 04-Mar-2011, tatu: Used to use "-(i + 1)", replaced with constants
-            table[i] = CharacterEscapes.ESCAPE_STANDARD;
-        }
-        /* Others (and some within that range too) have explicit shorter
-         * sequences
-         */
-        table['"'] = '"';
-        table['\\'] = '\\';
-        // Escaping of slash is optional, so let's not add it
-        table[0x08] = 'b';
-        table[0x09] = 't';
-        table[0x0C] = 'f';
-        table[0x0A] = 'n';
-        table[0x0D] = 'r';
-        sOutputEscapes128 = table;
-    }
-
-    /**
-     * Lookup table for the first 128 Unicode characters (7-bit ASCII)
-     * range. For actual hex digits, contains corresponding value;
-     * for others -1.
-     */
-    final static int[] sHexValues = new int[128];
-    static {
-        Arrays.fill(sHexValues, -1);
-        for (int i = 0; i < 10; ++i) {
-            sHexValues['0' + i] = i;
-        }
-        for (int i = 0; i < 6; ++i) {
-            sHexValues['a' + i] = 10 + i;
-            sHexValues['A' + i] = 10 + i;
-        }
-    }
-
-    public static int[] getInputCodeLatin1() { return sInputCodes; }
-    public static int[] getInputCodeUtf8() { return sInputCodesUtf8; }
-
-    public static int[] getInputCodeLatin1JsNames() { return sInputCodesJsNames; }
-    public static int[] getInputCodeUtf8JsNames() { return sInputCodesUtf8JsNames; }
-
-    public static int[] getInputCodeComment() { return sInputCodesComment; }
-    
-    /**
-     * Accessor for getting a read-only encoding table for first 128 Unicode
-     * code points (single-byte UTF-8 characters).
-     * Value of 0 means "no escaping"; other positive values that value is character
-     * to use after backslash; and negative values that generic (backslash - u)
-     * escaping is to be used.
-     */
-    public static int[] get7BitOutputEscapes() { return sOutputEscapes128; }
-
-    public static int charToHex(int ch)
-    {
-        return (ch > 127) ? -1 : sHexValues[ch];
-    }
-
-    public static void appendQuoted(StringBuilder sb, String content)
-    {
-        final int[] escCodes = sOutputEscapes128;
-        int escLen = escCodes.length;
-        for (int i = 0, len = content.length(); i < len; ++i) {
-            char c = content.charAt(i);
-            if (c >= escLen || escCodes[c] == 0) {
-                sb.append(c);
-                continue;
-            }
-            sb.append('\\');
-            int escCode = escCodes[c];
-            if (escCode < 0) { // generic quoting (hex value)
-                // We know that it has to fit in just 2 hex chars
-                sb.append('u');
-                sb.append('0');
-                sb.append('0');
-                int value = -(escCode + 1);
-                sb.append(HEX_CHARS[value >> 4]);
-                sb.append(HEX_CHARS[value & 0xF]);
-            } else { // "named", i.e. prepend with slash
-                sb.append((char) escCode);
-            }
-        }
-    }
-
-    public static char[] copyHexChars()
-    {
-        return (char[]) HEX_CHARS.clone();
-    }
-
-    public static byte[] copyHexBytes()
-    {
-        return (byte[]) HEX_BYTES.clone();
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/CharacterEscapes.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/CharacterEscapes.java
deleted file mode 100644
index 307e83e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/CharacterEscapes.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import com.fasterxml.jackson.core.SerializableString;
-
-/**
- * Abstract base class that defines interface for customizing character
- * escaping aspects for String values, for formats that use escaping.
- * For JSON this applies to both property names and String values.
- */
-public abstract class CharacterEscapes
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Value used for lookup tables to indicate that matching characters
-     * do not need to be escaped.
-     */
-    public final static int ESCAPE_NONE = 0;
-
-    /**
-     * Value used for lookup tables to indicate that matching characters
-     * are to be escaped using standard escaping; for JSON this means
-     * (for example) using "backslash - u" escape method.
-     */
-    public final static int ESCAPE_STANDARD = -1;
-
-    /**
-     * Value used for lookup tables to indicate that matching characters
-     * will need custom escapes; and that another call
-     * to {@link #getEscapeSequence} is needed to figure out exact escape
-     * sequence to output.
-     */
-    public final static int ESCAPE_CUSTOM = -2;
-    
-    /**
-     * Method generators can call to get lookup table for determining
-     * escape handling for first 128 characters of Unicode (ASCII
-     * characters. Caller is not to modify contents of this array, since
-     * this is expected to be a shared copy.
-     * 
-     * @return Array with size of at least 128, where first 128 entries
-     *    have either one of <code>ESCAPE_xxx</code> constants, or non-zero positive
-     *    integer (meaning of which is data format specific; for JSON it means
-     *    that combination of backslash and character with that value is to be used)
-     *    to indicate that specific escape sequence is to be used.
-     */
-    public abstract int[] getEscapeCodesForAscii();
-
-    /**
-     * Method generators can call to get lookup table for determining
-     * exact escape sequence to use for given character.
-     * It can be called for any character, but typically is called for
-     * either for ASCII characters for which custom escape
-     * sequence is needed; or for any non-ASCII character.
-     */
-    public abstract SerializableString getEscapeSequence(int ch);
-
-    /**
-     * Helper method that can be used to get a copy of standard JSON
-     * escape definitions; this is useful when just wanting to slightly
-     * customize definitions. Caller can modify this array as it sees
-     * fit and usually returns modified instance via {@link #getEscapeCodesForAscii}
-     */
-    public static int[] standardAsciiEscapesForJSON()
-    {
-        int[] esc = CharTypes.get7BitOutputEscapes();
-        int len = esc.length;
-        int[] result = new int[len];
-        System.arraycopy(esc, 0, result, 0, esc.length);
-        return result;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/IOContext.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/IOContext.java
deleted file mode 100644
index b9df730..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/IOContext.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.util.BufferRecycler;
-import com.fasterxml.jackson.core.util.TextBuffer;
-
-/**
- * To limit number of configuration and state objects to pass, all
- * contextual objects that need to be passed by the factory to
- * readers and writers are combined under this object. One instance
- * is created for each reader and writer.
- */
-public final class IOContext
-{
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Reference to the source object, which can be used for displaying
-     * location information
-     */
-    protected final Object _sourceRef;
-
-    /**
-     * Encoding used by the underlying stream, if known.
-     */
-    protected JsonEncoding _encoding;
-
-    /**
-     * Flag that indicates whether underlying input/output source/target
-     * object is fully managed by the owner of this context (parser or
-     * generator). If true, it is, and is to be closed by parser/generator;
-     * if false, calling application has to do closing (unless auto-closing
-     * feature is enabled for the parser/generator in question; in which
-     * case it acts like the owner).
-     */
-    protected final boolean _managedResource;
-
-    /*
-    /**********************************************************
-    /* Buffer handling, recycling
-    /**********************************************************
-     */
-
-    /**
-     * Recycler used for actual allocation/deallocation/reuse
-     */
-    protected final BufferRecycler _bufferRecycler;
-
-    /**
-     * Reference to the allocated I/O buffer for low-level input reading,
-     * if any allocated.
-     */
-    protected byte[] _readIOBuffer = null;
-
-    /**
-     * Reference to the allocated I/O buffer used for low-level
-     * encoding-related buffering.
-     */
-    protected byte[] _writeEncodingBuffer = null;
-    
-    /**
-     * Reference to the buffer allocated for temporary use with
-     * base64 encoding or decoding.
-     */
-    protected byte[] _base64Buffer = null;
-
-    /**
-     * Reference to the buffer allocated for tokenization purposes,
-     * in which character input is read, and from which it can be
-     * further returned.
-     */
-    protected char[] _tokenCBuffer = null;
-
-    /**
-     * Reference to the buffer allocated for buffering it for
-     * output, before being encoded: generally this means concatenating
-     * output, then encoding when buffer fills up.
-     */
-    protected char[] _concatCBuffer = null;
-
-    /**
-     * Reference temporary buffer Parser instances need if calling
-     * app decides it wants to access name via 'getTextCharacters' method.
-     * Regular text buffer can not be used as it may contain textual
-     * representation of the value token.
-     */
-    protected char[] _nameCopyBuffer = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public IOContext(BufferRecycler br, Object sourceRef, boolean managedResource)
-    {
-        _bufferRecycler = br;
-        _sourceRef = sourceRef;
-        _managedResource = managedResource;
-    }
-
-    public void setEncoding(JsonEncoding enc)
-    {
-        _encoding = enc;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, accessors
-    /**********************************************************
-     */
-
-    public Object getSourceReference() { return _sourceRef; }
-    public JsonEncoding getEncoding() { return _encoding; }
-    public boolean isResourceManaged() { return _managedResource; }
-    
-    /*
-    /**********************************************************
-    /* Public API, buffer management
-    /**********************************************************
-     */
-
-    public TextBuffer constructTextBuffer() {
-        return new TextBuffer(_bufferRecycler);
-    }
-
-    /**
-     *<p>
-     * Note: the method can only be called once during its life cycle.
-     * This is to protect against accidental sharing.
-     */
-    public byte[] allocReadIOBuffer()
-    {
-        if (_readIOBuffer != null) {
-            throw new IllegalStateException("Trying to call allocReadIOBuffer() second time");
-        }
-        _readIOBuffer = _bufferRecycler.allocByteBuffer(BufferRecycler.ByteBufferType.READ_IO_BUFFER);
-        return _readIOBuffer;
-    }
-
-    public byte[] allocWriteEncodingBuffer()
-    {
-        if (_writeEncodingBuffer != null) {
-            throw new IllegalStateException("Trying to call allocWriteEncodingBuffer() second time");
-        }
-        _writeEncodingBuffer = _bufferRecycler.allocByteBuffer(BufferRecycler.ByteBufferType.WRITE_ENCODING_BUFFER);
-        return _writeEncodingBuffer;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public byte[] allocBase64Buffer()
-    {
-        if (_base64Buffer != null) {
-            throw new IllegalStateException("Trying to call allocBase64Buffer() second time");
-        }
-        _base64Buffer = _bufferRecycler.allocByteBuffer(BufferRecycler.ByteBufferType.BASE64_CODEC_BUFFER);
-        return _base64Buffer;
-    }
-    
-    public char[] allocTokenBuffer()
-    {
-        if (_tokenCBuffer != null) {
-            throw new IllegalStateException("Trying to call allocTokenBuffer() second time");
-        }
-        _tokenCBuffer = _bufferRecycler.allocCharBuffer(BufferRecycler.CharBufferType.TOKEN_BUFFER);
-        return _tokenCBuffer;
-    }
-
-    public char[] allocConcatBuffer()
-    {
-        if (_concatCBuffer != null) {
-            throw new IllegalStateException("Trying to call allocConcatBuffer() second time");
-        }
-        _concatCBuffer = _bufferRecycler.allocCharBuffer(BufferRecycler.CharBufferType.CONCAT_BUFFER);
-        return _concatCBuffer;
-    }
-
-    public char[] allocNameCopyBuffer(int minSize)
-    {
-        if (_nameCopyBuffer != null) {
-            throw new IllegalStateException("Trying to call allocNameCopyBuffer() second time");
-        }
-        _nameCopyBuffer = _bufferRecycler.allocCharBuffer(BufferRecycler.CharBufferType.NAME_COPY_BUFFER, minSize);
-        return _nameCopyBuffer;
-    }
-
-    /**
-     * Method to call when all the processing buffers can be safely
-     * recycled.
-     */
-    public void releaseReadIOBuffer(byte[] buf)
-    {
-        if (buf != null) {
-            /* Let's do sanity checks to ensure once-and-only-once release,
-             * as well as avoiding trying to release buffers not owned
-             */
-            if (buf != _readIOBuffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _readIOBuffer = null;
-            _bufferRecycler.releaseByteBuffer(BufferRecycler.ByteBufferType.READ_IO_BUFFER, buf);
-        }
-    }
-
-    public void releaseWriteEncodingBuffer(byte[] buf)
-    {
-        if (buf != null) {
-            /* Let's do sanity checks to ensure once-and-only-once release,
-             * as well as avoiding trying to release buffers not owned
-             */
-            if (buf != _writeEncodingBuffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _writeEncodingBuffer = null;
-            _bufferRecycler.releaseByteBuffer(BufferRecycler.ByteBufferType.WRITE_ENCODING_BUFFER, buf);
-        }
-    }
-
-    public void releaseBase64Buffer(byte[] buf)
-    {
-        if (buf != null) { // sanity checks, release once-and-only-once, must be one owned
-            if (buf != _base64Buffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _base64Buffer = null;
-            _bufferRecycler.releaseByteBuffer(BufferRecycler.ByteBufferType.BASE64_CODEC_BUFFER, buf);
-        }
-    }
-    
-    public void releaseTokenBuffer(char[] buf)
-    {
-        if (buf != null) {
-            if (buf != _tokenCBuffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _tokenCBuffer = null;
-            _bufferRecycler.releaseCharBuffer(BufferRecycler.CharBufferType.TOKEN_BUFFER, buf);
-        }
-    }
-
-    public void releaseConcatBuffer(char[] buf)
-    {
-        if (buf != null) {
-            if (buf != _concatCBuffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _concatCBuffer = null;
-            _bufferRecycler.releaseCharBuffer(BufferRecycler.CharBufferType.CONCAT_BUFFER, buf);
-        }
-    }
-
-    public void releaseNameCopyBuffer(char[] buf)
-    {
-        if (buf != null) {
-            if (buf != _nameCopyBuffer) {
-                throw new IllegalArgumentException("Trying to release buffer not owned by the context");
-            }
-            _nameCopyBuffer = null;
-            _bufferRecycler.releaseCharBuffer(BufferRecycler.CharBufferType.NAME_COPY_BUFFER, buf);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/InputDecorator.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/InputDecorator.java
deleted file mode 100644
index 18b0b49..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/InputDecorator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-/**
- * Handler class that can be used to decorate input sources.
- * Typical use is to use a filter abstraction (filtered stream,
- * reader) around original input source, and apply additional
- * processing during read operations.
- */
-public abstract class InputDecorator
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-    
-    /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
-     * creating parser given an {@link InputStream}, when this decorator
-     * has been registered.
-     * 
-     * @param ctxt IO context in use (provides access to declared encoding).
-     *   NOTE: at this point context may not have all information initialized;
-     *   specifically auto-detected encoding is only available once parsing starts,
-     *   which may occur only after this method is called.
-     * @param in Original input source
-     * 
-     * @return InputStream to use; either passed in argument, or something that
-     *   calls it
-     */
-    public abstract InputStream decorate(IOContext ctxt, InputStream in)
-        throws IOException;
-
-    /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
-     * creating parser on given "raw" byte source.
-     * Method can either construct a {@link InputStream} for reading; or return
-     * null to indicate that no wrapping should occur.
-     * 
-     * @param ctxt IO context in use (provides access to declared encoding)
-     *   NOTE: at this point context may not have all information initialized;
-     *   specifically auto-detected encoding is only available once parsing starts,
-     *   which may occur only after this method is called.
-     * @param src Input buffer that contains contents to parse
-     * @param offset Offset of the first available byte in the input buffer
-     * @param length Number of bytes available in the input buffer
-     * 
-     * @return Either {@link InputStream} to use as input source; or null to indicate
-     *   that contents are to be processed as-is by caller
-     */
-    public abstract InputStream decorate(IOContext ctxt, byte[] src, int offset, int length)
-        throws IOException;
-    
-    /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
-     * creating parser given an {@link Reader}, when this decorator
-     * has been registered.
-     * 
-     * @param ctxt IO context in use (provides access to declared encoding)
-     *   NOTE: at this point context may not have all information initialized;
-     *   specifically auto-detected encoding is only available once parsing starts,
-     *   which may occur only after this method is called.
-     * @param src Original input source
-     * 
-     * @return Reader to use; either passed in argument, or something that
-     *   calls it (for example, a {@link FilterReader})
-     */
-    public abstract Reader decorate(IOContext ctxt, Reader src) throws IOException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/JsonStringEncoder.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/JsonStringEncoder.java
deleted file mode 100644
index 35f5f9a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/JsonStringEncoder.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.lang.ref.SoftReference;
-
-import com.fasterxml.jackson.core.util.BufferRecycler;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.core.util.TextBuffer;
-
-/**
- * Helper class used for efficient encoding of JSON String values (including
- * JSON field names) into Strings or UTF-8 byte arrays.
- *<p>
- * Note that methods in here are somewhat optimized, but not ridiculously so.
- * Reason is that conversion method results are expected to be cached so that
- * these methods will not be hot spots during normal operation.
- */
-public final class JsonStringEncoder
-{
-    private final static char[] HEX_CHARS = CharTypes.copyHexChars();
-
-    private final static byte[] HEX_BYTES = CharTypes.copyHexBytes();
-
-    private final static int SURR1_FIRST = 0xD800;
-    private final static int SURR1_LAST = 0xDBFF;
-    private final static int SURR2_FIRST = 0xDC00;
-    private final static int SURR2_LAST = 0xDFFF;
-
-    private final static int INT_BACKSLASH = '\\';
-    private final static int INT_U = 'u';
-    private final static int INT_0 = '0';
-    
-    /**
-     * This <code>ThreadLocal</code> contains a {@link java.lang.ref.SoftReference}
-     * to a {@link BufferRecycler} used to provide a low-cost
-     * buffer recycling between reader and writer instances.
-     */
-    final protected static ThreadLocal<SoftReference<JsonStringEncoder>> _threadEncoder
-        = new ThreadLocal<SoftReference<JsonStringEncoder>>();
-
-    /**
-     * Lazily constructed text buffer used to produce JSON encoded Strings
-     * as characters (without UTF-8 encoding)
-     */
-    protected TextBuffer _textBuffer;
-
-    /**
-     * Lazily-constructed builder used for UTF-8 encoding of text values
-     * (quoted and unquoted)
-     */
-    protected ByteArrayBuilder _byteBuilder;
-    
-    /**
-     * Temporary buffer used for composing quote/escape sequences
-     */
-    protected final char[] _quoteBuffer;
-    
-    /*
-    /**********************************************************
-    /* Construction, instance access
-    /**********************************************************
-     */
-    
-    public JsonStringEncoder()
-    {
-        _quoteBuffer = new char[6];
-        _quoteBuffer[0] = '\\';
-        _quoteBuffer[2] = '0';
-        _quoteBuffer[3] = '0';
-    }
-    
-    /**
-     * Factory method for getting an instance; this is either recycled per-thread instance,
-     * or a newly constructed one.
-     */
-    public static JsonStringEncoder getInstance()
-    {
-        SoftReference<JsonStringEncoder> ref = _threadEncoder.get();
-        JsonStringEncoder enc = (ref == null) ? null : ref.get();
-
-        if (enc == null) {
-            enc = new JsonStringEncoder();
-            _threadEncoder.set(new SoftReference<JsonStringEncoder>(enc));
-        }
-        return enc;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method that will quote text contents using JSON standard quoting,
-     * and return results as a character array
-     */
-    public char[] quoteAsString(String input)
-    {
-        TextBuffer textBuffer = _textBuffer;
-        if (textBuffer == null) {
-            // no allocator; can add if we must, shouldn't need to
-            _textBuffer = textBuffer = new TextBuffer(null);
-        }
-        char[] outputBuffer = textBuffer.emptyAndGetCurrentSegment();
-        final int[] escCodes = CharTypes.get7BitOutputEscapes();
-        final int escCodeCount = escCodes.length;
-        int inPtr = 0;
-        final int inputLen = input.length();
-        int outPtr = 0;
- 
-        outer_loop:
-        while (inPtr < inputLen) {
-            tight_loop:
-            while (true) {
-                char c = input.charAt(inPtr);
-                if (c < escCodeCount && escCodes[c] != 0) {
-                    break tight_loop;
-                }
-                if (outPtr >= outputBuffer.length) {
-                    outputBuffer = textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outputBuffer[outPtr++] = c;
-                if (++inPtr >= inputLen) {
-                    break outer_loop;
-                }
-            }
-            // something to escape; 2 or 6-char variant? 
-            int escCode = escCodes[input.charAt(inPtr++)];
-            int length = _appendSingleEscape(escCode, _quoteBuffer);
-            if ((outPtr + length) > outputBuffer.length) {
-                int first = outputBuffer.length - outPtr;
-                if (first > 0) {
-                    System.arraycopy(_quoteBuffer, 0, outputBuffer, outPtr, first);
-                }
-                outputBuffer = textBuffer.finishCurrentSegment();
-                int second = length - first;
-                System.arraycopy(_quoteBuffer, first, outputBuffer, 0, second);
-                outPtr = second;
-            } else {
-                System.arraycopy(_quoteBuffer, 0, outputBuffer, outPtr, length);
-                outPtr += length;
-            }
-        }
-        textBuffer.setCurrentLength(outPtr);
-        return textBuffer.contentsAsArray();
-    }
-
-    /**
-     * Will quote given JSON String value using standard quoting, encode
-     * results as UTF-8, and return result as a byte array.
-     */
-    public byte[] quoteAsUTF8(String text)
-    {
-        ByteArrayBuilder byteBuilder = _byteBuilder;
-        if (byteBuilder == null) {
-            // no allocator; can add if we must, shouldn't need to
-            _byteBuilder = byteBuilder = new ByteArrayBuilder(null);
-        }
-        int inputPtr = 0;
-        int inputEnd = text.length();
-        int outputPtr = 0;
-        byte[] outputBuffer = byteBuilder.resetAndGetFirstSegment();
-        
-        main_loop:
-        while (inputPtr < inputEnd) {
-            final int[] escCodes = CharTypes.get7BitOutputEscapes();
-
-            inner_loop: // ASCII and escapes
-            while (true) {
-                int ch = text.charAt(inputPtr);
-                if (ch > 0x7F || escCodes[ch] != 0) {
-                    break inner_loop;
-                }
-                if (outputPtr >= outputBuffer.length) {
-                    outputBuffer = byteBuilder.finishCurrentSegment();
-                    outputPtr = 0;
-                }
-                outputBuffer[outputPtr++] = (byte) ch;
-                if (++inputPtr >= inputEnd) {
-                    break main_loop;
-                }
-            }                
-            if (outputPtr >= outputBuffer.length) {
-                outputBuffer = byteBuilder.finishCurrentSegment();
-                outputPtr = 0;
-            }
-            // Ok, so what did we hit?
-            int ch = (int) text.charAt(inputPtr++);
-            if (ch <= 0x7F) { // needs quoting
-                int escape = escCodes[ch];
-                // ctrl-char, 6-byte escape...
-                outputPtr = _appendByteEscape(ch, escape, byteBuilder, outputPtr);
-                outputBuffer = byteBuilder.getCurrentSegment();
-                continue main_loop;
-            } else if (ch <= 0x7FF) { // fine, just needs 2 byte output
-                outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
-                ch = (0x80 | (ch & 0x3f));
-            } else { // 3 or 4 bytes
-                // Surrogates?
-                if (ch < SURR1_FIRST || ch > SURR2_LAST) { // nope
-                    outputBuffer[outputPtr++] = (byte) (0xe0 | (ch >> 12));
-                    if (outputPtr >= outputBuffer.length) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((ch >> 6) & 0x3f));
-                    ch = (0x80 | (ch & 0x3f));
-                } else { // yes, surrogate pair
-                    if (ch > SURR1_LAST) { // must be from first range
-                        _throwIllegalSurrogate(ch);
-                    }
-                    // and if so, followed by another from next range
-                    if (inputPtr >= inputEnd) {
-                        _throwIllegalSurrogate(ch);
-                    }
-                    ch = _convertSurrogate(ch, text.charAt(inputPtr++));
-                    if (ch > 0x10FFFF) { // illegal, as per RFC 4627
-                        _throwIllegalSurrogate(ch);
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0xf0 | (ch >> 18));
-                    if (outputPtr >= outputBuffer.length) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((ch >> 12) & 0x3f));
-                    if (outputPtr >= outputBuffer.length) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((ch >> 6) & 0x3f));
-                    ch = (0x80 | (ch & 0x3f));
-                }
-            }
-            if (outputPtr >= outputBuffer.length) {
-                outputBuffer = byteBuilder.finishCurrentSegment();
-                outputPtr = 0;
-            }
-            outputBuffer[outputPtr++] = (byte) ch;
-        }
-        return _byteBuilder.completeAndCoalesce(outputPtr);
-    }
-    
-    /**
-     * Will encode given String as UTF-8 (without any quoting), return
-     * resulting byte array.
-     */
-    public byte[] encodeAsUTF8(String text)
-    {
-        ByteArrayBuilder byteBuilder = _byteBuilder;
-        if (byteBuilder == null) {
-            // no allocator; can add if we must, shouldn't need to
-            _byteBuilder = byteBuilder = new ByteArrayBuilder(null);
-        }
-        int inputPtr = 0;
-        int inputEnd = text.length();
-        int outputPtr = 0;
-        byte[] outputBuffer = byteBuilder.resetAndGetFirstSegment();
-        int outputEnd = outputBuffer.length;
-        
-        main_loop:
-        while (inputPtr < inputEnd) {
-            int c = text.charAt(inputPtr++);
-
-            // first tight loop for ascii
-            while (c <= 0x7F) {
-                if (outputPtr >= outputEnd) {
-                    outputBuffer = byteBuilder.finishCurrentSegment();
-                    outputEnd = outputBuffer.length;
-                    outputPtr = 0;
-                }
-                outputBuffer[outputPtr++] = (byte) c;
-                if (inputPtr >= inputEnd) {
-                    break main_loop;
-                }
-                c = text.charAt(inputPtr++);
-            }
-
-            // then multi-byte...
-            if (outputPtr >= outputEnd) {
-                outputBuffer = byteBuilder.finishCurrentSegment();
-                outputEnd = outputBuffer.length;
-                outputPtr = 0;
-            }
-            if (c < 0x800) { // 2-byte
-                outputBuffer[outputPtr++] = (byte) (0xc0 | (c >> 6));
-            } else { // 3 or 4 bytes
-                // Surrogates?
-                if (c < SURR1_FIRST || c > SURR2_LAST) { // nope
-                    outputBuffer[outputPtr++] = (byte) (0xe0 | (c >> 12));
-                    if (outputPtr >= outputEnd) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputEnd = outputBuffer.length;
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                } else { // yes, surrogate pair
-                    if (c > SURR1_LAST) { // must be from first range
-                        _throwIllegalSurrogate(c);
-                    }
-                    // and if so, followed by another from next range
-                    if (inputPtr >= inputEnd) {
-                        _throwIllegalSurrogate(c);
-                    }
-                    c = _convertSurrogate(c, text.charAt(inputPtr++));
-                    if (c > 0x10FFFF) { // illegal, as per RFC 4627
-                        _throwIllegalSurrogate(c);
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0xf0 | (c >> 18));
-                    if (outputPtr >= outputEnd) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputEnd = outputBuffer.length;
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((c >> 12) & 0x3f));
-                    if (outputPtr >= outputEnd) {
-                        outputBuffer = byteBuilder.finishCurrentSegment();
-                        outputEnd = outputBuffer.length;
-                        outputPtr = 0;
-                    }
-                    outputBuffer[outputPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                }
-            }
-            if (outputPtr >= outputEnd) {
-                outputBuffer = byteBuilder.finishCurrentSegment();
-                outputEnd = outputBuffer.length;
-                outputPtr = 0;
-            }
-            outputBuffer[outputPtr++] = (byte) (0x80 | (c & 0x3f));
-        }
-        return _byteBuilder.completeAndCoalesce(outputPtr);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private int _appendSingleEscape(int escCode, char[] quoteBuffer)
-    {
-        if (escCode < 0) { // control char, value -(char + 1)
-            int value = -(escCode + 1);
-            quoteBuffer[1] = 'u';
-            // We know it's a control char, so only the last 2 chars are non-0
-            quoteBuffer[4] = HEX_CHARS[value >> 4];
-            quoteBuffer[5] = HEX_CHARS[value & 0xF];
-            return 6;
-        }
-        quoteBuffer[1] = (char) escCode;
-        return 2;
-    }
-
-    private int _appendByteEscape(int ch, int escCode, ByteArrayBuilder byteBuilder, int ptr)
-    {
-        byteBuilder.setCurrentSegmentLength(ptr);
-        byteBuilder.append(INT_BACKSLASH);
-        if (escCode < 0) { // standard escape
-            byteBuilder.append(INT_U);
-            if (ch > 0xFF) {
-                int hi = (ch >> 8);
-                byteBuilder.append(HEX_BYTES[hi >> 4]);
-                byteBuilder.append(HEX_BYTES[hi & 0xF]);
-                ch &= 0xFF;
-            } else {
-                byteBuilder.append(INT_0);
-                byteBuilder.append(INT_0);
-            }
-            byteBuilder.append(HEX_BYTES[ch >> 4]);
-            byteBuilder.append(HEX_BYTES[ch & 0xF]);
-        } else { // 2-char simple escape
-            byteBuilder.append((byte) escCode);
-        }
-        return byteBuilder.getCurrentSegmentLength();
-    }
-    
-    /**
-     * Method called to calculate UTF code point, from a surrogate pair.
-     */
-    private int _convertSurrogate(int firstPart, int secondPart)
-    {
-        // Ok, then, is the second part valid?
-        if (secondPart < SURR2_FIRST || secondPart > SURR2_LAST) {
-            throw new IllegalArgumentException("Broken surrogate pair: first char 0x"+Integer.toHexString(firstPart)+", second 0x"+Integer.toHexString(secondPart)+"; illegal combination");
-        }
-        return 0x10000 + ((firstPart - SURR1_FIRST) << 10) + (secondPart - SURR2_FIRST);
-    }
-    
-    private void _throwIllegalSurrogate(int code)
-    {
-        if (code > 0x10FFFF) { // over max?
-            throw new IllegalArgumentException("Illegal character point (0x"+Integer.toHexString(code)+") to output; max is 0x10FFFF as per RFC 4627");
-        }
-        if (code >= SURR1_FIRST) {
-            if (code <= SURR1_LAST) { // Unmatched first part (closing without second part?)
-                throw new IllegalArgumentException("Unmatched first part of surrogate pair (0x"+Integer.toHexString(code)+")");
-            }
-            throw new IllegalArgumentException("Unmatched second part of surrogate pair (0x"+Integer.toHexString(code)+")");
-        }
-        // should we ever get this?
-        throw new IllegalArgumentException("Illegal character point (0x"+Integer.toHexString(code)+") to output");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/MergedStream.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/MergedStream.java
deleted file mode 100644
index 3645097..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/MergedStream.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-/**
- * Simple {@link InputStream} implementation that is used to "unwind" some
- * data previously read from an input stream; so that as long as some of
- * that data remains, it's returned; but as long as it's read, we'll
- * just use data from the underlying original stream. 
- * This is similar to {@link java.io.PushbackInputStream}, but here there's
- * only one implicit pushback, when instance is constructed.
- */
-public final class MergedStream
-    extends InputStream
-{
-    final protected IOContext _context;
-
-    final InputStream _in;
-
-    byte[] _buffer;
-
-    int _ptr;
-
-    final int _end;
-
-    public MergedStream(IOContext context,
-            InputStream in, byte[] buf, int start, int end)
-    {
-        _context = context;
-        _in = in;
-        _buffer = buf;
-        _ptr = start;
-        _end = end;
-    }
-
-    @Override
-    public int available() throws IOException
-    {
-        if (_buffer != null) {
-            return _end - _ptr;
-        }
-        return _in.available();
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        freeMergedBuffer();
-        _in.close();
-    }
-
-    @Override
-    public void mark(int readlimit)
-    {
-        if (_buffer == null) {
-            _in.mark(readlimit);
-        }
-    }
-    
-    @Override
-    public boolean markSupported()
-    {
-        // Only supports marks past the initial rewindable section...
-        return (_buffer == null) && _in.markSupported();
-    }
-    
-    @Override
-    public int read() throws IOException
-    {
-        if (_buffer != null) {
-            int c = _buffer[_ptr++] & 0xFF;
-            if (_ptr >= _end) {
-                freeMergedBuffer();
-            }
-            return c;
-        }
-        return _in.read();
-    }
-    
-    @Override
-    public int read(byte[] b) throws IOException
-    {
-        return read(b, 0, b.length);
-    }
-
-    @Override
-    public int 	read(byte[] b, int off, int len) throws IOException
-    {
-        if (_buffer != null) {
-            int avail = _end - _ptr;
-            if (len > avail) {
-                len = avail;
-            }
-            System.arraycopy(_buffer, _ptr, b, off, len);
-            _ptr += len;
-            if (_ptr >= _end) {
-                freeMergedBuffer();
-            }
-            return len;
-        }
-        return _in.read(b, off, len);
-    }
-
-    @Override
-    public void reset() throws IOException
-    {
-        if (_buffer == null) {
-            _in.reset();
-        }
-    }
-
-    @Override
-    public long skip(long n) throws IOException
-    {
-        long count = 0L;
-
-        if (_buffer != null) {
-            int amount = _end - _ptr;
-
-            if (amount > n) { // all in pushed back segment?
-                _ptr += (int) n;
-                return n;
-            }
-            freeMergedBuffer();
-            count += amount;
-            n -= amount;
-        }
-
-        if (n > 0) {
-            count += _in.skip(n);
-        }
-        return count;
-    }
-
-    private void freeMergedBuffer()
-    {
-        byte[] buf = _buffer;
-        if (buf != null) {
-            _buffer = null;
-            if (_context != null) {
-                _context.releaseReadIOBuffer(buf);
-            }
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberInput.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberInput.java
deleted file mode 100644
index c8ba515..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberInput.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-public final class NumberInput
-{
-    /**
-     * Textual representation of a double constant that can cause nasty problems
-     * with JDK (see http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308).
-     */
-    public final static String NASTY_SMALL_DOUBLE = "2.2250738585072012e-308";
-
-    /**
-     * Constants needed for parsing longs from basic int parsing methods
-     */
-    final static long L_BILLION = 1000000000;
-
-    final static String MIN_LONG_STR_NO_SIGN = String.valueOf(Long.MIN_VALUE).substring(1);
-    final static String MAX_LONG_STR = String.valueOf(Long.MAX_VALUE);
-    
-    /**
-     * Fast method for parsing integers that are known to fit into
-     * regular 32-bit signed int type. This means that length is
-     * between 1 and 9 digits (inclusive)
-     *<p>
-     * Note: public to let unit tests call it
-     */
-    public static int parseInt(char[] digitChars, int offset, int len)
-    {
-        int num = digitChars[offset] - '0';
-        len += offset;
-        // This looks ugly, but appears the fastest way (as per measurements)
-        if (++offset < len) {
-            num = (num * 10) + (digitChars[offset] - '0');
-            if (++offset < len) {
-                num = (num * 10) + (digitChars[offset] - '0');
-                if (++offset < len) {
-                    num = (num * 10) + (digitChars[offset] - '0');
-                    if (++offset < len) {
-                        num = (num * 10) + (digitChars[offset] - '0');
-                        if (++offset < len) {
-                            num = (num * 10) + (digitChars[offset] - '0');
-                            if (++offset < len) {
-                                num = (num * 10) + (digitChars[offset] - '0');
-                                if (++offset < len) {
-                                    num = (num * 10) + (digitChars[offset] - '0');
-                                    if (++offset < len) {
-                                        num = (num * 10) + (digitChars[offset] - '0');
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return num;
-    }
-
-    /**
-     * Helper method to (more) efficiently parse integer numbers from
-     * String values.
-     */
-    public static int parseInt(String str)
-    {
-        /* Ok: let's keep strategy simple: ignoring optional minus sign,
-         * we'll accept 1 - 9 digits and parse things efficiently;
-         * otherwise just defer to JDK parse functionality.
-         */
-        char c = str.charAt(0);
-        int length = str.length();
-        boolean negative = (c == '-');
-        int offset = 1;
-        // must have 1 - 9 digits after optional sign:
-        // negative?
-        if (negative) {
-            if (length == 1 || length > 10) {
-                return Integer.parseInt(str);
-            }
-            c = str.charAt(offset++);
-        } else {
-            if (length > 9) {
-                return Integer.parseInt(str);
-            }
-        }
-        if (c > '9' || c < '0') {
-            return Integer.parseInt(str);
-        }
-        int num = c - '0';
-        if (offset < length) {
-            c = str.charAt(offset++);
-            if (c > '9' || c < '0') {
-                return Integer.parseInt(str);
-            }
-            num = (num * 10) + (c - '0');
-            if (offset < length) {
-                c = str.charAt(offset++);
-                if (c > '9' || c < '0') {
-                    return Integer.parseInt(str);
-                }
-                num = (num * 10) + (c - '0');
-                // Let's just loop if we have more than 3 digits:
-                if (offset < length) {
-                    do {
-                        c = str.charAt(offset++);
-                        if (c > '9' || c < '0') {
-                            return Integer.parseInt(str);
-                        }
-                        num = (num * 10) + (c - '0');
-                    } while (offset < length);
-                }
-            }
-        }
-        return negative ? -num : num;
-    }
-    
-    public static long parseLong(char[] digitChars, int offset, int len)
-    {
-        // Note: caller must ensure length is [10, 18]
-        int len1 = len-9;
-        long val = parseInt(digitChars, offset, len1) * L_BILLION;
-        return val + (long) parseInt(digitChars, offset+len1, 9);
-    }
-
-    public static long parseLong(String str)
-    {
-        /* Ok, now; as the very first thing, let's just optimize case of "fake longs";
-         * that is, if we know they must be ints, call int parsing
-         */
-        int length = str.length();
-        if (length <= 9) {
-            return (long) parseInt(str);
-        }
-        // !!! TODO: implement efficient 2-int parsing...
-        return Long.parseLong(str);
-    }
-    
-    /**
-     * Helper method for determining if given String representation of
-     * an integral number would fit in 64-bit Java long or not.
-     * Note that input String must NOT contain leading minus sign (even
-     * if 'negative' is set to true).
-     *
-     * @param negative Whether original number had a minus sign (which is
-     *    NOT passed to this method) or not
-     */
-    public static boolean inLongRange(char[] digitChars, int offset, int len,
-            boolean negative)
-    {
-        String cmpStr = negative ? MIN_LONG_STR_NO_SIGN : MAX_LONG_STR;
-        int cmpLen = cmpStr.length();
-        if (len < cmpLen) return true;
-        if (len > cmpLen) return false;
-
-        for (int i = 0; i < cmpLen; ++i) {
-            int diff = digitChars[offset+i] - cmpStr.charAt(i);
-            if (diff != 0) {
-                return (diff < 0);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Similar to {@link #inLongRange(char[],int,int,boolean)}, but
-     * with String argument
-     *
-     * @param negative Whether original number had a minus sign (which is
-     *    NOT passed to this method) or not
-     */
-    public static boolean inLongRange(String numberStr, boolean negative)
-    {
-        String cmpStr = negative ? MIN_LONG_STR_NO_SIGN : MAX_LONG_STR;
-        int cmpLen = cmpStr.length();
-        int actualLen = numberStr.length();
-        if (actualLen < cmpLen) return true;
-        if (actualLen > cmpLen) return false;
-
-        // could perhaps just use String.compareTo()?
-        for (int i = 0; i < cmpLen; ++i) {
-            int diff = numberStr.charAt(i) - cmpStr.charAt(i);
-            if (diff != 0) {
-                return (diff < 0);
-            }
-        }
-        return true;
-    }
-
-    public static int parseAsInt(String input, int defaultValue)
-    {
-        if (input == null) {
-            return defaultValue;
-        }
-        input = input.trim();
-        int len = input.length();
-        if (len == 0) {
-            return defaultValue;
-        }
-        // One more thing: use integer parsing for 'simple'
-        int i = 0;
-        if (i < len) { // skip leading sign:
-            char c = input.charAt(0);
-            if (c == '+') { // for plus, actually physically remove
-                input = input.substring(1);
-                len = input.length();
-            } else if (c == '-') { // minus, just skip for checks, must retain
-                ++i;
-            }
-        }
-        for (; i < len; ++i) {
-            char c = input.charAt(i);
-            // if other symbols, parse as Double, coerce
-            if (c > '9' || c < '0') {
-                try {
-                    return (int) parseDouble(input);
-                } catch (NumberFormatException e) {
-                    return defaultValue;
-                }
-            }
-        }
-        try {
-            return Integer.parseInt(input);
-        } catch (NumberFormatException e) { }
-        return defaultValue;
-    }
-
-    public static long parseAsLong(String input, long defaultValue)
-    {
-        if (input == null) {
-            return defaultValue;
-        }
-        input = input.trim();
-        int len = input.length();
-        if (len == 0) {
-            return defaultValue;
-        }
-        // One more thing: use long parsing for 'simple'
-        int i = 0;
-        if (i < len) { // skip leading sign:
-            char c = input.charAt(0);
-            if (c == '+') { // for plus, actually physically remove
-                input = input.substring(1);
-                len = input.length();
-            } else if (c == '-') { // minus, just skip for checks, must retain
-                ++i;
-            }
-        }
-        for (; i < len; ++i) {
-            char c = input.charAt(i);
-            // if other symbols, parse as Double, coerce
-            if (c > '9' || c < '0') {
-                try {
-                    return (long) parseDouble(input);
-                } catch (NumberFormatException e) {
-                    return defaultValue;
-                }
-            }
-        }
-        try {
-            return Long.parseLong(input);
-        } catch (NumberFormatException e) { }
-        return defaultValue;
-    }
-    
-    public static double parseAsDouble(String input, double defaultValue)
-    {
-        if (input == null) {
-            return defaultValue;
-        }
-        input = input.trim();
-        int len = input.length();
-        if (len == 0) {
-            return defaultValue;
-        }
-        try {
-            return parseDouble(input);
-        } catch (NumberFormatException e) { }
-        return defaultValue;
-    }
-    
-    public static double parseDouble(String numStr) throws NumberFormatException
-    {
-        // [JACKSON-486]: avoid some nasty float representations... but should it be MIN_NORMAL or MIN_VALUE?
-        /* as per [JACKSON-827], let's use MIN_VALUE as it is available on all JDKs; normalized
-         * only in JDK 1.6. In practice, should not really matter.
-         */
-        if (NASTY_SMALL_DOUBLE.equals(numStr)) {
-            return Double.MIN_VALUE;
-        }
-        return Double.parseDouble(numStr);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberOutput.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberOutput.java
deleted file mode 100644
index cb9bb8d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/NumberOutput.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-public final class NumberOutput
-{
-    private final static char NULL_CHAR = (char) 0;
-
-    private static int MILLION = 1000000;
-    private static int BILLION = 1000000000;
-    private static long TEN_BILLION_L = 10000000000L;
-    private static long THOUSAND_L = 1000L;
-
-    private static long MIN_INT_AS_LONG = (long) Integer.MIN_VALUE;
-    private static long MAX_INT_AS_LONG = (long) Integer.MAX_VALUE;
-
-    final static String SMALLEST_LONG = String.valueOf(Long.MIN_VALUE);
-
-    final static char[] LEADING_TRIPLETS = new char[4000];
-    final static char[] FULL_TRIPLETS = new char[4000];
-    static {
-        /* Let's fill it with NULLs for ignorable leading digits,
-         * and digit chars for others
-         */
-        int ix = 0;
-        for (int i1 = 0; i1 < 10; ++i1) {
-            char f1 = (char) ('0' + i1);
-            char l1 = (i1 == 0) ? NULL_CHAR : f1;
-            for (int i2 = 0; i2 < 10; ++i2) {
-                char f2 = (char) ('0' + i2);
-                char l2 = (i1 == 0 && i2 == 0) ? NULL_CHAR : f2;
-                for (int i3 = 0; i3 < 10; ++i3) {
-                    // Last is never to be empty
-                    char f3 = (char) ('0' + i3);
-                    LEADING_TRIPLETS[ix] = l1;
-                    LEADING_TRIPLETS[ix+1] = l2;
-                    LEADING_TRIPLETS[ix+2] = f3;
-                    FULL_TRIPLETS[ix] = f1;
-                    FULL_TRIPLETS[ix+1] = f2;
-                    FULL_TRIPLETS[ix+2] = f3;
-                    ix += 4;
-                }
-            }
-        }
-    }
-
-    final static byte[] FULL_TRIPLETS_B = new byte[4000];
-    static {
-        for (int i = 0; i < 4000; ++i) {
-            FULL_TRIPLETS_B[i] = (byte) FULL_TRIPLETS[i];
-        }
-    }
-    
-    final static String[] sSmallIntStrs = new String[] {
-        "0","1","2","3","4","5","6","7","8","9","10"
-    };
-    final static String[] sSmallIntStrs2 = new String[] {
-        "-1","-2","-3","-4","-5","-6","-7","-8","-9","-10"
-    };
-
-    /*
-    /**********************************************************
-    /* Efficient serialization methods using raw buffers
-    /**********************************************************
-     */
-
-    /**
-     * @return Offset within buffer after outputting int
-     */
-    public static int outputInt(int value, char[] buffer, int offset)
-    {
-        if (value < 0) {
-            if (value == Integer.MIN_VALUE) {
-                /* Special case: no matching positive value within range;
-                 * let's then "upgrade" to long and output as such.
-                 */
-                return outputLong((long) value, buffer, offset);
-            }
-            buffer[offset++] = '-';
-            value = -value;
-        }
-
-        if (value < MILLION) { // at most 2 triplets...
-            if (value < 1000) {
-                if (value < 10) {
-                    buffer[offset++] = (char) ('0' + value);
-                } else {
-                    offset = outputLeadingTriplet(value, buffer, offset);
-                }
-            } else {
-                int thousands = value / 1000;
-                value -= (thousands * 1000); // == value % 1000
-                offset = outputLeadingTriplet(thousands, buffer, offset);
-                offset = outputFullTriplet(value, buffer, offset);
-            }
-            return offset;
-        }
-
-        // ok, all 3 triplets included
-        /* Let's first hand possible billions separately before
-         * handling 3 triplets. This is possible since we know we
-         * can have at most '2' as billion count.
-         */
-        boolean hasBillions = (value >= BILLION);
-        if (hasBillions) {
-            value -= BILLION;
-            if (value >= BILLION) {
-                value -= BILLION;
-                buffer[offset++] = '2';
-            } else {
-                buffer[offset++] = '1';
-            }
-        }
-        int newValue = value / 1000;
-        int ones = (value - (newValue * 1000)); // == value % 1000
-        value = newValue;
-        newValue /= 1000;
-        int thousands = (value - (newValue * 1000));
-        
-        // value now has millions, which have 1, 2 or 3 digits
-        if (hasBillions) {
-            offset = outputFullTriplet(newValue, buffer, offset);
-        } else {
-            offset = outputLeadingTriplet(newValue, buffer, offset);
-        }
-        offset = outputFullTriplet(thousands, buffer, offset);
-        offset = outputFullTriplet(ones, buffer, offset);
-        return offset;
-    }
-
-    public static int outputInt(int value, byte[] buffer, int offset)
-    {
-        if (value < 0) {
-            if (value == Integer.MIN_VALUE) {
-                return outputLong((long) value, buffer, offset);
-            }
-            buffer[offset++] = '-';
-            value = -value;
-        }
-
-        if (value < MILLION) { // at most 2 triplets...
-            if (value < 1000) {
-                if (value < 10) {
-                    buffer[offset++] = (byte) ('0' + value);
-                } else {
-                    offset = outputLeadingTriplet(value, buffer, offset);
-                }
-            } else {
-                int thousands = value / 1000;
-                value -= (thousands * 1000); // == value % 1000
-                offset = outputLeadingTriplet(thousands, buffer, offset);
-                offset = outputFullTriplet(value, buffer, offset);
-            }
-            return offset;
-        }
-        boolean hasBillions = (value >= BILLION);
-        if (hasBillions) {
-            value -= BILLION;
-            if (value >= BILLION) {
-                value -= BILLION;
-                buffer[offset++] = '2';
-            } else {
-                buffer[offset++] = '1';
-            }
-        }
-        int newValue = value / 1000;
-        int ones = (value - (newValue * 1000)); // == value % 1000
-        value = newValue;
-        newValue /= 1000;
-        int thousands = (value - (newValue * 1000));
-        
-        if (hasBillions) {
-            offset = outputFullTriplet(newValue, buffer, offset);
-        } else {
-            offset = outputLeadingTriplet(newValue, buffer, offset);
-        }
-        offset = outputFullTriplet(thousands, buffer, offset);
-        offset = outputFullTriplet(ones, buffer, offset);
-        return offset;
-    }
-    
-    /**
-     * @return Offset within buffer after outputting int
-     */
-    public static int outputLong(long value, char[] buffer, int offset)
-    {
-        // First: does it actually fit in an int?
-        if (value < 0L) {
-            /* MIN_INT is actually printed as long, just because its
-             * negation is not an int but long
-             */
-            if (value > MIN_INT_AS_LONG) {
-                return outputInt((int) value, buffer, offset);
-            }
-            if (value == Long.MIN_VALUE) {
-                // Special case: no matching positive value within range
-                int len = SMALLEST_LONG.length();
-                SMALLEST_LONG.getChars(0, len, buffer, offset);
-                return (offset + len);
-            }
-            buffer[offset++] = '-';
-            value = -value;
-        } else {
-            if (value <= MAX_INT_AS_LONG) {
-                return outputInt((int) value, buffer, offset);
-            }
-        }
-
-        /* Ok: real long print. Need to first figure out length
-         * in characters, and then print in from end to beginning
-         */
-        int origOffset = offset;
-        offset += calcLongStrLength(value);
-        int ptr = offset;
-
-        // First, with long arithmetics:
-        while (value > MAX_INT_AS_LONG) { // full triplet
-            ptr -= 3;
-            long newValue = value / THOUSAND_L;
-            int triplet = (int) (value - newValue * THOUSAND_L);
-            outputFullTriplet(triplet, buffer, ptr);
-            value = newValue;
-        }
-        // Then with int arithmetics:
-        int ivalue = (int) value;
-        while (ivalue >= 1000) { // still full triplet
-            ptr -= 3;
-            int newValue = ivalue / 1000;
-            int triplet = ivalue - (newValue * 1000);
-            outputFullTriplet(triplet, buffer, ptr);
-            ivalue = newValue;
-        }
-        // And finally, if anything remains, partial triplet
-        outputLeadingTriplet(ivalue, buffer, origOffset);
-
-        return offset;
-    }
-
-    public static int outputLong(long value, byte[] buffer, int offset)
-    {
-        if (value < 0L) {
-            if (value > MIN_INT_AS_LONG) {
-                return outputInt((int) value, buffer, offset);
-            }
-            if (value == Long.MIN_VALUE) {
-                // Special case: no matching positive value within range
-                int len = SMALLEST_LONG.length();
-                for (int i = 0; i < len; ++i) {
-                    buffer[offset++] = (byte) SMALLEST_LONG.charAt(i);
-                }
-                return offset;
-            }
-            buffer[offset++] = '-';
-            value = -value;
-        } else {
-            if (value <= MAX_INT_AS_LONG) {
-                return outputInt((int) value, buffer, offset);
-            }
-        }
-        int origOffset = offset;
-        offset += calcLongStrLength(value);
-        int ptr = offset;
-
-        // First, with long arithmetics:
-        while (value > MAX_INT_AS_LONG) { // full triplet
-            ptr -= 3;
-            long newValue = value / THOUSAND_L;
-            int triplet = (int) (value - newValue * THOUSAND_L);
-            outputFullTriplet(triplet, buffer, ptr);
-            value = newValue;
-        }
-        // Then with int arithmetics:
-        int ivalue = (int) value;
-        while (ivalue >= 1000) { // still full triplet
-            ptr -= 3;
-            int newValue = ivalue / 1000;
-            int triplet = ivalue - (newValue * 1000);
-            outputFullTriplet(triplet, buffer, ptr);
-            ivalue = newValue;
-        }
-        outputLeadingTriplet(ivalue, buffer, origOffset);
-        return offset;
-    }
-    
-    /*
-    /**********************************************************
-    /* Secondary convenience serialization methods
-    /**********************************************************
-     */
-
-    /* !!! 05-Aug-2008, tatus: Any ways to further optimize
-     *   these? (or need: only called by diagnostics methods?)
-     */
-
-    public static String toString(int value)
-    {
-        // Lookup table for small values
-        if (value < sSmallIntStrs.length) {
-            if (value >= 0) {
-                return sSmallIntStrs[value];
-            }
-            int v2 = -value - 1;
-            if (v2 < sSmallIntStrs2.length) {
-                return sSmallIntStrs2[v2];
-            }
-        }
-        return Integer.toString(value);
-    }
-
-    public static String toString(long value)
-    {
-        if (value <= Integer.MAX_VALUE &&
-            value >= Integer.MIN_VALUE) {
-            return toString((int) value);
-        }
-        return Long.toString(value);
-    }
-
-    public static String toString(double value)
-    {
-        return Double.toString(value);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private static int outputLeadingTriplet(int triplet, char[] buffer, int offset)
-    {
-        int digitOffset = (triplet << 2);
-        char c = LEADING_TRIPLETS[digitOffset++];
-        if (c != NULL_CHAR) {
-            buffer[offset++] = c;
-        }
-        c = LEADING_TRIPLETS[digitOffset++];
-        if (c != NULL_CHAR) {
-            buffer[offset++] = c;
-        }
-        // Last is required to be non-empty
-        buffer[offset++] = LEADING_TRIPLETS[digitOffset];
-        return offset;
-    }
-
-    private static int outputLeadingTriplet(int triplet, byte[] buffer, int offset)
-    {
-        int digitOffset = (triplet << 2);
-        char c = LEADING_TRIPLETS[digitOffset++];
-        if (c != NULL_CHAR) {
-            buffer[offset++] = (byte) c;
-        }
-        c = LEADING_TRIPLETS[digitOffset++];
-        if (c != NULL_CHAR) {
-            buffer[offset++] = (byte) c;
-        }
-        // Last is required to be non-empty
-        buffer[offset++] = (byte) LEADING_TRIPLETS[digitOffset];
-        return offset;
-    }
-    
-    private static int outputFullTriplet(int triplet, char[] buffer, int offset)
-    {
-        int digitOffset = (triplet << 2);
-        buffer[offset++] = FULL_TRIPLETS[digitOffset++];
-        buffer[offset++] = FULL_TRIPLETS[digitOffset++];
-        buffer[offset++] = FULL_TRIPLETS[digitOffset];
-        return offset;
-    }
-
-    private static int outputFullTriplet(int triplet, byte[] buffer, int offset)
-    {
-        int digitOffset = (triplet << 2);
-        buffer[offset++] = FULL_TRIPLETS_B[digitOffset++];
-        buffer[offset++] = FULL_TRIPLETS_B[digitOffset++];
-        buffer[offset++] = FULL_TRIPLETS_B[digitOffset];
-        return offset;
-    }
-    
-    /**
-     *<p>
-     * Pre-conditions: posValue is positive, and larger than
-     * Integer.MAX_VALUE (about 2 billions).
-     */
-    private static int calcLongStrLength(long posValue)
-    {
-        int len = 10;
-        long comp = TEN_BILLION_L;
-
-        // 19 is longest, need to worry about overflow
-        while (posValue >= comp) {
-            if (len == 19) {
-                break;
-            }
-            ++len;
-            comp = (comp << 3) + (comp << 1); // 10x
-        }
-        return len;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/OutputDecorator.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/OutputDecorator.java
deleted file mode 100644
index 7a48c42..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/OutputDecorator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-/**
- * Handler class that can be used to decorate output destinations.
- * Typical use is to use a filter abstraction (filtered output stream,
- * writer) around original output destination, and apply additional
- * processing during write operations.
- */
-public abstract class OutputDecorator
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
-     * creating generator for given {@link OutputStream}, when this decorator
-     * has been registered.
-     * 
-     * @param ctxt IO context in use (provides access to declared encoding)
-     * @param out Original output destination
-     * 
-     * @return OutputStream to use; either passed in argument, or something that
-     *   calls it
-     */
-    public abstract OutputStream decorate(IOContext ctxt, OutputStream out)
-        throws IOException;
-
-    /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
-     * creating generator for given {@link Writer}, when this decorator
-     * has been registered.
-     * 
-     * @param ctxt IO context in use (provides access to declared encoding)
-     * @param w Original output writer
-     * 
-     * @return Writer to use; either passed in argument, or something that calls it
-     */
-    public abstract Writer decorate(IOContext ctxt, Writer w) throws IOException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/SegmentedStringWriter.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/SegmentedStringWriter.java
deleted file mode 100644
index 57009dc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/SegmentedStringWriter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.util.BufferRecycler;
-import com.fasterxml.jackson.core.util.TextBuffer;
-
-/**
- * Efficient alternative to {@link StringWriter}, based on using segmented
- * internal buffer. Initial input buffer is also recyclable.
- *<p>
- * This class is most useful when serializing JSON content as a String:
- * if so, instance of this class can be given as the writer to
- * <code>JsonGenerator</code>.
- */
-public final class SegmentedStringWriter
-    extends Writer
-{
-    final protected TextBuffer _buffer;
-
-    public SegmentedStringWriter(BufferRecycler br)
-    {
-        super();
-        _buffer = new TextBuffer(br);
-    }
-
-    /*
-    /**********************************************************
-    /* java.io.Writer implementation
-    /**********************************************************
-     */
-
-    @Override
-    public Writer append(char c)
-    {
-        write(c);
-        return this;
-    }
-
-    @Override
-    public Writer append(CharSequence csq)
-    {
-	String str = csq.toString();
-	_buffer.append(str, 0, str.length());
-        return this;
-    }
-
-    @Override
-    public Writer append(CharSequence csq, int start, int end)
-    {
-	String str = csq.subSequence(start, end).toString();
-	_buffer.append(str, 0, str.length());
-        return this;
-    }
-
-    @Override public void close() { } // NOP
-
-    @Override public void flush() { } // NOP
-
-    @Override
-    public void write(char[] cbuf) {
-        _buffer.append(cbuf, 0, cbuf.length);
-    }
-
-    @Override
-    public void write(char[] cbuf, int off, int len) {
-        _buffer.append(cbuf, off, len);
-    }
-
-    @Override
-    public void write(int c) {
-        _buffer.append((char) c);
-    }
-
-    @Override
-    public void write(String str) { _buffer.append(str, 0, str.length()); }
-
-    @Override
-    public void write(String str, int off, int len) {
-        _buffer.append(str, off, len);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Main access method that will construct a String that contains
-     * all the contents, release all internal buffers we may have,
-     * and return result String.
-     * Note that the method is not idempotent -- if called second time,
-     * will just return an empty String.
-     */
-    public String getAndClear()
-    {
-        String result = _buffer.contentsAsString();
-        _buffer.releaseBuffers();
-        return result;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/SerializedString.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/SerializedString.java
deleted file mode 100644
index d906633..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/SerializedString.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-
-import com.fasterxml.jackson.core.SerializableString;
-
-/**
- * String token that can lazily serialize String contained and then reuse that
- * serialization later on. This is similar to JDBC prepared statements, for example,
- * in that instances should only be created when they are used more than use;
- * prime candidates are various serializers.
- *<p>
- * Class is final for performance reasons and since this is not designed to
- * be extensible or customizable (customizations would occur in calling code)
- */
-public class SerializedString
-    implements SerializableString, java.io.Serializable
-{
-    protected final String _value;
-
-    /* 13-Dec-2010, tatu: Whether use volatile or not is actually an important
-     *   decision for multi-core use cases. Cost of volatility can be non-trivial
-     *   for heavy use cases, and serialized-string instances are accessed often.
-     *   Given that all code paths with common Jackson usage patterns go through
-     *   a few memory barriers (mostly with cache/reuse pool access) it seems safe
-     *   enough to omit volatiles here, given how simple lazy initialization is.
-     *   This can be compared to how {@link String#intern} works; lazily and
-     *   without synchronization or use of volatile keyword.
-     */
-    
-    protected /*volatile*/ byte[] _quotedUTF8Ref;
-
-    protected /*volatile*/ byte[] _unquotedUTF8Ref;
-
-    protected /*volatile*/ char[] _quotedChars;
-
-    public SerializedString(String v) {
-        if (v == null) {
-            throw new IllegalStateException("Null String illegal for SerializedString");
-        }
-        _value = v;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serializable overrides
-    /**********************************************************
-     */
-
-    /**
-     * Ugly hack, to work through the requirement that _value is indeed final,
-     * and that JDK serialization won't call ctor(s).
-     * 
-     * @since 2.1
-     */
-    protected transient String _jdkSerializeValue;
-
-    private void readObject(ObjectInputStream in) throws IOException {
-        _jdkSerializeValue = in.readUTF();
-    }
-
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        out.writeUTF(_value);
-    }
-
-    protected Object readResolve() {
-        return new SerializedString(_jdkSerializeValue);
-    }
-
-    /*
-    /**********************************************************
-    /* API
-    /**********************************************************
-     */
-
-//  @Override
-    public final String getValue() { return _value; }
-    
-    /**
-     * Returns length of the String as characters
-     */
-//  @Override
-    public final int charLength() { return _value.length(); }
-    
-//  @Override
-    public final char[] asQuotedChars()
-    {
-        char[] result = _quotedChars;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsString(_value);
-            _quotedChars = result;
-        }
-        return result;
-    }
-
-    /**
-     * Accessor for accessing value that has been quoted using JSON
-     * quoting rules, and encoded using UTF-8 encoding.
-     */
-//  @Override
-    public final byte[] asUnquotedUTF8()
-    {
-        byte[] result = _unquotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().encodeAsUTF8(_value);
-            _unquotedUTF8Ref  = result;
-        }
-        return result;
-    }
-
-    /**
-     * Accessor for accessing value as is (without JSON quoting)
-     * encoded using UTF-8 encoding.
-     */
-//  @Override
-    public final byte[] asQuotedUTF8()
-    {
-        byte[] result = _quotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsUTF8(_value);
-            _quotedUTF8Ref = result;
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Additional 2.0 methods for appending/writing contents
-    /**********************************************************
-     */
-
-//  @Override
-    public int appendQuotedUTF8(byte[] buffer, int offset)
-    {
-        byte[] result = _quotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsUTF8(_value);
-            _quotedUTF8Ref = result;
-        }
-        final int length = result.length;
-        if ((offset + length) > buffer.length) {
-            return -1;
-        }
-        System.arraycopy(result, 0, buffer, offset, length);
-        return length;
-    }
-
-//  @Override
-    public int appendQuoted(char[] buffer, int offset)
-    {
-        char[] result = _quotedChars;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsString(_value);
-            _quotedChars = result;
-        }
-        final int length = result.length;
-        if ((offset + length) > buffer.length) {
-            return -1;
-        }
-        System.arraycopy(result, 0, buffer, offset, length);
-        return length;
-    }
-
-//  @Override
-    public int appendUnquotedUTF8(byte[] buffer, int offset)
-    {
-        byte[] result = _unquotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().encodeAsUTF8(_value);
-            _unquotedUTF8Ref  = result;
-        }
-        final int length = result.length;
-        if ((offset + length) > buffer.length) {
-            return -1;
-        }
-        System.arraycopy(result, 0, buffer, offset, length);
-        return length;
-    }
-
-//  @Override
-    public int appendUnquoted(char[] buffer, int offset)
-    {
-        String str = _value;
-        final int length = str.length();
-        if ((offset + length) > buffer.length) {
-            return -1;
-        }
-        str.getChars(0,  length, buffer, offset);
-        return length;
-    }
-
-//  @Override
-    public int writeQuotedUTF8(OutputStream out) throws IOException
-    {
-        byte[] result = _quotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsUTF8(_value);
-            _quotedUTF8Ref = result;
-        }
-        final int length = result.length;
-        out.write(result, 0, length);
-        return length;
-    }
-
-//  @Override
-    public int writeUnquotedUTF8(OutputStream out) throws IOException
-    {
-        byte[] result = _unquotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().encodeAsUTF8(_value);
-            _unquotedUTF8Ref  = result;
-        }
-        final int length = result.length;
-        out.write(result, 0, length);
-        return length;
-    }
-
-//  @Override
-    public int putQuotedUTF8(ByteBuffer buffer)
-    {
-        byte[] result = _quotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().quoteAsUTF8(_value);
-            _quotedUTF8Ref = result;
-        }
-        final int length = result.length;
-        if (length > buffer.remaining()) {
-            return -1;
-        }
-        buffer.put(result, 0, length);
-        return length;
-    }
-
-//  @Override
-    public int putUnquotedUTF8(ByteBuffer buffer)
-    {
-        byte[] result = _unquotedUTF8Ref;
-        if (result == null) {
-            result = JsonStringEncoder.getInstance().encodeAsUTF8(_value);
-            _unquotedUTF8Ref  = result;
-        }
-        final int length = result.length;
-        if (length > buffer.remaining()) {
-            return -1;
-        }
-        buffer.put(result, 0, length);
-        return length;
-    }
-
-    
-    /*
-    /**********************************************************
-    /* Standard method overrides
-    /**********************************************************
-     */
-
-    @Override
-    public final String toString() { return _value; }
-    
-    @Override
-    public final int hashCode() { return _value.hashCode(); }
-
-    @Override
-    public final boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null || o.getClass() != getClass()) return false;
-        SerializedString other = (SerializedString) o;
-        return _value.equals(other._value);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF32Reader.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF32Reader.java
deleted file mode 100644
index 45e1783..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF32Reader.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-
-/**
- * Since JDK does not come with UTF-32/UCS-4, let's implement a simple
- * decoder to use.
- */
-public final class UTF32Reader
-    extends BaseReader
-{
-    final boolean mBigEndian;
-
-    /**
-     * Although input is fine with full Unicode set, Java still uses
-     * 16-bit chars, so we may have to split high-order chars into
-     * surrogate pairs.
-     */
-    char mSurrogate = NULL_CHAR;
-
-    /**
-     * Total read character count; used for error reporting purposes
-     */
-    int mCharCount = 0;
-
-    /**
-     * Total read byte count; used for error reporting purposes
-     */
-    int mByteCount = 0;
-
-    /*
-    ////////////////////////////////////////
-    // Life-cycle
-    ////////////////////////////////////////
-    */
-
-    public UTF32Reader(IOContext ctxt,
-                       InputStream in, byte[] buf, int ptr, int len,
-                       boolean isBigEndian)
-    {
-        super(ctxt, in, buf, ptr, len);
-        mBigEndian = isBigEndian;
-    }
-
-    /*
-    ////////////////////////////////////////
-    // Public API
-    ////////////////////////////////////////
-    */
-
-    @Override
-	public int read(char[] cbuf, int start, int len)
-        throws IOException
-    {
-        // Already EOF?
-        if (_buffer == null) {
-            return -1;
-        }
-        if (len < 1) {
-            return len;
-        }
-        // Let's then ensure there's enough room...
-        if (start < 0 || (start+len) > cbuf.length) {
-            reportBounds(cbuf, start, len);
-        }
-
-        len += start;
-        int outPtr = start;
-
-        // Ok, first; do we have a surrogate from last round?
-        if (mSurrogate != NULL_CHAR) {
-            cbuf[outPtr++] = mSurrogate;
-            mSurrogate = NULL_CHAR;
-            // No need to load more, already got one char
-        } else {
-            /* Note: we'll try to avoid blocking as much as possible. As a
-             * result, we only need to get 4 bytes for a full char.
-             */
-            int left = (_length - _ptr);
-            if (left < 4) {
-                if (!loadMore(left)) { // (legal) EOF?
-                    return -1;
-                }
-            }
-        }
-
-        main_loop:
-        while (outPtr < len) {
-            int ptr = _ptr;
-            int ch;
-
-            if (mBigEndian) {
-                ch = (_buffer[ptr] << 24) | ((_buffer[ptr+1] & 0xFF) << 16)
-                    | ((_buffer[ptr+2] & 0xFF) << 8) | (_buffer[ptr+3] & 0xFF);
-            } else {
-                ch = (_buffer[ptr] & 0xFF) | ((_buffer[ptr+1] & 0xFF) << 8)
-                    | ((_buffer[ptr+2] & 0xFF) << 16) | (_buffer[ptr+3] << 24);
-            }
-            _ptr += 4;
-
-            // Does it need to be split to surrogates?
-            // (also, we can and need to verify illegal chars)
-            if (ch > 0xFFFF) { // need to split into surrogates?
-                if (ch > LAST_VALID_UNICODE_CHAR) {
-                    reportInvalid(ch, outPtr-start,
-                                  "(above "+Integer.toHexString(LAST_VALID_UNICODE_CHAR)+") ");
-                }
-                ch -= 0x10000; // to normalize it starting with 0x0
-                cbuf[outPtr++] = (char) (0xD800 + (ch >> 10));
-                // hmmh. can this ever be 0? (not legal, at least?)
-                ch = (0xDC00 | (ch & 0x03FF));
-                // Room for second part?
-                if (outPtr >= len) { // nope
-                    mSurrogate = (char) ch;
-                    break main_loop;
-                }
-            }
-            cbuf[outPtr++] = (char) ch;
-            if (_ptr >= _length) {
-                break main_loop;
-            }
-        }
-
-        len = outPtr - start;
-        mCharCount += len;
-        return len;
-    }
-
-    /*
-    ////////////////////////////////////////
-    // Internal methods
-    ////////////////////////////////////////
-    */
-
-    private void reportUnexpectedEOF(int gotBytes, int needed)
-        throws IOException
-    {
-        int bytePos = mByteCount + gotBytes;
-        int charPos = mCharCount;
-
-        throw new CharConversionException("Unexpected EOF in the middle of a 4-byte UTF-32 char: got "
-                                          +gotBytes+", needed "+needed
-                                          +", at char #"+charPos+", byte #"+bytePos+")");
-    }
-
-    private void reportInvalid(int value, int offset, String msg)
-        throws IOException
-    {
-        int bytePos = mByteCount + _ptr - 1;
-        int charPos = mCharCount + offset;
-
-        throw new CharConversionException("Invalid UTF-32 character 0x"
-                                          +Integer.toHexString(value)
-                                          +msg+" at char #"+charPos+", byte #"+bytePos+")");
-    }
-
-    /**
-     * @param available Number of "unused" bytes in the input buffer
-     *
-     * @return True, if enough bytes were read to allow decoding of at least
-     *   one full character; false if EOF was encountered instead.
-     */
-    private boolean loadMore(int available)
-        throws IOException
-    {
-        mByteCount += (_length - available);
-
-        // Bytes that need to be moved to the beginning of buffer?
-        if (available > 0) {
-            if (_ptr > 0) {
-                for (int i = 0; i < available; ++i) {
-                    _buffer[i] = _buffer[_ptr+i];
-                }
-                _ptr = 0;
-            }
-            _length = available;
-        } else {
-            /* Ok; here we can actually reasonably expect an EOF,
-             * so let's do a separate read right away:
-             */
-            _ptr = 0;
-            int count = _in.read(_buffer);
-            if (count < 1) {
-                _length = 0;
-                if (count < 0) { // -1
-                    freeBuffers(); // to help GC?
-                    return false;
-                }
-                // 0 count is no good; let's err out
-                reportStrangeStream();
-            }
-            _length = count;
-        }
-
-        /* Need at least 4 bytes; if we don't get that many, it's an
-         * error.
-         */
-        while (_length < 4) {
-            int count = _in.read(_buffer, _length, _buffer.length - _length);
-            if (count < 1) {
-                if (count < 0) { // -1, EOF... no good!
-                    freeBuffers(); // to help GC?
-                    reportUnexpectedEOF(_length, 4);
-                }
-                // 0 count is no good; let's err out
-                reportStrangeStream();
-            }
-            _length += count;
-        }
-        return true;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF8Writer.java b/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF8Writer.java
deleted file mode 100644
index 87c4bd0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/io/UTF8Writer.java
+++ /dev/null
@@ -1,387 +0,0 @@
-package com.fasterxml.jackson.core.io;
-
-import java.io.*;
-
-
-public final class UTF8Writer
-    extends Writer
-{
-    final static int SURR1_FIRST = 0xD800;
-    final static int SURR1_LAST = 0xDBFF;
-    final static int SURR2_FIRST = 0xDC00;
-    final static int SURR2_LAST = 0xDFFF;
-
-    final protected IOContext _context;
-
-    OutputStream _out;
-
-    byte[] _outBuffer;
-
-    final int _outBufferEnd;
-
-    int _outPtr;
-
-    /**
-     * When outputting chars from BMP, surrogate pairs need to be coalesced.
-     * To do this, both pairs must be known first; and since it is possible
-     * pairs may be split, we need temporary storage for the first half
-     */
-    int _surrogate = 0;
-
-    public UTF8Writer(IOContext ctxt, OutputStream out)
-    {
-        _context = ctxt;
-        _out = out;
-
-        _outBuffer = ctxt.allocWriteEncodingBuffer();
-        /* Max. expansion for a single char (in unmodified UTF-8) is
-         * 4 bytes (or 3 depending on how you view it -- 4 when recombining
-         * surrogate pairs)
-         */
-        _outBufferEnd = _outBuffer.length - 4;
-        _outPtr = 0;
-    }
-
-    @Override
-    public Writer append(char c)
-        throws IOException
-    {
-        write(c);
-        return this;
-    }
-
-    @Override
-    public void close()
-        throws IOException
-    {
-        if (_out != null) {
-            if (_outPtr > 0) {
-                _out.write(_outBuffer, 0, _outPtr);
-                _outPtr = 0;
-            }
-            OutputStream out = _out;
-            _out = null;
-
-            byte[] buf = _outBuffer;
-            if (buf != null) {
-                _outBuffer = null;
-                _context.releaseWriteEncodingBuffer(buf);
-            }
-
-            out.close();
-
-            /* Let's 'flush' orphan surrogate, no matter what; but only
-             * after cleanly closing everything else.
-             */
-            int code = _surrogate;
-            _surrogate = 0;
-            if (code > 0) {
-                throwIllegal(code);
-            }
-        }
-    }
-
-    @Override
-    public void flush()
-        throws IOException
-    {
-        if (_out != null) {
-            if (_outPtr > 0) {
-                _out.write(_outBuffer, 0, _outPtr);
-                _outPtr = 0;
-            }
-            _out.flush();
-        }
-    }
-
-    @Override
-    public void write(char[] cbuf)
-        throws IOException
-    {
-        write(cbuf, 0, cbuf.length);
-    }
-
-    @Override
-    public void write(char[] cbuf, int off, int len)
-        throws IOException
-    {
-        if (len < 2) {
-            if (len == 1) {
-                write(cbuf[off]);
-            }
-            return;
-        }
-
-        // First: do we have a leftover surrogate to deal with?
-        if (_surrogate > 0) {
-            char second = cbuf[off++];
-            --len;
-            write(convertSurrogate(second));
-            // will have at least one more char
-        }
-
-        int outPtr = _outPtr;
-        byte[] outBuf = _outBuffer;
-        int outBufLast = _outBufferEnd; // has 4 'spare' bytes
-
-        // All right; can just loop it nice and easy now:
-        len += off; // len will now be the end of input buffer
-
-        output_loop:
-        for (; off < len; ) {
-            /* First, let's ensure we can output at least 4 bytes
-             * (longest UTF-8 encoded codepoint):
-             */
-            if (outPtr >= outBufLast) {
-                _out.write(outBuf, 0, outPtr);
-                outPtr = 0;
-            }
-
-            int c = cbuf[off++];
-            // And then see if we have an Ascii char:
-            if (c < 0x80) { // If so, can do a tight inner loop:
-                outBuf[outPtr++] = (byte)c;
-                // Let's calc how many ascii chars we can copy at most:
-                int maxInCount = (len - off);
-                int maxOutCount = (outBufLast - outPtr);
-
-                if (maxInCount > maxOutCount) {
-                    maxInCount = maxOutCount;
-                }
-                maxInCount += off;
-                ascii_loop:
-                while (true) {
-                    if (off >= maxInCount) { // done with max. ascii seq
-                        continue output_loop;
-                    }
-                    c = cbuf[off++];
-                    if (c >= 0x80) {
-                        break ascii_loop;
-                    }
-                    outBuf[outPtr++] = (byte) c;
-                }
-            }
-
-            // Nope, multi-byte:
-            if (c < 0x800) { // 2-byte
-                outBuf[outPtr++] = (byte) (0xc0 | (c >> 6));
-                outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-            } else { // 3 or 4 bytes
-                // Surrogates?
-                if (c < SURR1_FIRST || c > SURR2_LAST) {
-                    outBuf[outPtr++] = (byte) (0xe0 | (c >> 12));
-                    outBuf[outPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                    outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-                    continue;
-                }
-                // Yup, a surrogate:
-                if (c > SURR1_LAST) { // must be from first range
-                    _outPtr = outPtr;
-                    throwIllegal(c);
-                }
-                _surrogate = c;
-                // and if so, followed by another from next range
-                if (off >= len) { // unless we hit the end?
-                    break;
-                }
-                c = convertSurrogate(cbuf[off++]);
-                if (c > 0x10FFFF) { // illegal in JSON as well as in XML
-                    _outPtr = outPtr;
-                    throwIllegal(c);
-                }
-                outBuf[outPtr++] = (byte) (0xf0 | (c >> 18));
-                outBuf[outPtr++] = (byte) (0x80 | ((c >> 12) & 0x3f));
-                outBuf[outPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-            }
-        }
-        _outPtr = outPtr;
-    }
-    
-    @Override
-    public void write(int c) throws IOException
-    {
-        // First; do we have a left over surrogate?
-        if (_surrogate > 0) {
-            c = convertSurrogate(c);
-            // If not, do we start with a surrogate?
-        } else if (c >= SURR1_FIRST && c <= SURR2_LAST) {
-            // Illegal to get second part without first:
-            if (c > SURR1_LAST) {
-                throwIllegal(c);
-            }
-            // First part just needs to be held for now
-            _surrogate = c;
-            return;
-        }
-
-        if (_outPtr >= _outBufferEnd) { // let's require enough room, first
-            _out.write(_outBuffer, 0, _outPtr);
-            _outPtr = 0;
-        }
-
-        if (c < 0x80) { // ascii
-            _outBuffer[_outPtr++] = (byte) c;
-        } else {
-            int ptr = _outPtr;
-            if (c < 0x800) { // 2-byte
-                _outBuffer[ptr++] = (byte) (0xc0 | (c >> 6));
-                _outBuffer[ptr++] = (byte) (0x80 | (c & 0x3f));
-            } else if (c <= 0xFFFF) { // 3 bytes
-                _outBuffer[ptr++] = (byte) (0xe0 | (c >> 12));
-                _outBuffer[ptr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                _outBuffer[ptr++] = (byte) (0x80 | (c & 0x3f));
-            } else { // 4 bytes
-                if (c > 0x10FFFF) { // illegal
-                    throwIllegal(c);
-                }
-                _outBuffer[ptr++] = (byte) (0xf0 | (c >> 18));
-                _outBuffer[ptr++] = (byte) (0x80 | ((c >> 12) & 0x3f));
-                _outBuffer[ptr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                _outBuffer[ptr++] = (byte) (0x80 | (c & 0x3f));
-            }
-            _outPtr = ptr;
-        }
-    }
-
-    @Override
-    public void write(String str) throws IOException
-    {
-        write(str, 0, str.length());
-    }
-
-    @Override
-    public void write(String str, int off, int len)  throws IOException
-    {
-        if (len < 2) {
-            if (len == 1) {
-                write(str.charAt(off));
-            }
-            return;
-        }
-
-        // First: do we have a leftover surrogate to deal with?
-        if (_surrogate > 0) {
-            char second = str.charAt(off++);
-            --len;
-            write(convertSurrogate(second));
-            // will have at least one more char (case of 1 char was checked earlier on)
-        }
-
-        int outPtr = _outPtr;
-        byte[] outBuf = _outBuffer;
-        int outBufLast = _outBufferEnd; // has 4 'spare' bytes
-
-        // All right; can just loop it nice and easy now:
-        len += off; // len will now be the end of input buffer
-
-        output_loop:
-        for (; off < len; ) {
-            /* First, let's ensure we can output at least 4 bytes
-             * (longest UTF-8 encoded codepoint):
-             */
-            if (outPtr >= outBufLast) {
-                _out.write(outBuf, 0, outPtr);
-                outPtr = 0;
-            }
-
-            int c = str.charAt(off++);
-            // And then see if we have an Ascii char:
-            if (c < 0x80) { // If so, can do a tight inner loop:
-                outBuf[outPtr++] = (byte)c;
-                // Let's calc how many ascii chars we can copy at most:
-                int maxInCount = (len - off);
-                int maxOutCount = (outBufLast - outPtr);
-
-                if (maxInCount > maxOutCount) {
-                    maxInCount = maxOutCount;
-                }
-                maxInCount += off;
-                ascii_loop:
-                while (true) {
-                    if (off >= maxInCount) { // done with max. ascii seq
-                        continue output_loop;
-                    }
-                    c = str.charAt(off++);
-                    if (c >= 0x80) {
-                        break ascii_loop;
-                    }
-                    outBuf[outPtr++] = (byte) c;
-                }
-            }
-
-            // Nope, multi-byte:
-            if (c < 0x800) { // 2-byte
-                outBuf[outPtr++] = (byte) (0xc0 | (c >> 6));
-                outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-            } else { // 3 or 4 bytes
-                // Surrogates?
-                if (c < SURR1_FIRST || c > SURR2_LAST) {
-                    outBuf[outPtr++] = (byte) (0xe0 | (c >> 12));
-                    outBuf[outPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                    outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-                    continue;
-                }
-                // Yup, a surrogate:
-                if (c > SURR1_LAST) { // must be from first range
-                    _outPtr = outPtr;
-                    throwIllegal(c);
-                }
-                _surrogate = c;
-                // and if so, followed by another from next range
-                if (off >= len) { // unless we hit the end?
-                    break;
-                }
-                c = convertSurrogate(str.charAt(off++));
-                if (c > 0x10FFFF) { // illegal, as per RFC 4627
-                    _outPtr = outPtr;
-                    throwIllegal(c);
-                }
-                outBuf[outPtr++] = (byte) (0xf0 | (c >> 18));
-                outBuf[outPtr++] = (byte) (0x80 | ((c >> 12) & 0x3f));
-                outBuf[outPtr++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-                outBuf[outPtr++] = (byte) (0x80 | (c & 0x3f));
-            }
-        }
-        _outPtr = outPtr;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called to calculate UTF codepoint, from a surrogate pair.
-     */
-    private int convertSurrogate(int secondPart)
-        throws IOException
-    {
-        int firstPart = _surrogate;
-        _surrogate = 0;
-
-        // Ok, then, is the second part valid?
-        if (secondPart < SURR2_FIRST || secondPart > SURR2_LAST) {
-            throw new IOException("Broken surrogate pair: first char 0x"+Integer.toHexString(firstPart)+", second 0x"+Integer.toHexString(secondPart)+"; illegal combination");
-        }
-        return 0x10000 + ((firstPart - SURR1_FIRST) << 10) + (secondPart - SURR2_FIRST);
-    }
-
-    private void throwIllegal(int code)
-        throws IOException
-    {
-        if (code > 0x10FFFF) { // over max?
-            throw new IOException("Illegal character point (0x"+Integer.toHexString(code)+") to output; max is 0x10FFFF as per RFC 4627");
-        }
-        if (code >= SURR1_FIRST) {
-            if (code <= SURR1_LAST) { // Unmatched first part (closing without second part?)
-                throw new IOException("Unmatched first part of surrogate pair (0x"+Integer.toHexString(code)+")");
-            }
-            throw new IOException("Unmatched second part of surrogate pair (0x"+Integer.toHexString(code)+")");
-        }
-
-        // should we ever get this?
-        throw new IOException("Illegal character point (0x"+Integer.toHexString(code)+") to output");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
deleted file mode 100644
index c425c53..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.format.InputAccessor;
-import com.fasterxml.jackson.core.format.MatchStrength;
-import com.fasterxml.jackson.core.io.*;
-import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
-import com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer;
-
-/**
- * This class is used to determine the encoding of byte stream
- * that is to contain JSON content. Rules are fairly simple, and
- * defined in JSON specification (RFC-4627 or newer), except
- * for BOM handling, which is a property of underlying
- * streams.
- */
-public final class ByteSourceJsonBootstrapper
-{
-    final static byte UTF8_BOM_1 = (byte) 0xEF;
-    final static byte UTF8_BOM_2 = (byte) 0xBB;
-    final static byte UTF8_BOM_3 = (byte) 0xBF;
-    
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    protected final IOContext _context;
-
-    protected final InputStream _in;
-
-    /*
-    /**********************************************************
-    /* Input buffering
-    /**********************************************************
-     */
-
-    protected final byte[] _inputBuffer;
-
-    private int _inputPtr;
-
-    private int _inputEnd;
-
-    /**
-     * Flag that indicates whether buffer above is to be recycled
-     * after being used or not.
-     */
-    private final boolean _bufferRecyclable;
-
-    /*
-    /**********************************************************
-    /* Input location
-    /**********************************************************
-     */
-
-    /**
-     * Current number of input units (bytes or chars) that were processed in
-     * previous blocks,
-     * before contents of current input buffer.
-     *<p>
-     * Note: includes possible BOMs, if those were part of the input.
-     */
-    protected int _inputProcessed;
-
-    /*
-    /**********************************************************
-    /* Data gathered
-    /**********************************************************
-     */
-
-    protected boolean _bigEndian = true;
-
-    protected int _bytesPerChar = 0; // 0 means "dunno yet"
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public ByteSourceJsonBootstrapper(IOContext ctxt, InputStream in)
-    {
-        _context = ctxt;
-        _in = in;
-        _inputBuffer = ctxt.allocReadIOBuffer();
-        _inputEnd = _inputPtr = 0;
-        _inputProcessed = 0;
-        _bufferRecyclable = true;
-    }
-
-    public ByteSourceJsonBootstrapper(IOContext ctxt, byte[] inputBuffer, int inputStart, int inputLen)
-    {
-        _context = ctxt;
-        _in = null;
-        _inputBuffer = inputBuffer;
-        _inputPtr = inputStart;
-        _inputEnd = (inputStart + inputLen);
-        // Need to offset this for correct location info
-        _inputProcessed = -inputStart;
-        _bufferRecyclable = false;
-    }
-
-    /*
-    /**********************************************************
-    /*  Encoding detection during bootstrapping
-    /**********************************************************
-     */
-    
-    /**
-     * Method that should be called after constructing an instace.
-     * It will figure out encoding that content uses, to allow
-     * for instantiating a proper scanner object.
-     */
-    public JsonEncoding detectEncoding()
-        throws IOException, JsonParseException
-    {
-        boolean foundEncoding = false;
-
-        // First things first: BOM handling
-        /* Note: we can require 4 bytes to be read, since no
-         * combination of BOM + valid JSON content can have
-         * shorter length (shortest valid JSON content is single
-         * digit char, but BOMs are chosen such that combination
-         * is always at least 4 chars long)
-         */
-        if (ensureLoaded(4)) {
-            int quad =  (_inputBuffer[_inputPtr] << 24)
-                | ((_inputBuffer[_inputPtr+1] & 0xFF) << 16)
-                | ((_inputBuffer[_inputPtr+2] & 0xFF) << 8)
-                | (_inputBuffer[_inputPtr+3] & 0xFF);
-            
-            if (handleBOM(quad)) {
-                foundEncoding = true;
-            } else {
-                /* If no BOM, need to auto-detect based on first char;
-                 * this works since it must be 7-bit ascii (wrt. unicode
-                 * compatible encodings, only ones JSON can be transferred
-                 * over)
-                 */
-                // UTF-32?
-                if (checkUTF32(quad)) {
-                    foundEncoding = true;
-                } else if (checkUTF16(quad >>> 16)) {
-                    foundEncoding = true;
-                }
-            }
-        } else if (ensureLoaded(2)) {
-            int i16 = ((_inputBuffer[_inputPtr] & 0xFF) << 8)
-                | (_inputBuffer[_inputPtr+1] & 0xFF);
-            if (checkUTF16(i16)) {
-                foundEncoding = true;
-            }
-        }
-
-        JsonEncoding enc;
-
-        /* Not found yet? As per specs, this means it must be UTF-8. */
-        if (!foundEncoding) {
-            enc = JsonEncoding.UTF8;
-        } else {
-            switch (_bytesPerChar) {
-            case 1:
-                enc = JsonEncoding.UTF8;
-                break;
-            case 2:
-                enc = _bigEndian ? JsonEncoding.UTF16_BE : JsonEncoding.UTF16_LE;
-                break;
-            case 4:
-                enc = _bigEndian ? JsonEncoding.UTF32_BE : JsonEncoding.UTF32_LE;
-                break;
-            default:
-                throw new RuntimeException("Internal error"); // should never get here
-            }
-        }
-        _context.setEncoding(enc);
-        return enc;
-    }
-
-    /*
-    /**********************************************************
-    /* Constructing a Reader
-    /**********************************************************
-     */
-    
-    public Reader constructReader()
-        throws IOException
-    {
-        JsonEncoding enc = _context.getEncoding();
-        switch (enc) { 
-        case UTF32_BE:
-        case UTF32_LE:
-            return new UTF32Reader(_context, _in, _inputBuffer, _inputPtr, _inputEnd,
-                                   _context.getEncoding().isBigEndian());
-
-        case UTF16_BE:
-        case UTF16_LE:
-        case UTF8: // only in non-common case where we don't want to do direct mapping
-            {
-                // First: do we have a Stream? If not, need to create one:
-                InputStream in = _in;
-
-                if (in == null) {
-                    in = new ByteArrayInputStream(_inputBuffer, _inputPtr, _inputEnd);
-                } else {
-                    /* Also, if we have any read but unused input (usually true),
-                     * need to merge that input in:
-                     */
-                    if (_inputPtr < _inputEnd) {
-                        in = new MergedStream(_context, in, _inputBuffer, _inputPtr, _inputEnd);
-                    }
-                }
-                return new InputStreamReader(in, enc.getJavaName());
-            }
-        }
-        throw new RuntimeException("Internal error"); // should never get here
-    }
-
-    public JsonParser constructParser(int parserFeatures, ObjectCodec codec,
-            BytesToNameCanonicalizer rootByteSymbols, CharsToNameCanonicalizer rootCharSymbols,
-            boolean canonicalize, boolean intern)
-        throws IOException, JsonParseException
-    {
-        JsonEncoding enc = detectEncoding();
-
-        if (enc == JsonEncoding.UTF8) {
-            /* and without canonicalization, byte-based approach is not performance; just use std UTF-8 reader
-             * (which is ok for larger input; not so hot for smaller; but this is not a common case)
-             */
-            if (canonicalize) {
-                BytesToNameCanonicalizer can = rootByteSymbols.makeChild(canonicalize, intern);
-                return new UTF8StreamJsonParser(_context, parserFeatures, _in, codec, can, _inputBuffer, _inputPtr, _inputEnd, _bufferRecyclable);
-            }
-        }
-        return new ReaderBasedJsonParser(_context, parserFeatures, constructReader(), codec,
-                rootCharSymbols.makeChild(canonicalize, intern));
-    }
-
-    /*
-    /**********************************************************
-    /*  Encoding detection for data format auto-detection
-    /**********************************************************
-     */
-
-    /**
-     * Current implementation is not as thorough as other functionality
-     * ({@link com.fasterxml.jackson.core.json.ByteSourceJsonBootstrapper}); 
-     * supports UTF-8, for example. But it should work, for now, and can
-     * be improved as necessary.
-     */
-    public static MatchStrength hasJSONFormat(InputAccessor acc) throws IOException
-    {
-        // Ideally we should see "[" or "{"; but if not, we'll accept double-quote (String)
-        // in future could also consider accepting non-standard matches?
-        
-        if (!acc.hasMoreBytes()) {
-            return MatchStrength.INCONCLUSIVE;
-        }
-        byte b = acc.nextByte();
-        // Very first thing, a UTF-8 BOM?
-        if (b == UTF8_BOM_1) { // yes, looks like UTF-8 BOM
-            if (!acc.hasMoreBytes()) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            if (acc.nextByte() != UTF8_BOM_2) {
-                return MatchStrength.NO_MATCH;
-            }
-            if (!acc.hasMoreBytes()) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            if (acc.nextByte() != UTF8_BOM_3) {
-                return MatchStrength.NO_MATCH;
-            }
-            if (!acc.hasMoreBytes()) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            b = acc.nextByte();
-        }
-        // Then possible leading space
-        int ch = skipSpace(acc, b);
-        if (ch < 0) {
-            return MatchStrength.INCONCLUSIVE;
-        }
-        // First, let's see if it looks like a structured type:
-        if (ch == '{') { // JSON object?
-            // Ideally we need to find either double-quote or closing bracket
-            ch = skipSpace(acc);
-            if (ch < 0) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            if (ch == '"' || ch == '}') {
-                return MatchStrength.SOLID_MATCH;
-            }
-            // ... should we allow non-standard? Let's not yet... can add if need be
-            return MatchStrength.NO_MATCH;
-        }
-        MatchStrength strength;
-        
-        if (ch == '[') {
-            ch = skipSpace(acc);
-            if (ch < 0) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            // closing brackets is easy; but for now, let's also accept opening...
-            if (ch == ']' || ch == '[') {
-                return MatchStrength.SOLID_MATCH;
-            }
-            return MatchStrength.SOLID_MATCH;
-        } else {
-            // plain old value is not very convincing...
-            strength = MatchStrength.WEAK_MATCH;
-        }
-
-        if (ch == '"') { // string value
-            return strength;
-        }
-        if (ch <= '9' && ch >= '0') { // number
-            return strength;
-        }
-        if (ch == '-') { // negative number
-            ch = skipSpace(acc);
-            if (ch < 0) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            return (ch <= '9' && ch >= '0') ? strength : MatchStrength.NO_MATCH;
-        }
-        // or one of literals
-        if (ch == 'n') { // null
-            return tryMatch(acc, "ull", strength);
-        }
-        if (ch == 't') { // true
-            return tryMatch(acc, "rue", strength);
-        }
-        if (ch == 'f') { // false
-            return tryMatch(acc, "alse", strength);
-        }
-        return MatchStrength.NO_MATCH;
-    }
-
-    private static MatchStrength tryMatch(InputAccessor acc, String matchStr, MatchStrength fullMatchStrength)
-        throws IOException
-    {
-        for (int i = 0, len = matchStr.length(); i < len; ++i) {
-            if (!acc.hasMoreBytes()) {
-                return MatchStrength.INCONCLUSIVE;
-            }
-            if (acc.nextByte() != matchStr.charAt(i)) {
-                return MatchStrength.NO_MATCH;
-            }
-        }
-        return fullMatchStrength;
-    }
-    
-    private static int skipSpace(InputAccessor acc) throws IOException
-    {
-        if (!acc.hasMoreBytes()) {
-            return -1;
-        }
-        return skipSpace(acc, acc.nextByte());
-    }
-    
-    private static int skipSpace(InputAccessor acc, byte b) throws IOException
-    {
-        while (true) {
-            int ch = (int) b & 0xFF;
-            if (!(ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t')) {
-                return ch;
-            }
-            if (!acc.hasMoreBytes()) {
-                return -1;
-            }
-            b = acc.nextByte();
-            ch = (int) b & 0xFF;
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, parsing
-    /**********************************************************
-     */
-
-    /**
-     * @return True if a BOM was succesfully found, and encoding
-     *   thereby recognized.
-     */
-    private boolean handleBOM(int quad)
-        throws IOException
-    {
-        /* Handling of (usually) optional BOM (required for
-         * multi-byte formats); first 32-bit charsets:
-         */
-        switch (quad) {
-        case 0x0000FEFF:
-            _bigEndian = true;
-            _inputPtr += 4;
-            _bytesPerChar = 4;
-            return true;
-        case 0xFFFE0000: // UCS-4, LE?
-            _inputPtr += 4;
-            _bytesPerChar = 4;
-            _bigEndian = false;
-            return true;
-        case 0x0000FFFE: // UCS-4, in-order...
-            reportWeirdUCS4("2143"); // throws exception
-        case 0xFEFF0000: // UCS-4, in-order...
-            reportWeirdUCS4("3412"); // throws exception
-        }
-        // Ok, if not, how about 16-bit encoding BOMs?
-        int msw = quad >>> 16;
-        if (msw == 0xFEFF) { // UTF-16, BE
-            _inputPtr += 2;
-            _bytesPerChar = 2;
-            _bigEndian = true;
-            return true;
-        }
-        if (msw == 0xFFFE) { // UTF-16, LE
-            _inputPtr += 2;
-            _bytesPerChar = 2;
-            _bigEndian = false;
-            return true;
-        }
-        // And if not, then UTF-8 BOM?
-        if ((quad >>> 8) == 0xEFBBBF) { // UTF-8
-            _inputPtr += 3;
-            _bytesPerChar = 1;
-            _bigEndian = true; // doesn't really matter
-            return true;
-        }
-        return false;
-    }
-
-    private boolean checkUTF32(int quad)
-        throws IOException
-    {
-        /* Handling of (usually) optional BOM (required for
-         * multi-byte formats); first 32-bit charsets:
-         */
-        if ((quad >> 8) == 0) { // 0x000000?? -> UTF32-BE
-            _bigEndian = true;
-        } else if ((quad & 0x00FFFFFF) == 0) { // 0x??000000 -> UTF32-LE
-            _bigEndian = false;
-        } else if ((quad & ~0x00FF0000) == 0) { // 0x00??0000 -> UTF32-in-order
-            reportWeirdUCS4("3412");
-        } else if ((quad & ~0x0000FF00) == 0) { // 0x0000??00 -> UTF32-in-order
-            reportWeirdUCS4("2143");
-        } else {
-            // Can not be valid UTF-32 encoded JSON...
-            return false;
-        }
-        // Not BOM (just regular content), nothing to skip past:
-        //_inputPtr += 4;
-        _bytesPerChar = 4;
-        return true;
-    }
-
-    private boolean checkUTF16(int i16)
-    {
-        if ((i16 & 0xFF00) == 0) { // UTF-16BE
-            _bigEndian = true;
-        } else if ((i16 & 0x00FF) == 0) { // UTF-16LE
-            _bigEndian = false;
-        } else { // nope, not  UTF-16
-            return false;
-        }
-        // Not BOM (just regular content), nothing to skip past:
-        //_inputPtr += 2;
-        _bytesPerChar = 2;
-        return true;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, problem reporting
-    /**********************************************************
-     */
-
-    private void reportWeirdUCS4(String type)
-        throws IOException
-    {
-        throw new CharConversionException("Unsupported UCS-4 endianness ("+type+") detected");
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, raw input access
-    /**********************************************************
-     */
-
-    protected boolean ensureLoaded(int minimum)
-        throws IOException
-    {
-        /* Let's assume here buffer has enough room -- this will always
-         * be true for the limited used this method gets
-         */
-        int gotten = (_inputEnd - _inputPtr);
-        while (gotten < minimum) {
-            int count;
-
-            if (_in == null) { // block source
-                count = -1;
-            } else {
-                count = _in.read(_inputBuffer, _inputEnd, _inputBuffer.length - _inputEnd);
-            }
-            if (count < 1) {
-                return false;
-            }
-            _inputEnd += count;
-            gotten += count;
-        }
-        return true;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/CoreVersion.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/CoreVersion.java
deleted file mode 100644
index 88cfb17..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/CoreVersion.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * Helper class used for finding and caching version information
- * for the core bundle.
- * NOTE: although defined as public, should NOT be accessed directly
- * from outside core bundle itself.
- */
-public class CoreVersion extends VersionUtil
-{
-    public final static CoreVersion instance = new CoreVersion();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java
deleted file mode 100644
index 989f463..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonGeneratorImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.base.GeneratorBase;
-import com.fasterxml.jackson.core.io.CharTypes;
-import com.fasterxml.jackson.core.io.CharacterEscapes;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * Intermediate base class shared by JSON-backed generators
- * like {@link UTF8JsonGenerator} and {@link WriterBasedJsonGenerator}.
- * 
- * @since 2.1
- */
-public abstract class JsonGeneratorImpl extends GeneratorBase
-{
-    /*
-    /**********************************************************
-    /* Constants
-    /**********************************************************
-     */
-
-    /**
-     * This is the default set of escape codes, over 7-bit ASCII range
-     * (first 128 character codes), used for single-byte UTF-8 characters.
-     */
-    protected final static int[] sOutputEscapes = CharTypes.get7BitOutputEscapes();
-    
-    /*
-    /**********************************************************
-    /* Configuration, basic I/O
-    /**********************************************************
-     */
-
-    final protected IOContext _ioContext;
-
-    /*
-    /**********************************************************
-    /* Configuration, output escaping
-    /**********************************************************
-     */
-
-    /**
-     * Currently active set of output escape code definitions (whether
-     * and how to escape or not) for 7-bit ASCII range (first 128
-     * character codes). Defined separately to make potentially
-     * customizable
-     */
-    protected int[] _outputEscapes = sOutputEscapes;
-
-    /**
-     * Value between 128 (0x80) and 65535 (0xFFFF) that indicates highest
-     * Unicode code point that will not need escaping; or 0 to indicate
-     * that all characters can be represented without escaping.
-     * Typically used to force escaping of some portion of character set;
-     * for example to always escape non-ASCII characters (if value was 127).
-     *<p>
-     * NOTE: not all sub-classes make use of this setting.
-     */
-    protected int _maximumNonEscapedChar;
-
-    /**
-     * Definition of custom character escapes to use for generators created
-     * by this factory, if any. If null, standard data format specific
-     * escapes are used.
-     */
-    protected CharacterEscapes _characterEscapes;
-    
-    /*
-    /**********************************************************
-    /* Configuration, other
-    /**********************************************************
-     */
-
-    /**
-     * Separator to use, if any, between root-level values.
-     * 
-     * @since 2.1
-     */
-    protected SerializableString _rootValueSeparator
-        = DefaultPrettyPrinter.DEFAULT_ROOT_VALUE_SEPARATOR;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public JsonGeneratorImpl(IOContext ctxt, int features, ObjectCodec codec)
-    {
-        super(features, codec);
-        _ioContext = ctxt;
-        if (isEnabled(Feature.ESCAPE_NON_ASCII)) {
-            setHighestNonEscapedChar(127);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Overridden configuration methods
-    /**********************************************************
-     */
-
-    @Override
-    public JsonGenerator setHighestNonEscapedChar(int charCode) {
-        _maximumNonEscapedChar = (charCode < 0) ? 0 : charCode;
-        return this;
-    }
-
-    @Override
-    public int getHighestEscapedChar() {
-        return _maximumNonEscapedChar;
-    }
-
-    @Override
-    public JsonGenerator setCharacterEscapes(CharacterEscapes esc)
-    {
-        _characterEscapes = esc;
-        if (esc == null) { // revert to standard escapes
-            _outputEscapes = sOutputEscapes;
-        } else {
-            _outputEscapes = esc.getEscapeCodesForAscii();
-        }
-        return this;
-    }
-
-    /**
-     * Method for accessing custom escapes factory uses for {@link JsonGenerator}s
-     * it creates.
-     */
-    @Override
-    public CharacterEscapes getCharacterEscapes() {
-        return _characterEscapes;
-    }
-    
-    @Override
-    public JsonGenerator setRootValueSeparator(SerializableString sep) {
-        _rootValueSeparator = sep;
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Versioned
-    /**********************************************************
-     */
-
-    @Override
-    public Version version() {
-        return VersionUtil.versionFor(getClass());
-    }
-
-    /*
-    /**********************************************************
-    /* Partial API
-    /**********************************************************
-     */
-
-    // // Overrides just to make things final, to possibly help with inlining
-    
-    @Override
-    public final void writeStringField(String fieldName, String value)
-        throws IOException, JsonGenerationException
-    {
-        writeFieldName(fieldName);
-        writeString(value);
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonReadContext.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonReadContext.java
deleted file mode 100644
index 564a934..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonReadContext.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.CharTypes;
-
-/**
- * Extension of {@link JsonStreamContext}, which implements
- * core methods needed, and also exposes
- * more complete API to parser implementation classes.
- */
-public final class JsonReadContext
-    extends JsonStreamContext
-{
-    // // // Configuration
-
-    protected final JsonReadContext _parent;
-
-    // // // Location information (minus source reference)
-
-    protected int _lineNr;
-    protected int _columnNr;
-
-    protected String _currentName;
-
-    /*
-    /**********************************************************
-    /* Simple instance reuse slots; speeds up things
-    /* a bit (10-15%) for docs with lots of small
-    /* arrays/objects (for which allocation was
-    /* visible in profile stack frames)
-    /**********************************************************
-     */
-
-    protected JsonReadContext _child = null;
-
-    /*
-    /**********************************************************
-    /* Instance construction, reuse
-    /**********************************************************
-     */
-
-    public JsonReadContext(JsonReadContext parent, int type, int lineNr, int colNr)
-    {
-        super();
-        _type = type;
-        _parent = parent;
-        _lineNr = lineNr;
-        _columnNr = colNr;
-        _index = -1;
-    }
-
-    protected void reset(int type, int lineNr, int colNr)
-    {
-        _type = type;
-        _index = -1;
-        _lineNr = lineNr;
-        _columnNr = colNr;
-        _currentName = null;
-    }
-
-    // // // Factory methods
-
-    public static JsonReadContext createRootContext(int lineNr, int colNr)
-    {
-        return new JsonReadContext(null, TYPE_ROOT, lineNr, colNr);
-    }
-
-    public static JsonReadContext createRootContext()
-    {
-        return new JsonReadContext(null, TYPE_ROOT, 1, 0);
-    }
-    
-    public JsonReadContext createChildArrayContext(int lineNr, int colNr)
-    {
-        JsonReadContext ctxt = _child;
-        if (ctxt == null) {
-            _child = ctxt = new JsonReadContext(this, TYPE_ARRAY, lineNr, colNr);
-            return ctxt;
-        }
-        ctxt.reset(TYPE_ARRAY, lineNr, colNr);
-        return ctxt;
-    }
-
-    public JsonReadContext createChildObjectContext(int lineNr, int colNr)
-    {
-        JsonReadContext ctxt = _child;
-        if (ctxt == null) {
-            _child = ctxt = new JsonReadContext(this, TYPE_OBJECT, lineNr, colNr);
-            return ctxt;
-        }
-        ctxt.reset(TYPE_OBJECT, lineNr, colNr);
-        return ctxt;
-    }
-
-    /*
-    /**********************************************************
-    /* Abstract method implementation
-    /**********************************************************
-     */
-
-    @Override
-    public String getCurrentName() { return _currentName; }
-
-    @Override
-    public JsonReadContext getParent() { return _parent; }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * @return Location pointing to the point where the context
-     *   start marker was found
-     */
-    public JsonLocation getStartLocation(Object srcRef)
-    {
-        /* We don't keep track of offsets at this level (only
-         * reader does)
-         */
-        long totalChars = -1L;
-
-        return new JsonLocation(srcRef, totalChars, _lineNr, _columnNr);
-    }
-
-    /*
-    /**********************************************************
-    /* State changes
-    /**********************************************************
-     */
-
-    public boolean expectComma()
-    {
-        /* Assumption here is that we will be getting a value (at least
-         * before calling this method again), and
-         * so will auto-increment index to avoid having to do another call
-         */
-        int ix = ++_index; // starts from -1
-        return (_type != TYPE_ROOT && ix > 0);
-    }
-
-    public void setCurrentName(String name)
-    {
-        _currentName = name;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-
-    /**
-     * Overridden to provide developer readable "JsonPath" representation
-     * of the context.
-     */
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(64);
-        switch (_type) {
-        case TYPE_ROOT:
-            sb.append("/");
-            break;
-        case TYPE_ARRAY:
-            sb.append('[');
-            sb.append(getCurrentIndex());
-            sb.append(']');
-            break;
-        case TYPE_OBJECT:
-            sb.append('{');
-            if (_currentName != null) {
-                sb.append('"');
-                CharTypes.appendQuoted(sb, _currentName);
-                sb.append('"');
-            } else {
-                sb.append('?');
-            }
-            sb.append('}');
-            break;
-        }
-        return sb.toString();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonWriteContext.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonWriteContext.java
deleted file mode 100644
index 0c85d2a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/JsonWriteContext.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Extension of {@link JsonStreamContext}, which implements
- * core methods needed, and also exposes
- * more complete API to generator implementation classes.
- */
-public class JsonWriteContext
-    extends JsonStreamContext
-{
-    // // // Return values for writeValue()
-
-    public final static int STATUS_OK_AS_IS = 0;
-    public final static int STATUS_OK_AFTER_COMMA = 1;
-    public final static int STATUS_OK_AFTER_COLON = 2;
-    public final static int STATUS_OK_AFTER_SPACE = 3; // in root context
-    public final static int STATUS_EXPECT_VALUE = 4;
-    public final static int STATUS_EXPECT_NAME = 5;
-
-    protected final JsonWriteContext _parent;
-
-    /**
-     * Name of the field of which value is to be parsed; only
-     * used for OBJECT contexts
-     */
-    protected String _currentName;
-    
-    /*
-    /**********************************************************
-    /* Simple instance reuse slots; speed up things
-    /* a bit (10-15%) for docs with lots of small
-    /* arrays/objects
-    /**********************************************************
-     */
-
-    protected JsonWriteContext _child = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected JsonWriteContext(int type, JsonWriteContext parent)
-    {
-        super();
-        _type = type;
-        _parent = parent;
-        _index = -1;
-    }
-    
-    // // // Factory methods
-
-    public static JsonWriteContext createRootContext()
-    {
-        return new JsonWriteContext(TYPE_ROOT, null);
-    }
-
-    private JsonWriteContext reset(int type) {
-        _type = type;
-        _index = -1;
-        _currentName = null;
-        return this;
-    }
-    
-    public final JsonWriteContext createChildArrayContext()
-    {
-        JsonWriteContext ctxt = _child;
-        if (ctxt == null) {
-            _child = ctxt = new JsonWriteContext(TYPE_ARRAY, this);
-            return ctxt;
-        }
-        return ctxt.reset(TYPE_ARRAY);
-    }
-
-    public final JsonWriteContext createChildObjectContext()
-    {
-        JsonWriteContext ctxt = _child;
-        if (ctxt == null) {
-            _child = ctxt = new JsonWriteContext(TYPE_OBJECT, this);
-            return ctxt;
-        }
-        return ctxt.reset(TYPE_OBJECT);
-    }
-
-    // // // Shared API
-
-    @Override
-    public final JsonWriteContext getParent() { return _parent; }
-
-    @Override
-    public final String getCurrentName() { return _currentName; }
-    
-    // // // API sub-classes are to implement
-
-    /**
-     * Method that writer is to call before it writes a field name.
-     *
-     * @return Index of the field entry (0-based)
-     */
-    public final int writeFieldName(String name)
-    {
-        if (_type == TYPE_OBJECT) {
-            if (_currentName != null) { // just wrote a name...
-                return STATUS_EXPECT_VALUE;
-            }
-            _currentName = name;
-            return (_index < 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_COMMA;
-        }
-        return STATUS_EXPECT_VALUE;
-    }
-    
-    public final int writeValue()
-    {
-        // Most likely, object:
-        if (_type == TYPE_OBJECT) {
-            if (_currentName == null) {
-                return STATUS_EXPECT_NAME;
-            }
-            _currentName = null;
-            ++_index;
-            return STATUS_OK_AFTER_COLON;
-        }
-
-        // Ok, array?
-        if (_type == TYPE_ARRAY) {
-            int ix = _index;
-            ++_index;
-            return (ix < 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_COMMA;
-        }
-        
-        // Nope, root context
-        // No commas within root context, but need space
-        ++_index;
-        return (_index == 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_SPACE;
-    }
-
-    // // // Internally used abstract methods
-
-    protected final void appendDesc(StringBuilder sb)
-    {
-        if (_type == TYPE_OBJECT) {
-            sb.append('{');
-            if (_currentName != null) {
-                sb.append('"');
-                // !!! TODO: Name chars should be escaped?
-                sb.append(_currentName);
-                sb.append('"');
-            } else {
-                sb.append('?');
-            }
-            sb.append('}');
-        } else if (_type == TYPE_ARRAY) {
-            sb.append('[');
-            sb.append(getCurrentIndex());
-            sb.append(']');
-        } else {
-            // nah, ROOT:
-            sb.append("/");
-        }
-    }
-
-    // // // Overridden standard methods
-
-    /**
-     * Overridden to provide developer writeable "JsonPath" representation
-     * of the context.
-     */
-    @Override
-    public final String toString()
-    {
-        StringBuilder sb = new StringBuilder(64);
-        appendDesc(sb);
-        return sb.toString();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
deleted file mode 100644
index 2bc07c9..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
+++ /dev/null
@@ -1,1995 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.base.ParserBase;
-import com.fasterxml.jackson.core.io.CharTypes;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer;
-import com.fasterxml.jackson.core.util.*;
-
-/**
- * This is a concrete implementation of {@link JsonParser}, which is
- * based on a {@link java.io.Reader} to handle low-level character
- * conversion tasks.
- */
-public final class ReaderBasedJsonParser
-    extends ParserBase
-{
-    /*
-    /**********************************************************
-    /* Input configuration
-    /**********************************************************
-     */
-
-    /**
-     * Reader that can be used for reading more content, if one
-     * buffer from input source, but in some cases pre-loaded buffer
-     * is handed to the parser.
-     */
-    protected Reader _reader;
-
-    /**
-     * Current buffer from which data is read; generally data is read into
-     * buffer from input source.
-     */
-    protected char[] _inputBuffer;
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    protected ObjectCodec _objectCodec;
-
-    final protected CharsToNameCanonicalizer _symbols;
-    
-    final protected int _hashSeed;
-
-    /*
-    /**********************************************************
-    /* Parsing state
-    /**********************************************************
-     */
-    
-    /**
-     * Flag that indicates that the current token has not yet
-     * been fully processed, and needs to be finished for
-     * some access (or skipped to obtain the next token)
-     */
-    protected boolean _tokenIncomplete = false;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public ReaderBasedJsonParser(IOContext ctxt, int features, Reader r,
-            ObjectCodec codec, CharsToNameCanonicalizer st)
-    {
-        super(ctxt, features);
-        _reader = r;
-        _inputBuffer = ctxt.allocTokenBuffer();
-        _objectCodec = codec;
-        _symbols = st;
-        _hashSeed = st.hashSeed();
-    }
-
-    @Override
-    public Version version() {
-        return CoreVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* Base method defs, overrides
-    /**********************************************************
-     */
-    
-    @Override
-    public ObjectCodec getCodec() {
-        return _objectCodec;
-    }
-
-    @Override
-    public void setCodec(ObjectCodec c) {
-        _objectCodec = c;
-    }
-    
-    @Override
-    public int releaseBuffered(Writer w) throws IOException
-    {
-        int count = _inputEnd - _inputPtr;
-        if (count < 1) {
-            return 0;
-        }
-        // let's just advance ptr to end
-        int origPtr = _inputPtr;
-        w.write(_inputBuffer, origPtr, count);
-        return count;
-    }
-
-    @Override
-    public Object getInputSource() {
-        return _reader;
-    }
-
-    @Override
-    protected boolean loadMore() throws IOException
-    {
-        _currInputProcessed += _inputEnd;
-        _currInputRowStart -= _inputEnd;
-
-        if (_reader != null) {
-            int count = _reader.read(_inputBuffer, 0, _inputBuffer.length);
-            if (count > 0) {
-                _inputPtr = 0;
-                _inputEnd = count;
-                return true;
-            }
-            // End of input
-            _closeInput();
-            // Should never return 0, so let's fail
-            if (count == 0) {
-                throw new IOException("Reader returned 0 characters when trying to read "+_inputEnd);
-            }
-        }
-        return false;
-    }
-
-    protected char getNextChar(String eofMsg)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                _reportInvalidEOF(eofMsg);
-            }
-        }
-        return _inputBuffer[_inputPtr++];
-    }
-
-    @Override
-    protected void _closeInput() throws IOException
-    {
-        /* 25-Nov-2008, tatus: As per [JACKSON-16] we are not to call close()
-         *   on the underlying Reader, unless we "own" it, or auto-closing
-         *   feature is enabled.
-         *   One downside is that when using our optimized
-         *   Reader (granted, we only do that for UTF-32...) this
-         *   means that buffer recycling won't work correctly.
-         */
-        if (_reader != null) {
-            if (_ioContext.isResourceManaged() || isEnabled(Feature.AUTO_CLOSE_SOURCE)) {
-                _reader.close();
-            }
-            _reader = null;
-        }
-    }
-
-    /**
-     * Method called to release internal buffers owned by the base
-     * reader. This may be called along with {@link #_closeInput} (for
-     * example, when explicitly closing this reader instance), or
-     * separately (if need be).
-     */
-    @Override
-    protected void _releaseBuffers()
-        throws IOException
-    {
-        super._releaseBuffers();
-        char[] buf = _inputBuffer;
-        if (buf != null) {
-            _inputBuffer = null;
-            _ioContext.releaseTokenBuffer(buf);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, data access
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing textual representation of the current event;
-     * if no current event (before first call to {@link #nextToken}, or
-     * after encountering end-of-input), returns null.
-     * Method can be called for any event.
-     */
-    @Override
-    public String getText()
-        throws IOException, JsonParseException
-    {
-        JsonToken t = _currToken;
-        if (t == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return _getText2(t);
-    }
-
-    // // // Let's override default impls for improved performance
-    
-    // @since 2.1
-    @Override
-    public String getValueAsString() throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return super.getValueAsString(null);
-    }
-    
-    // @since 2.1
-    @Override
-    public String getValueAsString(String defValue) throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return super.getValueAsString(defValue);
-    }
-    
-    
-    protected String _getText2(JsonToken t)
-    {
-        if (t == null) {
-            return null;
-        }
-        switch (t) {
-        case FIELD_NAME:
-            return _parsingContext.getCurrentName();
-
-        case VALUE_STRING:
-            // fall through
-        case VALUE_NUMBER_INT:
-        case VALUE_NUMBER_FLOAT:
-            return _textBuffer.contentsAsString();
-        }
-        return t.asString();
-    }
-
-    @Override
-    public char[] getTextCharacters()
-        throws IOException, JsonParseException
-    {
-        if (_currToken != null) { // null only before/after document
-            switch (_currToken) {
-                
-            case FIELD_NAME:
-                if (!_nameCopied) {
-                    String name = _parsingContext.getCurrentName();
-                    int nameLen = name.length();
-                    if (_nameCopyBuffer == null) {
-                        _nameCopyBuffer = _ioContext.allocNameCopyBuffer(nameLen);
-                    } else if (_nameCopyBuffer.length < nameLen) {
-                        _nameCopyBuffer = new char[nameLen];
-                    }
-                    name.getChars(0, nameLen, _nameCopyBuffer, 0);
-                    _nameCopied = true;
-                }
-                return _nameCopyBuffer;
-    
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.getTextBuffer();
-                
-            default:
-                return _currToken.asCharArray();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public int getTextLength()
-        throws IOException, JsonParseException
-    {
-        if (_currToken != null) { // null only before/after document
-            switch (_currToken) {
-                
-            case FIELD_NAME:
-                return _parsingContext.getCurrentName().length();
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.size();
-                
-            default:
-                return _currToken.asCharArray().length;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public int getTextOffset() throws IOException, JsonParseException
-    {
-        // Most have offset of 0, only some may have other values:
-        if (_currToken != null) {
-            switch (_currToken) {
-            case FIELD_NAME:
-                return 0;
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.getTextOffset();
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public Object getEmbeddedObject() throws IOException, JsonParseException {
-        return null;
-    }
-
-    @Override
-    public byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        if (_currToken != JsonToken.VALUE_STRING &&
-                (_currToken != JsonToken.VALUE_EMBEDDED_OBJECT || _binaryValue == null)) {
-            _reportError("Current token ("+_currToken+") not VALUE_STRING or VALUE_EMBEDDED_OBJECT, can not access as binary");
-        }
-        /* To ensure that we won't see inconsistent data, better clear up
-         * state...
-         */
-        if (_tokenIncomplete) {
-            try {
-                _binaryValue = _decodeBase64(b64variant);
-            } catch (IllegalArgumentException iae) {
-                throw _constructError("Failed to decode VALUE_STRING as base64 ("+b64variant+"): "+iae.getMessage());
-            }
-            /* let's clear incomplete only now; allows for accessing other
-             * textual content in error cases
-             */
-            _tokenIncomplete = false;
-        } else { // may actually require conversion...
-            if (_binaryValue == null) {
-                ByteArrayBuilder builder = _getByteArrayBuilder();
-                _decodeBase64(getText(), builder, b64variant);
-                _binaryValue = builder.toByteArray();
-            }
-        }
-        return _binaryValue;
-    }
-    
-    @Override
-    public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-        throws IOException, JsonParseException
-    {
-        // if we have already read the token, just use whatever we may have
-        if (!_tokenIncomplete || _currToken != JsonToken.VALUE_STRING) {
-            byte[] b = getBinaryValue(b64variant);
-            out.write(b);
-            return b.length;
-        }
-        // otherwise do "real" incremental parsing...
-        byte[] buf = _ioContext.allocBase64Buffer();
-        try {
-            return _readBinary(b64variant, out, buf);
-        } finally {
-            _ioContext.releaseBase64Buffer(buf);
-        }
-    }
-
-    protected int _readBinary(Base64Variant b64variant, OutputStream out,
-                              byte[] buffer)
-            throws IOException, JsonParseException
-    {
-        int outputPtr = 0;
-        final int outputEnd = buffer.length - 3;
-        int outputCount = 0;
-
-        while (true) {
-            // first, we'll skip preceding white space, if any
-            char ch;
-            do {
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                ch = _inputBuffer[_inputPtr++];
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) { // reached the end, fair and square?
-                if (ch == '"') {
-                    break;
-                }
-                bits = _decodeBase64Escape(b64variant, ch, 0);
-                if (bits < 0) { // white space to skip
-                    continue;
-                }
-            }
-
-            // enough room? If not, flush
-            if (outputPtr > outputEnd) {
-                outputCount += outputPtr;
-                out.write(buffer, 0, outputPtr);
-                outputPtr = 0;
-            }
-
-            int decodedData = bits;
-
-            // then second base64 char; can't get padding yet, nor ws
-
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                bits = _decodeBase64Escape(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-
-            // third base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 4;
-                        buffer[outputPtr++] = (byte) decodedData;
-                        break;
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 2);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    // Ok, must get padding
-                    if (_inputPtr >= _inputEnd) {
-                        loadMoreGuaranteed();
-                    }
-                    ch = _inputBuffer[_inputPtr++];
-                    if (!b64variant.usesPaddingChar(ch)) {
-                        throw reportInvalidBase64Char(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                    }
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    buffer[outputPtr++] = (byte) decodedData;
-                    continue;
-                }
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 2;
-                        buffer[outputPtr++] = (byte) (decodedData >> 8);
-                        buffer[outputPtr++] = (byte) decodedData;
-                        break;
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 3);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    /* With padding we only get 2 bytes; but we have
-                     * to shift it a bit so it is identical to triplet
-                     * case with partial output.
-                     * 3 chars gives 3x6 == 18 bits, of which 2 are
-                     * dummies, need to discard:
-                     */
-                    decodedData >>= 2;
-                    buffer[outputPtr++] = (byte) (decodedData >> 8);
-                    buffer[outputPtr++] = (byte) decodedData;
-                    continue;
-                }
-            }
-            // otherwise, our triplet is now complete
-            decodedData = (decodedData << 6) | bits;
-            buffer[outputPtr++] = (byte) (decodedData >> 16);
-            buffer[outputPtr++] = (byte) (decodedData >> 8);
-            buffer[outputPtr++] = (byte) decodedData;
-        }
-        _tokenIncomplete = false;
-        if (outputPtr > 0) {
-            outputCount += outputPtr;
-            out.write(buffer, 0, outputPtr);
-        }
-        return outputCount;
-    }
-
-    /*
-   /**********************************************************
-   /* Public API, traversal
-   /**********************************************************
-    */
-
-    /**
-     * @return Next token from the stream, if any found, or null
-     *   to indicate end-of-input
-     */
-    @Override
-    public JsonToken nextToken()
-        throws IOException, JsonParseException
-    {
-        _numTypesValid = NR_UNKNOWN;
-
-        /* First: field names are special -- we will always tokenize
-         * (part of) value along with field name to simplify
-         * state handling. If so, can and need to use secondary token:
-         */
-        if (_currToken == JsonToken.FIELD_NAME) {
-            return _nextAfterName();
-        }
-        if (_tokenIncomplete) {
-            _skipString(); // only strings can be partial
-        }
-        int i = _skipWSOrEnd();
-        if (i < 0) { // end-of-input
-            /* 19-Feb-2009, tatu: Should actually close/release things
-             *    like input source, symbol table and recyclable buffers now.
-             */
-            close();
-            return (_currToken = null);
-        }
-
-        /* First, need to ensure we know the starting location of token
-         * after skipping leading white space
-         */
-        _tokenInputTotal = _currInputProcessed + _inputPtr - 1;
-        _tokenInputRow = _currInputRow;
-        _tokenInputCol = _inputPtr - _currInputRowStart - 1;
-
-        // finally: clear any data retained so far
-        _binaryValue = null;
-
-        // Closing scope?
-        if (i == INT_RBRACKET) {
-            if (!_parsingContext.inArray()) {
-                _reportMismatchedEndMarker(i, '}');
-            }
-            _parsingContext = _parsingContext.getParent();
-            return (_currToken = JsonToken.END_ARRAY);
-        }
-        if (i == INT_RCURLY) {
-            if (!_parsingContext.inObject()) {
-                _reportMismatchedEndMarker(i, ']');
-            }
-            _parsingContext = _parsingContext.getParent();
-            return (_currToken = JsonToken.END_OBJECT);
-        }
-
-        // Nope: do we then expect a comma?
-        if (_parsingContext.expectComma()) {
-            if (i != INT_COMMA) {
-                _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.getTypeDesc()+" entries");
-            }
-            i = _skipWS();
-        }
-
-        /* And should we now have a name? Always true for
-         * Object contexts, since the intermediate 'expect-value'
-         * state is never retained.
-         */
-        boolean inObject = _parsingContext.inObject();
-        if (inObject) {
-           // First, field name itself:
-            String name = _parseFieldName(i);
-            _parsingContext.setCurrentName(name);
-            _currToken = JsonToken.FIELD_NAME;
-            i = _skipWS();
-            if (i != INT_COLON) {
-                _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
-            }
-            i = _skipWS();
-        }
-
-        // Ok: we must have a value... what is it?
-
-        JsonToken t;
-
-        switch (i) {
-        case INT_QUOTE:
-            _tokenIncomplete = true;
-            t = JsonToken.VALUE_STRING;
-            break;
-        case INT_LBRACKET:
-            if (!inObject) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            }
-            t = JsonToken.START_ARRAY;
-            break;
-        case INT_LCURLY:
-            if (!inObject) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            t = JsonToken.START_OBJECT;
-            break;
-        case INT_RBRACKET:
-        case INT_RCURLY:
-            // Error: neither is valid at this point; valid closers have
-            // been handled earlier
-            _reportUnexpectedChar(i, "expected a value");
-        case INT_t:
-            _matchToken("true", 1);
-            t = JsonToken.VALUE_TRUE;
-            break;
-        case INT_f:
-            _matchToken("false", 1);
-            t = JsonToken.VALUE_FALSE;
-            break;
-        case INT_n:
-            _matchToken("null", 1);
-            t = JsonToken.VALUE_NULL;
-            break;
-
-        case INT_MINUS:
-            /* Should we have separate handling for plus? Although
-             * it is not allowed per se, it may be erroneously used,
-             * and could be indicate by a more specific error message.
-             */
-        case INT_0:
-        case INT_1:
-        case INT_2:
-        case INT_3:
-        case INT_4:
-        case INT_5:
-        case INT_6:
-        case INT_7:
-        case INT_8:
-        case INT_9:
-            t = parseNumberText(i);
-            break;
-        default:
-            t = _handleUnexpectedValue(i);
-            break;
-        }
-
-        if (inObject) {
-            _nextToken = t;
-            return _currToken;
-        }
-        _currToken = t;
-        return t;
-    }
-
-    private JsonToken _nextAfterName()
-    {
-        _nameCopied = false; // need to invalidate if it was copied
-        JsonToken t = _nextToken;
-        _nextToken = null;
-        // Also: may need to start new context?
-        if (t == JsonToken.START_ARRAY) {
-            _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-        } else if (t == JsonToken.START_OBJECT) {
-            _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-        }
-        return (_currToken = t);
-    }
-
-    /*
-    @Override
-    public boolean nextFieldName(SerializableString str)
-         throws IOException, JsonParseException
-     */
-
-    // note: identical to one in Utf8StreamParser
-    @Override
-    public String nextTextValue()
-        throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_STRING) {
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString();
-                }
-                return _textBuffer.contentsAsString();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return null;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
-    }
-
-    // note: identical to one in Utf8StreamParser
-    @Override
-    public int nextIntValue(int defaultValue)
-        throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.FIELD_NAME) {
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                return getIntValue();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return defaultValue;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
-    }
-
-    // note: identical to one in Utf8StreamParser
-    @Override
-    public long nextLongValue(long defaultValue)
-        throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                return getLongValue();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return defaultValue;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
-    }
-
-    // note: identical to one in Utf8StreamParser
-    @Override
-    public Boolean nextBooleanValue()
-        throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_TRUE) {
-                return Boolean.TRUE;
-            }
-            if (t == JsonToken.VALUE_FALSE) {
-                return Boolean.FALSE;
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return null;
-        }
-        switch (nextToken()) {
-        case VALUE_TRUE:
-            return Boolean.TRUE;
-        case VALUE_FALSE:
-            return Boolean.FALSE;
-        }
-        return null;
-    }
-    
-    @Override
-    public void close() throws IOException
-    {
-        super.close();
-        _symbols.release();
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, number parsing
-    /* (note: in 1.8 and prior, part of "ReaderBasedNumericParser"
-    /**********************************************************
-     */
-
-    /**
-     * Initial parsing method for number values. It needs to be able
-     * to parse enough input to be able to determine whether the
-     * value is to be considered a simple integer value, or a more
-     * generic decimal value: latter of which needs to be expressed
-     * as a floating point number. The basic rule is that if the number
-     * has no fractional or exponential part, it is an integer; otherwise
-     * a floating point number.
-     *<p>
-     * Because much of input has to be processed in any case, no partial
-     * parsing is done: all input text will be stored for further
-     * processing. However, actual numeric value conversion will be
-     * deferred, since it is usually the most complicated and costliest
-     * part of processing.
-     */
-    protected JsonToken parseNumberText(int ch)
-        throws IOException, JsonParseException
-    {
-        /* Although we will always be complete with respect to textual
-         * representation (that is, all characters will be parsed),
-         * actual conversion to a number is deferred. Thus, need to
-         * note that no representations are valid yet
-         */
-        boolean negative = (ch == INT_MINUS);
-        int ptr = _inputPtr;
-        int startPtr = ptr-1; // to include sign/digit already read
-        final int inputLen = _inputEnd;
-
-        dummy_loop:
-        do { // dummy loop, to be able to break out
-            if (negative) { // need to read the next digit
-                if (ptr >= _inputEnd) {
-                    break dummy_loop;
-                }
-                ch = _inputBuffer[ptr++];
-                // First check: must have a digit to follow minus sign
-                if (ch > INT_9 || ch < INT_0) {
-                    _inputPtr = ptr;
-                    return _handleInvalidNumberStart(ch, true);
-                }
-                /* (note: has been checked for non-negative already, in
-                 * the dispatching code that determined it should be
-                 * a numeric value)
-                 */
-            }
-            // One special case, leading zero(es):
-            if (ch == INT_0) {
-                break dummy_loop;
-            }
-            
-            /* First, let's see if the whole number is contained within
-             * the input buffer unsplit. This should be the common case;
-             * and to simplify processing, we will just reparse contents
-             * in the alternative case (number split on buffer boundary)
-             */
-            
-            int intLen = 1; // already got one
-            
-            // First let's get the obligatory integer part:
-            
-            int_loop:
-            while (true) {
-                if (ptr >= _inputEnd) {
-                    break dummy_loop;
-                }
-                ch = (int) _inputBuffer[ptr++];
-                if (ch < INT_0 || ch > INT_9) {
-                    break int_loop;
-                }
-                ++intLen;
-            }
-
-            int fractLen = 0;
-            
-            // And then see if we get other parts
-            if (ch == INT_DECIMAL_POINT) { // yes, fraction
-                fract_loop:
-                while (true) {
-                    if (ptr >= inputLen) {
-                        break dummy_loop;
-                    }
-                    ch = (int) _inputBuffer[ptr++];
-                    if (ch < INT_0 || ch > INT_9) {
-                        break fract_loop;
-                    }
-                    ++fractLen;
-                }
-                // must be followed by sequence of ints, one minimum
-                if (fractLen == 0) {
-                    reportUnexpectedNumberChar(ch, "Decimal point not followed by a digit");
-                }
-            }
-
-            int expLen = 0;
-            if (ch == INT_e || ch == INT_E) { // and/or exponent
-                if (ptr >= inputLen) {
-                    break dummy_loop;
-                }
-                // Sign indicator?
-                ch = (int) _inputBuffer[ptr++];
-                if (ch == INT_MINUS || ch == INT_PLUS) { // yup, skip for now
-                    if (ptr >= inputLen) {
-                        break dummy_loop;
-                    }
-                    ch = (int) _inputBuffer[ptr++];
-                }
-                while (ch <= INT_9 && ch >= INT_0) {
-                    ++expLen;
-                    if (ptr >= inputLen) {
-                        break dummy_loop;
-                    }
-                    ch = (int) _inputBuffer[ptr++];
-                }
-                // must be followed by sequence of ints, one minimum
-                if (expLen == 0) {
-                    reportUnexpectedNumberChar(ch, "Exponent indicator not followed by a digit");
-                }
-            }
-
-            // Got it all: let's add to text buffer for parsing, access
-            --ptr; // need to push back following separator
-            _inputPtr = ptr;
-            int len = ptr-startPtr;
-            _textBuffer.resetWithShared(_inputBuffer, startPtr, len);
-            return reset(negative, intLen, fractLen, expLen);
-        } while (false);
-
-        _inputPtr = negative ? (startPtr+1) : startPtr;
-        return parseNumberText2(negative);
-    }
-
-    /**
-     * Method called to parse a number, when the primary parse
-     * method has failed to parse it, due to it being split on
-     * buffer boundary. As a result code is very similar, except
-     * that it has to explicitly copy contents to the text buffer
-     * instead of just sharing the main input buffer.
-     */
-    private JsonToken parseNumberText2(boolean negative)
-        throws IOException, JsonParseException
-    {
-        char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
-        int outPtr = 0;
-
-        // Need to prepend sign?
-        if (negative) {
-            outBuf[outPtr++] = '-';
-        }
-
-        // This is the place to do leading-zero check(s) too:
-        int intLen = 0;
-        char c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++] : getNextChar("No digit following minus sign");
-        if (c == '0') {
-            c = _verifyNoLeadingZeroes();
-        }
-        boolean eof = false;
-
-        // Ok, first the obligatory integer part:
-        int_loop:
-        while (c >= '0' && c <= '9') {
-            ++intLen;
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            outBuf[outPtr++] = c;
-            if (_inputPtr >= _inputEnd && !loadMore()) {
-                // EOF is legal for main level int values
-                c = CHAR_NULL;
-                eof = true;
-                break int_loop;
-            }
-            c = _inputBuffer[_inputPtr++];
-        }
-        // Also, integer part is not optional
-        if (intLen == 0) {
-            reportInvalidNumber("Missing integer part (next char "+_getCharDesc(c)+")");
-        }
-
-        int fractLen = 0;
-        // And then see if we get other parts
-        if (c == '.') { // yes, fraction
-            outBuf[outPtr++] = c;
-
-            fract_loop:
-            while (true) {
-                if (_inputPtr >= _inputEnd && !loadMore()) {
-                    eof = true;
-                    break fract_loop;
-                }
-                c = _inputBuffer[_inputPtr++];
-                if (c < INT_0 || c > INT_9) {
-                    break fract_loop;
-                }
-                ++fractLen;
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = c;
-            }
-            // must be followed by sequence of ints, one minimum
-            if (fractLen == 0) {
-                reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
-            }
-        }
-
-        int expLen = 0;
-        if (c == 'e' || c == 'E') { // exponent?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            outBuf[outPtr++] = c;
-            // Not optional, can require that we get one more char
-            c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++]
-                : getNextChar("expected a digit for number exponent");
-            // Sign indicator?
-            if (c == '-' || c == '+') {
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = c;
-                // Likewise, non optional:
-                c = (_inputPtr < _inputEnd) ? _inputBuffer[_inputPtr++]
-                    : getNextChar("expected a digit for number exponent");
-            }
-
-            exp_loop:
-            while (c <= INT_9 && c >= INT_0) {
-                ++expLen;
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = c;
-                if (_inputPtr >= _inputEnd && !loadMore()) {
-                    eof = true;
-                    break exp_loop;
-                }
-                c = _inputBuffer[_inputPtr++];
-            }
-            // must be followed by sequence of ints, one minimum
-            if (expLen == 0) {
-                reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
-            }
-        }
-
-        // Ok; unless we hit end-of-input, need to push last char read back
-        if (!eof) {
-            --_inputPtr;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-        // And there we have it!
-        return reset(negative, intLen, fractLen, expLen);
-    }
-
-    /**
-     * Method called when we have seen one zero, and want to ensure
-     * it is not followed by another
-     */
-    private char _verifyNoLeadingZeroes()
-        throws IOException, JsonParseException
-    {
-        // Ok to have plain "0"
-        if (_inputPtr >= _inputEnd && !loadMore()) {
-            return '0';
-        }
-        char ch = _inputBuffer[_inputPtr];
-        // if not followed by a number (probably '.'); return zero as is, to be included
-        if (ch < '0' || ch > '9') {
-            return '0';
-        }
-        if (!isEnabled(Feature.ALLOW_NUMERIC_LEADING_ZEROS)) {
-            reportInvalidNumber("Leading zeroes not allowed");
-        }
-        // if so, just need to skip either all zeroes (if followed by number); or all but one (if non-number)
-        ++_inputPtr; // Leading zero to be skipped
-        if (ch == INT_0) {
-            while (_inputPtr < _inputEnd || loadMore()) {
-                ch = _inputBuffer[_inputPtr];
-                if (ch < '0' || ch > '9') { // followed by non-number; retain one zero
-                    return '0';
-                }
-                ++_inputPtr; // skip previous zero
-                if (ch != '0') { // followed by other number; return 
-                    break;
-                }
-            }
-        }
-        return ch;
-    }
-
-    /**
-     * Method called if expected numeric value (due to leading sign) does not
-     * look like a number
-     */
-    protected JsonToken _handleInvalidNumberStart(int ch, boolean negative)
-        throws IOException, JsonParseException
-    {
-        if (ch == 'I') {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOFInValue();
-                }
-            }
-            ch = _inputBuffer[_inputPtr++];
-            if (ch == 'N') {
-                String match = negative ? "-INF" :"+INF";
-                _matchToken(match, 3);
-                if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                    return resetAsNaN(match, negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY);
-                }
-                _reportError("Non-standard token '"+match+"': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            } else if (ch == 'n') {
-                String match = negative ? "-Infinity" :"+Infinity";
-                _matchToken(match, 3);
-                if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                    return resetAsNaN(match, negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY);
-                }
-                _reportError("Non-standard token '"+match+"': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            }
-        }
-        reportUnexpectedNumberChar(ch, "expected digit (0-9) to follow minus sign, for valid numeric value");
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, secondary parsing
-    /**********************************************************
-     */
-
-    protected String _parseFieldName(int i)
-        throws IOException, JsonParseException
-    {
-        if (i != INT_QUOTE) {
-            return _handleUnusualFieldName(i);
-        }
-        /* First: let's try to see if we have a simple name: one that does
-         * not cross input buffer boundary, and does not contain escape
-         * sequences.
-         */
-        int ptr = _inputPtr;
-        int hash = _hashSeed;
-        final int inputLen = _inputEnd;
-
-        if (ptr < inputLen) {
-            final int[] codes = CharTypes.getInputCodeLatin1();
-            final int maxCode = codes.length;
-
-            do {
-                int ch = _inputBuffer[ptr];
-                if (ch < maxCode && codes[ch] != 0) {
-                    if (ch == '"') {
-                        int start = _inputPtr;
-                        _inputPtr = ptr+1; // to skip the quote
-                        return _symbols.findSymbol(_inputBuffer, start, ptr - start, hash);
-                    }
-                    break;
-                }
-                hash = (hash * CharsToNameCanonicalizer.HASH_MULT) + ch;
-                ++ptr;
-            } while (ptr < inputLen);
-        }
-
-        int start = _inputPtr;
-        _inputPtr = ptr;
-        return _parseFieldName2(start, hash, INT_QUOTE);
-    }
-
-    private String _parseFieldName2(int startPtr, int hash, int endChar)
-        throws IOException, JsonParseException
-    {
-        _textBuffer.resetWithShared(_inputBuffer, startPtr, (_inputPtr - startPtr));
-
-        /* Output pointers; calls will also ensure that the buffer is
-         * not shared and has room for at least one more char.
-         */
-        char[] outBuf = _textBuffer.getCurrentSegment();
-        int outPtr = _textBuffer.getCurrentSegmentSize();
-
-        while (true) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(": was expecting closing '"+((char) endChar)+"' for name");
-                }
-            }
-            char c = _inputBuffer[_inputPtr++];
-            int i = (int) c;
-            if (i <= INT_BACKSLASH) {
-                if (i == INT_BACKSLASH) {
-                    /* Although chars outside of BMP are to be escaped as
-                     * an UTF-16 surrogate pair, does that affect decoding?
-                     * For now let's assume it does not.
-                     */
-                    c = _decodeEscaped();
-                } else if (i <= endChar) {
-                    if (i == endChar) {
-                        break;
-                    }
-                    if (i < INT_SPACE) {
-                        _throwUnquotedSpace(i, "name");
-                    }
-                }
-            }
-            hash = (hash * CharsToNameCanonicalizer.HASH_MULT) + i;
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = c;
-
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-        }
-        _textBuffer.setCurrentLength(outPtr);
-        {
-            TextBuffer tb = _textBuffer;
-            char[] buf = tb.getTextBuffer();
-            int start = tb.getTextOffset();
-            int len = tb.size();
-
-            return _symbols.findSymbol(buf, start, len, hash);
-        }
-    }
-
-    /**
-     * Method called when we see non-white space character other
-     * than double quote, when expecting a field name.
-     * In standard mode will just throw an expection; but
-     * in non-standard modes may be able to parse name.
-     */
-    protected String _handleUnusualFieldName(int i)
-        throws IOException, JsonParseException
-    {
-        // [JACKSON-173]: allow single quotes
-        if (i == INT_APOSTROPHE && isEnabled(Feature.ALLOW_SINGLE_QUOTES)) {
-            return _parseApostropheFieldName();
-        }
-        // [JACKSON-69]: allow unquoted names if feature enabled:
-        if (!isEnabled(Feature.ALLOW_UNQUOTED_FIELD_NAMES)) {
-            _reportUnexpectedChar(i, "was expecting double-quote to start field name");
-        }
-        final int[] codes = CharTypes.getInputCodeLatin1JsNames();
-        final int maxCode = codes.length;
-
-        // Also: first char must be a valid name char, but NOT be number
-        boolean firstOk;
-
-        if (i < maxCode) { // identifier, and not a number
-            firstOk = (codes[i] == 0) && (i < INT_0 || i > INT_9);
-        } else {
-            firstOk = Character.isJavaIdentifierPart((char) i);
-        }
-        if (!firstOk) {
-            _reportUnexpectedChar(i, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
-        }
-        int ptr = _inputPtr;
-        int hash = _hashSeed;
-        final int inputLen = _inputEnd;
-
-        if (ptr < inputLen) {
-            do {
-                int ch = _inputBuffer[ptr];
-                if (ch < maxCode) {
-                    if (codes[ch] != 0) {
-                        int start = _inputPtr-1; // -1 to bring back first char
-                        _inputPtr = ptr;
-                        return _symbols.findSymbol(_inputBuffer, start, ptr - start, hash);
-                    }
-                } else if (!Character.isJavaIdentifierPart((char) ch)) {
-                    int start = _inputPtr-1; // -1 to bring back first char
-                    _inputPtr = ptr;
-                    return _symbols.findSymbol(_inputBuffer, start, ptr - start, hash);
-                }
-                hash = (hash * CharsToNameCanonicalizer.HASH_MULT) + ch;
-                ++ptr;
-            } while (ptr < inputLen);
-        }
-        int start = _inputPtr-1;
-        _inputPtr = ptr;
-        return _parseUnusualFieldName2(start, hash, codes);
-    }
-
-    protected String _parseApostropheFieldName()
-        throws IOException, JsonParseException
-    {
-        // Note: mostly copy of_parseFieldName
-        int ptr = _inputPtr;
-        int hash = _hashSeed;
-        final int inputLen = _inputEnd;
-
-        if (ptr < inputLen) {
-            final int[] codes = CharTypes.getInputCodeLatin1();
-            final int maxCode = codes.length;
-
-            do {
-                int ch = _inputBuffer[ptr];
-                if (ch == '\'') {
-                    int start = _inputPtr;
-                    _inputPtr = ptr+1; // to skip the quote
-                    return _symbols.findSymbol(_inputBuffer, start, ptr - start, hash);
-                }
-                if (ch < maxCode && codes[ch] != 0) {
-                    break;
-                }
-                hash = (hash * CharsToNameCanonicalizer.HASH_MULT) + ch;
-                ++ptr;
-            } while (ptr < inputLen);
-        }
-
-        int start = _inputPtr;
-        _inputPtr = ptr;
-
-        return _parseFieldName2(start, hash, INT_APOSTROPHE);
-    }
-
-    /**
-     * Method for handling cases where first non-space character
-     * of an expected value token is not legal for standard JSON content.
-     */
-    protected JsonToken _handleUnexpectedValue(int i)
-        throws IOException, JsonParseException
-    {
-        // Most likely an error, unless we are to allow single-quote-strings
-        switch (i) {
-        case '\'':
-            /* [JACKSON-173]: allow single quotes. Unlike with regular
-             * Strings, we'll eagerly parse contents; this so that there's
-             * no need to store information on quote char used.
-             *
-             * Also, no separation to fast/slow parsing; we'll just do
-             * one regular (~= slowish) parsing, to keep code simple
-             */
-            if (isEnabled(Feature.ALLOW_SINGLE_QUOTES)) {
-                return _handleApostropheValue();
-            }
-            break;
-        case 'N':
-            _matchToken("NaN", 1);
-            if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                return resetAsNaN("NaN", Double.NaN);
-            }
-            _reportError("Non-standard token 'NaN': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            break;
-        case '+': // note: '-' is taken as number
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOFInValue();
-                }
-            }
-            return _handleInvalidNumberStart(_inputBuffer[_inputPtr++], false);
-        }
-        _reportUnexpectedChar(i, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
-        return null;
-    }
-    
-    protected JsonToken _handleApostropheValue()
-        throws IOException, JsonParseException
-    {
-        char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
-        int outPtr = _textBuffer.getCurrentSegmentSize();
-
-        while (true) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(": was expecting closing quote for a string value");
-                }
-            }
-            char c = _inputBuffer[_inputPtr++];
-            int i = (int) c;
-            if (i <= INT_BACKSLASH) {
-                if (i == INT_BACKSLASH) {
-                    /* Although chars outside of BMP are to be escaped as
-                     * an UTF-16 surrogate pair, does that affect decoding?
-                     * For now let's assume it does not.
-                     */
-                    c = _decodeEscaped();
-                } else if (i <= INT_APOSTROPHE) {
-                    if (i == INT_APOSTROPHE) {
-                        break;
-                    }
-                    if (i < INT_SPACE) {
-                        _throwUnquotedSpace(i, "string value");
-                    }
-                }
-            }
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = c;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-        return JsonToken.VALUE_STRING;
-    }
-    
-    private String _parseUnusualFieldName2(int startPtr, int hash, int[] codes)
-        throws IOException, JsonParseException
-    {
-        _textBuffer.resetWithShared(_inputBuffer, startPtr, (_inputPtr - startPtr));
-        char[] outBuf = _textBuffer.getCurrentSegment();
-        int outPtr = _textBuffer.getCurrentSegmentSize();
-        final int maxCode = codes.length;
-
-        while (true) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) { // acceptable for now (will error out later)
-                    break;
-                }
-            }
-            char c = _inputBuffer[_inputPtr];
-            int i = (int) c;
-            if (i <= maxCode) {
-                if (codes[i] != 0) {
-                    break;
-                }
-            } else if (!Character.isJavaIdentifierPart(c)) {
-                break;
-            }
-            ++_inputPtr;
-            hash = (hash * CharsToNameCanonicalizer.HASH_MULT) + i;
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = c;
-
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-        }
-        _textBuffer.setCurrentLength(outPtr);
-        {
-            TextBuffer tb = _textBuffer;
-            char[] buf = tb.getTextBuffer();
-            int start = tb.getTextOffset();
-            int len = tb.size();
-
-            return _symbols.findSymbol(buf, start, len, hash);
-        }
-    }
-  
-    @Override
-    protected void _finishString()
-        throws IOException, JsonParseException
-    {
-        /* First: let's try to see if we have simple String value: one
-         * that does not cross input buffer boundary, and does not
-         * contain escape sequences.
-         */
-        int ptr = _inputPtr;
-        final int inputLen = _inputEnd;
-
-        if (ptr < inputLen) {
-            final int[] codes = CharTypes.getInputCodeLatin1();
-            final int maxCode = codes.length;
-
-            do {
-                int ch = _inputBuffer[ptr];
-                if (ch < maxCode && codes[ch] != 0) {
-                    if (ch == '"') {
-                        _textBuffer.resetWithShared(_inputBuffer, _inputPtr, (ptr-_inputPtr));
-                        _inputPtr = ptr+1;
-                        // Yes, we got it all
-                        return;
-                    }
-                    break;
-                }
-                ++ptr;
-            } while (ptr < inputLen);
-        }
-
-        /* Either ran out of input, or bumped into an escape
-         * sequence...
-         */
-        _textBuffer.resetWithCopy(_inputBuffer, _inputPtr, (ptr-_inputPtr));
-        _inputPtr = ptr;
-        _finishString2();
-    }
-
-    protected void _finishString2()
-        throws IOException, JsonParseException
-    {
-        char[] outBuf = _textBuffer.getCurrentSegment();
-        int outPtr = _textBuffer.getCurrentSegmentSize();
-
-        while (true) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(": was expecting closing quote for a string value");
-                }
-            }
-            char c = _inputBuffer[_inputPtr++];
-            int i = (int) c;
-            if (i <= INT_BACKSLASH) {
-                if (i == INT_BACKSLASH) {
-                    /* Although chars outside of BMP are to be escaped as
-                     * an UTF-16 surrogate pair, does that affect decoding?
-                     * For now let's assume it does not.
-                     */
-                    c = _decodeEscaped();
-                } else if (i <= INT_QUOTE) {
-                    if (i == INT_QUOTE) {
-                        break;
-                    }
-                    if (i < INT_SPACE) {
-                        _throwUnquotedSpace(i, "string value");
-                    }
-                }
-            }
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = c;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-    }
-
-    /**
-     * Method called to skim through rest of unparsed String value,
-     * if it is not needed. This can be done bit faster if contents
-     * need not be stored for future access.
-     */
-    protected void _skipString()
-        throws IOException, JsonParseException
-    {
-        _tokenIncomplete = false;
-
-        int inputPtr = _inputPtr;
-        int inputLen = _inputEnd;
-        char[] inputBuffer = _inputBuffer;
-
-        while (true) {
-            if (inputPtr >= inputLen) {
-                _inputPtr = inputPtr;
-                if (!loadMore()) {
-                    _reportInvalidEOF(": was expecting closing quote for a string value");
-                }
-                inputPtr = _inputPtr;
-                inputLen = _inputEnd;
-            }
-            char c = inputBuffer[inputPtr++];
-            int i = (int) c;
-            if (i <= INT_BACKSLASH) {
-                if (i == INT_BACKSLASH) {
-                    /* Although chars outside of BMP are to be escaped as
-                     * an UTF-16 surrogate pair, does that affect decoding?
-                     * For now let's assume it does not.
-                     */
-                    _inputPtr = inputPtr;
-                    c = _decodeEscaped();
-                    inputPtr = _inputPtr;
-                    inputLen = _inputEnd;
-                } else if (i <= INT_QUOTE) {
-                    if (i == INT_QUOTE) {
-                        _inputPtr = inputPtr;
-                        break;
-                    }
-                    if (i < INT_SPACE) {
-                        _inputPtr = inputPtr;
-                        _throwUnquotedSpace(i, "string value");
-                    }
-                }
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, other parsing
-    /**********************************************************
-     */
-    
-    /**
-     * We actually need to check the character value here
-     * (to see if we have \n following \r).
-     */
-    protected void _skipCR() throws IOException
-    {
-        if (_inputPtr < _inputEnd || loadMore()) {
-            if (_inputBuffer[_inputPtr] == '\n') {
-                ++_inputPtr;
-            }
-        }
-        ++_currInputRow;
-        _currInputRowStart = _inputPtr;
-    }
-
-    protected void _skipLF() throws IOException
-    {
-        ++_currInputRow;
-        _currInputRowStart = _inputPtr;
-    }
-
-    private int _skipWS()
-        throws IOException, JsonParseException
-    {
-        while (_inputPtr < _inputEnd || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++];
-            if (i > INT_SPACE) {
-                if (i != INT_SLASH) {
-                    return i;
-                }
-                _skipComment();
-            } else if (i != INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                } else if (i == INT_CR) {
-                    _skipCR();
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-        throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");
-    }
-
-    private int _skipWSOrEnd()
-        throws IOException, JsonParseException
-    {
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++];
-            if (i > INT_SPACE) {
-                 if (i == INT_SLASH) {
-                     _skipComment();
-                     continue;
-                }
-                 return i;
-            }
-            if (i != INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                } else if (i == INT_CR) {
-                    _skipCR();
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-        // We ran out of input...
-        _handleEOF();
-        return -1;
-    }
-
-    private void _skipComment()
-        throws IOException, JsonParseException
-    {
-        if (!isEnabled(Feature.ALLOW_COMMENTS)) {
-            _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
-        }
-        // First: check which comment (if either) it is:
-        if (_inputPtr >= _inputEnd && !loadMore()) {
-            _reportInvalidEOF(" in a comment");
-        }
-        char c = _inputBuffer[_inputPtr++];
-        if (c == '/') {
-            _skipCppComment();
-        } else if (c == '*') {
-            _skipCComment();
-        } else {
-            _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
-        }
-    }
-
-    private void _skipCComment()
-        throws IOException, JsonParseException
-    {
-        // Ok: need the matching '*/'
-        main_loop:
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++];
-            if (i <= INT_ASTERISK) {
-                if (i == INT_ASTERISK) { // end?
-                    if ((_inputPtr >= _inputEnd) && !loadMore()) {
-                        break main_loop;
-                    }
-                    if (_inputBuffer[_inputPtr] == INT_SLASH) {
-                        ++_inputPtr;
-                        return;
-                    }
-                    continue;
-                }
-                if (i < INT_SPACE) {
-                    if (i == INT_LF) {
-                        _skipLF();
-                    } else if (i == INT_CR) {
-                        _skipCR();
-                    } else if (i != INT_TAB) {
-                        _throwInvalidSpace(i);
-                    }
-                }
-            }
-        }
-        _reportInvalidEOF(" in a comment");
-    }
-
-    private void _skipCppComment()
-        throws IOException, JsonParseException
-    {
-        // Ok: need to find EOF or linefeed
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++];
-            if (i < INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                    break;
-                } else if (i == INT_CR) {
-                    _skipCR();
-                    break;
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected char _decodeEscaped()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                _reportInvalidEOF(" in character escape sequence");
-            }
-        }
-        char c = _inputBuffer[_inputPtr++];
-
-        switch ((int) c) {
-            // First, ones that are mapped
-        case INT_b:
-            return '\b';
-        case INT_t:
-            return '\t';
-        case INT_n:
-            return '\n';
-        case INT_f:
-            return '\f';
-        case INT_r:
-            return '\r';
-
-            // And these are to be returned as they are
-        case INT_QUOTE:
-        case INT_SLASH:
-        case INT_BACKSLASH:
-            return c;
-
-        case INT_u: // and finally hex-escaped
-            break;
-
-        default:
-            return _handleUnrecognizedCharacterEscape(c);
-        }
-
-        // Ok, a hex escape. Need 4 characters
-        int value = 0;
-        for (int i = 0; i < 4; ++i) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in character escape sequence");
-                }
-            }
-            int ch = (int) _inputBuffer[_inputPtr++];
-            int digit = CharTypes.charToHex(ch);
-            if (digit < 0) {
-                _reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");
-            }
-            value = (value << 4) | digit;
-        }
-        return (char) value;
-    }
-    
-    /**
-     * Helper method for checking whether input matches expected token
-     */
-    protected void _matchToken(String matchStr, int i)
-        throws IOException, JsonParseException
-    {
-        final int len = matchStr.length();
-
-        do {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOFInValue();
-                }
-            }
-            if (_inputBuffer[_inputPtr] != matchStr.charAt(i)) {
-                _reportInvalidToken(matchStr.substring(0, i), "'null', 'true', 'false' or NaN");
-            }
-            ++_inputPtr;
-        } while (++i < len);
-
-        // but let's also ensure we either get EOF, or non-alphanum char...
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                return;
-            }
-        }
-        char c = _inputBuffer[_inputPtr];
-        if (c < '0' || c == ']' || c == '}') { // expected/allowed chars
-            return;
-        }
-        // if Java letter, it's a problem tho
-        if (Character.isJavaIdentifierPart(c)) {
-            _reportInvalidToken(matchStr.substring(0, i), "'null', 'true', 'false' or NaN");
-        }
-        return;
-    }
-
-    /*
-    /**********************************************************
-    /* Binary access
-    /**********************************************************
-     */
-
-    /**
-     * Efficient handling for incremental parsing of base64-encoded
-     * textual content.
-     */
-    protected byte[] _decodeBase64(Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        ByteArrayBuilder builder = _getByteArrayBuilder();
-
-        //main_loop:
-        while (true) {
-            // first, we'll skip preceding white space, if any
-            char ch;
-            do {
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                ch = _inputBuffer[_inputPtr++];
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (ch == '"') { // reached the end, fair and square?
-                    return builder.toByteArray();
-                }
-                bits = _decodeBase64Escape(b64variant, ch, 0);
-                if (bits < 0) { // white space to skip
-                    continue;
-                }
-            }
-            int decodedData = bits;
-            
-            // then second base64 char; can't get padding yet, nor ws
-            
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                bits = _decodeBase64Escape(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-            
-            // third base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 4;
-                        builder.append(decodedData);
-                        return builder.toByteArray();
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 2);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    // Ok, must get more padding chars, then
-                    if (_inputPtr >= _inputEnd) {
-                        loadMoreGuaranteed();
-                    }
-                    ch = _inputBuffer[_inputPtr++];
-                    if (!b64variant.usesPaddingChar(ch)) {
-                        throw reportInvalidBase64Char(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                    }
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    builder.append(decodedData);
-                    continue;
-                }
-                // otherwise we got escaped other char, to be processed below
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++];
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 2;
-                        builder.appendTwoBytes(decodedData);
-                        return builder.toByteArray();
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 3);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    // With padding we only get 2 bytes; but we have
-                    // to shift it a bit so it is identical to triplet
-                    // case with partial output.
-                    // 3 chars gives 3x6 == 18 bits, of which 2 are
-                    // dummies, need to discard:
-                    decodedData >>= 2;
-                    builder.appendTwoBytes(decodedData);
-                    continue;
-                }
-                // otherwise we got escaped other char, to be processed below
-            }
-            // otherwise, our triplet is now complete
-            decodedData = (decodedData << 6) | bits;
-            builder.appendThreeBytes(decodedData);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Error reporting
-    /**********************************************************
-     */
-
-    protected void _reportInvalidToken(String matchedPart, String msg)
-        throws IOException, JsonParseException
-    {
-        StringBuilder sb = new StringBuilder(matchedPart);
-        /* Let's just try to find what appears to be the token, using
-         * regular Java identifier character rules. It's just a heuristic,
-         * nothing fancy here.
-         */
-        while (true) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    break;
-                }
-            }
-            char c = _inputBuffer[_inputPtr];
-            if (!Character.isJavaIdentifierPart(c)) {
-                break;
-            }
-            ++_inputPtr;
-            sb.append(c);
-        }
-        _reportError("Unrecognized token '"+sb.toString()+"': was expecting ");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java
deleted file mode 100644
index 1b59552..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java
+++ /dev/null
@@ -1,1822 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.*;
-
-public class UTF8JsonGenerator
-    extends JsonGeneratorImpl
-{
-    private final static byte BYTE_u = (byte) 'u';
-
-    private final static byte BYTE_0 = (byte) '0';
-    
-    private final static byte BYTE_LBRACKET = (byte) '[';
-    private final static byte BYTE_RBRACKET = (byte) ']';
-    private final static byte BYTE_LCURLY = (byte) '{';
-    private final static byte BYTE_RCURLY = (byte) '}';
- 
-    private final static byte BYTE_BACKSLASH = (byte) '\\';
-    private final static byte BYTE_COMMA = (byte) ',';
-    private final static byte BYTE_COLON = (byte) ':';
-    private final static byte BYTE_QUOTE = (byte) '"';
-
-    protected final static int SURR1_FIRST = 0xD800;
-    protected final static int SURR1_LAST = 0xDBFF;
-    protected final static int SURR2_FIRST = 0xDC00;
-    protected final static int SURR2_LAST = 0xDFFF;
-
-    // intermediate copies only made up to certain length...
-    private final static int MAX_BYTES_TO_BUFFER = 512;
-    
-    final static byte[] HEX_CHARS = CharTypes.copyHexBytes();
-
-    private final static byte[] NULL_BYTES = { 'n', 'u', 'l', 'l' };
-    private final static byte[] TRUE_BYTES = { 't', 'r', 'u', 'e' };
-    private final static byte[] FALSE_BYTES = { 'f', 'a', 'l', 's', 'e' };
-
-    /*
-    /**********************************************************
-    /* Output buffering
-    /**********************************************************
-     */
-    
-    /**
-     * Underlying output stream used for writing JSON content.
-     */
-    final protected OutputStream _outputStream;
-
-    /**
-     * Intermediate buffer in which contents are buffered before
-     * being written using {@link #_outputStream}.
-     */
-    protected byte[] _outputBuffer;
-
-    /**
-     * Pointer to the position right beyond the last character to output
-     * (end marker; may be past the buffer)
-     */
-    protected int _outputTail = 0;
-
-    /**
-     * End marker of the output buffer; one past the last valid position
-     * within the buffer.
-     */
-    protected final int _outputEnd;
-
-    /**
-     * Maximum number of <code>char</code>s that we know will always fit
-     * in the output buffer after escaping
-     */
-    protected final int _outputMaxContiguous;
-    
-    /**
-     * Intermediate buffer in which characters of a String are copied
-     * before being encoded.
-     */
-    protected char[] _charBuffer;
-    
-    /**
-     * Length of <code>_charBuffer</code>
-     */
-    protected final int _charBufferLength;
-    
-    /**
-     * 6 character temporary buffer allocated if needed, for constructing
-     * escape sequences
-     */
-    protected byte[] _entityBuffer;
-
-    /**
-     * Flag that indicates whether the output buffer is recycable (and
-     * needs to be returned to recycler once we are done) or not.
-     */
-    protected boolean _bufferRecyclable;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public UTF8JsonGenerator(IOContext ctxt, int features, ObjectCodec codec,
-            OutputStream out)
-    {
-        super(ctxt, features, codec);
-        _outputStream = out;
-        _bufferRecyclable = true;
-        _outputBuffer = ctxt.allocWriteEncodingBuffer();
-        _outputEnd = _outputBuffer.length;
-
-        /* To be exact, each char can take up to 6 bytes when escaped (Unicode
-         * escape with backslash, 'u' and 4 hex digits); but to avoid fluctuation,
-         * we will actually round down to only do up to 1/8 number of chars
-         */
-        _outputMaxContiguous = _outputEnd >> 3;
-        _charBuffer = ctxt.allocConcatBuffer();
-        _charBufferLength = _charBuffer.length;
-
-        // By default we use this feature to determine additional quoting
-        if (isEnabled(Feature.ESCAPE_NON_ASCII)) {
-            setHighestNonEscapedChar(127);
-        }
-    }
-    
-    public UTF8JsonGenerator(IOContext ctxt, int features, ObjectCodec codec,
-            OutputStream out,
-            byte[] outputBuffer, int outputOffset, boolean bufferRecyclable)
-    {
-        
-        super(ctxt, features, codec);
-        _outputStream = out;
-        _bufferRecyclable = bufferRecyclable;
-        _outputTail = outputOffset;
-        _outputBuffer = outputBuffer;
-        _outputEnd = _outputBuffer.length;
-        // up to 6 bytes per char (see above), rounded up to 1/8
-        _outputMaxContiguous = _outputEnd >> 3;
-        _charBuffer = ctxt.allocConcatBuffer();
-        _charBufferLength = _charBuffer.length;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridden configuration methods
-    /**********************************************************
-     */
-    
-    @Override
-    public Object getOutputTarget() {
-        return _outputStream;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public final void writeFieldName(String name)  throws IOException, JsonGenerationException
-    {
-        int status = _writeContext.writeFieldName(name);
-        if (status == JsonWriteContext.STATUS_EXPECT_VALUE) {
-            _reportError("Can not write a field name, expecting a value");
-        }
-        if (_cfgPrettyPrinter != null) {
-            _writePPFieldName(name, (status == JsonWriteContext.STATUS_OK_AFTER_COMMA));
-            return;
-        }
-        if (status == JsonWriteContext.STATUS_OK_AFTER_COMMA) { // need comma
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_COMMA;
-        }
-        _writeFieldName(name);
-    }
-
-    @Override
-    public final void writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException
-    {
-        // Object is a value, need to verify it's allowed
-        int status = _writeContext.writeFieldName(name.getValue());
-        if (status == JsonWriteContext.STATUS_EXPECT_VALUE) {
-            _reportError("Can not write a field name, expecting a value");
-        }
-        if (_cfgPrettyPrinter != null) {
-            _writePPFieldName(name, (status == JsonWriteContext.STATUS_OK_AFTER_COMMA));
-            return;
-        }
-        if (status == JsonWriteContext.STATUS_OK_AFTER_COMMA) {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_COMMA;
-        }
-        _writeFieldName(name);
-    }
-
-    /*
-    /**********************************************************
-    /* Output method implementations, structural
-    /**********************************************************
-     */
-
-    @Override
-    public final void writeStartArray() throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("start an array");
-        _writeContext = _writeContext.createChildArrayContext();
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeStartArray(this);
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_LBRACKET;
-        }
-    }
-
-    @Override
-    public final void writeEndArray() throws IOException, JsonGenerationException
-    {
-        if (!_writeContext.inArray()) {
-            _reportError("Current context not an ARRAY but "+_writeContext.getTypeDesc());
-        }
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeEndArray(this, _writeContext.getEntryCount());
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_RBRACKET;
-        }
-        _writeContext = _writeContext.getParent();
-    }
-
-    @Override
-    public final void writeStartObject() throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("start an object");
-        _writeContext = _writeContext.createChildObjectContext();
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeStartObject(this);
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_LCURLY;
-        }
-    }
-
-    @Override
-    public final void writeEndObject() throws IOException, JsonGenerationException
-    {
-        if (!_writeContext.inObject()) {
-            _reportError("Current context not an object but "+_writeContext.getTypeDesc());
-        }
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeEndObject(this, _writeContext.getEntryCount());
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_RCURLY;
-        }
-        _writeContext = _writeContext.getParent();
-    }
-
-    protected final void _writeFieldName(String name)
-        throws IOException, JsonGenerationException
-    {
-        /* To support [JACKSON-46], we'll do this:
-         * (Question: should quoting of spaces (etc) still be enabled?)
-         */
-        if (!isEnabled(Feature.QUOTE_FIELD_NAMES)) {
-            _writeStringSegments(name);
-            return;
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        // The beef:
-        final int len = name.length();
-        if (len <= _charBufferLength) { // yes, fits right in
-            name.getChars(0, len, _charBuffer, 0);
-            // But as one segment, or multiple?
-            if (len <= _outputMaxContiguous) {
-                if ((_outputTail + len) > _outputEnd) { // caller must ensure enough space
-                    _flushBuffer();
-                }
-                _writeStringSegment(_charBuffer, 0, len);
-            } else {
-                _writeStringSegments(_charBuffer, 0, len);
-            }
-        } else {
-            _writeStringSegments(name);
-        }
-
-        // and closing quotes; need room for one more char:
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    protected final void _writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException
-    {
-        if (!isEnabled(Feature.QUOTE_FIELD_NAMES)) {
-            int len = name.appendQuotedUTF8(_outputBuffer, _outputTail); // different quoting (escaping)
-            if (len < 0) {
-                _writeBytes(name.asQuotedUTF8());
-            } else {
-                _outputTail += len;
-            }
-            return;
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        int len = name.appendQuotedUTF8(_outputBuffer, _outputTail);
-        if (len < 0) { // couldn't append, bit longer processing
-            _writeBytes(name.asQuotedUTF8());
-        } else {
-            _outputTail += len;
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }    
-    
-    /**
-     * Specialized version of <code>_writeFieldName</code>, off-lined
-     * to keep the "fast path" as simple (and hopefully fast) as possible.
-     */
-    protected final void _writePPFieldName(String name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (commaBefore) {
-            _cfgPrettyPrinter.writeObjectEntrySeparator(this);
-        } else {
-            _cfgPrettyPrinter.beforeObjectEntries(this);
-        }
-
-        if (isEnabled(Feature.QUOTE_FIELD_NAMES)) { // standard
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_QUOTE;
-            final int len = name.length();
-            if (len <= _charBufferLength) { // yes, fits right in
-                name.getChars(0, len, _charBuffer, 0);
-                // But as one segment, or multiple?
-                if (len <= _outputMaxContiguous) {
-                    if ((_outputTail + len) > _outputEnd) { // caller must ensure enough space
-                        _flushBuffer();
-                    }
-                    _writeStringSegment(_charBuffer, 0, len);
-                } else {
-                    _writeStringSegments(_charBuffer, 0, len);
-                }
-            } else {
-                _writeStringSegments(name);
-            }
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        } else { // non-standard, omit quotes
-            _writeStringSegments(name);
-        }
-    }
-
-    protected final void _writePPFieldName(SerializableString name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (commaBefore) {
-            _cfgPrettyPrinter.writeObjectEntrySeparator(this);
-        } else {
-            _cfgPrettyPrinter.beforeObjectEntries(this);
-        }
-
-        boolean addQuotes = isEnabled(Feature.QUOTE_FIELD_NAMES); // standard
-        if (addQuotes) {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        }
-        _writeBytes(name.asQuotedUTF8());
-        if (addQuotes) {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, textual
-    /**********************************************************
-     */
-
-    @Override
-    public void writeString(String text)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (text == null) {
-            _writeNull();
-            return;
-        }
-        // First: can we make a local copy of chars that make up text?
-        final int len = text.length();
-        if (len > _charBufferLength) { // nope: off-line handling
-            _writeLongString(text);
-            return;
-        }
-        // yes: good.
-        text.getChars(0, len, _charBuffer, 0);
-        // Output: if we can't guarantee it fits in output buffer, off-line as well:
-        if (len > _outputMaxContiguous) {
-            _writeLongString(_charBuffer, 0, len);
-            return;
-        }
-        if ((_outputTail + len) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _writeStringSegment(_charBuffer, 0, len); // we checked space already above
-        /* [JACKSON-462] But that method may have had to expand multi-byte Unicode
-         *   chars, so we must check again
-         */
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-    
-    private void _writeLongString(String text)
-        throws IOException, JsonGenerationException
-    {
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _writeStringSegments(text);
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    private void _writeLongString(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _writeStringSegments(_charBuffer, 0, len);
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public void writeString(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        // One or multiple segments?
-        if (len <= _outputMaxContiguous) {
-            if ((_outputTail + len) > _outputEnd) { // caller must ensure enough space
-                _flushBuffer();
-            }
-            _writeStringSegment(text, offset, len);
-        } else {
-            _writeStringSegments(text, offset, len);
-        }
-        // And finally, closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public final void writeString(SerializableString text)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        int len = text.appendQuotedUTF8(_outputBuffer, _outputTail);
-        if (len < 0) {
-            _writeBytes(text.asQuotedUTF8());
-        } else {
-            _outputTail += len;
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public void writeRawUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _writeBytes(text, offset, length);
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public void writeUTF8String(byte[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        // One or multiple segments?
-        if (len <= _outputMaxContiguous) {
-            _writeUTF8Segment(text, offset, len);
-        } else {
-            _writeUTF8Segments(text, offset, len);
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, unprocessed ("raw")
-    /**********************************************************
-     */
-
-    @Override
-    public void writeRaw(String text)
-        throws IOException, JsonGenerationException
-    {
-        int start = 0;
-        int len = text.length();
-        while (len > 0) {
-            char[] buf = _charBuffer;
-            final int blen = buf.length;
-            final int len2 = (len < blen) ? len : blen;
-            text.getChars(start, start+len2, buf, 0);
-            writeRaw(buf, 0, len2);
-            start += len2;
-            len -= len2;
-        }
-    }
-
-    @Override
-    public void writeRaw(String text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        while (len > 0) {
-            char[] buf = _charBuffer;
-            final int blen = buf.length;
-            final int len2 = (len < blen) ? len : blen;
-            text.getChars(offset, offset+len2, buf, 0);
-            writeRaw(buf, 0, len2);
-            offset += len2;
-            len -= len2;
-        }
-    }
-
-    @Override
-    public void writeRaw(SerializableString text) throws IOException, JsonGenerationException
-    {
-        byte[] raw = text.asUnquotedUTF8();
-        if (raw.length > 0) {
-            _writeBytes(raw);
-        }
-    }
-    
-    // @TODO: rewrite for speed...
-    @Override
-    public final void writeRaw(char[] cbuf, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        // First: if we have 3 x charCount spaces, we know it'll fit just fine
-        {
-            int len3 = len+len+len;
-            if ((_outputTail + len3) > _outputEnd) {
-                // maybe we could flush?
-                if (_outputEnd < len3) { // wouldn't be enough...
-                    _writeSegmentedRaw(cbuf, offset, len);
-                    return;
-                }
-                // yes, flushing brings enough space
-                _flushBuffer();
-            }
-        }
-        len += offset; // now marks the end
-
-        // Note: here we know there is enough room, hence no output boundary checks
-        main_loop:
-        while (offset < len) {
-            inner_loop:
-            while (true) {
-                int ch = (int) cbuf[offset];
-                if (ch > 0x7F) {
-                    break inner_loop;
-                }
-                _outputBuffer[_outputTail++] = (byte) ch;
-                if (++offset >= len) {
-                    break main_loop;
-                }
-            }
-            char ch = cbuf[offset++];
-            if (ch < 0x800) { // 2-byte?
-                _outputBuffer[_outputTail++] = (byte) (0xc0 | (ch >> 6));
-                _outputBuffer[_outputTail++] = (byte) (0x80 | (ch & 0x3f));
-            } else {
-                _outputRawMultiByteChar(ch, cbuf, offset, len);
-            }
-        }
-    }
-
-    @Override
-    public void writeRaw(char ch)
-        throws IOException, JsonGenerationException
-    {
-        if ((_outputTail + 3) >= _outputEnd) {
-            _flushBuffer();
-        }
-        final byte[] bbuf = _outputBuffer;
-        if (ch <= 0x7F) {
-            bbuf[_outputTail++] = (byte) ch;
-        } else  if (ch < 0x800) { // 2-byte?
-            bbuf[_outputTail++] = (byte) (0xc0 | (ch >> 6));
-            bbuf[_outputTail++] = (byte) (0x80 | (ch & 0x3f));
-        } else {
-            _outputRawMultiByteChar(ch, null, 0, 0);
-        }
-    }
-
-    /**
-     * Helper method called when it is possible that output of raw section
-     * to output may cross buffer boundary
-     */
-    private void _writeSegmentedRaw(char[] cbuf, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        final int end = _outputEnd;
-        final byte[] bbuf = _outputBuffer;
-        
-        main_loop:
-        while (offset < len) {
-            inner_loop:
-            while (true) {
-                int ch = (int) cbuf[offset];
-                if (ch >= 0x80) {
-                    break inner_loop;
-                }
-                // !!! TODO: fast(er) writes (roll input, output checks in one)
-                if (_outputTail >= end) {
-                    _flushBuffer();
-                }
-                bbuf[_outputTail++] = (byte) ch;
-                if (++offset >= len) {
-                    break main_loop;
-                }
-            }
-            if ((_outputTail + 3) >= _outputEnd) {
-                _flushBuffer();
-            }
-            char ch = cbuf[offset++];
-            if (ch < 0x800) { // 2-byte?
-                bbuf[_outputTail++] = (byte) (0xc0 | (ch >> 6));
-                bbuf[_outputTail++] = (byte) (0x80 | (ch & 0x3f));
-            } else {
-                _outputRawMultiByteChar(ch, cbuf, offset, len);
-            }
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, base64-encoded binary
-    /**********************************************************
-     */
-
-    @Override
-    public void writeBinary(Base64Variant b64variant,
-            byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write binary value");
-        // Starting quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _writeBinary(b64variant, data, offset, offset+len);
-        // and closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public int writeBinary(Base64Variant b64variant,
-            InputStream data, int dataLength)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write binary value");
-        // Starting quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        byte[] encodingBuffer = _ioContext.allocBase64Buffer();
-        int bytes;
-        try {
-            if (dataLength < 0) { // length unknown
-                bytes = _writeBinary(b64variant, data, encodingBuffer);
-            } else {
-                int missing = _writeBinary(b64variant, data, encodingBuffer, dataLength);
-                if (missing > 0) {
-                    _reportError("Too few bytes available: missing "+missing+" bytes (out of "+dataLength+")");
-                }
-                bytes = dataLength;
-            }
-        } finally {
-            _ioContext.releaseBase64Buffer(encodingBuffer);
-        }
-        // and closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        return bytes;
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, primitive
-    /**********************************************************
-     */
-
-    @Override
-    public void writeNumber(int i)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        // up to 10 digits and possible minus sign
-        if ((_outputTail + 11) >= _outputEnd) {
-            _flushBuffer();
-        }
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedInt(i);
-            return;
-        }
-        _outputTail = NumberOutput.outputInt(i, _outputBuffer, _outputTail);
-    }
-
-    private void _writeQuotedInt(int i) throws IOException {
-        if ((_outputTail + 13) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _outputTail = NumberOutput.outputInt(i, _outputBuffer, _outputTail);
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }    
-
-    @Override
-    public void writeNumber(long l)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedLong(l);
-            return;
-        }
-        if ((_outputTail + 21) >= _outputEnd) {
-            // up to 20 digits, minus sign
-            _flushBuffer();
-        }
-        _outputTail = NumberOutput.outputLong(l, _outputBuffer, _outputTail);
-    }
-
-    private void _writeQuotedLong(long l) throws IOException {
-        if ((_outputTail + 23) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        _outputTail = NumberOutput.outputLong(l, _outputBuffer, _outputTail);
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-
-    @Override
-    public void writeNumber(BigInteger value)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (value == null) {
-            _writeNull();
-        } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
-        } else {
-            writeRaw(value.toString());
-        }
-    }
-
-    
-    @Override
-    public void writeNumber(double d)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgNumbersAsStrings ||
-            // [JACKSON-139]
-            (((Double.isNaN(d) || Double.isInfinite(d))
-                && isEnabled(Feature.QUOTE_NON_NUMERIC_NUMBERS)))) {
-            writeString(String.valueOf(d));
-            return;
-        }
-        // What is the max length for doubles? 40 chars?
-        _verifyValueWrite("write number");
-        writeRaw(String.valueOf(d));
-    }
-
-    @Override
-    public void writeNumber(float f)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgNumbersAsStrings ||
-            // [JACKSON-139]
-            (((Float.isNaN(f) || Float.isInfinite(f))
-                && isEnabled(Feature.QUOTE_NON_NUMERIC_NUMBERS)))) {
-            writeString(String.valueOf(f));
-            return;
-        }
-        // What is the max length for floats?
-        _verifyValueWrite("write number");
-        writeRaw(String.valueOf(f));
-    }
-
-    @Override
-    public void writeNumber(BigDecimal value)
-        throws IOException, JsonGenerationException
-    {
-        // Don't really know max length for big decimal, no point checking
-        _verifyValueWrite("write number");
-        if (value == null) {
-            _writeNull();
-        } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
-        } else {
-            writeRaw(value.toString());
-        }
-    }
-
-    @Override
-    public void writeNumber(String encodedValue)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(encodedValue);            
-        } else {
-            writeRaw(encodedValue);
-        }
-    }
-
-    private void _writeQuotedRaw(Object value) throws IOException
-    {
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-        writeRaw(value.toString());
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = BYTE_QUOTE;
-    }
-    
-    @Override
-    public void writeBoolean(boolean state)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write boolean value");
-        if ((_outputTail + 5) >= _outputEnd) {
-            _flushBuffer();
-        }
-        byte[] keyword = state ? TRUE_BYTES : FALSE_BYTES;
-        int len = keyword.length;
-        System.arraycopy(keyword, 0, _outputBuffer, _outputTail, len);
-        _outputTail += len;
-    }
-
-    @Override
-    public void writeNull()
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write null value");
-        _writeNull();
-    }
-
-    /*
-    /**********************************************************
-    /* Implementations for other methods
-    /**********************************************************
-     */
-
-    @Override
-    protected final void _verifyValueWrite(String typeMsg)
-        throws IOException, JsonGenerationException
-    {
-        int status = _writeContext.writeValue();
-        if (status == JsonWriteContext.STATUS_EXPECT_NAME) {
-            _reportError("Can not "+typeMsg+", expecting field name");
-        }
-        if (_cfgPrettyPrinter == null) {
-            byte b;
-            switch (status) {
-            case JsonWriteContext.STATUS_OK_AFTER_COMMA:
-                b = BYTE_COMMA;
-                break;
-            case JsonWriteContext.STATUS_OK_AFTER_COLON:
-                b = BYTE_COLON;
-                break;
-            case JsonWriteContext.STATUS_OK_AFTER_SPACE: // root-value separator
-                if (_rootValueSeparator != null) {
-                    byte[] raw = _rootValueSeparator.asUnquotedUTF8();
-                    if (raw.length > 0) {
-                        _writeBytes(raw);
-                    }
-                }
-                return;
-            case JsonWriteContext.STATUS_OK_AS_IS:
-            default:
-                return;
-            }
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail] = b;
-            ++_outputTail;
-            return;
-        }
-        // Otherwise, pretty printer knows what to do...
-        _verifyPrettyValueWrite(typeMsg, status);
-    }
-
-    protected final void _verifyPrettyValueWrite(String typeMsg, int status)
-        throws IOException, JsonGenerationException
-    {
-        // If we have a pretty printer, it knows what to do:
-        switch (status) {
-        case JsonWriteContext.STATUS_OK_AFTER_COMMA: // array
-            _cfgPrettyPrinter.writeArrayValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AFTER_COLON:
-            _cfgPrettyPrinter.writeObjectFieldValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AFTER_SPACE:
-            _cfgPrettyPrinter.writeRootValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AS_IS:
-            // First entry, but of which context?
-            if (_writeContext.inArray()) {
-                _cfgPrettyPrinter.beforeArrayValues(this);
-            } else if (_writeContext.inObject()) {
-                _cfgPrettyPrinter.beforeObjectEntries(this);
-            }
-            break;
-        default:
-            _cantHappen();
-            break;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Low-level output handling
-    /**********************************************************
-     */
-
-    @Override
-    public final void flush()
-        throws IOException
-    {
-        _flushBuffer();
-        if (_outputStream != null) {
-            if (isEnabled(Feature.FLUSH_PASSED_TO_STREAM)) {
-                _outputStream.flush();
-            }
-        }
-    }
-
-    @Override
-    public void close()
-        throws IOException
-    {
-        super.close();
-
-        /* 05-Dec-2008, tatu: To add [JACKSON-27], need to close open
-         *   scopes.
-         */
-        // First: let's see that we still have buffers...
-        if (_outputBuffer != null
-            && isEnabled(Feature.AUTO_CLOSE_JSON_CONTENT)) {
-            while (true) {
-                JsonStreamContext ctxt = getOutputContext();
-                if (ctxt.inArray()) {
-                    writeEndArray();
-                } else if (ctxt.inObject()) {
-                    writeEndObject();
-                } else {
-                    break;
-                }
-            }
-        }
-        _flushBuffer();
-
-        /* 25-Nov-2008, tatus: As per [JACKSON-16] we are not to call close()
-         *   on the underlying Reader, unless we "own" it, or auto-closing
-         *   feature is enabled.
-         *   One downside: when using UTF8Writer, underlying buffer(s)
-         *   may not be properly recycled if we don't close the writer.
-         */
-        if (_outputStream != null) {
-            if (_ioContext.isResourceManaged() || isEnabled(Feature.AUTO_CLOSE_TARGET)) {
-                _outputStream.close();
-            } else  if (isEnabled(Feature.FLUSH_PASSED_TO_STREAM)) {
-                // If we can't close it, we should at least flush
-                _outputStream.flush();
-            }
-        }
-        // Internal buffer(s) generator has can now be released as well
-        _releaseBuffers();
-    }
-
-    @Override
-    protected void _releaseBuffers()
-    {
-        byte[] buf = _outputBuffer;
-        if (buf != null && _bufferRecyclable) {
-            _outputBuffer = null;
-            _ioContext.releaseWriteEncodingBuffer(buf);
-        }
-        char[] cbuf = _charBuffer;
-        if (cbuf != null) {
-            _charBuffer = null;
-            _ioContext.releaseConcatBuffer(cbuf);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, raw bytes
-    /**********************************************************
-     */
-
-    private void _writeBytes(byte[] bytes) throws IOException
-    {
-        final int len = bytes.length;
-        if ((_outputTail + len) > _outputEnd) {
-            _flushBuffer();
-            // still not enough?
-            if (len > MAX_BYTES_TO_BUFFER) {
-                _outputStream.write(bytes, 0, len);
-                return;
-            }
-        }
-        System.arraycopy(bytes, 0, _outputBuffer, _outputTail, len);
-        _outputTail += len;
-    }
-
-    private void _writeBytes(byte[] bytes, int offset, int len) throws IOException
-    {
-        if ((_outputTail + len) > _outputEnd) {
-            _flushBuffer();
-            // still not enough?
-            if (len > MAX_BYTES_TO_BUFFER) {
-                _outputStream.write(bytes, offset, len);
-                return;
-            }
-        }
-        System.arraycopy(bytes, offset, _outputBuffer, _outputTail, len);
-        _outputTail += len;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, mid-level writing, String segments
-    /**********************************************************
-     */
-    
-    /**
-     * Method called when String to write is long enough not to fit
-     * completely in temporary copy buffer. If so, we will actually
-     * copy it in small enough chunks so it can be directly fed
-     * to single-segment writes (instead of maximum slices that
-     * would fit in copy buffer)
-     */
-    private void _writeStringSegments(String text)
-        throws IOException, JsonGenerationException
-    {
-        int left = text.length();
-        int offset = 0;
-        final char[] cbuf = _charBuffer;
-
-        while (left > 0) {
-            int len = Math.min(_outputMaxContiguous, left);
-            text.getChars(offset, offset+len, cbuf, 0);
-            if ((_outputTail + len) > _outputEnd) { // caller must ensure enough space
-                _flushBuffer();
-            }
-            _writeStringSegment(cbuf, 0, len);
-            offset += len;
-            left -= len;
-        }
-    }
-
-    /**
-     * Method called when character sequence to write is long enough that
-     * its maximum encoded and escaped form is not guaranteed to fit in
-     * the output buffer. If so, we will need to choose smaller output
-     * chunks to write at a time.
-     */
-    private void _writeStringSegments(char[] cbuf, int offset, int totalLen)
-        throws IOException, JsonGenerationException
-    {
-        do {
-            int len = Math.min(_outputMaxContiguous, totalLen);
-            if ((_outputTail + len) > _outputEnd) { // caller must ensure enough space
-                _flushBuffer();
-            }
-            _writeStringSegment(cbuf, offset, len);
-            offset += len;
-            totalLen -= len;
-        } while (totalLen > 0);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, text segments
-    /**********************************************************
-     */
-
-    /**
-     * This method called when the string content is already in
-     * a char buffer, and its maximum total encoded and escaped length
-     * can not exceed size of the output buffer.
-     * Caller must ensure that there is enough space in output buffer,
-     * assuming case of all non-escaped ASCII characters, as well as
-     * potentially enough space for other cases (but not necessarily flushed)
-     */
-    private void _writeStringSegment(char[] cbuf, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        // note: caller MUST ensure (via flushing) there's room for ASCII only
-        
-        // Fast+tight loop for ASCII-only, no-escaping-needed output
-        len += offset; // becomes end marker, then
-
-        int outputPtr = _outputTail;
-        final byte[] outputBuffer = _outputBuffer;
-        final int[] escCodes = _outputEscapes;
-
-        while (offset < len) {
-            int ch = cbuf[offset];
-            // note: here we know that (ch > 0x7F) will cover case of escaping non-ASCII too:
-            if (ch > 0x7F || escCodes[ch] != 0) {
-                break;
-            }
-            outputBuffer[outputPtr++] = (byte) ch;
-            ++offset;
-        }
-        _outputTail = outputPtr;
-        if (offset < len) {
-            // [JACKSON-106]
-            if (_characterEscapes != null) {
-                _writeCustomStringSegment2(cbuf, offset, len);
-            // [JACKSON-102]
-            } else if (_maximumNonEscapedChar == 0) {
-                _writeStringSegment2(cbuf, offset, len);
-            } else {
-                _writeStringSegmentASCII2(cbuf, offset, len);
-            }
-
-        }
-    }
-
-    /**
-     * Secondary method called when content contains characters to escape,
-     * and/or multi-byte UTF-8 characters.
-     */
-    private void _writeStringSegment2(final char[] cbuf, int offset, final int end)
-        throws IOException, JsonGenerationException
-    {
-        // Ok: caller guarantees buffer can have room; but that may require flushing:
-        if ((_outputTail +  6 * (end - offset)) > _outputEnd) {
-            _flushBuffer();
-        }
-
-        int outputPtr = _outputTail;
-
-        final byte[] outputBuffer = _outputBuffer;
-        final int[] escCodes = _outputEscapes;
-        
-        while (offset < end) {
-            int ch = cbuf[offset++];
-            if (ch <= 0x7F) {
-                 if (escCodes[ch] == 0) {
-                     outputBuffer[outputPtr++] = (byte) ch;
-                     continue;
-                 }
-                 int escape = escCodes[ch];
-                 if (escape > 0) { // 2-char escape, fine
-                     outputBuffer[outputPtr++] = BYTE_BACKSLASH;
-                     outputBuffer[outputPtr++] = (byte) escape;
-                 } else {
-                     // ctrl-char, 6-byte escape...
-                     outputPtr = _writeGenericEscape(ch, outputPtr);
-                }
-                continue;
-            }
-            if (ch <= 0x7FF) { // fine, just needs 2 byte output
-                outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
-                outputBuffer[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
-            } else {
-                outputPtr = _outputMultiByteChar(ch, outputPtr);
-            }
-        }
-        _outputTail = outputPtr;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, text segment
-    /* with additional escaping (ASCII or such)
-    /**********************************************************
-     */
-
-    /**
-     * Same as <code>_writeStringSegment2(char[], ...)</code., but with
-     * additional escaping for high-range code points
-     */
-    private void _writeStringSegmentASCII2(final char[] cbuf, int offset, final int end)
-        throws IOException, JsonGenerationException
-    {
-        // Ok: caller guarantees buffer can have room; but that may require flushing:
-        if ((_outputTail +  6 * (end - offset)) > _outputEnd) {
-            _flushBuffer();
-        }
-    
-        int outputPtr = _outputTail;
-    
-        final byte[] outputBuffer = _outputBuffer;
-        final int[] escCodes = _outputEscapes;
-        final int maxUnescaped = _maximumNonEscapedChar;
-        
-        while (offset < end) {
-            int ch = cbuf[offset++];
-            if (ch <= 0x7F) {
-                 if (escCodes[ch] == 0) {
-                     outputBuffer[outputPtr++] = (byte) ch;
-                     continue;
-                 }
-                 int escape = escCodes[ch];
-                 if (escape > 0) { // 2-char escape, fine
-                     outputBuffer[outputPtr++] = BYTE_BACKSLASH;
-                     outputBuffer[outputPtr++] = (byte) escape;
-                 } else {
-                     // ctrl-char, 6-byte escape...
-                     outputPtr = _writeGenericEscape(ch, outputPtr);
-                 }
-                 continue;
-            }
-            if (ch > maxUnescaped) { // [JACKSON-102] Allow forced escaping if non-ASCII (etc) chars:
-                outputPtr = _writeGenericEscape(ch, outputPtr);
-                continue;
-            }
-            if (ch <= 0x7FF) { // fine, just needs 2 byte output
-                outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
-                outputBuffer[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
-            } else {
-                outputPtr = _outputMultiByteChar(ch, outputPtr);
-            }
-        }
-        _outputTail = outputPtr;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, text segment
-    /* with fully custom escaping (and possibly escaping of non-ASCII
-    /**********************************************************
-     */
-
-    /**
-     * Same as <code>_writeStringSegmentASCII2(char[], ...)</code., but with
-     * additional checking for completely custom escapes
-     */
-    private void _writeCustomStringSegment2(final char[] cbuf, int offset, final int end)
-        throws IOException, JsonGenerationException
-    {
-        // Ok: caller guarantees buffer can have room; but that may require flushing:
-        if ((_outputTail +  6 * (end - offset)) > _outputEnd) {
-            _flushBuffer();
-        }
-        int outputPtr = _outputTail;
-    
-        final byte[] outputBuffer = _outputBuffer;
-        final int[] escCodes = _outputEscapes;
-        // may or may not have this limit
-        final int maxUnescaped = (_maximumNonEscapedChar <= 0) ? 0xFFFF : _maximumNonEscapedChar;
-        final CharacterEscapes customEscapes = _characterEscapes; // non-null
-        
-        while (offset < end) {
-            int ch = cbuf[offset++];
-            if (ch <= 0x7F) {
-                 if (escCodes[ch] == 0) {
-                     outputBuffer[outputPtr++] = (byte) ch;
-                     continue;
-                 }
-                 int escape = escCodes[ch];
-                 if (escape > 0) { // 2-char escape, fine
-                     outputBuffer[outputPtr++] = BYTE_BACKSLASH;
-                     outputBuffer[outputPtr++] = (byte) escape;
-                 } else if (escape == CharacterEscapes.ESCAPE_CUSTOM) {
-                     SerializableString esc = customEscapes.getEscapeSequence(ch);
-                     if (esc == null) {
-                         _reportError("Invalid custom escape definitions; custom escape not found for character code 0x"
-                                 +Integer.toHexString(ch)+", although was supposed to have one");
-                     }
-                     outputPtr = _writeCustomEscape(outputBuffer, outputPtr, esc, end-offset);
-                 } else {
-                     // ctrl-char, 6-byte escape...
-                     outputPtr = _writeGenericEscape(ch, outputPtr);
-                 }
-                 continue;
-            }
-            if (ch > maxUnescaped) { // [JACKSON-102] Allow forced escaping if non-ASCII (etc) chars:
-                outputPtr = _writeGenericEscape(ch, outputPtr);
-                continue;
-            }
-            SerializableString esc = customEscapes.getEscapeSequence(ch);
-            if (esc != null) {
-                outputPtr = _writeCustomEscape(outputBuffer, outputPtr, esc, end-offset);
-                continue;
-            }
-            if (ch <= 0x7FF) { // fine, just needs 2 byte output
-                outputBuffer[outputPtr++] = (byte) (0xc0 | (ch >> 6));
-                outputBuffer[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
-            } else {
-                outputPtr = _outputMultiByteChar(ch, outputPtr);
-            }
-        }
-        _outputTail = outputPtr;
-    }
-
-    private int _writeCustomEscape(byte[] outputBuffer, int outputPtr, SerializableString esc, int remainingChars)
-        throws IOException, JsonGenerationException
-    {
-        byte[] raw = esc.asUnquotedUTF8(); // must be escaped at this point, shouldn't double-quote
-        int len = raw.length;
-        if (len > 6) { // may violate constraints we have, do offline
-            return _handleLongCustomEscape(outputBuffer, outputPtr, _outputEnd, raw, remainingChars);
-        }
-        // otherwise will fit without issues, so:
-        System.arraycopy(raw, 0, outputBuffer, outputPtr, len);
-        return (outputPtr + len);
-    }
-    
-    private int _handleLongCustomEscape(byte[] outputBuffer, int outputPtr, int outputEnd, byte[] raw,
-            int remainingChars)
-        throws IOException, JsonGenerationException
-    {
-        int len = raw.length;
-        if ((outputPtr + len) > outputEnd) {
-            _outputTail = outputPtr;
-            _flushBuffer();
-            outputPtr = _outputTail;
-            if (len > outputBuffer.length) { // very unlikely, but possible...
-                _outputStream.write(raw, 0, len);
-                return outputPtr;
-            }
-            System.arraycopy(raw, 0, outputBuffer, outputPtr, len);
-            outputPtr += len;
-        }
-        // but is the invariant still obeyed? If not, flush once more
-        if ((outputPtr +  6 * remainingChars) > outputEnd) {
-            _flushBuffer();
-            return _outputTail;
-        }
-        return outputPtr;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, "raw UTF-8" segments
-    /**********************************************************
-     */
-    
-    /**
-     * Method called when UTF-8 encoded (but NOT yet escaped!) content is not guaranteed
-     * to fit in the output buffer after escaping; as such, we just need to
-     * chunk writes.
-     */
-    private void _writeUTF8Segments(byte[] utf8, int offset, int totalLen)
-        throws IOException, JsonGenerationException
-    {
-        do {
-            int len = Math.min(_outputMaxContiguous, totalLen);
-            _writeUTF8Segment(utf8, offset, len);
-            offset += len;
-            totalLen -= len;
-        } while (totalLen > 0);
-    }
-    
-    private void _writeUTF8Segment(byte[] utf8, final int offset, final int len)
-        throws IOException, JsonGenerationException
-    {
-        // fast loop to see if escaping is needed; don't copy, just look
-        final int[] escCodes = _outputEscapes;
-
-        for (int ptr = offset, end = offset + len; ptr < end; ) {
-            // 28-Feb-2011, tatu: escape codes just cover 7-bit range, so:
-            int ch = utf8[ptr++];
-            if ((ch >= 0) && escCodes[ch] != 0) {
-                _writeUTF8Segment2(utf8, offset, len);
-                return;
-            }
-        }
-        
-        // yes, fine, just copy the sucker
-        if ((_outputTail + len) > _outputEnd) { // enough room or need to flush?
-            _flushBuffer(); // but yes once we flush (caller guarantees length restriction)
-        }
-        System.arraycopy(utf8, offset, _outputBuffer, _outputTail, len);
-        _outputTail += len;
-    }
-
-    private void _writeUTF8Segment2(final byte[] utf8, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        int outputPtr = _outputTail;
-
-        // Ok: caller guarantees buffer can have room; but that may require flushing:
-        if ((outputPtr + (len * 6)) > _outputEnd) {
-            _flushBuffer();
-            outputPtr = _outputTail;
-        }
-        
-        final byte[] outputBuffer = _outputBuffer;
-        final int[] escCodes = _outputEscapes;
-        len += offset; // so 'len' becomes 'end'
-        
-        while (offset < len) {
-            byte b = utf8[offset++];
-            int ch = b;
-            if (ch < 0 || escCodes[ch] == 0) {
-                outputBuffer[outputPtr++] = b;
-                continue;
-            }
-            int escape = escCodes[ch];
-            if (escape > 0) { // 2-char escape, fine
-                outputBuffer[outputPtr++] = BYTE_BACKSLASH;
-                outputBuffer[outputPtr++] = (byte) escape;
-            } else {
-                // ctrl-char, 6-byte escape...
-                outputPtr = _writeGenericEscape(ch, outputPtr);
-            }
-        }
-        _outputTail = outputPtr;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, base64 encoded
-    /**********************************************************
-     */
-    
-    protected void _writeBinary(Base64Variant b64variant,
-            byte[] input, int inputPtr, final int inputEnd)
-        throws IOException, JsonGenerationException
-    {
-        // Encoding is by chunks of 3 input, 4 output chars, so:
-        int safeInputEnd = inputEnd - 3;
-        // Let's also reserve room for possible (and quoted) lf char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        // Ok, first we loop through all full triplets of data:
-        while (inputPtr <= safeInputEnd) {
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            // First, mash 3 bytes into lsb of 32-bit int
-            int b24 = ((int) input[inputPtr++]) << 8;
-            b24 |= ((int) input[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) input[inputPtr++]) & 0xFF);
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                // note: must quote in JSON value
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-
-        // And then we may have 1 or 2 leftover bytes to encode
-        int inputLeft = inputEnd - inputPtr; // 0, 1 or 2
-        if (inputLeft > 0) { // yes, but do we have room for output?
-            if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                _flushBuffer();
-            }
-            int b24 = ((int) input[inputPtr++]) << 16;
-            if (inputLeft == 2) {
-                b24 |= (((int) input[inputPtr++]) & 0xFF) << 8;
-            }
-            _outputTail = b64variant.encodeBase64Partial(b24, inputLeft, _outputBuffer, _outputTail);
-        }
-    }
-
-    // write-method called when length is definitely known
-    protected int _writeBinary(Base64Variant b64variant,
-            InputStream data, byte[] readBuffer, int bytesLeft)
-        throws IOException, JsonGenerationException
-    {
-        int inputPtr = 0;
-        int inputEnd = 0;
-        int lastFullOffset = -3;       
-        
-        // Let's also reserve room for possible (and quoted) LF char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        while (bytesLeft > 2) { // main loop for full triplets
-            if (inputPtr > lastFullOffset) {
-                inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, bytesLeft);
-                inputPtr = 0;
-                if (inputEnd < 3) { // required to try to read to have at least 3 bytes
-                    break;
-                }
-                lastFullOffset = inputEnd-3;
-            }
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            int b24 = ((int) readBuffer[inputPtr++]) << 8;
-            b24 |= ((int) readBuffer[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) readBuffer[inputPtr++]) & 0xFF);
-            bytesLeft -= 3;
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-        
-        // And then we may have 1 or 2 leftover bytes to encode
-        if (bytesLeft > 0) {
-            inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, bytesLeft);
-            inputPtr = 0;
-            if (inputEnd > 0) { // yes, but do we have room for output?
-                if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                    _flushBuffer();
-                }
-                int b24 = ((int) readBuffer[inputPtr++]) << 16;
-                int amount;
-                if (inputPtr < inputEnd) {
-                    b24 |= (((int) readBuffer[inputPtr]) & 0xFF) << 8;
-                    amount = 2;
-                } else {
-                    amount = 1;
-                }
-                _outputTail = b64variant.encodeBase64Partial(b24, amount, _outputBuffer, _outputTail);
-                bytesLeft -= amount;
-            }
-        }
-        return bytesLeft;
-    }
-
-    // write method when length is unknown
-    protected int _writeBinary(Base64Variant b64variant,
-            InputStream data, byte[] readBuffer)
-        throws IOException, JsonGenerationException
-    {
-        int inputPtr = 0;
-        int inputEnd = 0;
-        int lastFullOffset = -3;
-        int bytesDone = 0;
-        
-        // Let's also reserve room for possible (and quoted) LF char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        // Ok, first we loop through all full triplets of data:
-        while (true) {
-            if (inputPtr > lastFullOffset) { // need to load more
-                inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, readBuffer.length);
-                inputPtr = 0;
-                if (inputEnd < 3) { // required to try to read to have at least 3 bytes
-                    break;
-                }
-                lastFullOffset = inputEnd-3;
-            }
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            // First, mash 3 bytes into lsb of 32-bit int
-            int b24 = ((int) readBuffer[inputPtr++]) << 8;
-            b24 |= ((int) readBuffer[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) readBuffer[inputPtr++]) & 0xFF);
-            bytesDone += 3;
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-
-        // And then we may have 1 or 2 leftover bytes to encode
-        if (inputPtr < inputEnd) { // yes, but do we have room for output?
-            if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                _flushBuffer();
-            }
-            int b24 = ((int) readBuffer[inputPtr++]) << 16;
-            int amount = 1;
-            if (inputPtr < inputEnd) {
-                b24 |= (((int) readBuffer[inputPtr]) & 0xFF) << 8;
-                amount = 2;
-            }
-            bytesDone += amount;
-            _outputTail = b64variant.encodeBase64Partial(b24, amount, _outputBuffer, _outputTail);
-        }
-        return bytesDone;
-    }
-    
-    private int _readMore(InputStream in,
-            byte[] readBuffer, int inputPtr, int inputEnd,
-            int maxRead) throws IOException
-    {
-        // anything to shift to front?
-        int i = 0;
-        while (inputPtr < inputEnd) {
-            readBuffer[i++]  = readBuffer[inputPtr++];
-        }
-        inputPtr = 0;
-        inputEnd = i;
-        maxRead = Math.min(maxRead, readBuffer.length);
-        
-        do {
-            int count = in.read(readBuffer, inputEnd, maxRead - inputEnd);
-            if (count < 0) {
-                return inputEnd;
-            }
-            inputEnd += count;
-        } while (inputEnd < 3);
-        return inputEnd;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, character escapes/encoding
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to output a character that is beyond range of
-     * 1- and 2-byte UTF-8 encodings, when outputting "raw" 
-     * text (meaning it is not to be escaped or quoted)
-     */
-    private int _outputRawMultiByteChar(int ch, char[] cbuf, int inputOffset, int inputLen)
-        throws IOException
-    {
-        // Let's handle surrogates gracefully (as 4 byte output):
-        if (ch >= SURR1_FIRST) {
-            if (ch <= SURR2_LAST) { // yes, outside of BMP
-                // Do we have second part?
-                if (inputOffset >= inputLen) { // nope... have to note down
-                    _reportError("Split surrogate on writeRaw() input (last character)");
-                }
-                _outputSurrogates(ch, cbuf[inputOffset]);
-                return (inputOffset+1);
-            }
-        }
-        final byte[] bbuf = _outputBuffer;
-        bbuf[_outputTail++] = (byte) (0xe0 | (ch >> 12));
-        bbuf[_outputTail++] = (byte) (0x80 | ((ch >> 6) & 0x3f));
-        bbuf[_outputTail++] = (byte) (0x80 | (ch & 0x3f));
-        return inputOffset;
-    }
-
-    protected final void _outputSurrogates(int surr1, int surr2)
-        throws IOException
-    {
-        int c = _decodeSurrogate(surr1, surr2);
-        if ((_outputTail + 4) > _outputEnd) {
-            _flushBuffer();
-        }
-        final byte[] bbuf = _outputBuffer;
-        bbuf[_outputTail++] = (byte) (0xf0 | (c >> 18));
-        bbuf[_outputTail++] = (byte) (0x80 | ((c >> 12) & 0x3f));
-        bbuf[_outputTail++] = (byte) (0x80 | ((c >> 6) & 0x3f));
-        bbuf[_outputTail++] = (byte) (0x80 | (c & 0x3f));
-    }
-    
-    /**
-     * 
-     * @param ch
-     * @param outputPtr Position within output buffer to append multi-byte in
-     * 
-     * @return New output position after appending
-     * 
-     * @throws IOException
-     */
-    private int _outputMultiByteChar(int ch, int outputPtr)
-        throws IOException
-    {
-        byte[] bbuf = _outputBuffer;
-        if (ch >= SURR1_FIRST && ch <= SURR2_LAST) { // yes, outside of BMP; add an escape
-            bbuf[outputPtr++] = BYTE_BACKSLASH;
-            bbuf[outputPtr++] = BYTE_u;
-            
-            bbuf[outputPtr++] = HEX_CHARS[(ch >> 12) & 0xF];
-            bbuf[outputPtr++] = HEX_CHARS[(ch >> 8) & 0xF];
-            bbuf[outputPtr++] = HEX_CHARS[(ch >> 4) & 0xF];
-            bbuf[outputPtr++] = HEX_CHARS[ch & 0xF];
-        } else {
-            bbuf[outputPtr++] = (byte) (0xe0 | (ch >> 12));
-            bbuf[outputPtr++] = (byte) (0x80 | ((ch >> 6) & 0x3f));
-            bbuf[outputPtr++] = (byte) (0x80 | (ch & 0x3f));
-        }
-        return outputPtr;
-    }
-
-    protected final int _decodeSurrogate(int surr1, int surr2) throws IOException
-    {
-        // First is known to be valid, but how about the other?
-        if (surr2 < SURR2_FIRST || surr2 > SURR2_LAST) {
-            String msg = "Incomplete surrogate pair: first char 0x"+Integer.toHexString(surr1)+", second 0x"+Integer.toHexString(surr2);
-            _reportError(msg);
-        }
-        int c = 0x10000 + ((surr1 - SURR1_FIRST) << 10) + (surr2 - SURR2_FIRST);
-        return c;
-    }
-    
-    private void _writeNull() throws IOException
-    {
-        if ((_outputTail + 4) >= _outputEnd) {
-            _flushBuffer();
-        }
-        System.arraycopy(NULL_BYTES, 0, _outputBuffer, _outputTail, 4);
-        _outputTail += 4;
-    }
-        
-    /**
-     * Method called to write a generic Unicode escape for given character.
-     * 
-     * @param charToEscape Character to escape using escape sequence (\\uXXXX)
-     */
-    private int _writeGenericEscape(int charToEscape, int outputPtr)
-        throws IOException
-    {
-        final byte[] bbuf = _outputBuffer;
-        bbuf[outputPtr++] = BYTE_BACKSLASH;
-        bbuf[outputPtr++] = BYTE_u;
-        if (charToEscape > 0xFF) {
-            int hi = (charToEscape >> 8) & 0xFF;
-            bbuf[outputPtr++] = HEX_CHARS[hi >> 4];
-            bbuf[outputPtr++] = HEX_CHARS[hi & 0xF];
-            charToEscape &= 0xFF;
-        } else {
-            bbuf[outputPtr++] = BYTE_0;
-            bbuf[outputPtr++] = BYTE_0;
-        }
-        // We know it's a control char, so only the last 2 chars are non-0
-        bbuf[outputPtr++] = HEX_CHARS[charToEscape >> 4];
-        bbuf[outputPtr++] = HEX_CHARS[charToEscape & 0xF];
-        return outputPtr;
-    }
-
-    protected final void _flushBuffer() throws IOException
-    {
-        int len = _outputTail;
-        if (len > 0) {
-            _outputTail = 0;
-            _outputStream.write(_outputBuffer, 0, len);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
deleted file mode 100644
index 4f4d241..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
+++ /dev/null
@@ -1,3147 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.base.ParserBase;
-import com.fasterxml.jackson.core.io.CharTypes;
-import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.sym.*;
-import com.fasterxml.jackson.core.util.*;
-
-/**
- * This is a concrete implementation of {@link JsonParser}, which is
- * based on a {@link java.io.InputStream} as the input source.
- */
-public final class UTF8StreamJsonParser
-    extends ParserBase
-{
-    final static byte BYTE_LF = (byte) '\n';
-
-    private final static int[] sInputCodesUtf8 = CharTypes.getInputCodeUtf8();
-
-    /**
-     * Latin1 encoding is not supported, but we do use 8-bit subset for
-     * pre-processing task, to simplify first pass, keep it fast.
-     */
-    private final static int[] sInputCodesLatin1 = CharTypes.getInputCodeLatin1();
-    
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Codec used for data binding when (if) requested; typically full
-     * <code>ObjectMapper</code>, but that abstract is not part of core
-     * package.
-     */
-    protected ObjectCodec _objectCodec;
-
-    /**
-     * Symbol table that contains field names encountered so far
-     */
-    final protected BytesToNameCanonicalizer _symbols;
-    
-    /*
-    /**********************************************************
-    /* Parsing state
-    /**********************************************************
-     */
-    
-    /**
-     * Temporary buffer used for name parsing.
-     */
-    protected int[] _quadBuffer = new int[16];
-
-    /**
-     * Flag that indicates that the current token has not yet
-     * been fully processed, and needs to be finished for
-     * some access (or skipped to obtain the next token)
-     */
-    protected boolean _tokenIncomplete = false;
-
-    /**
-     * Temporary storage for partially parsed name bytes.
-     */
-    private int _quad1;
-    
-    /*
-    /**********************************************************
-    /* Input buffering (from former 'StreamBasedParserBase')
-    /**********************************************************
-     */
-    
-    protected InputStream _inputStream;
-
-    /*
-    /**********************************************************
-    /* Current input data
-    /**********************************************************
-     */
-
-    /**
-     * Current buffer from which data is read; generally data is read into
-     * buffer from input source, but in some cases pre-loaded buffer
-     * is handed to the parser.
-     */
-    protected byte[] _inputBuffer;
-
-    /**
-     * Flag that indicates whether the input buffer is recycable (and
-     * needs to be returned to recycler once we are done) or not.
-     *<p>
-     * If it is not, it also means that parser can NOT modify underlying
-     * buffer.
-     */
-    protected boolean _bufferRecyclable;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public UTF8StreamJsonParser(IOContext ctxt, int features, InputStream in,
-            ObjectCodec codec, BytesToNameCanonicalizer sym,
-            byte[] inputBuffer, int start, int end,
-            boolean bufferRecyclable)
-    {
-        super(ctxt, features);
-        _inputStream = in;
-        _objectCodec = codec;
-        _symbols = sym;
-        _inputBuffer = inputBuffer;
-        _inputPtr = start;
-        _inputEnd = end;
-        _bufferRecyclable = bufferRecyclable;
-    }
-
-    @Override
-    public ObjectCodec getCodec() {
-        return _objectCodec;
-    }
-
-    @Override
-    public void setCodec(ObjectCodec c) {
-        _objectCodec = c;
-    }
-
-    @Override
-    public Version version() {
-        return CoreVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* Overrides
-    /**********************************************************
-     */
-
-    @Override
-    public int releaseBuffered(OutputStream out) throws IOException
-    {
-        int count = _inputEnd - _inputPtr;
-        if (count < 1) {
-            return 0;
-        }
-        // let's just advance ptr to end
-        int origPtr = _inputPtr;
-        out.write(_inputBuffer, origPtr, count);
-        return count;
-    }
-
-    @Override
-    public Object getInputSource() {
-        return _inputStream;
-    }
-    
-    /*
-    /**********************************************************
-    /* Low-level reading, other
-    /**********************************************************
-     */
-
-    @Override
-    protected boolean loadMore()
-        throws IOException
-    {
-        _currInputProcessed += _inputEnd;
-        _currInputRowStart -= _inputEnd;
-        
-        if (_inputStream != null) {
-            int count = _inputStream.read(_inputBuffer, 0, _inputBuffer.length);
-            if (count > 0) {
-                _inputPtr = 0;
-                _inputEnd = count;
-                return true;
-            }
-            // End of input
-            _closeInput();
-            // Should never return 0, so let's fail
-            if (count == 0) {
-                throw new IOException("InputStream.read() returned 0 characters when trying to read "+_inputBuffer.length+" bytes");
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Helper method that will try to load at least specified number bytes in
-     * input buffer, possible moving existing data around if necessary
-     */
-    protected boolean _loadToHaveAtLeast(int minAvailable)
-        throws IOException
-    {
-        // No input stream, no leading (either we are closed, or have non-stream input source)
-        if (_inputStream == null) {
-            return false;
-        }
-        // Need to move remaining data in front?
-        int amount = _inputEnd - _inputPtr;
-        if (amount > 0 && _inputPtr > 0) {
-            _currInputProcessed += _inputPtr;
-            _currInputRowStart -= _inputPtr;
-            System.arraycopy(_inputBuffer, _inputPtr, _inputBuffer, 0, amount);
-            _inputEnd = amount;
-        } else {
-            _inputEnd = 0;
-        }
-        _inputPtr = 0;
-        while (_inputEnd < minAvailable) {
-            int count = _inputStream.read(_inputBuffer, _inputEnd, _inputBuffer.length - _inputEnd);
-            if (count < 1) {
-                // End of input
-                _closeInput();
-                // Should never return 0, so let's fail
-                if (count == 0) {
-                    throw new IOException("InputStream.read() returned 0 characters when trying to read "+amount+" bytes");
-                }
-                return false;
-            }
-            _inputEnd += count;
-        }
-        return true;
-    }
-    
-    @Override
-    protected void _closeInput() throws IOException
-    {
-        /* 25-Nov-2008, tatus: As per [JACKSON-16] we are not to call close()
-         *   on the underlying InputStream, unless we "own" it, or auto-closing
-         *   feature is enabled.
-         */
-        if (_inputStream != null) {
-            if (_ioContext.isResourceManaged() || isEnabled(Feature.AUTO_CLOSE_SOURCE)) {
-                _inputStream.close();
-            }
-            _inputStream = null;
-        }
-    }
-
-    /**
-     * Method called to release internal buffers owned by the base
-     * reader. This may be called along with {@link #_closeInput} (for
-     * example, when explicitly closing this reader instance), or
-     * separately (if need be).
-     */
-    @Override
-    protected void _releaseBuffers() throws IOException
-    {
-        super._releaseBuffers();
-        if (_bufferRecyclable) {
-            byte[] buf = _inputBuffer;
-            if (buf != null) {
-                _inputBuffer = null;
-                _ioContext.releaseReadIOBuffer(buf);
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, data access
-    /**********************************************************
-     */
-
-    @Override
-    public String getText()
-        throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return _getText2(_currToken);
-    }
-
-    // // // Let's override default impls for improved performance
-    
-    // @since 2.1
-    @Override
-    public String getValueAsString() throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return super.getValueAsString(null);
-    }
-    
-    // @since 2.1
-    @Override
-    public String getValueAsString(String defValue) throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.VALUE_STRING) {
-            if (_tokenIncomplete) {
-                _tokenIncomplete = false;
-                _finishString(); // only strings can be incomplete
-            }
-            return _textBuffer.contentsAsString();
-        }
-        return super.getValueAsString(defValue);
-    }
-    
-    protected String _getText2(JsonToken t)
-    {
-        if (t == null) {
-            return null;
-        }
-        switch (t) {
-        case FIELD_NAME:
-            return _parsingContext.getCurrentName();
-
-        case VALUE_STRING:
-            // fall through
-        case VALUE_NUMBER_INT:
-        case VALUE_NUMBER_FLOAT:
-            return _textBuffer.contentsAsString();
-        }
-        return t.asString();
-    }
-
-    @Override
-    public char[] getTextCharacters()
-        throws IOException, JsonParseException
-    {
-        if (_currToken != null) { // null only before/after document
-            switch (_currToken) {
-                
-            case FIELD_NAME:
-                if (!_nameCopied) {
-                    String name = _parsingContext.getCurrentName();
-                    int nameLen = name.length();
-                    if (_nameCopyBuffer == null) {
-                        _nameCopyBuffer = _ioContext.allocNameCopyBuffer(nameLen);
-                    } else if (_nameCopyBuffer.length < nameLen) {
-                        _nameCopyBuffer = new char[nameLen];
-                    }
-                    name.getChars(0, nameLen, _nameCopyBuffer, 0);
-                    _nameCopied = true;
-                }
-                return _nameCopyBuffer;
-    
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.getTextBuffer();
-                
-            default:
-                return _currToken.asCharArray();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public int getTextLength()
-        throws IOException, JsonParseException
-    {
-        if (_currToken != null) { // null only before/after document
-            switch (_currToken) {
-                
-            case FIELD_NAME:
-                return _parsingContext.getCurrentName().length();
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.size();
-                
-            default:
-                return _currToken.asCharArray().length;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public int getTextOffset() throws IOException, JsonParseException
-    {
-        // Most have offset of 0, only some may have other values:
-        if (_currToken != null) {
-            switch (_currToken) {
-            case FIELD_NAME:
-                return 0;
-            case VALUE_STRING:
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString(); // only strings can be incomplete
-                }
-                // fall through
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                return _textBuffer.getTextOffset();
-            }
-        }
-        return 0;
-    }
-
-    // No embedded objects with base impl...
-    @Override
-    public Object getEmbeddedObject() throws IOException, JsonParseException {
-        return null;
-    }
-    
-    @Override
-    public byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        if (_currToken != JsonToken.VALUE_STRING &&
-                (_currToken != JsonToken.VALUE_EMBEDDED_OBJECT || _binaryValue == null)) {
-            _reportError("Current token ("+_currToken+") not VALUE_STRING or VALUE_EMBEDDED_OBJECT, can not access as binary");
-        }
-        /* To ensure that we won't see inconsistent data, better clear up
-         * state...
-         */
-        if (_tokenIncomplete) {
-            try {
-                _binaryValue = _decodeBase64(b64variant);
-            } catch (IllegalArgumentException iae) {
-                throw _constructError("Failed to decode VALUE_STRING as base64 ("+b64variant+"): "+iae.getMessage());
-            }
-            /* let's clear incomplete only now; allows for accessing other
-             * textual content in error cases
-             */
-            _tokenIncomplete = false;
-        } else { // may actually require conversion...
-            if (_binaryValue == null) {
-                ByteArrayBuilder builder = _getByteArrayBuilder();
-                _decodeBase64(getText(), builder, b64variant);
-                _binaryValue = builder.toByteArray();
-            }
-        }
-        return _binaryValue;
-    }
-
-    @Override
-    public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-        throws IOException, JsonParseException
-    {
-        // if we have already read the token, just use whatever we may have
-        if (!_tokenIncomplete || _currToken != JsonToken.VALUE_STRING) {
-            byte[] b = getBinaryValue(b64variant);
-            out.write(b);
-            return b.length;
-        }
-        // otherwise do "real" incremental parsing...
-        byte[] buf = _ioContext.allocBase64Buffer();
-        try {
-            return _readBinary(b64variant, out, buf);
-        } finally {
-            _ioContext.releaseBase64Buffer(buf);
-        }
-    }
-
-    protected int _readBinary(Base64Variant b64variant, OutputStream out,
-                              byte[] buffer)
-        throws IOException, JsonParseException
-    {
-        int outputPtr = 0;
-        final int outputEnd = buffer.length - 3;
-        int outputCount = 0;
-
-        while (true) {
-            // first, we'll skip preceding white space, if any
-            int ch;
-            do {
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                ch = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) { // reached the end, fair and square?
-                if (ch == INT_QUOTE) {
-                    break;
-                }
-                bits = _decodeBase64Escape(b64variant, ch, 0);
-                if (bits < 0) { // white space to skip
-                    continue;
-                }
-            }
-
-            // enough room? If not, flush
-            if (outputPtr > outputEnd) {
-                outputCount += outputPtr;
-                out.write(buffer, 0, outputPtr);
-                outputPtr = 0;
-            }
-
-            int decodedData = bits;
-
-            // then second base64 char; can't get padding yet, nor ws
-
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                bits = _decodeBase64Escape(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-
-            // third base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 4;
-                        buffer[outputPtr++] = (byte) decodedData;
-                        break;
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 2);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    // Ok, must get padding
-                    if (_inputPtr >= _inputEnd) {
-                        loadMoreGuaranteed();
-                    }
-                    ch = _inputBuffer[_inputPtr++] & 0xFF;
-                    if (!b64variant.usesPaddingChar(ch)) {
-                        throw reportInvalidBase64Char(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                    }
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    buffer[outputPtr++] = (byte) decodedData;
-                    continue;
-                }
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 2;
-                        buffer[outputPtr++] = (byte) (decodedData >> 8);
-                        buffer[outputPtr++] = (byte) decodedData;
-                        break;
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 3);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    /* With padding we only get 2 bytes; but we have
-                     * to shift it a bit so it is identical to triplet
-                     * case with partial output.
-                     * 3 chars gives 3x6 == 18 bits, of which 2 are
-                     * dummies, need to discard:
-                     */
-                    decodedData >>= 2;
-                    buffer[outputPtr++] = (byte) (decodedData >> 8);
-                    buffer[outputPtr++] = (byte) decodedData;
-                    continue;
-                }
-            }
-            // otherwise, our triplet is now complete
-            decodedData = (decodedData << 6) | bits;
-            buffer[outputPtr++] = (byte) (decodedData >> 16);
-            buffer[outputPtr++] = (byte) (decodedData >> 8);
-            buffer[outputPtr++] = (byte) decodedData;
-        }
-        _tokenIncomplete = false;
-        if (outputPtr > 0) {
-            outputCount += outputPtr;
-            out.write(buffer, 0, outputPtr);
-        }
-        return outputCount;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, traversal, basic
-    /**********************************************************
-     */
-
-    /**
-     * @return Next token from the stream, if any found, or null
-     *   to indicate end-of-input
-     */
-    @Override
-    public JsonToken nextToken()
-        throws IOException, JsonParseException
-    {
-        _numTypesValid = NR_UNKNOWN;
-        /* First: field names are special -- we will always tokenize
-         * (part of) value along with field name to simplify
-         * state handling. If so, can and need to use secondary token:
-         */
-        if (_currToken == JsonToken.FIELD_NAME) {
-            return _nextAfterName();
-        }
-        if (_tokenIncomplete) {
-            _skipString(); // only strings can be partial
-        }
-
-        int i = _skipWSOrEnd();
-        if (i < 0) { // end-of-input
-            /* 19-Feb-2009, tatu: Should actually close/release things
-             *    like input source, symbol table and recyclable buffers now.
-             */
-            close();
-            return (_currToken = null);
-        }
-
-        /* First, need to ensure we know the starting location of token
-         * after skipping leading white space
-         */
-        _tokenInputTotal = _currInputProcessed + _inputPtr - 1;
-        _tokenInputRow = _currInputRow;
-        _tokenInputCol = _inputPtr - _currInputRowStart - 1;
-
-        // finally: clear any data retained so far
-        _binaryValue = null;
-
-        // Closing scope?
-        if (i == INT_RBRACKET) {
-            if (!_parsingContext.inArray()) {
-                _reportMismatchedEndMarker(i, '}');
-            }
-            _parsingContext = _parsingContext.getParent();
-            return (_currToken = JsonToken.END_ARRAY);
-        }
-        if (i == INT_RCURLY) {
-            if (!_parsingContext.inObject()) {
-                _reportMismatchedEndMarker(i, ']');
-            }
-            _parsingContext = _parsingContext.getParent();
-            return (_currToken = JsonToken.END_OBJECT);
-        }
-
-        // Nope: do we then expect a comma?
-        if (_parsingContext.expectComma()) {
-            if (i != INT_COMMA) {
-                _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.getTypeDesc()+" entries");
-            }
-            i = _skipWS();
-        }
-
-        /* And should we now have a name? Always true for
-         * Object contexts, since the intermediate 'expect-value'
-         * state is never retained.
-         */
-        if (!_parsingContext.inObject()) {
-            return _nextTokenNotInObject(i);
-        }
-        // So first parse the field name itself:
-        Name n = _parseFieldName(i);
-        _parsingContext.setCurrentName(n.getName());
-        _currToken = JsonToken.FIELD_NAME;
-        i = _skipWS();
-        if (i != INT_COLON) {
-            _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
-        }
-        i = _skipWS();
-
-        // Ok: we must have a value... what is it? Strings are very common, check first:
-        if (i == INT_QUOTE) {
-            _tokenIncomplete = true;
-            _nextToken = JsonToken.VALUE_STRING;
-            return _currToken;
-        }        
-        JsonToken t;
-
-        switch (i) {
-        case INT_LBRACKET:
-            t = JsonToken.START_ARRAY;
-            break;
-        case INT_LCURLY:
-            t = JsonToken.START_OBJECT;
-            break;
-        case INT_RBRACKET:
-        case INT_RCURLY:
-            // Error: neither is valid at this point; valid closers have
-            // been handled earlier
-            _reportUnexpectedChar(i, "expected a value");
-        case INT_t:
-            _matchToken("true", 1);
-            t = JsonToken.VALUE_TRUE;
-            break;
-        case INT_f:
-            _matchToken("false", 1);
-             t = JsonToken.VALUE_FALSE;
-            break;
-        case INT_n:
-            _matchToken("null", 1);
-            t = JsonToken.VALUE_NULL;
-            break;
-
-        case INT_MINUS:
-            /* Should we have separate handling for plus? Although
-             * it is not allowed per se, it may be erroneously used,
-             * and could be indicate by a more specific error message.
-             */
-        case INT_0:
-        case INT_1:
-        case INT_2:
-        case INT_3:
-        case INT_4:
-        case INT_5:
-        case INT_6:
-        case INT_7:
-        case INT_8:
-        case INT_9:
-            t = parseNumberText(i);
-            break;
-        default:
-            t = _handleUnexpectedValue(i);
-        }
-        _nextToken = t;
-        return _currToken;
-    }
-
-    private JsonToken _nextTokenNotInObject(int i)
-        throws IOException, JsonParseException
-    {
-        if (i == INT_QUOTE) {
-            _tokenIncomplete = true;
-            return (_currToken = JsonToken.VALUE_STRING);
-        }
-        switch (i) {
-        case INT_LBRACKET:
-            _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            return (_currToken = JsonToken.START_ARRAY);
-        case INT_LCURLY:
-            _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            return (_currToken = JsonToken.START_OBJECT);
-        case INT_RBRACKET:
-        case INT_RCURLY:
-            // Error: neither is valid at this point; valid closers have
-            // been handled earlier
-            _reportUnexpectedChar(i, "expected a value");
-        case INT_t:
-            _matchToken("true", 1);
-            return (_currToken = JsonToken.VALUE_TRUE);
-        case INT_f:
-            _matchToken("false", 1);
-            return (_currToken = JsonToken.VALUE_FALSE);
-        case INT_n:
-            _matchToken("null", 1);
-            return (_currToken = JsonToken.VALUE_NULL);
-        case INT_MINUS:
-            /* Should we have separate handling for plus? Although
-             * it is not allowed per se, it may be erroneously used,
-             * and could be indicate by a more specific error message.
-             */
-        case INT_0:
-        case INT_1:
-        case INT_2:
-        case INT_3:
-        case INT_4:
-        case INT_5:
-        case INT_6:
-        case INT_7:
-        case INT_8:
-        case INT_9:
-            return (_currToken = parseNumberText(i));
-        }
-        return (_currToken = _handleUnexpectedValue(i));
-    }
-    
-    private JsonToken _nextAfterName()
-    {
-        _nameCopied = false; // need to invalidate if it was copied
-        JsonToken t = _nextToken;
-        _nextToken = null;
-        // Also: may need to start new context?
-        if (t == JsonToken.START_ARRAY) {
-            _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-        } else if (t == JsonToken.START_OBJECT) {
-            _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-        }
-        return (_currToken = t);
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        super.close();
-        // Merge found symbols, if any:
-        _symbols.release();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, traversal, nextXxxValue/nextFieldName
-    /**********************************************************
-     */
-    
-    @Override
-    public boolean nextFieldName(SerializableString str)
-        throws IOException, JsonParseException
-    {
-        // // // Note: most of code below is copied from nextToken()
-        
-        _numTypesValid = NR_UNKNOWN;
-        if (_currToken == JsonToken.FIELD_NAME) { // can't have name right after name
-            _nextAfterName();
-            return false;
-        }
-        if (_tokenIncomplete) {
-            _skipString();
-        }
-        int i = _skipWSOrEnd();
-        if (i < 0) { // end-of-input
-            close();
-            _currToken = null;
-            return false;
-        }
-        _tokenInputTotal = _currInputProcessed + _inputPtr - 1;
-        _tokenInputRow = _currInputRow;
-        _tokenInputCol = _inputPtr - _currInputRowStart - 1;
-
-        // finally: clear any data retained so far
-        _binaryValue = null;
-
-        // Closing scope?
-        if (i == INT_RBRACKET) {
-            if (!_parsingContext.inArray()) {
-                _reportMismatchedEndMarker(i, '}');
-            }
-            _parsingContext = _parsingContext.getParent();
-            _currToken = JsonToken.END_ARRAY;
-            return false;
-        }
-        if (i == INT_RCURLY) {
-            if (!_parsingContext.inObject()) {
-                _reportMismatchedEndMarker(i, ']');
-            }
-            _parsingContext = _parsingContext.getParent();
-            _currToken = JsonToken.END_OBJECT;
-            return false;
-        }
-
-        // Nope: do we then expect a comma?
-        if (_parsingContext.expectComma()) {
-            if (i != INT_COMMA) {
-                _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.getTypeDesc()+" entries");
-            }
-            i = _skipWS();
-        }
-
-        if (!_parsingContext.inObject()) {
-            _nextTokenNotInObject(i);
-            return false;
-        }
-        
-        // // // This part differs, name parsing
-        if (i == INT_QUOTE) {
-            // when doing literal match, must consider escaping:
-            byte[] nameBytes = str.asQuotedUTF8();
-            final int len = nameBytes.length;
-            if ((_inputPtr + len) < _inputEnd) { // maybe...
-                // first check length match by
-                final int end = _inputPtr+len;
-                if (_inputBuffer[end] == INT_QUOTE) {
-                    int offset = 0;
-                    final int ptr = _inputPtr;
-                    while (true) {
-                        if (offset == len) { // yes, match!
-                            _inputPtr = end+1; // skip current value first
-                            // First part is simple; setting of name
-                            _parsingContext.setCurrentName(str.getValue());
-                            _currToken = JsonToken.FIELD_NAME;
-                            // But then we also must handle following value etc
-                            _isNextTokenNameYes();
-                            return true;
-                        }
-                        if (nameBytes[offset] != _inputBuffer[ptr+offset]) {
-                            break;
-                        }
-                        ++offset;
-                    }
-                }
-            }
-        }
-        _isNextTokenNameNo(i);
-        return false;
-    }
-
-    private void _isNextTokenNameYes()
-        throws IOException, JsonParseException
-    {
-        // very first thing: common case, colon, value, no white space
-        int i;
-        if (_inputPtr < _inputEnd && _inputBuffer[_inputPtr] == INT_COLON) { // fast case first
-            ++_inputPtr;
-            i = _inputBuffer[_inputPtr++];
-            if (i == INT_QUOTE) {
-                _tokenIncomplete = true;
-                _nextToken = JsonToken.VALUE_STRING;
-                return;
-            }
-            if (i == INT_LCURLY) {
-                _nextToken = JsonToken.START_OBJECT;
-                return;
-            }
-            if (i == INT_LBRACKET) {
-                _nextToken = JsonToken.START_ARRAY;
-                return;
-            }
-            i &= 0xFF;
-            if (i <= INT_SPACE || i == INT_SLASH) {
-                --_inputPtr;
-                i = _skipWS();
-            }
-        } else {
-            i = _skipColon();
-        }
-        switch (i) {
-        case INT_QUOTE:
-            _tokenIncomplete = true;
-            _nextToken = JsonToken.VALUE_STRING;
-            return;
-        case INT_LBRACKET:
-            _nextToken = JsonToken.START_ARRAY;
-            return;
-        case INT_LCURLY:
-            _nextToken = JsonToken.START_OBJECT;
-            return;
-        case INT_RBRACKET:
-        case INT_RCURLY:
-            _reportUnexpectedChar(i, "expected a value");
-        case INT_t:
-            _matchToken("true", 1);
-            _nextToken = JsonToken.VALUE_TRUE;
-            return;
-        case INT_f:
-            _matchToken("false", 1);
-            _nextToken = JsonToken.VALUE_FALSE;
-            return;
-        case INT_n:
-            _matchToken("null", 1);
-            _nextToken = JsonToken.VALUE_NULL;
-            return;
-        case INT_MINUS:
-        case INT_0:
-        case INT_1:
-        case INT_2:
-        case INT_3:
-        case INT_4:
-        case INT_5:
-        case INT_6:
-        case INT_7:
-        case INT_8:
-        case INT_9:
-            _nextToken = parseNumberText(i);
-            return;
-        }
-        _nextToken = _handleUnexpectedValue(i);
-    }
-    
-    private void _isNextTokenNameNo(int i)
-            throws IOException, JsonParseException
-    {
-        // // // and this is back to standard nextToken()
-            
-        Name n = _parseFieldName(i);
-        _parsingContext.setCurrentName(n.getName());
-        _currToken = JsonToken.FIELD_NAME;
-        i = _skipWS();
-        if (i != INT_COLON) {
-            _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
-        }
-        i = _skipWS();
-
-        // Ok: we must have a value... what is it? Strings are very common, check first:
-        if (i == INT_QUOTE) {
-            _tokenIncomplete = true;
-            _nextToken = JsonToken.VALUE_STRING;
-            return;
-        }        
-        JsonToken t;
-
-        switch (i) {
-        case INT_LBRACKET:
-            t = JsonToken.START_ARRAY;
-            break;
-        case INT_LCURLY:
-            t = JsonToken.START_OBJECT;
-            break;
-        case INT_RBRACKET:
-        case INT_RCURLY:
-            _reportUnexpectedChar(i, "expected a value");
-        case INT_t:
-            _matchToken("true", 1);
-            t = JsonToken.VALUE_TRUE;
-            break;
-        case INT_f:
-            _matchToken("false", 1);
-             t = JsonToken.VALUE_FALSE;
-            break;
-        case INT_n:
-            _matchToken("null", 1);
-            t = JsonToken.VALUE_NULL;
-            break;
-
-        case INT_MINUS:
-        case INT_0:
-        case INT_1:
-        case INT_2:
-        case INT_3:
-        case INT_4:
-        case INT_5:
-        case INT_6:
-        case INT_7:
-        case INT_8:
-        case INT_9:
-            t = parseNumberText(i);
-            break;
-        default:
-            t = _handleUnexpectedValue(i);
-        }
-        _nextToken = t;
-    }
-
-    @Override
-    public String nextTextValue()
-        throws IOException, JsonParseException
-    {
-        // two distinct cases; either got name and we know next type, or 'other'
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_STRING) {
-                if (_tokenIncomplete) {
-                    _tokenIncomplete = false;
-                    _finishString();
-                }
-                return _textBuffer.contentsAsString();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return null;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
-    }
-
-    @Override
-    public int nextIntValue(int defaultValue)
-        throws IOException, JsonParseException
-    {
-        // two distinct cases; either got name and we know next type, or 'other'
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                return getIntValue();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return defaultValue;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
-    }
-
-    @Override
-    public long nextLongValue(long defaultValue)
-        throws IOException, JsonParseException
-    {
-        // two distinct cases; either got name and we know next type, or 'other'
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                return getLongValue();
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return defaultValue;
-        }
-        // !!! TODO: optimize this case as well
-        return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
-    }
-
-    @Override
-    public Boolean nextBooleanValue()
-        throws IOException, JsonParseException
-    {
-        // two distinct cases; either got name and we know next type, or 'other'
-        if (_currToken == JsonToken.FIELD_NAME) { // mostly copied from '_nextAfterName'
-            _nameCopied = false;
-            JsonToken t = _nextToken;
-            _nextToken = null;
-            _currToken = t;
-            if (t == JsonToken.VALUE_TRUE) {
-                return Boolean.TRUE;
-            }
-            if (t == JsonToken.VALUE_FALSE) {
-                return Boolean.FALSE;
-            }
-            if (t == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(_tokenInputRow, _tokenInputCol);
-            } else if (t == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(_tokenInputRow, _tokenInputCol);
-            }
-            return null;
-        }
-        switch (nextToken()) {
-        case VALUE_TRUE:
-            return Boolean.TRUE;
-        case VALUE_FALSE:
-            return Boolean.FALSE;
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, number parsing
-    /* (note: in 1.6 and prior, part of "Utf8NumericParser"
-    /**********************************************************
-     */
-
-    /**
-     * Initial parsing method for number values. It needs to be able
-     * to parse enough input to be able to determine whether the
-     * value is to be considered a simple integer value, or a more
-     * generic decimal value: latter of which needs to be expressed
-     * as a floating point number. The basic rule is that if the number
-     * has no fractional or exponential part, it is an integer; otherwise
-     * a floating point number.
-     *<p>
-     * Because much of input has to be processed in any case, no partial
-     * parsing is done: all input text will be stored for further
-     * processing. However, actual numeric value conversion will be
-     * deferred, since it is usually the most complicated and costliest
-     * part of processing.
-     */
-    protected JsonToken parseNumberText(int c)
-        throws IOException, JsonParseException
-    {
-        char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
-        int outPtr = 0;
-        boolean negative = (c == INT_MINUS);
-
-        // Need to prepend sign?
-        if (negative) {
-            outBuf[outPtr++] = '-';
-            // Must have something after sign too
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            // Note: must be followed by a digit
-            if (c < INT_0 || c > INT_9) {
-                return _handleInvalidNumberStart(c, true);
-            }
-        }
-
-        // One special case: if first char is 0, must not be followed by a digit
-        if (c == INT_0) {
-            c = _verifyNoLeadingZeroes();
-        }
-        
-        // Ok: we can first just add digit we saw first:
-        outBuf[outPtr++] = (char) c;
-        int intLen = 1;
-
-        // And then figure out how far we can read without further checks:
-        int end = _inputPtr + outBuf.length;
-        if (end > _inputEnd) {
-            end = _inputEnd;
-        }
-
-        // With this, we have a nice and tight loop:
-        while (true) {
-            if (_inputPtr >= end) {
-                // Long enough to be split across boundary, so:
-                return _parserNumber2(outBuf, outPtr, negative, intLen);
-            }
-            c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            if (c < INT_0 || c > INT_9) {
-                break;
-            }
-            ++intLen;
-            outBuf[outPtr++] = (char) c;
-        }
-        if (c == '.' || c == 'e' || c == 'E') {
-            return _parseFloatText(outBuf, outPtr, c, negative, intLen);
-        }
-
-        --_inputPtr; // to push back trailing char (comma etc)
-        _textBuffer.setCurrentLength(outPtr);
-
-        // And there we have it!
-        return resetInt(negative, intLen);
-    }
-    
-    /**
-     * Method called to handle parsing when input is split across buffer boundary
-     * (or output is longer than segment used to store it)
-     */
-    private JsonToken _parserNumber2(char[] outBuf, int outPtr, boolean negative,
-            int intPartLength)
-        throws IOException, JsonParseException
-    {
-        // Ok, parse the rest
-        while (true) {
-            if (_inputPtr >= _inputEnd && !loadMore()) {
-                _textBuffer.setCurrentLength(outPtr);
-                return resetInt(negative, intPartLength);
-            }
-            int c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            if (c > INT_9 || c < INT_0) {
-                if (c == '.' || c == 'e' || c == 'E') {
-                    return _parseFloatText(outBuf, outPtr, c, negative, intPartLength);
-                }
-                break;
-            }
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            outBuf[outPtr++] = (char) c;
-            ++intPartLength;
-        }
-        --_inputPtr; // to push back trailing char (comma etc)
-        _textBuffer.setCurrentLength(outPtr);
-
-        // And there we have it!
-        return resetInt(negative, intPartLength);
-        
-    }
-    
-    /**
-     * Method called when we have seen one zero, and want to ensure
-     * it is not followed by another
-     */
-    private int _verifyNoLeadingZeroes()
-        throws IOException, JsonParseException
-    {
-        // Ok to have plain "0"
-        if (_inputPtr >= _inputEnd && !loadMore()) {
-            return INT_0;
-        }
-        int ch = _inputBuffer[_inputPtr] & 0xFF;
-        // if not followed by a number (probably '.'); return zero as is, to be included
-        if (ch < INT_0 || ch > INT_9) {
-            return INT_0;
-        }
-        // [JACKSON-358]: we may want to allow them, after all...
-        if (!isEnabled(Feature.ALLOW_NUMERIC_LEADING_ZEROS)) {
-            reportInvalidNumber("Leading zeroes not allowed");
-        }
-        // if so, just need to skip either all zeroes (if followed by number); or all but one (if non-number)
-        ++_inputPtr; // Leading zero to be skipped
-        if (ch == INT_0) {
-            while (_inputPtr < _inputEnd || loadMore()) {
-                ch = _inputBuffer[_inputPtr] & 0xFF;
-                if (ch < INT_0 || ch > INT_9) { // followed by non-number; retain one zero
-                    return INT_0;
-                }
-                ++_inputPtr; // skip previous zeroes
-                if (ch != INT_0) { // followed by other number; return 
-                    break;
-                }
-            }
-        }
-        return ch;
-    }
-    
-    private JsonToken _parseFloatText(char[] outBuf, int outPtr, int c,
-            boolean negative, int integerPartLength)
-        throws IOException, JsonParseException
-    {
-        int fractLen = 0;
-        boolean eof = false;
-
-        // And then see if we get other parts
-        if (c == '.') { // yes, fraction
-            outBuf[outPtr++] = (char) c;
-
-            fract_loop:
-            while (true) {
-                if (_inputPtr >= _inputEnd && !loadMore()) {
-                    eof = true;
-                    break fract_loop;
-                }
-                c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-                if (c < INT_0 || c > INT_9) {
-                    break fract_loop;
-                }
-                ++fractLen;
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = (char) c;
-            }
-            // must be followed by sequence of ints, one minimum
-            if (fractLen == 0) {
-                reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
-            }
-        }
-
-        int expLen = 0;
-        if (c == 'e' || c == 'E') { // exponent?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            outBuf[outPtr++] = (char) c;
-            // Not optional, can require that we get one more char
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            // Sign indicator?
-            if (c == '-' || c == '+') {
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = (char) c;
-                // Likewise, non optional:
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            }
-
-            exp_loop:
-            while (c <= INT_9 && c >= INT_0) {
-                ++expLen;
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                outBuf[outPtr++] = (char) c;
-                if (_inputPtr >= _inputEnd && !loadMore()) {
-                    eof = true;
-                    break exp_loop;
-                }
-                c = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            }
-            // must be followed by sequence of ints, one minimum
-            if (expLen == 0) {
-                reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
-            }
-        }
-
-        // Ok; unless we hit end-of-input, need to push last char read back
-        if (!eof) {
-            --_inputPtr;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-
-        // And there we have it!
-        return resetFloat(negative, integerPartLength, fractLen, expLen);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, secondary parsing
-    /**********************************************************
-     */
-    
-    protected Name _parseFieldName(int i)
-        throws IOException, JsonParseException
-    {
-        if (i != INT_QUOTE) {
-            return _handleUnusualFieldName(i);
-        }
-        // First: can we optimize out bounds checks?
-        if ((_inputPtr + 9) > _inputEnd) { // Need 8 chars, plus one trailing (quote)
-            return slowParseFieldName();
-        }
-
-        // If so, can also unroll loops nicely
-        /* 25-Nov-2008, tatu: This may seem weird, but here we do
-         *   NOT want to worry about UTF-8 decoding. Rather, we'll
-         *   assume that part is ok (if not it will get caught
-         *   later on), and just handle quotes and backslashes here.
-         */
-        final byte[] input = _inputBuffer;
-        final int[] codes = sInputCodesLatin1;
-
-        int q = input[_inputPtr++] & 0xFF;
-
-        if (codes[q] == 0) {
-            i = input[_inputPtr++] & 0xFF;
-            if (codes[i] == 0) {
-                q = (q << 8) | i;
-                i = input[_inputPtr++] & 0xFF;
-                if (codes[i] == 0) {
-                    q = (q << 8) | i;
-                    i = input[_inputPtr++] & 0xFF;
-                    if (codes[i] == 0) {
-                        q = (q << 8) | i;
-                        i = input[_inputPtr++] & 0xFF;
-                        if (codes[i] == 0) {
-                            _quad1 = q;
-                            return parseMediumFieldName(i, codes);
-                        }
-                        if (i == INT_QUOTE) { // one byte/char case or broken
-                            return findName(q, 4);
-                        }
-                        return parseFieldName(q, i, 4);
-                    }
-                    if (i == INT_QUOTE) { // one byte/char case or broken
-                        return findName(q, 3);
-                    }
-                    return parseFieldName(q, i, 3);
-                }                
-                if (i == INT_QUOTE) { // one byte/char case or broken
-                    return findName(q, 2);
-                }
-                return parseFieldName(q, i, 2);
-            }
-            if (i == INT_QUOTE) { // one byte/char case or broken
-                return findName(q, 1);
-            }
-            return parseFieldName(q, i, 1);
-        }     
-        if (q == INT_QUOTE) { // special case, ""
-            return BytesToNameCanonicalizer.getEmptyName();
-        }
-        return parseFieldName(0, q, 0); // quoting or invalid char
-    }
-
-    protected Name parseMediumFieldName(int q2, final int[] codes)
-        throws IOException, JsonParseException
-    {
-        // Ok, got 5 name bytes so far
-        int i = _inputBuffer[_inputPtr++] & 0xFF;
-        if (codes[i] != 0) {
-            if (i == INT_QUOTE) { // 5 bytes
-                return findName(_quad1, q2, 1);
-            }
-            return parseFieldName(_quad1, q2, i, 1); // quoting or invalid char
-        }
-        q2 = (q2 << 8) | i;
-        i = _inputBuffer[_inputPtr++] & 0xFF;
-        if (codes[i] != 0) {
-            if (i == INT_QUOTE) { // 6 bytes
-                return findName(_quad1, q2, 2);
-            }
-            return parseFieldName(_quad1, q2, i, 2);
-        }
-        q2 = (q2 << 8) | i;
-        i = _inputBuffer[_inputPtr++] & 0xFF;
-        if (codes[i] != 0) {
-            if (i == INT_QUOTE) { // 7 bytes
-                return findName(_quad1, q2, 3);
-            }
-            return parseFieldName(_quad1, q2, i, 3);
-        }
-        q2 = (q2 << 8) | i;
-        i = _inputBuffer[_inputPtr++] & 0xFF;
-        if (codes[i] != 0) {
-            if (i == INT_QUOTE) { // 8 bytes
-                return findName(_quad1, q2, 4);
-            }
-            return parseFieldName(_quad1, q2, i, 4);
-        }
-        _quadBuffer[0] = _quad1;
-        _quadBuffer[1] = q2;
-        return parseLongFieldName(i);
-    }
-
-    protected Name parseLongFieldName(int q)
-        throws IOException, JsonParseException
-    {
-        // As explained above, will ignore UTF-8 encoding at this point
-        final int[] codes = sInputCodesLatin1;
-        int qlen = 2;
-
-        while (true) {
-            /* Let's offline if we hit buffer boundary (otherwise would
-             * need to [try to] align input, which is bit complicated
-             * and may not always be possible)
-             */
-            if ((_inputEnd - _inputPtr) < 4) {
-                return parseEscapedFieldName(_quadBuffer, qlen, 0, q, 0);
-            }
-            // Otherwise can skip boundary checks for 4 bytes in loop
-
-            int i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (codes[i] != 0) {
-                if (i == INT_QUOTE) {
-                    return findName(_quadBuffer, qlen, q, 1);
-                }
-                return parseEscapedFieldName(_quadBuffer, qlen, q, i, 1);
-            }
-
-            q = (q << 8) | i;
-            i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (codes[i] != 0) {
-                if (i == INT_QUOTE) {
-                    return findName(_quadBuffer, qlen, q, 2);
-                }
-                return parseEscapedFieldName(_quadBuffer, qlen, q, i, 2);
-            }
-
-            q = (q << 8) | i;
-            i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (codes[i] != 0) {
-                if (i == INT_QUOTE) {
-                    return findName(_quadBuffer, qlen, q, 3);
-                }
-                return parseEscapedFieldName(_quadBuffer, qlen, q, i, 3);
-            }
-
-            q = (q << 8) | i;
-            i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (codes[i] != 0) {
-                if (i == INT_QUOTE) {
-                    return findName(_quadBuffer, qlen, q, 4);
-                }
-                return parseEscapedFieldName(_quadBuffer, qlen, q, i, 4);
-            }
-
-            // Nope, no end in sight. Need to grow quad array etc
-            if (qlen >= _quadBuffer.length) {
-                _quadBuffer = growArrayBy(_quadBuffer, qlen);
-            }
-            _quadBuffer[qlen++] = q;
-            q = i;
-        }
-    }
-
-    /**
-     * Method called when not even first 8 bytes are guaranteed
-     * to come consequtively. Happens rarely, so this is offlined;
-     * plus we'll also do full checks for escaping etc.
-     */
-    protected Name slowParseFieldName()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                _reportInvalidEOF(": was expecting closing '\"' for name");
-            }
-        }
-        int i = _inputBuffer[_inputPtr++] & 0xFF;
-        if (i == INT_QUOTE) { // special case, ""
-            return BytesToNameCanonicalizer.getEmptyName();
-        }
-        return parseEscapedFieldName(_quadBuffer, 0, 0, i, 0);
-    }
-
-    private Name parseFieldName(int q1, int ch, int lastQuadBytes)
-        throws IOException, JsonParseException
-    {
-        return parseEscapedFieldName(_quadBuffer, 0, q1, ch, lastQuadBytes);
-    }
-
-    private Name parseFieldName(int q1, int q2, int ch, int lastQuadBytes)
-        throws IOException, JsonParseException
-    {
-        _quadBuffer[0] = q1;
-        return parseEscapedFieldName(_quadBuffer, 1, q2, ch, lastQuadBytes);
-    }
-
-    /**
-     * Slower parsing method which is generally branched to when
-     * an escape sequence is detected (or alternatively for long
-     * names, or ones crossing input buffer boundary). In any case,
-     * needs to be able to handle more exceptional cases, gets
-     * slower, and hance is offlined to a separate method.
-     */
-    protected Name parseEscapedFieldName(int[] quads, int qlen, int currQuad, int ch,
-                                         int currQuadBytes)
-        throws IOException, JsonParseException
-    {
-        /* 25-Nov-2008, tatu: This may seem weird, but here we do
-         *   NOT want to worry about UTF-8 decoding. Rather, we'll
-         *   assume that part is ok (if not it will get caught
-         *   later on), and just handle quotes and backslashes here.
-         */
-        final int[] codes = sInputCodesLatin1;
-
-        while (true) {
-            if (codes[ch] != 0) {
-                if (ch == INT_QUOTE) { // we are done
-                    break;
-                }
-                // Unquoted white space?
-                if (ch != INT_BACKSLASH) {
-                    // As per [JACKSON-208], call can now return:
-                    _throwUnquotedSpace(ch, "name");
-                } else {
-                    // Nope, escape sequence
-                    ch = _decodeEscaped();
-                }
-                /* Oh crap. May need to UTF-8 (re-)encode it, if it's
-                 * beyond 7-bit ascii. Gets pretty messy.
-                 * If this happens often, may want to use different name
-                 * canonicalization to avoid these hits.
-                 */
-                if (ch > 127) {
-                    // Ok, we'll need room for first byte right away
-                    if (currQuadBytes >= 4) {
-                        if (qlen >= quads.length) {
-                            _quadBuffer = quads = growArrayBy(quads, quads.length);
-                        }
-                        quads[qlen++] = currQuad;
-                        currQuad = 0;
-                        currQuadBytes = 0;
-                    }
-                    if (ch < 0x800) { // 2-byte
-                        currQuad = (currQuad << 8) | (0xc0 | (ch >> 6));
-                        ++currQuadBytes;
-                        // Second byte gets output below:
-                    } else { // 3 bytes; no need to worry about surrogates here
-                        currQuad = (currQuad << 8) | (0xe0 | (ch >> 12));
-                        ++currQuadBytes;
-                        // need room for middle byte?
-                        if (currQuadBytes >= 4) {
-                            if (qlen >= quads.length) {
-                                _quadBuffer = quads = growArrayBy(quads, quads.length);
-                            }
-                            quads[qlen++] = currQuad;
-                            currQuad = 0;
-                            currQuadBytes = 0;
-                        }
-                        currQuad = (currQuad << 8) | (0x80 | ((ch >> 6) & 0x3f));
-                        ++currQuadBytes;
-                    }
-                    // And same last byte in both cases, gets output below:
-                    ch = 0x80 | (ch & 0x3f);
-                }
-            }
-            // Ok, we have one more byte to add at any rate:
-            if (currQuadBytes < 4) {
-                ++currQuadBytes;
-                currQuad = (currQuad << 8) | ch;
-            } else {
-                if (qlen >= quads.length) {
-                    _quadBuffer = quads = growArrayBy(quads, quads.length);
-                }
-                quads[qlen++] = currQuad;
-                currQuad = ch;
-                currQuadBytes = 1;
-            }
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in field name");
-                }
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-        }
-
-        if (currQuadBytes > 0) {
-            if (qlen >= quads.length) {
-                _quadBuffer = quads = growArrayBy(quads, quads.length);
-            }
-            quads[qlen++] = currQuad;
-        }
-        Name name = _symbols.findName(quads, qlen);
-        if (name == null) {
-            name = addName(quads, qlen, currQuadBytes);
-        }
-        return name;
-    }
-
-    /**
-     * Method called when we see non-white space character other
-     * than double quote, when expecting a field name.
-     * In standard mode will just throw an expection; but
-     * in non-standard modes may be able to parse name.
-     */
-    protected Name _handleUnusualFieldName(int ch)
-        throws IOException, JsonParseException
-    {
-        // [JACKSON-173]: allow single quotes
-        if (ch == INT_APOSTROPHE && isEnabled(Feature.ALLOW_SINGLE_QUOTES)) {
-            return _parseApostropheFieldName();
-        }
-        // [JACKSON-69]: allow unquoted names if feature enabled:
-        if (!isEnabled(Feature.ALLOW_UNQUOTED_FIELD_NAMES)) {
-            _reportUnexpectedChar(ch, "was expecting double-quote to start field name");
-        }
-        /* Also: note that although we use a different table here,
-         * it does NOT handle UTF-8 decoding. It'll just pass those
-         * high-bit codes as acceptable for later decoding.
-         */
-        final int[] codes = CharTypes.getInputCodeUtf8JsNames();
-        // Also: must start with a valid character...
-        if (codes[ch] != 0) {
-            _reportUnexpectedChar(ch, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
-        }
-
-        /* Ok, now; instead of ultra-optimizing parsing here (as with
-         * regular JSON names), let's just use the generic "slow"
-         * variant. Can measure its impact later on if need be
-         */
-        int[] quads = _quadBuffer;
-        int qlen = 0;
-        int currQuad = 0;
-        int currQuadBytes = 0;
-
-        while (true) {
-            // Ok, we have one more byte to add at any rate:
-            if (currQuadBytes < 4) {
-                ++currQuadBytes;
-                currQuad = (currQuad << 8) | ch;
-            } else {
-                if (qlen >= quads.length) {
-                    _quadBuffer = quads = growArrayBy(quads, quads.length);
-                }
-                quads[qlen++] = currQuad;
-                currQuad = ch;
-                currQuadBytes = 1;
-            }
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in field name");
-                }
-            }
-            ch = _inputBuffer[_inputPtr] & 0xFF;
-            if (codes[ch] != 0) {
-                break;
-            }
-            ++_inputPtr;
-        }
-
-        if (currQuadBytes > 0) {
-            if (qlen >= quads.length) {
-                _quadBuffer = quads = growArrayBy(quads, quads.length);
-            }
-            quads[qlen++] = currQuad;
-        }
-        Name name = _symbols.findName(quads, qlen);
-        if (name == null) {
-            name = addName(quads, qlen, currQuadBytes);
-        }
-        return name;
-    }
-
-    /* Parsing to support [JACKSON-173]. Plenty of duplicated code;
-     * main reason being to try to avoid slowing down fast path
-     * for valid JSON -- more alternatives, more code, generally
-     * bit slower execution.
-     */
-    protected Name _parseApostropheFieldName()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                _reportInvalidEOF(": was expecting closing '\'' for name");
-            }
-        }
-        int ch = _inputBuffer[_inputPtr++] & 0xFF;
-        if (ch == INT_APOSTROPHE) { // special case, ''
-            return BytesToNameCanonicalizer.getEmptyName();
-        }
-        int[] quads = _quadBuffer;
-        int qlen = 0;
-        int currQuad = 0;
-        int currQuadBytes = 0;
-
-        // Copied from parseEscapedFieldName, with minor mods:
-
-        final int[] codes = sInputCodesLatin1;
-
-        while (true) {
-            if (ch == INT_APOSTROPHE) {
-                break;
-            }
-            // additional check to skip handling of double-quotes
-            if (ch != INT_QUOTE && codes[ch] != 0) {
-                if (ch != INT_BACKSLASH) {
-                    // Unquoted white space?
-                    // As per [JACKSON-208], call can now return:
-                    _throwUnquotedSpace(ch, "name");
-                } else {
-                    // Nope, escape sequence
-                    ch = _decodeEscaped();
-                }
-                /* Oh crap. May need to UTF-8 (re-)encode it, if it's
-                 * beyond 7-bit ascii. Gets pretty messy.
-                 * If this happens often, may want to use different name
-                 * canonicalization to avoid these hits.
-                 */
-                if (ch > 127) {
-                    // Ok, we'll need room for first byte right away
-                    if (currQuadBytes >= 4) {
-                        if (qlen >= quads.length) {
-                            _quadBuffer = quads = growArrayBy(quads, quads.length);
-                        }
-                        quads[qlen++] = currQuad;
-                        currQuad = 0;
-                        currQuadBytes = 0;
-                    }
-                    if (ch < 0x800) { // 2-byte
-                        currQuad = (currQuad << 8) | (0xc0 | (ch >> 6));
-                        ++currQuadBytes;
-                        // Second byte gets output below:
-                    } else { // 3 bytes; no need to worry about surrogates here
-                        currQuad = (currQuad << 8) | (0xe0 | (ch >> 12));
-                        ++currQuadBytes;
-                        // need room for middle byte?
-                        if (currQuadBytes >= 4) {
-                            if (qlen >= quads.length) {
-                                _quadBuffer = quads = growArrayBy(quads, quads.length);
-                            }
-                            quads[qlen++] = currQuad;
-                            currQuad = 0;
-                            currQuadBytes = 0;
-                        }
-                        currQuad = (currQuad << 8) | (0x80 | ((ch >> 6) & 0x3f));
-                        ++currQuadBytes;
-                    }
-                    // And same last byte in both cases, gets output below:
-                    ch = 0x80 | (ch & 0x3f);
-                }
-            }
-            // Ok, we have one more byte to add at any rate:
-            if (currQuadBytes < 4) {
-                ++currQuadBytes;
-                currQuad = (currQuad << 8) | ch;
-            } else {
-                if (qlen >= quads.length) {
-                    _quadBuffer = quads = growArrayBy(quads, quads.length);
-                }
-                quads[qlen++] = currQuad;
-                currQuad = ch;
-                currQuadBytes = 1;
-            }
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in field name");
-                }
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-        }
-
-        if (currQuadBytes > 0) {
-            if (qlen >= quads.length) {
-                _quadBuffer = quads = growArrayBy(quads, quads.length);
-            }
-            quads[qlen++] = currQuad;
-        }
-        Name name = _symbols.findName(quads, qlen);
-        if (name == null) {
-            name = addName(quads, qlen, currQuadBytes);
-        }
-        return name;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, symbol (name) handling
-    /**********************************************************
-     */
-
-    private Name findName(int q1, int lastQuadBytes)
-        throws JsonParseException
-    {
-        // Usually we'll find it from the canonical symbol table already
-        Name name = _symbols.findName(q1);
-        if (name != null) {
-            return name;
-        }
-        // If not, more work. We'll need add stuff to buffer
-        _quadBuffer[0] = q1;
-        return addName(_quadBuffer, 1, lastQuadBytes);
-    }
-
-    private Name findName(int q1, int q2, int lastQuadBytes)
-        throws JsonParseException
-    {
-        // Usually we'll find it from the canonical symbol table already
-        Name name = _symbols.findName(q1, q2);
-        if (name != null) {
-            return name;
-        }
-        // If not, more work. We'll need add stuff to buffer
-        _quadBuffer[0] = q1;
-        _quadBuffer[1] = q2;
-        return addName(_quadBuffer, 2, lastQuadBytes);
-    }
-
-    private Name findName(int[] quads, int qlen, int lastQuad, int lastQuadBytes)
-        throws JsonParseException
-    {
-        if (qlen >= quads.length) {
-            _quadBuffer = quads = growArrayBy(quads, quads.length);
-        }
-        quads[qlen++] = lastQuad;
-        Name name = _symbols.findName(quads, qlen);
-        if (name == null) {
-            return addName(quads, qlen, lastQuadBytes);
-        }
-        return name;
-    }
-
-    /**
-     * This is the main workhorse method used when we take a symbol
-     * table miss. It needs to demultiplex individual bytes, decode
-     * multi-byte chars (if any), and then construct Name instance
-     * and add it to the symbol table.
-     */
-    private Name addName(int[] quads, int qlen, int lastQuadBytes)
-        throws JsonParseException
-    {
-        /* Ok: must decode UTF-8 chars. No other validation is
-         * needed, since unescaping has been done earlier as necessary
-         * (as well as error reporting for unescaped control chars)
-         */
-        // 4 bytes per quad, except last one maybe less
-        int byteLen = (qlen << 2) - 4 + lastQuadBytes;
-
-        /* And last one is not correctly aligned (leading zero bytes instead
-         * need to shift a bit, instead of trailing). Only need to shift it
-         * for UTF-8 decoding; need revert for storage (since key will not
-         * be aligned, to optimize lookup speed)
-         */
-        int lastQuad;
-
-        if (lastQuadBytes < 4) {
-            lastQuad = quads[qlen-1];
-            // 8/16/24 bit left shift
-            quads[qlen-1] = (lastQuad << ((4 - lastQuadBytes) << 3));
-        } else {
-            lastQuad = 0;
-        }
-
-        // Need some working space, TextBuffer works well:
-        char[] cbuf = _textBuffer.emptyAndGetCurrentSegment();
-        int cix = 0;
-
-        for (int ix = 0; ix < byteLen; ) {
-            int ch = quads[ix >> 2]; // current quad, need to shift+mask
-            int byteIx = (ix & 3);
-            ch = (ch >> ((3 - byteIx) << 3)) & 0xFF;
-            ++ix;
-
-            if (ch > 127) { // multi-byte
-                int needed;
-                if ((ch & 0xE0) == 0xC0) { // 2 bytes (0x0080 - 0x07FF)
-                    ch &= 0x1F;
-                    needed = 1;
-                } else if ((ch & 0xF0) == 0xE0) { // 3 bytes (0x0800 - 0xFFFF)
-                    ch &= 0x0F;
-                    needed = 2;
-                } else if ((ch & 0xF8) == 0xF0) { // 4 bytes; double-char with surrogates and all...
-                    ch &= 0x07;
-                    needed = 3;
-                } else { // 5- and 6-byte chars not valid xml chars
-                    _reportInvalidInitial(ch);
-                    needed = ch = 1; // never really gets this far
-                }
-                if ((ix + needed) > byteLen) {
-                    _reportInvalidEOF(" in field name");
-                }
-                
-                // Ok, always need at least one more:
-                int ch2 = quads[ix >> 2]; // current quad, need to shift+mask
-                byteIx = (ix & 3);
-                ch2 = (ch2 >> ((3 - byteIx) << 3));
-                ++ix;
-                
-                if ((ch2 & 0xC0) != 0x080) {
-                    _reportInvalidOther(ch2);
-                }
-                ch = (ch << 6) | (ch2 & 0x3F);
-                if (needed > 1) {
-                    ch2 = quads[ix >> 2];
-                    byteIx = (ix & 3);
-                    ch2 = (ch2 >> ((3 - byteIx) << 3));
-                    ++ix;
-                    
-                    if ((ch2 & 0xC0) != 0x080) {
-                        _reportInvalidOther(ch2);
-                    }
-                    ch = (ch << 6) | (ch2 & 0x3F);
-                    if (needed > 2) { // 4 bytes? (need surrogates on output)
-                        ch2 = quads[ix >> 2];
-                        byteIx = (ix & 3);
-                        ch2 = (ch2 >> ((3 - byteIx) << 3));
-                        ++ix;
-                        if ((ch2 & 0xC0) != 0x080) {
-                            _reportInvalidOther(ch2 & 0xFF);
-                        }
-                        ch = (ch << 6) | (ch2 & 0x3F);
-                    }
-                }
-                if (needed > 2) { // surrogate pair? once again, let's output one here, one later on
-                    ch -= 0x10000; // to normalize it starting with 0x0
-                    if (cix >= cbuf.length) {
-                        cbuf = _textBuffer.expandCurrentSegment();
-                    }
-                    cbuf[cix++] = (char) (0xD800 + (ch >> 10));
-                    ch = 0xDC00 | (ch & 0x03FF);
-                }
-            }
-            if (cix >= cbuf.length) {
-                cbuf = _textBuffer.expandCurrentSegment();
-            }
-            cbuf[cix++] = (char) ch;
-        }
-
-        // Ok. Now we have the character array, and can construct the String
-        String baseName = new String(cbuf, 0, cix);
-        // And finally, un-align if necessary
-        if (lastQuadBytes < 4) {
-            quads[qlen-1] = lastQuad;
-        }
-        return _symbols.addName(baseName, quads, qlen);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, String value parsing
-    /**********************************************************
-     */
-
-    @Override
-    protected void _finishString()
-        throws IOException, JsonParseException
-    {
-        // First, single tight loop for ASCII content, not split across input buffer boundary:        
-        int ptr = _inputPtr;
-        if (ptr >= _inputEnd) {
-            loadMoreGuaranteed();
-            ptr = _inputPtr;
-        }
-        int outPtr = 0;
-        char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
-        final int[] codes = sInputCodesUtf8;
-
-        final int max = Math.min(_inputEnd, (ptr + outBuf.length));
-        final byte[] inputBuffer = _inputBuffer;
-        while (ptr < max) {
-            int c = (int) inputBuffer[ptr] & 0xFF;
-            if (codes[c] != 0) {
-                if (c == INT_QUOTE) {
-                    _inputPtr = ptr+1;
-                    _textBuffer.setCurrentLength(outPtr);
-                    return;
-                }
-                break;
-            }
-            ++ptr;
-            outBuf[outPtr++] = (char) c;
-        }
-        _inputPtr = ptr;
-        _finishString2(outBuf, outPtr);
-    }
-
-    private void _finishString2(char[] outBuf, int outPtr)
-        throws IOException, JsonParseException
-    {
-        int c;
-
-        // Here we do want to do full decoding, hence:
-        final int[] codes = sInputCodesUtf8;
-        final byte[] inputBuffer = _inputBuffer;
-
-        main_loop:
-        while (true) {
-            // Then the tight ASCII non-funny-char loop:
-            ascii_loop:
-            while (true) {
-                int ptr = _inputPtr;
-                if (ptr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                    ptr = _inputPtr;
-                }
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                final int max = Math.min(_inputEnd, (ptr + (outBuf.length - outPtr)));
-                while (ptr < max) {
-                    c = (int) inputBuffer[ptr++] & 0xFF;
-                    if (codes[c] != 0) {
-                        _inputPtr = ptr;
-                        break ascii_loop;
-                    }
-                    outBuf[outPtr++] = (char) c;
-                }
-                _inputPtr = ptr;
-            }
-            // Ok: end marker, escape or multi-byte?
-            if (c == INT_QUOTE) {
-                break main_loop;
-            }
-
-            switch (codes[c]) {
-            case 1: // backslash
-                c = _decodeEscaped();
-                break;
-            case 2: // 2-byte UTF
-                c = _decodeUtf8_2(c);
-                break;
-            case 3: // 3-byte UTF
-                if ((_inputEnd - _inputPtr) >= 2) {
-                    c = _decodeUtf8_3fast(c);
-                } else {
-                    c = _decodeUtf8_3(c);
-                }
-                break;
-            case 4: // 4-byte UTF
-                c = _decodeUtf8_4(c);
-                // Let's add first part right away:
-                outBuf[outPtr++] = (char) (0xD800 | (c >> 10));
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                c = 0xDC00 | (c & 0x3FF);
-                // And let the other char output down below
-                break;
-            default:
-                if (c < INT_SPACE) {
-                    // As per [JACKSON-208], call can now return:
-                    _throwUnquotedSpace(c, "string value");
-                } else {
-                    // Is this good enough error message?
-                    _reportInvalidChar(c);
-                }
-            }
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = (char) c;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-    }
-
-    /**
-     * Method called to skim through rest of unparsed String value,
-     * if it is not needed. This can be done bit faster if contents
-     * need not be stored for future access.
-     */
-    protected void _skipString()
-        throws IOException, JsonParseException
-    {
-        _tokenIncomplete = false;
-
-        // Need to be fully UTF-8 aware here:
-        final int[] codes = sInputCodesUtf8;
-        final byte[] inputBuffer = _inputBuffer;
-
-        main_loop:
-        while (true) {
-            int c;
-
-            ascii_loop:
-            while (true) {
-                int ptr = _inputPtr;
-                int max = _inputEnd;
-                if (ptr >= max) {
-                    loadMoreGuaranteed();
-                    ptr = _inputPtr;
-                    max = _inputEnd;
-                }
-                while (ptr < max) {
-                    c = (int) inputBuffer[ptr++] & 0xFF;
-                    if (codes[c] != 0) {
-                        _inputPtr = ptr;
-                        break ascii_loop;
-                    }
-                }
-                _inputPtr = ptr;
-            }
-            // Ok: end marker, escape or multi-byte?
-            if (c == INT_QUOTE) {
-                break main_loop;
-            }
-            
-            switch (codes[c]) {
-            case 1: // backslash
-                _decodeEscaped();
-                break;
-            case 2: // 2-byte UTF
-                _skipUtf8_2(c);
-                break;
-            case 3: // 3-byte UTF
-                _skipUtf8_3(c);
-                break;
-            case 4: // 4-byte UTF
-                _skipUtf8_4(c);
-                break;
-            default:
-                if (c < INT_SPACE) {
-                    // As per [JACKSON-208], call can now return:
-                    _throwUnquotedSpace(c, "string value");
-                } else {
-                    // Is this good enough error message?
-                    _reportInvalidChar(c);
-                }
-            }
-        }
-    }
-
-    /**
-     * Method for handling cases where first non-space character
-     * of an expected value token is not legal for standard JSON content.
-     */
-    protected JsonToken _handleUnexpectedValue(int c)
-        throws IOException, JsonParseException
-    {
-        // Most likely an error, unless we are to allow single-quote-strings
-        switch (c) {
-        case '\'':
-            if (isEnabled(Feature.ALLOW_SINGLE_QUOTES)) {
-                return _handleApostropheValue();
-            }
-            break;
-        case 'N':
-            _matchToken("NaN", 1);
-            if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                return resetAsNaN("NaN", Double.NaN);
-            }
-            _reportError("Non-standard token 'NaN': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            break;
-        case '+': // note: '-' is taken as number
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOFInValue();
-                }
-            }
-            return _handleInvalidNumberStart(_inputBuffer[_inputPtr++] & 0xFF, false);
-        }
-
-        _reportUnexpectedChar(c, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
-        return null;
-    }
-    
-    protected JsonToken _handleApostropheValue()
-        throws IOException, JsonParseException
-    {
-        int c = 0;
-        // Otherwise almost verbatim copy of _finishString()
-        int outPtr = 0;
-        char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
-
-        // Here we do want to do full decoding, hence:
-        final int[] codes = sInputCodesUtf8;
-        final byte[] inputBuffer = _inputBuffer;
-
-        main_loop:
-        while (true) {
-            // Then the tight ascii non-funny-char loop:
-            ascii_loop:
-            while (true) {
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                int max = _inputEnd;
-                {
-                    int max2 = _inputPtr + (outBuf.length - outPtr);
-                    if (max2 < max) {
-                        max = max2;
-                    }
-                }
-                while (_inputPtr < max) {
-                    c = (int) inputBuffer[_inputPtr++] & 0xFF;
-                    if (c == INT_APOSTROPHE || codes[c] != 0) {
-                        break ascii_loop;
-                    }
-                    outBuf[outPtr++] = (char) c;
-                }
-            }
-
-            // Ok: end marker, escape or multi-byte?
-            if (c == INT_APOSTROPHE) {
-                break main_loop;
-            }
-
-            switch (codes[c]) {
-            case 1: // backslash
-                if (c != INT_QUOTE) { // marked as special, isn't here
-                    c = _decodeEscaped();
-                }
-                break;
-            case 2: // 2-byte UTF
-                c = _decodeUtf8_2(c);
-                break;
-            case 3: // 3-byte UTF
-                if ((_inputEnd - _inputPtr) >= 2) {
-                    c = _decodeUtf8_3fast(c);
-                } else {
-                    c = _decodeUtf8_3(c);
-                }
-                break;
-            case 4: // 4-byte UTF
-                c = _decodeUtf8_4(c);
-                // Let's add first part right away:
-                outBuf[outPtr++] = (char) (0xD800 | (c >> 10));
-                if (outPtr >= outBuf.length) {
-                    outBuf = _textBuffer.finishCurrentSegment();
-                    outPtr = 0;
-                }
-                c = 0xDC00 | (c & 0x3FF);
-                // And let the other char output down below
-                break;
-            default:
-                if (c < INT_SPACE) {
-                    _throwUnquotedSpace(c, "string value");
-                }
-                // Is this good enough error message?
-                _reportInvalidChar(c);
-            }
-            // Need more room?
-            if (outPtr >= outBuf.length) {
-                outBuf = _textBuffer.finishCurrentSegment();
-                outPtr = 0;
-            }
-            // Ok, let's add char to output:
-            outBuf[outPtr++] = (char) c;
-        }
-        _textBuffer.setCurrentLength(outPtr);
-
-        return JsonToken.VALUE_STRING;
-    }
-
-    /**
-     * Method called if expected numeric value (due to leading sign) does not
-     * look like a number
-     */
-    protected JsonToken _handleInvalidNumberStart(int ch, boolean negative)
-        throws IOException, JsonParseException
-    {
-        if (ch == 'I') {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOFInValue();
-                }
-            }
-            ch = _inputBuffer[_inputPtr++];
-            if (ch == 'N') {
-                String match = negative ? "-INF" :"+INF";
-                _matchToken(match, 3);
-                if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                    return resetAsNaN(match, negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY);
-                }
-                _reportError("Non-standard token '"+match+"': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            } else if (ch == 'n') {
-                String match = negative ? "-Infinity" :"+Infinity";
-                _matchToken(match, 3);
-                if (isEnabled(Feature.ALLOW_NON_NUMERIC_NUMBERS)) {
-                    return resetAsNaN(match, negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY);
-                }
-                _reportError("Non-standard token '"+match+"': enable JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS to allow");
-            }
-        }
-        reportUnexpectedNumberChar(ch, "expected digit (0-9) to follow minus sign, for valid numeric value");
-        return null;
-    }
-
-    protected void _matchToken(String matchStr, int i)
-        throws IOException, JsonParseException
-    {
-        final int len = matchStr.length();
-    
-        do {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in a value");
-                }
-            }
-            if (_inputBuffer[_inputPtr] != matchStr.charAt(i)) {
-                _reportInvalidToken(matchStr.substring(0, i), "'null', 'true', 'false' or NaN");
-            }
-            ++_inputPtr;
-        } while (++i < len);
-    
-        // but let's also ensure we either get EOF, or non-alphanum char...
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                return;
-            }
-        }
-        int ch = _inputBuffer[_inputPtr] & 0xFF;
-        if (ch < '0' || ch == ']' || ch == '}') { // expected/allowed chars
-            return;
-        }
-        // but actually only alphanums are problematic
-        char c = (char) _decodeCharForError(ch);
-        if (Character.isJavaIdentifierPart(c)) {
-            ++_inputPtr;
-            _reportInvalidToken(matchStr.substring(0, i), "'null', 'true', 'false' or NaN");
-        }
-    }
-    
-    protected void _reportInvalidToken(String matchedPart, String msg)
-        throws IOException, JsonParseException
-    {
-        StringBuilder sb = new StringBuilder(matchedPart);
-        /* Let's just try to find what appears to be the token, using
-         * regular Java identifier character rules. It's just a heuristic,
-         * nothing fancy here (nor fast).
-         */
-        while (true) {
-            if (_inputPtr >= _inputEnd && !loadMore()) {
-                break;
-            }
-            int i = (int) _inputBuffer[_inputPtr++];
-            char c = (char) _decodeCharForError(i);
-            if (!Character.isJavaIdentifierPart(c)) {
-                break;
-            }
-            sb.append(c);
-        }
-        _reportError("Unrecognized token '"+sb.toString()+"': was expecting "+msg);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, ws skipping, escape/unescape
-    /**********************************************************
-     */
-
-    private int _skipWS()
-        throws IOException, JsonParseException
-    {
-        while (_inputPtr < _inputEnd || loadMore()) {
-            int i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (i > INT_SPACE) {
-                if (i != INT_SLASH) {
-                    return i;
-                }
-                _skipComment();
-            } else if (i != INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                } else if (i == INT_CR) {
-                    _skipCR();
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-        throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");
-    }
-
-    private int _skipWSOrEnd()
-        throws IOException, JsonParseException
-    {
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (i > INT_SPACE) {
-                if (i != INT_SLASH) {
-                    return i;
-                }
-                _skipComment();
-            } else if (i != INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                } else if (i == INT_CR) {
-                    _skipCR();
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-        // We ran out of input...
-        _handleEOF();
-        return -1;
-    }
-
-    /**
-     * Helper method for matching and skipping a colon character,
-     * optionally surrounded by white space
-     */
-    private int _skipColon()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        // first fast case: we just got a colon without white space:
-        int i = _inputBuffer[_inputPtr++];
-        if (i == INT_COLON) {
-            if (_inputPtr < _inputEnd) {
-                i = _inputBuffer[_inputPtr] & 0xFF;
-                if (i > INT_SPACE && i != INT_SLASH) {
-                    ++_inputPtr;
-                    return i;
-                }
-            }
-        } else {
-            // need to skip potential leading space
-            i &= 0xFF;
-
-            space_loop:
-            while (true) {
-                switch (i) {
-                case INT_SPACE:
-                case INT_TAB:
-                case INT_CR:
-                    _skipCR();
-                    break;
-                case INT_LF:
-                    _skipLF();
-                    break;
-                case INT_SLASH:
-                    _skipComment();
-                    break;
-                default:
-                    if (i < INT_SPACE) {
-                        _throwInvalidSpace(i);
-                    }
-                    break space_loop;
-                }
-            }
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (i != INT_COLON) {
-                _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
-            }
-        }
-
-            // either way, found colon, skip through trailing WS
-        while (_inputPtr < _inputEnd || loadMore()) {
-            i = _inputBuffer[_inputPtr++] & 0xFF;
-            if (i > INT_SPACE) {
-                if (i != INT_SLASH) {
-                    return i;
-                }
-                _skipComment();
-            } else if (i != INT_SPACE) {
-                if (i == INT_LF) {
-                    _skipLF();
-                } else if (i == INT_CR) {
-                    _skipCR();
-                } else if (i != INT_TAB) {
-                    _throwInvalidSpace(i);
-                }
-            }
-        }
-        throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");
-    }
-    
-    private void _skipComment()
-        throws IOException, JsonParseException
-    {
-        if (!isEnabled(Feature.ALLOW_COMMENTS)) {
-            _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
-        }
-        // First: check which comment (if either) it is:
-        if (_inputPtr >= _inputEnd && !loadMore()) {
-            _reportInvalidEOF(" in a comment");
-        }
-        int c = _inputBuffer[_inputPtr++] & 0xFF;
-        if (c == INT_SLASH) {
-            _skipCppComment();
-        } else if (c == INT_ASTERISK) {
-            _skipCComment();
-        } else {
-            _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
-        }
-    }
-
-    private void _skipCComment()
-        throws IOException, JsonParseException
-    {
-        // Need to be UTF-8 aware here to decode content (for skipping)
-        final int[] codes = CharTypes.getInputCodeComment();
-
-        // Ok: need the matching '*/'
-        main_loop:
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            int code = codes[i];
-            if (code != 0) {
-                switch (code) {
-                case INT_ASTERISK:
-                    if (_inputPtr >= _inputEnd && !loadMore()) {
-                        break main_loop;
-                    }
-                    if (_inputBuffer[_inputPtr] == INT_SLASH) {
-                        ++_inputPtr;
-                        return;
-                    }
-                    break;
-                case INT_LF:
-                    _skipLF();
-                    break;
-                case INT_CR:
-                    _skipCR();
-                    break;
-                case 2: // 2-byte UTF
-                    _skipUtf8_2(i);
-                    break;
-                case 3: // 3-byte UTF
-                    _skipUtf8_3(i);
-                    break;
-                case 4: // 4-byte UTF
-                    _skipUtf8_4(i);
-                    break;
-                default: // e.g. -1
-                    // Is this good enough error message?
-                    _reportInvalidChar(i);
-                }
-            }
-        }
-        _reportInvalidEOF(" in a comment");
-    }
-
-    private void _skipCppComment()
-        throws IOException, JsonParseException
-    {
-        // Ok: need to find EOF or linefeed
-        final int[] codes = CharTypes.getInputCodeComment();
-        while ((_inputPtr < _inputEnd) || loadMore()) {
-            int i = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            int code = codes[i];
-            if (code != 0) {
-                switch (code) {
-                case INT_LF:
-                    _skipLF();
-                    return;
-                case INT_CR:
-                    _skipCR();
-                    return;
-                case INT_ASTERISK: // nop for these comments
-                    break;
-                case 2: // 2-byte UTF
-                    _skipUtf8_2(i);
-                    break;
-                case 3: // 3-byte UTF
-                    _skipUtf8_3(i);
-                    break;
-                case 4: // 4-byte UTF
-                    _skipUtf8_4(i);
-                    break;
-                default: // e.g. -1
-                    // Is this good enough error message?
-                    _reportInvalidChar(i);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected char _decodeEscaped()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            if (!loadMore()) {
-                _reportInvalidEOF(" in character escape sequence");
-            }
-        }
-        int c = (int) _inputBuffer[_inputPtr++];
-
-        switch ((int) c) {
-            // First, ones that are mapped
-        case INT_b:
-            return '\b';
-        case INT_t:
-            return '\t';
-        case INT_n:
-            return '\n';
-        case INT_f:
-            return '\f';
-        case INT_r:
-            return '\r';
-
-            // And these are to be returned as they are
-        case INT_QUOTE:
-        case INT_SLASH:
-        case INT_BACKSLASH:
-            return (char) c;
-
-        case INT_u: // and finally hex-escaped
-            break;
-
-        default:
-            return _handleUnrecognizedCharacterEscape((char) _decodeCharForError(c));
-        }
-
-        // Ok, a hex escape. Need 4 characters
-        int value = 0;
-        for (int i = 0; i < 4; ++i) {
-            if (_inputPtr >= _inputEnd) {
-                if (!loadMore()) {
-                    _reportInvalidEOF(" in character escape sequence");
-                }
-            }
-            int ch = (int) _inputBuffer[_inputPtr++];
-            int digit = CharTypes.charToHex(ch);
-            if (digit < 0) {
-                _reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");
-            }
-            value = (value << 4) | digit;
-        }
-        return (char) value;
-    }
-
-    protected int _decodeCharForError(int firstByte)
-        throws IOException, JsonParseException
-    {
-        int c = (int) firstByte;
-        if (c < 0) { // if >= 0, is ascii and fine as is
-            int needed;
-            
-            // Ok; if we end here, we got multi-byte combination
-            if ((c & 0xE0) == 0xC0) { // 2 bytes (0x0080 - 0x07FF)
-                c &= 0x1F;
-                needed = 1;
-            } else if ((c & 0xF0) == 0xE0) { // 3 bytes (0x0800 - 0xFFFF)
-                c &= 0x0F;
-                needed = 2;
-            } else if ((c & 0xF8) == 0xF0) {
-                // 4 bytes; double-char with surrogates and all...
-                c &= 0x07;
-                needed = 3;
-            } else {
-                _reportInvalidInitial(c & 0xFF);
-                needed = 1; // never gets here
-            }
-
-            int d = nextByte();
-            if ((d & 0xC0) != 0x080) {
-                _reportInvalidOther(d & 0xFF);
-            }
-            c = (c << 6) | (d & 0x3F);
-            
-            if (needed > 1) { // needed == 1 means 2 bytes total
-                d = nextByte(); // 3rd byte
-                if ((d & 0xC0) != 0x080) {
-                    _reportInvalidOther(d & 0xFF);
-                }
-                c = (c << 6) | (d & 0x3F);
-                if (needed > 2) { // 4 bytes? (need surrogates)
-                    d = nextByte();
-                    if ((d & 0xC0) != 0x080) {
-                        _reportInvalidOther(d & 0xFF);
-                    }
-                    c = (c << 6) | (d & 0x3F);
-                }
-            }
-        }
-        return c;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods,UTF8 decoding
-    /**********************************************************
-     */
-
-    private int _decodeUtf8_2(int c)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        int d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        return ((c & 0x1F) << 6) | (d & 0x3F);
-    }
-
-    private int _decodeUtf8_3(int c1)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        c1 &= 0x0F;
-        int d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        int c = (c1 << 6) | (d & 0x3F);
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        c = (c << 6) | (d & 0x3F);
-        return c;
-    }
-
-    private int _decodeUtf8_3fast(int c1)
-        throws IOException, JsonParseException
-    {
-        c1 &= 0x0F;
-        int d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        int c = (c1 << 6) | (d & 0x3F);
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        c = (c << 6) | (d & 0x3F);
-        return c;
-    }
-
-    /**
-     * @return Character value <b>minus 0x10000</c>; this so that caller
-     *    can readily expand it to actual surrogates
-     */
-    private int _decodeUtf8_4(int c)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        int d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        c = ((c & 0x07) << 6) | (d & 0x3F);
-
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        c = (c << 6) | (d & 0x3F);
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-
-        /* note: won't change it to negative here, since caller
-         * already knows it'll need a surrogate
-         */
-        return ((c << 6) | (d & 0x3F)) - 0x10000;
-    }
-
-    private void _skipUtf8_2(int c)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        c = (int) _inputBuffer[_inputPtr++];
-        if ((c & 0xC0) != 0x080) {
-            _reportInvalidOther(c & 0xFF, _inputPtr);
-        }
-    }
-
-    /* Alas, can't heavily optimize skipping, since we still have to
-     * do validity checks...
-     */
-    private void _skipUtf8_3(int c)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        //c &= 0x0F;
-        c = (int) _inputBuffer[_inputPtr++];
-        if ((c & 0xC0) != 0x080) {
-            _reportInvalidOther(c & 0xFF, _inputPtr);
-        }
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        c = (int) _inputBuffer[_inputPtr++];
-        if ((c & 0xC0) != 0x080) {
-            _reportInvalidOther(c & 0xFF, _inputPtr);
-        }
-    }
-
-    private void _skipUtf8_4(int c)
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        int d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        d = (int) _inputBuffer[_inputPtr++];
-        if ((d & 0xC0) != 0x080) {
-            _reportInvalidOther(d & 0xFF, _inputPtr);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, input loading
-    /**********************************************************
-     */
-
-    /**
-     * We actually need to check the character value here
-     * (to see if we have \n following \r).
-     */
-    protected void _skipCR() throws IOException
-    {
-        if (_inputPtr < _inputEnd || loadMore()) {
-            if (_inputBuffer[_inputPtr] == BYTE_LF) {
-                ++_inputPtr;
-            }
-        }
-        ++_currInputRow;
-        _currInputRowStart = _inputPtr;
-    }
-
-    protected void _skipLF() throws IOException
-    {
-        ++_currInputRow;
-        _currInputRowStart = _inputPtr;
-    }
-
-    private int nextByte()
-        throws IOException, JsonParseException
-    {
-        if (_inputPtr >= _inputEnd) {
-            loadMoreGuaranteed();
-        }
-        return _inputBuffer[_inputPtr++] & 0xFF;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, error reporting
-    /**********************************************************
-     */
-
-    protected void _reportInvalidChar(int c)
-        throws JsonParseException
-        {
-            // Either invalid WS or illegal UTF-8 start char
-            if (c < INT_SPACE) {
-                _throwInvalidSpace(c);
-            }
-            _reportInvalidInitial(c);
-        }
-
-    protected void _reportInvalidInitial(int mask)
-        throws JsonParseException
-    {
-        _reportError("Invalid UTF-8 start byte 0x"+Integer.toHexString(mask));
-    }
-
-    protected void _reportInvalidOther(int mask)
-        throws JsonParseException
-    {
-        _reportError("Invalid UTF-8 middle byte 0x"+Integer.toHexString(mask));
-    }
-
-    protected void _reportInvalidOther(int mask, int ptr)
-        throws JsonParseException
-    {
-        _inputPtr = ptr;
-        _reportInvalidOther(mask);
-    }
-
-    public static int[] growArrayBy(int[] arr, int more)
-    {
-        if (arr == null) {
-            return new int[more];
-        }
-        int[] old = arr;
-        int len = arr.length;
-        arr = new int[len + more];
-        System.arraycopy(old, 0, arr, 0, len);
-        return arr;
-    }
-
-    /*
-    /**********************************************************
-    /* Binary access
-    /**********************************************************
-     */
-
-    /**
-     * Efficient handling for incremental parsing of base64-encoded
-     * textual content.
-     */
-    protected byte[] _decodeBase64(Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        ByteArrayBuilder builder = _getByteArrayBuilder();
-
-        //main_loop:
-        while (true) {
-            // first, we'll skip preceding white space, if any
-            int ch;
-            do {
-                if (_inputPtr >= _inputEnd) {
-                    loadMoreGuaranteed();
-                }
-                ch = (int) _inputBuffer[_inputPtr++] & 0xFF;
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) { // reached the end, fair and square?
-                if (ch == INT_QUOTE) {
-                    return builder.toByteArray();
-                }
-                bits = _decodeBase64Escape(b64variant, ch, 0);
-                if (bits < 0) { // white space to skip
-                    continue;
-                }
-            }
-            int decodedData = bits;
-            
-            // then second base64 char; can't get padding yet, nor ws
-            
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                bits = _decodeBase64Escape(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-            
-            // third base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 4;
-                        builder.append(decodedData);
-                        return builder.toByteArray();
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 2);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    // Ok, must get padding
-                    if (_inputPtr >= _inputEnd) {
-                        loadMoreGuaranteed();
-                    }
-                    ch = _inputBuffer[_inputPtr++] & 0xFF;
-                    if (!b64variant.usesPaddingChar(ch)) {
-                        throw reportInvalidBase64Char(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                    }
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    builder.append(decodedData);
-                    continue;
-                }
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (_inputPtr >= _inputEnd) {
-                loadMoreGuaranteed();
-            }
-            ch = _inputBuffer[_inputPtr++] & 0xFF;
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    // as per [JACKSON-631], could also just be 'missing'  padding
-                    if (ch == '"' && !b64variant.usesPadding()) {
-                        decodedData >>= 2;
-                        builder.appendTwoBytes(decodedData);
-                        return builder.toByteArray();
-                    }
-                    bits = _decodeBase64Escape(b64variant, ch, 3);
-                }
-                if (bits == Base64Variant.BASE64_VALUE_PADDING) {
-                    /* With padding we only get 2 bytes; but we have
-                     * to shift it a bit so it is identical to triplet
-                     * case with partial output.
-                     * 3 chars gives 3x6 == 18 bits, of which 2 are
-                     * dummies, need to discard:
-                     */
-                    decodedData >>= 2;
-                    builder.appendTwoBytes(decodedData);
-                    continue;
-                }
-            }
-            // otherwise, our triplet is now complete
-            decodedData = (decodedData << 6) | bits;
-            builder.appendThreeBytes(decodedData);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java
deleted file mode 100644
index 48f474c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java
+++ /dev/null
@@ -1,1882 +0,0 @@
-package com.fasterxml.jackson.core.json;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.*;
-
-/**
- * {@link JsonGenerator} that outputs JSON content using a {@link java.io.Writer}
- * which handles character encoding.
- */
-public final class WriterBasedJsonGenerator
-    extends JsonGeneratorImpl
-{
-    final protected static int SHORT_WRITE = 32;
-
-    final protected static char[] HEX_CHARS = CharTypes.copyHexChars();
-    
-    /*
-    /**********************************************************
-    /* Output buffering
-    /**********************************************************
-     */
-
-    final protected Writer _writer;
-    
-    /**
-     * Intermediate buffer in which contents are buffered before
-     * being written using {@link #_writer}.
-     */
-    protected char[] _outputBuffer;
-
-    /**
-     * Pointer to the first buffered character to output
-     */
-    protected int _outputHead = 0;
-
-    /**
-     * Pointer to the position right beyond the last character to output
-     * (end marker; may point to position right beyond the end of the buffer)
-     */
-    protected int _outputTail = 0;
-
-    /**
-     * End marker of the output buffer; one past the last valid position
-     * within the buffer.
-     */
-    protected int _outputEnd;
-
-    /**
-     * Short (14 char) temporary buffer allocated if needed, for constructing
-     * escape sequences
-     */
-    protected char[] _entityBuffer;
-
-    /**
-     * When custom escapes are used, this member variable is used
-     * internally to hold a reference to currently used escape
-     */
-    protected SerializableString _currentEscape;
-    
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public WriterBasedJsonGenerator(IOContext ctxt, int features,
-            ObjectCodec codec, Writer w)
-    {
-        super(ctxt, features, codec);
-        _writer = w;
-        _outputBuffer = ctxt.allocConcatBuffer();
-        _outputEnd = _outputBuffer.length;
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridden configuration methods
-    /**********************************************************
-     */
-    
-    @Override
-    public Object getOutputTarget() {
-        return _writer;
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public void writeFieldName(String name)  throws IOException, JsonGenerationException
-    {
-        int status = _writeContext.writeFieldName(name);
-        if (status == JsonWriteContext.STATUS_EXPECT_VALUE) {
-            _reportError("Can not write a field name, expecting a value");
-        }
-        _writeFieldName(name, (status == JsonWriteContext.STATUS_OK_AFTER_COMMA));
-    }
-
-    @Override
-    public void writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException
-    {
-        // Object is a value, need to verify it's allowed
-        int status = _writeContext.writeFieldName(name.getValue());
-        if (status == JsonWriteContext.STATUS_EXPECT_VALUE) {
-            _reportError("Can not write a field name, expecting a value");
-        }
-        _writeFieldName(name, (status == JsonWriteContext.STATUS_OK_AFTER_COMMA));
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, structural
-    /**********************************************************
-     */
-
-    @Override
-    public void writeStartArray() throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("start an array");
-        _writeContext = _writeContext.createChildArrayContext();
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeStartArray(this);
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '[';
-        }
-    }
-
-    @Override
-    public void writeEndArray() throws IOException, JsonGenerationException
-    {
-        if (!_writeContext.inArray()) {
-            _reportError("Current context not an ARRAY but "+_writeContext.getTypeDesc());
-        }
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeEndArray(this, _writeContext.getEntryCount());
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = ']';
-        }
-        _writeContext = _writeContext.getParent();
-    }
-
-    @Override
-    public void writeStartObject() throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("start an object");
-        _writeContext = _writeContext.createChildObjectContext();
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeStartObject(this);
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '{';
-        }
-    }
-
-    @Override
-    public void writeEndObject() throws IOException, JsonGenerationException
-    {
-        if (!_writeContext.inObject()) {
-            _reportError("Current context not an object but "+_writeContext.getTypeDesc());
-        }
-        if (_cfgPrettyPrinter != null) {
-            _cfgPrettyPrinter.writeEndObject(this, _writeContext.getEntryCount());
-        } else {
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '}';
-        }
-        _writeContext = _writeContext.getParent();
-    }
-
-    protected void _writeFieldName(String name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgPrettyPrinter != null) {
-            _writePPFieldName(name, commaBefore);
-            return;
-        }
-        // for fast+std case, need to output up to 2 chars, comma, dquote
-        if ((_outputTail + 1) >= _outputEnd) {
-            _flushBuffer();
-        }
-        if (commaBefore) {
-            _outputBuffer[_outputTail++] = ',';
-        }
-
-        /* To support [JACKSON-46], we'll do this:
-         * (Question: should quoting of spaces (etc) still be enabled?)
-         */
-        if (!isEnabled(Feature.QUOTE_FIELD_NAMES)) {
-            _writeString(name);
-            return;
-        }
-
-        // we know there's room for at least one more char
-        _outputBuffer[_outputTail++] = '"';
-        // The beef:
-        _writeString(name);
-        // and closing quotes; need room for one more char:
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    public void _writeFieldName(SerializableString name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgPrettyPrinter != null) {
-            _writePPFieldName(name, commaBefore);
-            return;
-        }
-        // for fast+std case, need to output up to 2 chars, comma, dquote
-        if ((_outputTail + 1) >= _outputEnd) {
-            _flushBuffer();
-        }
-        if (commaBefore) {
-            _outputBuffer[_outputTail++] = ',';
-        }
-        /* To support [JACKSON-46], we'll do this:
-         * (Question: should quoting of spaces (etc) still be enabled?)
-         */
-        final char[] quoted = name.asQuotedChars();
-        if (!isEnabled(Feature.QUOTE_FIELD_NAMES)) {
-            writeRaw(quoted, 0, quoted.length);
-            return;
-        }
-        // we know there's room for at least one more char
-        _outputBuffer[_outputTail++] = '"';
-        // The beef:
-        final int qlen = quoted.length;
-        if ((_outputTail + qlen + 1) >= _outputEnd) {
-            writeRaw(quoted, 0, qlen);
-            // and closing quotes; need room for one more char:
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '"';
-        } else {
-            System.arraycopy(quoted, 0, _outputBuffer, _outputTail, qlen);
-            _outputTail += qlen;
-            _outputBuffer[_outputTail++] = '"';
-        }
-    }
-    
-    /**
-     * Specialized version of <code>_writeFieldName</code>, off-lined
-     * to keep the "fast path" as simple (and hopefully fast) as possible.
-     */
-    protected void _writePPFieldName(String name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (commaBefore) {
-            _cfgPrettyPrinter.writeObjectEntrySeparator(this);
-        } else {
-            _cfgPrettyPrinter.beforeObjectEntries(this);
-        }
-
-        if (isEnabled(Feature.QUOTE_FIELD_NAMES)) { // standard
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '"';
-            _writeString(name);
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '"';
-        } else { // non-standard, omit quotes
-            _writeString(name);
-        }
-    }
-
-    protected void _writePPFieldName(SerializableString name, boolean commaBefore)
-        throws IOException, JsonGenerationException
-    {
-        if (commaBefore) {
-            _cfgPrettyPrinter.writeObjectEntrySeparator(this);
-        } else {
-            _cfgPrettyPrinter.beforeObjectEntries(this);
-        }
-    
-        final char[] quoted = name.asQuotedChars();
-        if (isEnabled(Feature.QUOTE_FIELD_NAMES)) { // standard
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '"';
-            writeRaw(quoted, 0, quoted.length);
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '"';
-        } else { // non-standard, omit quotes
-            writeRaw(quoted, 0, quoted.length);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Output method implementations, textual
-    /**********************************************************
-     */
-
-    @Override
-    public void writeString(String text)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (text == null) {
-            _writeNull();
-            return;
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        _writeString(text);
-        // And finally, closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    @Override
-    public void writeString(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        _writeString(text, offset, len);
-        // And finally, closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    @Override
-    public void writeString(SerializableString sstr)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write text value");
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        // Note: copied from writeRaw:
-        char[] text = sstr.asQuotedChars();
-        final int len = text.length;
-        // Only worth buffering if it's a short write?
-        if (len < SHORT_WRITE) {
-            int room = _outputEnd - _outputTail;
-            if (len > room) {
-                _flushBuffer();
-            }
-            System.arraycopy(text, 0, _outputBuffer, _outputTail, len);
-            _outputTail += len;
-        } else {
-            // Otherwise, better just pass through:
-            _flushBuffer();
-            _writer.write(text, 0, len);
-        }
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    @Override
-    public void writeRawUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        // could add support for buffering if we really want it...
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        // could add support for buffering if we really want it...
-        _reportUnsupportedOperation();
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, unprocessed ("raw")
-    /**********************************************************
-     */
-
-    @Override
-    public void writeRaw(String text)
-        throws IOException, JsonGenerationException
-    {
-        // Nothing to check, can just output as is
-        int len = text.length();
-        int room = _outputEnd - _outputTail;
-
-        if (room == 0) {
-            _flushBuffer();
-            room = _outputEnd - _outputTail;
-        }
-        // But would it nicely fit in? If yes, it's easy
-        if (room >= len) {
-            text.getChars(0, len, _outputBuffer, _outputTail);
-            _outputTail += len;
-        } else {
-            writeRawLong(text);
-        }
-    }
-
-    @Override
-    public void writeRaw(String text, int start, int len)
-        throws IOException, JsonGenerationException
-    {
-        // Nothing to check, can just output as is
-        int room = _outputEnd - _outputTail;
-
-        if (room < len) {
-            _flushBuffer();
-            room = _outputEnd - _outputTail;
-        }
-        // But would it nicely fit in? If yes, it's easy
-        if (room >= len) {
-            text.getChars(start, start+len, _outputBuffer, _outputTail);
-            _outputTail += len;
-        } else {            	
-            writeRawLong(text.substring(start, start+len));
-        }
-    }
-
-    // @since 2.1
-    @Override
-    public void writeRaw(SerializableString text) throws IOException, JsonGenerationException {
-        writeRaw(text.getValue());
-    }
-    
-    @Override
-    public void writeRaw(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        // Only worth buffering if it's a short write?
-        if (len < SHORT_WRITE) {
-            int room = _outputEnd - _outputTail;
-            if (len > room) {
-                _flushBuffer();
-            }
-            System.arraycopy(text, offset, _outputBuffer, _outputTail, len);
-            _outputTail += len;
-            return;
-        }
-        // Otherwise, better just pass through:
-        _flushBuffer();
-        _writer.write(text, offset, len);
-    }
-
-    @Override
-    public void writeRaw(char c)
-        throws IOException, JsonGenerationException
-    {
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = c;
-    }
-
-    private void writeRawLong(String text)
-        throws IOException, JsonGenerationException
-    {
-        int room = _outputEnd - _outputTail;
-        // If not, need to do it by looping
-        text.getChars(0, room, _outputBuffer, _outputTail);
-        _outputTail += room;
-        _flushBuffer();
-        int offset = room;
-        int len = text.length() - room;
-
-        while (len > _outputEnd) {
-            int amount = _outputEnd;
-            text.getChars(offset, offset+amount, _outputBuffer, 0);
-            _outputHead = 0;
-            _outputTail = amount;
-            _flushBuffer();
-            offset += amount;
-            len -= amount;
-        }
-        // And last piece (at most length of buffer)
-        text.getChars(offset, offset+len, _outputBuffer, 0);
-        _outputHead = 0;
-        _outputTail = len;
-    }
-
-    /*
-    /**********************************************************
-    /* Output method implementations, base64-encoded binary
-    /**********************************************************
-     */
-
-    @Override
-    public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write binary value");
-        // Starting quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        _writeBinary(b64variant, data, offset, offset+len);
-        // and closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    @Override
-    public int writeBinary(Base64Variant b64variant,
-            InputStream data, int dataLength)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write binary value");
-        // Starting quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        byte[] encodingBuffer = _ioContext.allocBase64Buffer();
-        int bytes;
-        try {
-            if (dataLength < 0) { // length unknown
-                bytes = _writeBinary(b64variant, data, encodingBuffer);
-            } else {
-                int missing = _writeBinary(b64variant, data, encodingBuffer, dataLength);
-                if (missing > 0) {
-                    _reportError("Too few bytes available: missing "+missing+" bytes (out of "+dataLength+")");
-                }
-                bytes = dataLength;
-            }
-        } finally {
-            _ioContext.releaseBase64Buffer(encodingBuffer);
-        }
-        // and closing quotes
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        return bytes;
-    }
-    
-    /*
-    /**********************************************************
-    /* Output method implementations, primitive
-    /**********************************************************
-     */
-
-    @Override
-    public void writeNumber(int i)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedInt(i);
-            return;
-        }
-        // up to 10 digits and possible minus sign
-        if ((_outputTail + 11) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputTail = NumberOutput.outputInt(i, _outputBuffer, _outputTail);
-    }
-
-    private void _writeQuotedInt(int i) throws IOException {
-        if ((_outputTail + 13) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        _outputTail = NumberOutput.outputInt(i, _outputBuffer, _outputTail);
-        _outputBuffer[_outputTail++] = '"';
-    }    
-
-    @Override
-    public void writeNumber(long l)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedLong(l);
-            return;
-        }
-        if ((_outputTail + 21) >= _outputEnd) {
-            // up to 20 digits, minus sign
-            _flushBuffer();
-        }
-        _outputTail = NumberOutput.outputLong(l, _outputBuffer, _outputTail);
-    }
-
-    private void _writeQuotedLong(long l) throws IOException {
-        if ((_outputTail + 23) >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        _outputTail = NumberOutput.outputLong(l, _outputBuffer, _outputTail);
-        _outputBuffer[_outputTail++] = '"';
-    }
-
-    // !!! 05-Aug-2008, tatus: Any ways to optimize these?
-
-    @Override
-    public void writeNumber(BigInteger value)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (value == null) {
-            _writeNull();
-        } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
-        } else {
-            writeRaw(value.toString());
-        }
-    }
-
-    
-    @Override
-    public void writeNumber(double d)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgNumbersAsStrings ||
-            // [JACKSON-139]
-            (((Double.isNaN(d) || Double.isInfinite(d))
-                && isEnabled(Feature.QUOTE_NON_NUMERIC_NUMBERS)))) {
-            writeString(String.valueOf(d));
-            return;
-        }
-        // What is the max length for doubles? 40 chars?
-        _verifyValueWrite("write number");
-        writeRaw(String.valueOf(d));
-    }
-
-    @Override
-    public void writeNumber(float f)
-        throws IOException, JsonGenerationException
-    {
-        if (_cfgNumbersAsStrings ||
-            // [JACKSON-139]
-            (((Float.isNaN(f) || Float.isInfinite(f))
-                && isEnabled(Feature.QUOTE_NON_NUMERIC_NUMBERS)))) {
-            writeString(String.valueOf(f));
-            return;
-        }
-        // What is the max length for floats?
-        _verifyValueWrite("write number");
-        writeRaw(String.valueOf(f));
-    }
-
-    @Override
-    public void writeNumber(BigDecimal value)
-        throws IOException, JsonGenerationException
-    {
-        // Don't really know max length for big decimal, no point checking
-        _verifyValueWrite("write number");
-        if (value == null) {
-            _writeNull();
-        } else if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(value);
-        } else {
-            writeRaw(value.toString());
-        }
-    }
-
-    @Override
-    public void writeNumber(String encodedValue)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write number");
-        if (_cfgNumbersAsStrings) {
-            _writeQuotedRaw(encodedValue);            
-        } else {
-            writeRaw(encodedValue);
-        }
-    }
-
-    private void _writeQuotedRaw(Object value) throws IOException
-    {
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-        writeRaw(value.toString());
-        if (_outputTail >= _outputEnd) {
-            _flushBuffer();
-        }
-        _outputBuffer[_outputTail++] = '"';
-    }
-    
-    @Override
-    public void writeBoolean(boolean state)
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write boolean value");
-        if ((_outputTail + 5) >= _outputEnd) {
-            _flushBuffer();
-        }
-        int ptr = _outputTail;
-        char[] buf = _outputBuffer;
-        if (state) {
-            buf[ptr] = 't';
-            buf[++ptr] = 'r';
-            buf[++ptr] = 'u';
-            buf[++ptr] = 'e';
-        } else {
-            buf[ptr] = 'f';
-            buf[++ptr] = 'a';
-            buf[++ptr] = 'l';
-            buf[++ptr] = 's';
-            buf[++ptr] = 'e';
-        }
-        _outputTail = ptr+1;
-    }
-
-    @Override
-    public void writeNull()
-        throws IOException, JsonGenerationException
-    {
-        _verifyValueWrite("write null value");
-        _writeNull();
-    }
-
-    /*
-    /**********************************************************
-    /* Implementations for other methods
-    /**********************************************************
-     */
-
-    @Override
-    protected void _verifyValueWrite(String typeMsg)
-        throws IOException, JsonGenerationException
-    {
-        int status = _writeContext.writeValue();
-        if (status == JsonWriteContext.STATUS_EXPECT_NAME) {
-            _reportError("Can not "+typeMsg+", expecting field name");
-        }
-        if (_cfgPrettyPrinter == null) {
-            char c;
-            switch (status) {
-            case JsonWriteContext.STATUS_OK_AFTER_COMMA:
-                c = ',';
-                break;
-            case JsonWriteContext.STATUS_OK_AFTER_COLON:
-                c = ':';
-                break;
-            case JsonWriteContext.STATUS_OK_AFTER_SPACE: // root-value separator
-                if (_rootValueSeparator != null) {
-                    writeRaw(_rootValueSeparator.getValue());
-                }
-                return;
-            case JsonWriteContext.STATUS_OK_AS_IS:
-            default:
-                return;
-            }
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail] = c;
-            ++_outputTail;
-            return;
-        }
-        // Otherwise, pretty printer knows what to do...
-        _verifyPrettyValueWrite(typeMsg, status);
-    }
-
-    protected void _verifyPrettyValueWrite(String typeMsg, int status)
-        throws IOException, JsonGenerationException
-    {
-        // If we have a pretty printer, it knows what to do:
-        switch (status) {
-        case JsonWriteContext.STATUS_OK_AFTER_COMMA: // array
-            _cfgPrettyPrinter.writeArrayValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AFTER_COLON:
-            _cfgPrettyPrinter.writeObjectFieldValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AFTER_SPACE:
-            _cfgPrettyPrinter.writeRootValueSeparator(this);
-            break;
-        case JsonWriteContext.STATUS_OK_AS_IS:
-            // First entry, but of which context?
-            if (_writeContext.inArray()) {
-                _cfgPrettyPrinter.beforeArrayValues(this);
-            } else if (_writeContext.inObject()) {
-                _cfgPrettyPrinter.beforeObjectEntries(this);
-            }
-            break;
-        default:
-            _cantHappen();
-            break;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Low-level output handling
-    /**********************************************************
-     */
-
-    @Override
-    public void flush()
-        throws IOException
-    {
-        _flushBuffer();
-        if (_writer != null) {
-            if (isEnabled(Feature.FLUSH_PASSED_TO_STREAM)) {
-                _writer.flush();
-            }
-        }
-    }
-
-    @Override
-    public void close()
-        throws IOException
-    {
-        super.close();
-
-        /* 05-Dec-2008, tatu: To add [JACKSON-27], need to close open
-         *   scopes.
-         */
-        // First: let's see that we still have buffers...
-        if (_outputBuffer != null
-            && isEnabled(Feature.AUTO_CLOSE_JSON_CONTENT)) {
-            while (true) {
-                JsonStreamContext ctxt = getOutputContext();
-                if (ctxt.inArray()) {
-                    writeEndArray();
-                } else if (ctxt.inObject()) {
-                    writeEndObject();
-                } else {
-                    break;
-                }
-            }
-        }
-        _flushBuffer();
-
-        /* 25-Nov-2008, tatus: As per [JACKSON-16] we are not to call close()
-         *   on the underlying Reader, unless we "own" it, or auto-closing
-         *   feature is enabled.
-         *   One downside: when using UTF8Writer, underlying buffer(s)
-         *   may not be properly recycled if we don't close the writer.
-         */
-        if (_writer != null) {
-            if (_ioContext.isResourceManaged() || isEnabled(Feature.AUTO_CLOSE_TARGET)) {
-                _writer.close();
-            } else  if (isEnabled(Feature.FLUSH_PASSED_TO_STREAM)) {
-                // If we can't close it, we should at least flush
-                _writer.flush();
-            }
-        }
-        // Internal buffer(s) generator has can now be released as well
-        _releaseBuffers();
-    }
-
-    @Override
-    protected void _releaseBuffers()
-    {
-        char[] buf = _outputBuffer;
-        if (buf != null) {
-            _outputBuffer = null;
-            _ioContext.releaseConcatBuffer(buf);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing; text, default
-    /**********************************************************
-     */
-
-    private void _writeString(String text)
-        throws IOException, JsonGenerationException
-    {
-        /* One check first: if String won't fit in the buffer, let's
-         * segment writes. No point in extending buffer to huge sizes
-         * (like if someone wants to include multi-megabyte base64
-         * encoded stuff or such)
-         */
-        final int len = text.length();
-        if (len > _outputEnd) { // Let's reserve space for entity at begin/end
-            _writeLongString(text);
-            return;
-        }
-
-        // Ok: we know String will fit in buffer ok
-        // But do we need to flush first?
-        if ((_outputTail + len) > _outputEnd) {
-            _flushBuffer();
-        }
-        text.getChars(0, len, _outputBuffer, _outputTail);
-
-        if (_characterEscapes != null) {
-            _writeStringCustom(len);
-        } else if (_maximumNonEscapedChar != 0) {
-            _writeStringASCII(len, _maximumNonEscapedChar);
-        } else {
-            _writeString2(len);
-        }
-    }
-
-    private void _writeString2(final int len)
-        throws IOException, JsonGenerationException
-    {
-        // And then we'll need to verify need for escaping etc:
-        int end = _outputTail + len;
-        final int[] escCodes = _outputEscapes;
-        final int escLen = escCodes.length;
-
-        output_loop:
-        while (_outputTail < end) {
-            // Fast loop for chars not needing escaping
-            escape_loop:
-            while (true) {
-                char c = _outputBuffer[_outputTail];
-                if (c < escLen && escCodes[c] != 0) {
-                    break escape_loop;
-                }
-                if (++_outputTail >= end) {
-                    break output_loop;
-                }
-            }
-
-            // Ok, bumped into something that needs escaping.
-            /* First things first: need to flush the buffer.
-             * Inlined, as we don't want to lose tail pointer
-             */
-            int flushLen = (_outputTail - _outputHead);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, _outputHead, flushLen);
-            }
-            /* In any case, tail will be the new start, so hopefully
-             * we have room now.
-             */
-            char c = _outputBuffer[_outputTail++];
-            _prependOrWriteCharacterEscape(c, escCodes[c]);
-        }
-    }
-
-    /**
-     * Method called to write "long strings", strings whose length exceeds
-     * output buffer length.
-     */
-    private void _writeLongString(String text)
-        throws IOException, JsonGenerationException
-    {
-        // First things first: let's flush the buffer to get some more room
-        _flushBuffer();
-
-        // Then we can write 
-        final int textLen = text.length();
-        int offset = 0;
-        do {
-            int max = _outputEnd;
-            int segmentLen = ((offset + max) > textLen)
-                ? (textLen - offset) : max;
-            text.getChars(offset, offset+segmentLen, _outputBuffer, 0);
-            if (_characterEscapes != null) {
-                _writeSegmentCustom(segmentLen);
-            } else if (_maximumNonEscapedChar != 0) {
-                _writeSegmentASCII(segmentLen, _maximumNonEscapedChar);
-            } else {
-                _writeSegment(segmentLen);
-            }
-            offset += segmentLen;
-        } while (offset < textLen);
-    }
-
-    /**
-     * Method called to output textual context which has been copied
-     * to the output buffer prior to call. If any escaping is needed,
-     * it will also be handled by the method.
-     *<p>
-     * Note: when called, textual content to write is within output
-     * buffer, right after buffered content (if any). That's why only
-     * length of that text is passed, as buffer and offset are implied.
-     */
-    private void _writeSegment(int end)
-        throws IOException, JsonGenerationException
-    {
-        final int[] escCodes = _outputEscapes;
-        final int escLen = escCodes.length;
-    
-        int ptr = 0;
-        int start = ptr;
-
-        output_loop:
-        while (ptr < end) {
-            // Fast loop for chars not needing escaping
-            char c;
-            while (true) {
-                c = _outputBuffer[ptr];
-                if (c < escLen && escCodes[c] != 0) {
-                    break;
-                }
-                if (++ptr >= end) {
-                    break;
-                }
-            }
-
-            // Ok, bumped into something that needs escaping.
-            /* First things first: need to flush the buffer.
-             * Inlined, as we don't want to lose tail pointer
-             */
-            int flushLen = (ptr - start);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, start, flushLen);
-                if (ptr >= end) {
-                    break output_loop;
-                }
-            }
-            ++ptr;
-            // So; either try to prepend (most likely), or write directly:
-            start = _prependOrWriteCharacterEscape(_outputBuffer, ptr, end, c, escCodes[c]);
-        }
-    }
-    
-    /**
-     * This method called when the string content is already in
-     * a char buffer, and need not be copied for processing.
-     */
-    private void _writeString(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        if (_characterEscapes != null) {
-            _writeStringCustom(text, offset, len);
-            return;
-        }
-        if (_maximumNonEscapedChar != 0) {
-            _writeStringASCII(text, offset, len, _maximumNonEscapedChar);
-            return;
-        }
-        
-        /* Let's just find longest spans of non-escapable
-         * content, and for each see if it makes sense
-         * to copy them, or write through
-         */
-        len += offset; // -> len marks the end from now on
-        final int[] escCodes = _outputEscapes;
-        final int escLen = escCodes.length;
-        while (offset < len) {
-            int start = offset;
-
-            while (true) {
-                char c = text[offset];
-                if (c < escLen && escCodes[c] != 0) {
-                    break;
-                }
-                if (++offset >= len) {
-                    break;
-                }
-            }
-
-            // Short span? Better just copy it to buffer first:
-            int newAmount = offset - start;
-            if (newAmount < SHORT_WRITE) {
-                // Note: let's reserve room for escaped char (up to 6 chars)
-                if ((_outputTail + newAmount) > _outputEnd) {
-                    _flushBuffer();
-                }
-                if (newAmount > 0) {
-                    System.arraycopy(text, start, _outputBuffer, _outputTail, newAmount);
-                    _outputTail += newAmount;
-                }
-            } else { // Nope: better just write through
-                _flushBuffer();
-                _writer.write(text, start, newAmount);
-            }
-            // Was this the end?
-            if (offset >= len) { // yup
-                break;
-            }
-            // Nope, need to escape the char.
-            char c = text[offset++];
-            _appendCharacterEscape(c, escCodes[c]);          
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, text segment
-    /* with additional escaping (ASCII or such)
-    /**********************************************************
-     */
-
-    /* Same as "_writeString2()", except needs additional escaping
-     * for subset of characters
-     */
-    private void _writeStringASCII(final int len, final int maxNonEscaped)
-        throws IOException, JsonGenerationException
-    {
-        // And then we'll need to verify need for escaping etc:
-        int end = _outputTail + len;
-        final int[] escCodes = _outputEscapes;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-        int escCode = 0;
-        
-        output_loop:
-        while (_outputTail < end) {
-            char c;
-            // Fast loop for chars not needing escaping
-            escape_loop:
-            while (true) {
-                c = _outputBuffer[_outputTail];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break escape_loop;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break escape_loop;
-                }
-                if (++_outputTail >= end) {
-                    break output_loop;
-                }
-            }
-            int flushLen = (_outputTail - _outputHead);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, _outputHead, flushLen);
-            }
-            ++_outputTail;
-            _prependOrWriteCharacterEscape(c, escCode);
-        }
-    }
-
-    private void _writeSegmentASCII(int end, final int maxNonEscaped)
-        throws IOException, JsonGenerationException
-    {
-        final int[] escCodes = _outputEscapes;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-    
-        int ptr = 0;
-        int escCode = 0;
-        int start = ptr;
-    
-        output_loop:
-        while (ptr < end) {
-            // Fast loop for chars not needing escaping
-            char c;
-            while (true) {
-                c = _outputBuffer[ptr];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break;
-                }
-                if (++ptr >= end) {
-                    break;
-                }
-            }
-            int flushLen = (ptr - start);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, start, flushLen);
-                if (ptr >= end) {
-                    break output_loop;
-                }
-            }
-            ++ptr;
-            start = _prependOrWriteCharacterEscape(_outputBuffer, ptr, end, c, escCode);
-        }
-    }
-
-    private void _writeStringASCII(char[] text, int offset, int len,
-            final int maxNonEscaped)
-        throws IOException, JsonGenerationException
-    {
-        len += offset; // -> len marks the end from now on
-        final int[] escCodes = _outputEscapes;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-
-        int escCode = 0;
-        
-        while (offset < len) {
-            int start = offset;
-            char c;
-            
-            while (true) {
-                c = text[offset];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break;
-                }
-                if (++offset >= len) {
-                    break;
-                }
-            }
-
-            // Short span? Better just copy it to buffer first:
-            int newAmount = offset - start;
-            if (newAmount < SHORT_WRITE) {
-                // Note: let's reserve room for escaped char (up to 6 chars)
-                if ((_outputTail + newAmount) > _outputEnd) {
-                    _flushBuffer();
-                }
-                if (newAmount > 0) {
-                    System.arraycopy(text, start, _outputBuffer, _outputTail, newAmount);
-                    _outputTail += newAmount;
-                }
-            } else { // Nope: better just write through
-                _flushBuffer();
-                _writer.write(text, start, newAmount);
-            }
-            // Was this the end?
-            if (offset >= len) { // yup
-                break;
-            }
-            // Nope, need to escape the char.
-            ++offset;
-            _appendCharacterEscape(c, escCode);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, text segment
-    /* with custom escaping (possibly coupling with ASCII limits)
-    /**********************************************************
-     */
-
-    /* Same as "_writeString2()", except needs additional escaping
-     * for subset of characters
-     */
-    private void _writeStringCustom(final int len)
-        throws IOException, JsonGenerationException
-    {
-        // And then we'll need to verify need for escaping etc:
-        int end = _outputTail + len;
-        final int[] escCodes = _outputEscapes;
-        final int maxNonEscaped = (_maximumNonEscapedChar < 1) ? 0xFFFF : _maximumNonEscapedChar;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-        int escCode = 0;
-        final CharacterEscapes customEscapes = _characterEscapes;
-
-        output_loop:
-        while (_outputTail < end) {
-            char c;
-            // Fast loop for chars not needing escaping
-            escape_loop:
-            while (true) {
-                c = _outputBuffer[_outputTail];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break escape_loop;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break escape_loop;
-                } else {
-                    if ((_currentEscape = customEscapes.getEscapeSequence(c)) != null) {
-                        escCode = CharacterEscapes.ESCAPE_CUSTOM;
-                        break escape_loop;
-                    }
-                }
-                if (++_outputTail >= end) {
-                    break output_loop;
-                }
-            }
-            int flushLen = (_outputTail - _outputHead);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, _outputHead, flushLen);
-            }
-            ++_outputTail;
-            _prependOrWriteCharacterEscape(c, escCode);
-        }
-    }
-
-    private void _writeSegmentCustom(int end)
-        throws IOException, JsonGenerationException
-    {
-        final int[] escCodes = _outputEscapes;
-        final int maxNonEscaped = (_maximumNonEscapedChar < 1) ? 0xFFFF : _maximumNonEscapedChar;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-        final CharacterEscapes customEscapes = _characterEscapes;
-    
-        int ptr = 0;
-        int escCode = 0;
-        int start = ptr;
-    
-        output_loop:
-        while (ptr < end) {
-            // Fast loop for chars not needing escaping
-            char c;
-            while (true) {
-                c = _outputBuffer[ptr];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break;
-                } else {
-                    if ((_currentEscape = customEscapes.getEscapeSequence(c)) != null) {
-                        escCode = CharacterEscapes.ESCAPE_CUSTOM;
-                        break;
-                    }
-                }
-                if (++ptr >= end) {
-                    break;
-                }
-            }
-            int flushLen = (ptr - start);
-            if (flushLen > 0) {
-                _writer.write(_outputBuffer, start, flushLen);
-                if (ptr >= end) {
-                    break output_loop;
-                }
-            }
-            ++ptr;
-            start = _prependOrWriteCharacterEscape(_outputBuffer, ptr, end, c, escCode);
-        }
-    }
-
-    private void _writeStringCustom(char[] text, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        len += offset; // -> len marks the end from now on
-        final int[] escCodes = _outputEscapes;
-        final int maxNonEscaped = (_maximumNonEscapedChar < 1) ? 0xFFFF : _maximumNonEscapedChar;
-        final int escLimit = Math.min(escCodes.length, maxNonEscaped+1);
-        final CharacterEscapes customEscapes = _characterEscapes;
-
-        int escCode = 0;
-        
-        while (offset < len) {
-            int start = offset;
-            char c;
-            
-            while (true) {
-                c = text[offset];
-                if (c < escLimit) {
-                    escCode = escCodes[c];
-                    if (escCode != 0) {
-                        break;
-                    }
-                } else if (c > maxNonEscaped) {
-                    escCode = CharacterEscapes.ESCAPE_STANDARD;
-                    break;
-                } else {
-                    if ((_currentEscape = customEscapes.getEscapeSequence(c)) != null) {
-                        escCode = CharacterEscapes.ESCAPE_CUSTOM;
-                        break;
-                    }
-                }
-                if (++offset >= len) {
-                    break;
-                }
-            }
-    
-            // Short span? Better just copy it to buffer first:
-            int newAmount = offset - start;
-            if (newAmount < SHORT_WRITE) {
-                // Note: let's reserve room for escaped char (up to 6 chars)
-                if ((_outputTail + newAmount) > _outputEnd) {
-                    _flushBuffer();
-                }
-                if (newAmount > 0) {
-                    System.arraycopy(text, start, _outputBuffer, _outputTail, newAmount);
-                    _outputTail += newAmount;
-                }
-            } else { // Nope: better just write through
-                _flushBuffer();
-                _writer.write(text, start, newAmount);
-            }
-            // Was this the end?
-            if (offset >= len) { // yup
-                break;
-            }
-            // Nope, need to escape the char.
-            ++offset;
-            _appendCharacterEscape(c, escCode);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing; binary
-    /**********************************************************
-     */
-    
-    protected void _writeBinary(Base64Variant b64variant, byte[] input, int inputPtr, final int inputEnd)
-        throws IOException, JsonGenerationException
-    {
-        // Encoding is by chunks of 3 input, 4 output chars, so:
-        int safeInputEnd = inputEnd - 3;
-        // Let's also reserve room for possible (and quoted) lf char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        // Ok, first we loop through all full triplets of data:
-        while (inputPtr <= safeInputEnd) {
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            // First, mash 3 bytes into lsb of 32-bit int
-            int b24 = ((int) input[inputPtr++]) << 8;
-            b24 |= ((int) input[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) input[inputPtr++]) & 0xFF);
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                // note: must quote in JSON value
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-
-        // And then we may have 1 or 2 leftover bytes to encode
-        int inputLeft = inputEnd - inputPtr; // 0, 1 or 2
-        if (inputLeft > 0) { // yes, but do we have room for output?
-            if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                _flushBuffer();
-            }
-            int b24 = ((int) input[inputPtr++]) << 16;
-            if (inputLeft == 2) {
-                b24 |= (((int) input[inputPtr++]) & 0xFF) << 8;
-            }
-            _outputTail = b64variant.encodeBase64Partial(b24, inputLeft, _outputBuffer, _outputTail);
-        }
-    }
-
-    // write-method called when length is definitely known
-    protected int _writeBinary(Base64Variant b64variant,
-            InputStream data, byte[] readBuffer, int bytesLeft)
-        throws IOException, JsonGenerationException
-    {
-        int inputPtr = 0;
-        int inputEnd = 0;
-        int lastFullOffset = -3;       
-        
-        // Let's also reserve room for possible (and quoted) lf char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        while (bytesLeft > 2) { // main loop for full triplets
-            if (inputPtr > lastFullOffset) {
-                inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, bytesLeft);
-                inputPtr = 0;
-                if (inputEnd < 3) { // required to try to read to have at least 3 bytes
-                    break;
-                }
-                lastFullOffset = inputEnd-3;
-            }
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            int b24 = ((int) readBuffer[inputPtr++]) << 8;
-            b24 |= ((int) readBuffer[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) readBuffer[inputPtr++]) & 0xFF);
-            bytesLeft -= 3;
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-        
-        // And then we may have 1 or 2 leftover bytes to encode
-        if (bytesLeft > 0) {
-            inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, bytesLeft);
-            inputPtr = 0;
-            if (inputEnd > 0) { // yes, but do we have room for output?
-                if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                    _flushBuffer();
-                }
-                int b24 = ((int) readBuffer[inputPtr++]) << 16;
-                int amount;
-                if (inputPtr < inputEnd) {
-                    b24 |= (((int) readBuffer[inputPtr]) & 0xFF) << 8;
-                    amount = 2;
-                } else {
-                    amount = 1;
-                }
-                _outputTail = b64variant.encodeBase64Partial(b24, amount, _outputBuffer, _outputTail);
-                bytesLeft -= amount;
-            }
-        }
-        return bytesLeft;
-    }
-    
-    // write method when length is unknown
-    protected int _writeBinary(Base64Variant b64variant,
-            InputStream data, byte[] readBuffer)
-        throws IOException, JsonGenerationException
-    {
-        int inputPtr = 0;
-        int inputEnd = 0;
-        int lastFullOffset = -3;
-        int bytesDone = 0;
-        
-        // Let's also reserve room for possible (and quoted) LF char each round
-        int safeOutputEnd = _outputEnd - 6;
-        int chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-
-        // Ok, first we loop through all full triplets of data:
-        while (true) {
-            if (inputPtr > lastFullOffset) { // need to load more
-                inputEnd = _readMore(data, readBuffer, inputPtr, inputEnd, readBuffer.length);
-                inputPtr = 0;
-                if (inputEnd < 3) { // required to try to read to have at least 3 bytes
-                    break;
-                }
-                lastFullOffset = inputEnd-3;
-            }
-            if (_outputTail > safeOutputEnd) { // need to flush
-                _flushBuffer();
-            }
-            // First, mash 3 bytes into lsb of 32-bit int
-            int b24 = ((int) readBuffer[inputPtr++]) << 8;
-            b24 |= ((int) readBuffer[inputPtr++]) & 0xFF;
-            b24 = (b24 << 8) | (((int) readBuffer[inputPtr++]) & 0xFF);
-            bytesDone += 3;
-            _outputTail = b64variant.encodeBase64Chunk(b24, _outputBuffer, _outputTail);
-            if (--chunksBeforeLF <= 0) {
-                _outputBuffer[_outputTail++] = '\\';
-                _outputBuffer[_outputTail++] = 'n';
-                chunksBeforeLF = b64variant.getMaxLineLength() >> 2;
-            }
-        }
-
-        // And then we may have 1 or 2 leftover bytes to encode
-        if (inputPtr < inputEnd) { // yes, but do we have room for output?
-            if (_outputTail > safeOutputEnd) { // don't really need 6 bytes but...
-                _flushBuffer();
-            }
-            int b24 = ((int) readBuffer[inputPtr++]) << 16;
-            int amount = 1;
-            if (inputPtr < inputEnd) {
-                b24 |= (((int) readBuffer[inputPtr]) & 0xFF) << 8;
-                amount = 2;
-            }
-            bytesDone += amount;
-            _outputTail = b64variant.encodeBase64Partial(b24, amount, _outputBuffer, _outputTail);
-        }
-        return bytesDone;
-    }
-    
-    private int _readMore(InputStream in,
-            byte[] readBuffer, int inputPtr, int inputEnd,
-            int maxRead) throws IOException
-    {
-        // anything to shift to front?
-        int i = 0;
-        while (inputPtr < inputEnd) {
-            readBuffer[i++]  = readBuffer[inputPtr++];
-        }
-        inputPtr = 0;
-        inputEnd = i;
-        maxRead = Math.min(maxRead, readBuffer.length);
-        
-        do {
-            int count = in.read(readBuffer, inputEnd, maxRead - inputEnd);
-            if (count < 0) {
-                return inputEnd;
-            }
-            inputEnd += count;
-        } while (inputEnd < 3);
-        return inputEnd;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, other
-    /**********************************************************
-     */
-    
-    private void _writeNull() throws IOException
-    {
-        if ((_outputTail + 4) >= _outputEnd) {
-            _flushBuffer();
-        }
-        int ptr = _outputTail;
-        char[] buf = _outputBuffer;
-        buf[ptr] = 'n';
-        buf[++ptr] = 'u';
-        buf[++ptr] = 'l';
-        buf[++ptr] = 'l';
-        _outputTail = ptr+1;
-    }
-        
-    /*
-    /**********************************************************
-    /* Internal methods, low-level writing, escapes
-    /**********************************************************
-     */
-
-    /**
-     * Method called to try to either prepend character escape at front of
-     * given buffer; or if not possible, to write it out directly.
-     * Uses head and tail pointers (and updates as necessary)
-     */
-    private void _prependOrWriteCharacterEscape(char ch, int escCode)
-        throws IOException, JsonGenerationException
-    {
-        if (escCode >= 0) { // \\N (2 char)
-            if (_outputTail >= 2) { // fits, just prepend
-                int ptr = _outputTail - 2;
-                _outputHead = ptr;
-                _outputBuffer[ptr++] = '\\';
-                _outputBuffer[ptr] = (char) escCode;
-                return;
-            }
-            // won't fit, write
-            char[] buf = _entityBuffer;
-            if (buf == null) {
-                buf = _allocateEntityBuffer();
-            }
-            _outputHead = _outputTail;
-            buf[1] = (char) escCode;
-            _writer.write(buf, 0, 2);
-            return;
-        }
-        if (escCode != CharacterEscapes.ESCAPE_CUSTOM) { // std, \\uXXXX
-            if (_outputTail >= 6) { // fits, prepend to buffer
-                char[] buf = _outputBuffer;
-                int ptr = _outputTail - 6;
-                _outputHead = ptr;
-                buf[ptr] = '\\';
-                buf[++ptr] = 'u';
-                // We know it's a control char, so only the last 2 chars are non-0
-                if (ch > 0xFF) { // beyond 8 bytes
-                    int hi = (ch >> 8) & 0xFF;
-                    buf[++ptr] = HEX_CHARS[hi >> 4];
-                    buf[++ptr] = HEX_CHARS[hi & 0xF];
-                    ch &= 0xFF;
-                } else {
-                    buf[++ptr] = '0';
-                    buf[++ptr] = '0';
-                }
-                buf[++ptr] = HEX_CHARS[ch >> 4];
-                buf[++ptr] = HEX_CHARS[ch & 0xF];
-                return;
-            }
-            // won't fit, flush and write
-            char[] buf = _entityBuffer;
-            if (buf == null) {
-                buf = _allocateEntityBuffer();
-            }
-            _outputHead = _outputTail;
-            if (ch > 0xFF) { // beyond 8 bytes
-                int hi = (ch >> 8) & 0xFF;
-                int lo = ch & 0xFF;
-                buf[10] = HEX_CHARS[hi >> 4];
-                buf[11] = HEX_CHARS[hi & 0xF];
-                buf[12] = HEX_CHARS[lo >> 4];
-                buf[13] = HEX_CHARS[lo & 0xF];
-                _writer.write(buf, 8, 6);
-            } else { // We know it's a control char, so only the last 2 chars are non-0
-                buf[6] = HEX_CHARS[ch >> 4];
-                buf[7] = HEX_CHARS[ch & 0xF];
-                _writer.write(buf, 2, 6);
-            }
-            return;
-        }
-        String escape;
-
-        if (_currentEscape == null) {
-            escape = _characterEscapes.getEscapeSequence(ch).getValue();
-        } else {
-            escape = _currentEscape.getValue();
-            _currentEscape = null;
-        }
-        int len = escape.length();
-        if (_outputTail >= len) { // fits in, prepend
-            int ptr = _outputTail - len;
-            _outputHead = ptr;
-            escape.getChars(0, len, _outputBuffer, ptr);
-            return;
-        }
-        // won't fit, write separately
-        _outputHead = _outputTail;
-        _writer.write(escape);
-    }
-
-    /**
-     * Method called to try to either prepend character escape at front of
-     * given buffer; or if not possible, to write it out directly.
-     * 
-     * @return Pointer to start of prepended entity (if prepended); or 'ptr'
-     *   if not.
-     */
-    private int _prependOrWriteCharacterEscape(char[] buffer, int ptr, int end,
-            char ch, int escCode)
-        throws IOException, JsonGenerationException
-    {
-        if (escCode >= 0) { // \\N (2 char)
-            if (ptr > 1 && ptr < end) { // fits, just prepend
-                ptr -= 2;
-                buffer[ptr] = '\\';
-                buffer[ptr+1] = (char) escCode;
-            } else { // won't fit, write
-                char[] ent = _entityBuffer;
-                if (ent == null) {
-                    ent = _allocateEntityBuffer();
-                }
-                ent[1] = (char) escCode;
-                _writer.write(ent, 0, 2);
-            }
-            return ptr;
-        }
-        if (escCode != CharacterEscapes.ESCAPE_CUSTOM) { // std, \\uXXXX
-            if (ptr > 5 && ptr < end) { // fits, prepend to buffer
-                ptr -= 6;
-                buffer[ptr++] = '\\';
-                buffer[ptr++] = 'u';
-                // We know it's a control char, so only the last 2 chars are non-0
-                if (ch > 0xFF) { // beyond 8 bytes
-                    int hi = (ch >> 8) & 0xFF;
-                    buffer[ptr++] = HEX_CHARS[hi >> 4];
-                    buffer[ptr++] = HEX_CHARS[hi & 0xF];
-                    ch &= 0xFF;
-                } else {
-                    buffer[ptr++] = '0';
-                    buffer[ptr++] = '0';
-                }
-                buffer[ptr++] = HEX_CHARS[ch >> 4];
-                buffer[ptr] = HEX_CHARS[ch & 0xF];
-                ptr -= 5;
-            } else {
-                // won't fit, flush and write
-                char[] ent = _entityBuffer;
-                if (ent == null) {
-                    ent = _allocateEntityBuffer();
-                }
-                _outputHead = _outputTail;
-                if (ch > 0xFF) { // beyond 8 bytes
-                    int hi = (ch >> 8) & 0xFF;
-                    int lo = ch & 0xFF;
-                    ent[10] = HEX_CHARS[hi >> 4];
-                    ent[11] = HEX_CHARS[hi & 0xF];
-                    ent[12] = HEX_CHARS[lo >> 4];
-                    ent[13] = HEX_CHARS[lo & 0xF];
-                    _writer.write(ent, 8, 6);
-                } else { // We know it's a control char, so only the last 2 chars are non-0
-                    ent[6] = HEX_CHARS[ch >> 4];
-                    ent[7] = HEX_CHARS[ch & 0xF];
-                    _writer.write(ent, 2, 6);
-                }
-            }
-            return ptr;
-        }
-        String escape;
-        if (_currentEscape == null) {
-            escape = _characterEscapes.getEscapeSequence(ch).getValue();
-        } else {
-            escape = _currentEscape.getValue();
-            _currentEscape = null;
-        }
-        int len = escape.length();
-        if (ptr >= len && ptr < end) { // fits in, prepend
-            ptr -= len;
-            escape.getChars(0, len, buffer, ptr);
-        } else { // won't fit, write separately
-            _writer.write(escape);
-        }
-        return ptr;
-    }
-
-    /**
-     * Method called to append escape sequence for given character, at the
-     * end of standard output buffer; or if not possible, write out directly.
-     */
-    private void _appendCharacterEscape(char ch, int escCode)
-        throws IOException, JsonGenerationException
-    {
-        if (escCode >= 0) { // \\N (2 char)
-            if ((_outputTail + 2) > _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = '\\';
-            _outputBuffer[_outputTail++] = (char) escCode;
-            return;
-        }
-        if (escCode != CharacterEscapes.ESCAPE_CUSTOM) { // std, \\uXXXX
-            if ((_outputTail + 2) > _outputEnd) {
-                _flushBuffer();
-            }
-            int ptr = _outputTail;
-            char[] buf = _outputBuffer;
-            buf[ptr++] = '\\';
-            buf[ptr++] = 'u';
-            // We know it's a control char, so only the last 2 chars are non-0
-            if (ch > 0xFF) { // beyond 8 bytes
-                int hi = (ch >> 8) & 0xFF;
-                buf[ptr++] = HEX_CHARS[hi >> 4];
-                buf[ptr++] = HEX_CHARS[hi & 0xF];
-                ch &= 0xFF;
-            } else {
-                buf[ptr++] = '0';
-                buf[ptr++] = '0';
-            }
-            buf[ptr++] = HEX_CHARS[ch >> 4];
-            buf[ptr] = HEX_CHARS[ch & 0xF];
-            _outputTail = ptr;
-            return;
-        }
-        String escape;
-        if (_currentEscape == null) {
-            escape = _characterEscapes.getEscapeSequence(ch).getValue();
-        } else {
-            escape = _currentEscape.getValue();
-            _currentEscape = null;
-        }
-        int len = escape.length();
-        if ((_outputTail + len) > _outputEnd) {
-            _flushBuffer();
-            if (len > _outputEnd) { // very very long escape; unlikely but theoretically possible
-                _writer.write(escape);
-                return;
-            }
-        }
-        escape.getChars(0, len, _outputBuffer, _outputTail);
-        _outputTail += len;
-    }
-    
-    private char[] _allocateEntityBuffer()
-    {
-        char[] buf = new char[14];
-        // first 2 chars, non-numeric escapes (like \n)
-        buf[0] = '\\';
-        // next 6; 8-bit escapes (control chars mostly)
-        buf[2] = '\\';
-        buf[3] = 'u';
-        buf[4] = '0';
-        buf[5] = '0';
-        // last 6, beyond 8 bits
-        buf[8] = '\\';
-        buf[9] = 'u';
-        _entityBuffer = buf;
-        return buf;
-    }
-    
-    protected void _flushBuffer() throws IOException
-    {
-        int len = _outputTail - _outputHead;
-        if (len > 0) {
-            int offset = _outputHead;
-            _outputTail = _outputHead = 0;
-            _writer.write(_outputBuffer, offset, len);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/json/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/json/package-info.java
deleted file mode 100644
index 7657a3f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/json/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * JSON-specific parser and generator implementation classes that
- * Jackson defines and uses.
- * Application code should not (need to) use contents of this package;
- * nor are these implementations likely to be of use for sub-classing.
- */
-package com.fasterxml.jackson.core.json;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/package-info.java
deleted file mode 100644
index d30c4fb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Main public API classes of the core streaming JSON
- * processor: most importantly {@link com.fasterxml.jackson.core.JsonFactory}
- * used for constructing
- * JSON parser ({@link com.fasterxml.jackson.core.JsonParser})
- * and generator
- * ({@link com.fasterxml.jackson.core.JsonParser})
- * instances.
- * <p>
- * Public API of the higher-level mapping interfaces ("Mapping API")
- * is found from the "jackson-databind" bundle, except for following
- * base interfaces that are defined here:
- * <ul>
- *<li>{@link com.fasterxml.jackson.core.TreeNode} is included
- *within Streaming API to support integration of the Tree Model
- *(which is based on <code>JsonNode</code>) with the basic
- *parsers and generators (iff using mapping-supporting factory: which
- *is part of Mapping API, not core)
- *  </li>
- *<li>{@link com.fasterxml.jackson.core.ObjectCodec} is included so that
- *  reference to the object capable of serializing/deserializing
- *  Objects to/from JSON (usually, <code>com.fasterxml.jackson.databind.ObjectMapper</code>)
- *  can be exposed, without adding direct dependency to implementation.
- *  </li>
- *</ul>
- */
-
-package com.fasterxml.jackson.core;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer.java
deleted file mode 100644
index 8695cc3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer.java
+++ /dev/null
@@ -1,1208 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.fasterxml.jackson.core.util.InternCache;
-
-/**
- * A caching symbol table implementation used for canonicalizing JSON field
- * names (as {@link Name}s which are constructed directly from a byte-based
- * input source).
- * Complications arise from trying to do efficient reuse and merging of
- * symbol tables, to be able to make use of usually shared vocabulary
- * of subsequent parsing runs.
- *
- * @author Tatu Saloranta
- */
-public final class BytesToNameCanonicalizer
-{
-    protected static final int DEFAULT_TABLE_SIZE = 64;
-
-    /**
-     * Let's not expand symbol tables past some maximum size;
-     * this should protected against OOMEs caused by large documents
-     * with unique (~= random) names.
-     */
-    protected static final int MAX_TABLE_SIZE = 0x10000; // 64k entries == 256k mem
-    
-    /**
-     * Let's only share reasonably sized symbol tables. Max size set to 3/4 of 16k;
-     * this corresponds to 64k main hash index. This should allow for enough distinct
-     * names for almost any case.
-     */
-    final static int MAX_ENTRIES_FOR_REUSE = 6000;
-
-    /**
-     * Also: to thwart attacks based on hash collisions (which may or may not
-     * be cheap to calculate), we will need to detect "too long"
-     * collision chains. Let's start with static value of 255 entries
-     * for the longest legal chain.
-     *<p>
-     * Note: longest chain we have been able to produce without malicious
-     * intent has been 60 (with "com.fasterxml.jackson.core.main.TestWithTonsaSymbols");
-     * our setting should be reasonable here.
-     * 
-     * @since 2.1
-     */
-    final static int MAX_COLL_CHAIN_LENGTH = 255;
-
-    /**
-     * And to support reduce likelihood of accidental collisions causing
-     * exceptions, let's prevent reuse of tables with long collision
-     * overflow lists as well.
-     * 
-     * @since 2.1
-     */
-    final static int MAX_COLL_CHAIN_FOR_REUSE  = 63;
-
-    /**
-     * No point in trying to construct tiny tables, just need to resize
-     * soon.
-     */
-    final static int MIN_HASH_SIZE = 16;
-
-    /**
-     * We will also need to defin
-     */
-    final static int INITIAL_COLLISION_LEN = 32;
-
-    /**
-     * Bucket index is 8 bits, and value 0 is reserved to represent
-     * 'empty' status.
-     */
-    final static int LAST_VALID_BUCKET = 0xFE;
-    
-    /*
-    /**********************************************************
-    /* Linkage, needed for merging symbol tables
-    /**********************************************************
-     */
-
-    /**
-     * Reference to the root symbol table, for child tables, so
-     * that they can merge table information back as necessary.
-     */
-    final protected BytesToNameCanonicalizer _parent;
-
-    /**
-     * Member that is only used by the root table instance: root
-     * passes immutable state into child instances, and children
-     * may return new state if they add entries to the table.
-     * Child tables do NOT use the reference.
-     */
-    final protected AtomicReference<TableInfo> _tableInfo;
-    
-    /**
-     * Seed value we use as the base to make hash codes non-static between
-     * different runs, but still stable for lifetime of a single symbol table
-     * instance.
-     * This is done for security reasons, to avoid potential DoS attack via
-     * hash collisions.
-     * 
-     * @since 2.1
-     */
-    final private int _hashSeed;
-    
-    /*
-    /**********************************************************
-    /* Main table state
-    /**********************************************************
-     */
-
-    /**
-     * Whether canonical symbol Strings are to be intern()ed before added
-     * to the table or not
-     */
-    protected final boolean _intern;
-    
-    // // // First, global information
-
-    /**
-     * Total number of Names in the symbol table;
-     * only used for child tables.
-     */
-    protected int _count;
-
-    /**
-     * We need to keep track of the longest collision list; this is needed
-     * both to indicate problems with attacks and to allow flushing for
-     * other cases.
-     * 
-     * @since 2.1
-     */
-    protected int _longestCollisionList;
-    
-    // // // Then information regarding primary hash array and its
-    // // // matching Name array
-
-    /**
-     * Mask used to truncate 32-bit hash value to current hash array
-     * size; essentially, hash array size - 1 (since hash array sizes
-     * are 2^N).
-     */
-    protected int _mainHashMask;
-
-    /**
-     * Array of 2^N size, which contains combination
-     * of 24-bits of hash (0 to indicate 'empty' slot),
-     * and 8-bit collision bucket index (0 to indicate empty
-     * collision bucket chain; otherwise subtract one from index)
-     */
-    protected int[] _mainHash;
-
-    /**
-     * Array that contains <code>Name</code> instances matching
-     * entries in <code>_mainHash</code>. Contains nulls for unused
-     * entries.
-     */
-    protected Name[] _mainNames;
-
-    // // // Then the collision/spill-over area info
-
-    /**
-     * Array of heads of collision bucket chains; size dynamically
-     */
-    protected Bucket[] _collList;
-
-    /**
-     * Total number of Names in collision buckets (included in
-     * <code>_count</code> along with primary entries)
-     */
-    protected int _collCount;
-
-    /**
-     * Index of the first unused collision bucket entry (== size of
-     * the used portion of collision list): less than
-     * or equal to 0xFF (255), since max number of entries is 255
-     * (8-bit, minus 0 used as 'empty' marker)
-     */
-    protected int _collEnd;
-
-    // // // Info regarding pending rehashing...
-
-    /**
-     * This flag is set if, after adding a new entry, it is deemed
-     * that a rehash is warranted if any more entries are to be added.
-     */
-    private transient boolean _needRehash;
-
-    /*
-    /**********************************************************
-    /* Sharing, versioning
-    /**********************************************************
-     */
-
-    // // // Which of the buffers may be shared (and are copy-on-write)?
-
-    /**
-     * Flag that indicates whether underlying data structures for
-     * the main hash area are shared or not. If they are, then they
-     * need to be handled in copy-on-write way, i.e. if they need
-     * to be modified, a copy needs to be made first; at this point
-     * it will not be shared any more, and can be modified.
-     *<p>
-     * This flag needs to be checked both when adding new main entries,
-     * and when adding new collision list queues (i.e. creating a new
-     * collision list head entry)
-     */
-    private boolean _mainHashShared;
-
-    private boolean _mainNamesShared;
-
-    /**
-     * Flag that indicates whether underlying data structures for
-     * the collision list are shared or not. If they are, then they
-     * need to be handled in copy-on-write way, i.e. if they need
-     * to be modified, a copy needs to be made first; at this point
-     * it will not be shared any more, and can be modified.
-     *<p>
-     * This flag needs to be checked when adding new collision entries.
-     */
-    private boolean _collListShared;
-
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used for creating per-<code>JsonFactory</code> "root"
-     * symbol tables: ones used for merging and sharing common symbols
-     * 
-     * @param hashSize Initial hash area size
-     * @param intern Whether Strings contained should be {@link String#intern}ed
-     * @param seed Random seed valued used to make it more difficult to cause
-     *   collisions (used for collision-based DoS attacks).
-     */
-    private BytesToNameCanonicalizer(int hashSize, boolean intern, int seed)
-    {
-        _parent = null;
-        _hashSeed = seed;
-        _intern = intern;
-        // Sanity check: let's now allow hash sizes below certain minimum value
-        if (hashSize < MIN_HASH_SIZE) {
-            hashSize = MIN_HASH_SIZE;
-        } else {
-            /* Also; size must be 2^N; otherwise hash algorithm won't
-             * work... so let's just pad it up, if so
-             */
-            if ((hashSize & (hashSize - 1)) != 0) { // only true if it's 2^N
-                int curr = MIN_HASH_SIZE;
-                while (curr < hashSize) {
-                    curr += curr;
-                }
-                hashSize = curr;
-            }
-        }
-        _tableInfo = new AtomicReference<TableInfo>(initTableInfo(hashSize));
-    }
-
-    /**
-     * Constructor used when creating a child instance
-     */
-    private BytesToNameCanonicalizer(BytesToNameCanonicalizer parent, boolean intern, int seed,
-            TableInfo state)
-    {
-        _parent = parent;
-        _hashSeed = seed;
-        _intern = intern;
-        _tableInfo = null; // not used by child tables
-
-        // Then copy shared state
-        _count = state.count;
-        _mainHashMask = state.mainHashMask;
-        _mainHash = state.mainHash;
-        _mainNames = state.mainNames;
-        _collList = state.collList;
-        _collCount = state.collCount;
-        _collEnd = state.collEnd;
-        _longestCollisionList = state.longestCollisionList;
-
-        // and then set other state to reflect sharing status
-        _needRehash = false;
-        _mainHashShared = true;
-        _mainNamesShared = true;
-        _collListShared = true;
-    }
-
-    /*
-        public TableInfo(int count, int mainHashMask, int[] mainHash, Name[] mainNames,
-                Bucket[] collList, int collCount, int collEnd, int longestCollisionList)
-     */
-    private TableInfo initTableInfo(int hashSize)
-    {
-        return new TableInfo(0, // count
-                hashSize - 1, // mainHashMask
-                new int[hashSize], // mainHash
-                new Name[hashSize], // mainNames
-                null, // collList
-                0, // collCount,
-                0, // collEnd
-                0 // longestCollisionList
-        );
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: factory methods, merging
-    /**********************************************************
-     */
-    
-    /**
-     * Factory method to call to create a symbol table instance with a
-     * randomized seed value.
-     */
-    public static BytesToNameCanonicalizer createRoot()
-    {
-        /* [Issue-21]: Need to use a variable seed, to thwart hash-collision
-         * based attacks.
-         */
-        long now = System.currentTimeMillis();
-        // ensure it's not 0; and might as well require to be odd so:
-        int seed = (((int) now) + ((int) (now >>> 32))) | 1;
-        return createRoot(seed);
-    }
-
-    /**
-     * Factory method that should only be called from unit tests, where seed
-     * value should remain the same.
-     */
-    protected static BytesToNameCanonicalizer createRoot(int hashSeed) {
-        return new BytesToNameCanonicalizer(DEFAULT_TABLE_SIZE, true, hashSeed);
-    }
-    
-    /**
-     * Factory method used to create actual symbol table instance to
-     * use for parsing.
-     * 
-     * @param intern Whether canonical symbol Strings should be interned
-     *   or not
-     */
-    public BytesToNameCanonicalizer makeChild(boolean canonicalize,
-        boolean intern)
-    {
-        return new BytesToNameCanonicalizer(this, intern, _hashSeed, _tableInfo.get());
-    }
-
-    /**
-     * Method called by the using code to indicate it is done
-     * with this instance. This lets instance merge accumulated
-     * changes into parent (if need be), safely and efficiently,
-     * and without calling code having to know about parent
-     * information
-     */
-    public void release()
-    {
-        // we will try to merge if child table has new entries
-        if (_parent != null && maybeDirty()) {
-            _parent.mergeChild(new TableInfo(this));
-            /* Let's also mark this instance as dirty, so that just in
-             * case release was too early, there's no corruption of possibly shared data.
-             */
-            _mainHashShared = true;
-            _mainNamesShared = true;
-            _collListShared = true;
-        }
-    }
-
-    private void mergeChild(TableInfo childState)
-    {
-        final int childCount = childState.count;
-        TableInfo currState = _tableInfo.get();
-        
-        // Only makes sense if child actually has more entries
-        if (childCount <= currState.count) {
-            return;
-        }
-
-        /* One caveat: let's try to avoid problems with
-         * degenerate cases of documents with generated "random"
-         * names: for these, symbol tables would bloat indefinitely.
-         * One way to do this is to just purge tables if they grow
-         * too large, and that's what we'll do here.
-         */
-        if (childCount > MAX_ENTRIES_FOR_REUSE
-                || childState.longestCollisionList > MAX_COLL_CHAIN_FOR_REUSE) {
-            /* Should there be a way to get notified about this
-             * event, to log it or such? (as it's somewhat abnormal
-             * thing to happen)
-             */
-            // At any rate, need to clean up the tables
-            childState = initTableInfo(DEFAULT_TABLE_SIZE);
-        }
-        _tableInfo.compareAndSet(currState, childState);
-    }
-
-    /*
-    /**********************************************************
-    /* API, accessors
-    /**********************************************************
-     */
-
-    public int size()
-    {
-        if (_tableInfo != null) { // root table
-            return _tableInfo.get().count;
-        }
-        // nope, child table
-        return _count;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public int bucketCount() { return _mainHash.length; }
-    
-    /**
-     * Method called to check to quickly see if a child symbol table
-     * may have gotten additional entries. Used for checking to see
-     * if a child table should be merged into shared table.
-     */
-    public boolean maybeDirty() {
-        return !_mainHashShared;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public int hashSeed() { return _hashSeed; }
-    
-    /**
-     * Method mostly needed by unit tests; calculates number of
-     * entries that are in collision list. Value can be at most
-     * ({@link #size} - 1), but should usually be much lower, ideally 0.
-     * 
-     * @since 2.1
-     */
-    public int collisionCount() {
-        return _collCount;
-    }
-
-    /**
-     * Method mostly needed by unit tests; calculates length of the
-     * longest collision chain. This should typically be a low number,
-     * but may be up to {@link #size} - 1 in the pathological case
-     * 
-     * @since 2.1
-     */
-    public int maxCollisionLength() {
-        return _longestCollisionList;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, accessing symbols:
-    /**********************************************************
-     */
-    
-    public static Name getEmptyName()
-    {
-        return Name1.getEmptyName();
-    }
-
-    /**
-     * Finds and returns name matching the specified symbol, if such
-     * name already exists in the table.
-     * If not, will return null.
-     *<p>
-     * Note: separate methods to optimize common case of
-     * short element/attribute names (4 or less ascii characters)
-     *
-     * @param firstQuad int32 containing first 4 bytes of the name;
-     *   if the whole name less than 4 bytes, padded with zero bytes
-     *   in front (zero MSBs, ie. right aligned)
-     *
-     * @return Name matching the symbol passed (or constructed for
-     *   it)
-     */
-    public Name findName(int firstQuad)
-    {
-        int hash = calcHash(firstQuad);
-        int ix = (hash & _mainHashMask);
-        int val = _mainHash[ix];
-        
-        /* High 24 bits of the value are low 24 bits of hash (low 8 bits
-         * are bucket index)... match?
-         */
-        if ((((val >> 8) ^ hash) << 8) == 0) { // match
-            // Ok, but do we have an actual match?
-            Name name = _mainNames[ix];
-            if (name == null) { // main slot empty; can't find
-                return null;
-            }
-            if (name.equals(firstQuad)) {
-                return name;
-            }
-        } else if (val == 0) { // empty slot? no match
-            return null;
-        }
-        // Maybe a spill-over?
-        val &= 0xFF;
-        if (val > 0) { // 0 means 'empty'
-            val -= 1; // to convert from 1-based to 0...
-            Bucket bucket = _collList[val];
-            if (bucket != null) {
-                return bucket.find(hash, firstQuad, 0);
-            }
-        }
-        // Nope, no match whatsoever
-        return null;
-    }
-
-    /**
-     * Finds and returns name matching the specified symbol, if such
-     * name already exists in the table.
-     * If not, will return null.
-     *<p>
-     * Note: separate methods to optimize common case of relatively
-     * short element/attribute names (8 or less ascii characters)
-     *
-     * @param firstQuad int32 containing first 4 bytes of the name.
-     * @param secondQuad int32 containing bytes 5 through 8 of the
-     *   name; if less than 8 bytes, padded with up to 3 zero bytes
-     *   in front (zero MSBs, ie. right aligned)
-     *
-     * @return Name matching the symbol passed (or constructed for it)
-     */
-    public Name findName(int firstQuad, int secondQuad)
-    {
-        int hash = (secondQuad == 0) ? calcHash(firstQuad) : calcHash(firstQuad, secondQuad);
-        int ix = (hash & _mainHashMask);
-        int val = _mainHash[ix];
-        
-        /* High 24 bits of the value are low 24 bits of hash (low 8 bits
-         * are bucket index)... match?
-         */
-        if ((((val >> 8) ^ hash) << 8) == 0) { // match
-            // Ok, but do we have an actual match?
-            Name name = _mainNames[ix];
-            if (name == null) { // main slot empty; can't find
-                return null;
-            }
-            if (name.equals(firstQuad, secondQuad)) {
-                return name;
-            }
-        } else if (val == 0) { // empty slot? no match
-            return null;
-        }
-        // Maybe a spill-over?
-        val &= 0xFF;
-        if (val > 0) { // 0 means 'empty'
-            val -= 1; // to convert from 1-based to 0...
-            Bucket bucket = _collList[val];
-            if (bucket != null) {
-                return bucket.find(hash, firstQuad, secondQuad);
-            }
-        }
-        // Nope, no match whatsoever
-        return null;
-    }
-
-    /**
-     * Finds and returns name matching the specified symbol, if such
-     * name already exists in the table; or if not, creates name object,
-     * adds to the table, and returns it.
-     *<p>
-     * Note: this is the general purpose method that can be called for
-     * names of any length. However, if name is less than 9 bytes long,
-     * it is preferable to call the version optimized for short
-     * names.
-     *
-     * @param quads Array of int32s, each of which contain 4 bytes of
-     *   encoded name
-     * @param qlen Number of int32s, starting from index 0, in quads
-     *   parameter
-     *
-     * @return Name matching the symbol passed (or constructed for it)
-     */
-    public Name findName(int[] quads, int qlen)
-    {
-        if (qlen < 3) { // another sanity check
-            return findName(quads[0], (qlen < 2) ? 0 : quads[1]);
-        }
-        int hash = calcHash(quads, qlen);
-        // (for rest of comments regarding logic, see method above)
-        int ix = (hash & _mainHashMask);
-        int val = _mainHash[ix];
-        if ((((val >> 8) ^ hash) << 8) == 0) {
-            Name name = _mainNames[ix];
-            if (name == null // main slot empty; no collision list then either
-                || name.equals(quads, qlen)) { // should be match, let's verify
-                return name;
-            }
-        } else if (val == 0) { // empty slot? no match
-            return null;
-        }
-        val &= 0xFF;
-        if (val > 0) { // 0 means 'empty'
-            val -= 1; // to convert from 1-based to 0...
-            Bucket bucket = _collList[val];
-            if (bucket != null) {
-                return bucket.find(hash, quads, qlen);
-            }
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* API, mutators
-    /**********************************************************
-     */
-
-    public Name addName(String symbolStr, int q1, int q2)
-    {
-        if (_intern) {
-            symbolStr = InternCache.instance.intern(symbolStr);
-        }
-        int hash = (q2 == 0) ? calcHash(q1) : calcHash(q1, q2);
-        Name symbol = constructName(hash, symbolStr, q1, q2);
-        _addSymbol(hash, symbol);
-        return symbol;
-    }
-    
-    public Name addName(String symbolStr, int[] quads, int qlen)
-    {
-        if (_intern) {
-            symbolStr = InternCache.instance.intern(symbolStr);
-        }
-        int hash;
-        if (qlen < 3) {
-            hash = (qlen == 1) ? calcHash(quads[0]) : calcHash(quads[0], quads[1]);
-        } else {
-            hash = calcHash(quads, qlen);
-        }
-        Name symbol = constructName(hash, symbolStr, quads, qlen);
-        _addSymbol(hash, symbol);
-        return symbol;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /* Note on hash calculation: we try to make it more difficult to
-     * generate collisions automatically; part of this is to avoid
-     * simple "multiply-add" algorithm (like JDK String.hashCode()),
-     * and add bit of shifting. And other part is to make this
-     * non-linear, at least for shorter symbols.
-     */
-    
-    // JDK uses 31; other fine choices are 33 and 65599, let's use 33
-    // as it seems to give fewest collisions for us
-    // (see [http://www.cse.yorku.ca/~oz/hash.html] for details)
-    private final static int MULT = 33;
-    private final static int MULT2 = 65599;
-    private final static int MULT3 = 31;
-    
-    public int calcHash(int firstQuad)
-    {
-        int hash = firstQuad ^ _hashSeed;
-        hash += (hash >>> 15); // to xor hi- and low- 16-bits
-        hash ^= (hash >>> 9); // as well as lowest 2 bytes
-        return hash;
-    }
-
-    public int calcHash(int firstQuad, int secondQuad)
-    {
-        /* For two quads, let's change algorithm a bit, to spice
-         * things up (can do bit more processing anyway)
-         */
-        int hash = firstQuad;
-        hash ^= (hash >>> 15); // try mixing first and second byte pairs first
-        hash += (secondQuad * MULT); // then add second quad
-        hash ^= _hashSeed;
-        hash += (hash >>> 7); // and shuffle some more
-        return hash;
-    }
-
-    public int calcHash(int[] quads, int qlen)
-    {
-        // Note: may be called for qlen < 3; but has at least one int
-        if (qlen < 3) {
-            throw new IllegalArgumentException();
-        }
-
-        /* And then change handling again for "multi-quad" case; mostly
-         * to make calculation of collisions less fun. For example,
-         * add seed bit later in the game, and switch plus/xor around,
-         * use different shift lengths.
-         */
-        int hash = quads[0] ^ _hashSeed;
-        hash += (hash >>> 9);
-        hash *= MULT;
-        hash += quads[1];
-        hash *= MULT2;
-        hash += (hash >>> 15);
-        hash ^= quads[2];
-        hash += (hash >>> 17);
-        
-        for (int i = 3; i < qlen; ++i) {
-            hash = (hash * MULT3) ^ quads[i];
-            // for longer entries, mess a bit in-between too
-            hash += (hash >>> 3);
-            hash ^= (hash << 7);
-        }
-        // and finally shuffle some more once done
-        hash += (hash >>> 15); // to get high-order bits to mix more
-        hash ^= (hash << 9); // as well as lowest 2 bytes
-        return hash;
-    }
-
-    // Method only used by unit tests
-    protected static int[] calcQuads(byte[] wordBytes)
-    {
-        int blen = wordBytes.length;
-        int[] result = new int[(blen + 3) / 4];
-        for (int i = 0; i < blen; ++i) {
-            int x = wordBytes[i] & 0xFF;
-
-            if (++i < blen) {
-                x = (x << 8) | (wordBytes[i] & 0xFF);
-                if (++i < blen) {
-                    x = (x << 8) | (wordBytes[i] & 0xFF);
-                    if (++i < blen) {
-                        x = (x << 8) | (wordBytes[i] & 0xFF);
-                    }
-                }
-            }
-            result[i >> 2] = x;
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    /*
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[BytesToNameCanonicalizer, size: ");
-        sb.append(_count);
-        sb.append('/');
-        sb.append(_mainHash.length);
-        sb.append(", ");
-        sb.append(_collCount);
-        sb.append(" coll; avg length: ");
-
-        // Average length: minimum of 1 for all (1 == primary hit);
-        // and then 1 per each traversal for collisions/buckets
-        //int maxDist = 1;
-        int pathCount = _count;
-        for (int i = 0; i < _collEnd; ++i) {
-            int spillLen = _collList[i].length();
-            for (int j = 1; j <= spillLen; ++j) {
-                pathCount += j;
-            }
-        }
-        double avgLength;
-
-        if (_count == 0) {
-            avgLength = 0.0;
-        } else {
-            avgLength = (double) pathCount / (double) _count;
-        }
-        // let's round up a bit (two 2 decimal places)
-        //avgLength -= (avgLength % 0.01);
-
-        sb.append(avgLength);
-        sb.append(']');
-        return sb.toString();
-    }
-    */
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private void _addSymbol(int hash, Name symbol)
-    {
-        if (_mainHashShared) { // always have to modify main entry
-            unshareMain();
-        }
-        // First, do we need to rehash?
-        if (_needRehash) {
-            rehash();
-        }
-
-        ++_count;
-
-        /* Ok, enough about set up: now we need to find the slot to add
-         * symbol in:
-         */
-        int ix = (hash & _mainHashMask);
-        if (_mainNames[ix] == null) { // primary empty?
-            _mainHash[ix] = (hash << 8);
-            if (_mainNamesShared) {
-                unshareNames();
-            }
-            _mainNames[ix] = symbol;
-        } else { // nope, it's a collision, need to spill over
-            /* How about spill-over area... do we already know the bucket
-             * (is the case if it's not the first collision)
-             */
-            if (_collListShared) {
-                unshareCollision(); // also allocates if list was null
-            }
-            ++_collCount;
-            int entryValue = _mainHash[ix];
-            int bucket = entryValue & 0xFF;
-            if (bucket == 0) { // first spill over?
-                if (_collEnd <= LAST_VALID_BUCKET) { // yup, still unshared bucket
-                    bucket = _collEnd;
-                    ++_collEnd;
-                    // need to expand?
-                    if (bucket >= _collList.length) {
-                        expandCollision();
-                    }
-                } else { // nope, have to share... let's find shortest?
-                    bucket = findBestBucket();
-                }
-                // Need to mark the entry... and the spill index is 1-based
-                _mainHash[ix] = (entryValue & ~0xFF) | (bucket + 1);
-            } else {
-                --bucket; // 1-based index in value
-            }
-            
-            // And then just need to link the new bucket entry in
-            Bucket newB = new Bucket(symbol, _collList[bucket]);
-            _collList[bucket] = newB;
-            // but, be careful wrt attacks
-            _longestCollisionList = Math.max(newB.length(), _longestCollisionList);
-            if (_longestCollisionList > MAX_COLL_CHAIN_LENGTH) {
-                reportTooManyCollisions(MAX_COLL_CHAIN_LENGTH);
-            }
-        }
-
-        /* Ok. Now, do we need a rehash next time? Need to have at least
-         * 50% fill rate no matter what:
-         */
-        {
-            int hashSize = _mainHash.length;
-            if (_count > (hashSize >> 1)) {
-                int hashQuarter = (hashSize >> 2);
-                /* And either strictly above 75% (the usual) or
-                 * just 50%, and collision count >= 25% of total hash size
-                 */
-                if (_count > (hashSize - hashQuarter)) {
-                    _needRehash = true;
-                } else if (_collCount >= hashQuarter) {
-                    _needRehash = true;
-                }
-            }
-        }
-    }
-
-    private void rehash()
-    {
-        _needRehash = false;        
-        // Note: since we'll make copies, no need to unshare, can just mark as such:
-        _mainNamesShared = false;
-
-        /* And then we can first deal with the main hash area. Since we
-         * are expanding linearly (double up), we know there'll be no
-         * collisions during this phase.
-         */
-        int[] oldMainHash = _mainHash;
-        int len = oldMainHash.length;
-        int newLen = len+len;
-
-        /* 13-Mar-2010, tatu: Let's guard against OOME that could be caused by
-         *    large documents with unique (or mostly so) names
-         */
-        if (newLen > MAX_TABLE_SIZE) {
-            nukeSymbols();
-            return;
-        }
-        
-        _mainHash = new int[newLen];
-        _mainHashMask = (newLen - 1);
-        Name[] oldNames = _mainNames;
-        _mainNames = new Name[newLen];
-        int symbolsSeen = 0; // let's do a sanity check
-        for (int i = 0; i < len; ++i) {
-            Name symbol = oldNames[i];
-            if (symbol != null) {
-                ++symbolsSeen;
-                int hash = symbol.hashCode();
-                int ix = (hash & _mainHashMask);
-                _mainNames[ix] = symbol;
-                _mainHash[ix] = hash << 8; // will clear spill index
-            }
-        }
-
-        /* And then the spill area. This may cause collisions, although
-         * not necessarily as many as there were earlier. Let's allocate
-         * same amount of space, however
-         */
-        int oldEnd = _collEnd;
-        if (oldEnd == 0) { // no prior collisions...
-            _longestCollisionList = 0;
-            return;
-        }
-
-        _collCount = 0;
-        _collEnd = 0;
-        _collListShared = false;
-
-        int maxColl = 0;
-        
-        Bucket[] oldBuckets = _collList;
-        _collList = new Bucket[oldBuckets.length];
-        for (int i = 0; i < oldEnd; ++i) {
-            for (Bucket curr = oldBuckets[i]; curr != null; curr = curr._next) {
-                ++symbolsSeen;
-                Name symbol = curr._name;
-                int hash = symbol.hashCode();
-                int ix = (hash & _mainHashMask);
-                int val = _mainHash[ix];
-                if (_mainNames[ix] == null) { // no primary entry?
-                    _mainHash[ix] = (hash << 8);
-                    _mainNames[ix] = symbol;
-                } else { // nope, it's a collision, need to spill over
-                    ++_collCount;
-                    int bucket = val & 0xFF;
-                    if (bucket == 0) { // first spill over?
-                        if (_collEnd <= LAST_VALID_BUCKET) { // yup, still unshared bucket
-                            bucket = _collEnd;
-                            ++_collEnd;
-                            // need to expand?
-                            if (bucket >= _collList.length) {
-                                expandCollision();
-                            }
-                        } else { // nope, have to share... let's find shortest?
-                            bucket = findBestBucket();
-                        }
-                        // Need to mark the entry... and the spill index is 1-based
-                        _mainHash[ix] = (val & ~0xFF) | (bucket + 1);
-                    } else {
-                        --bucket; // 1-based index in value
-                    }
-                    // And then just need to link the new bucket entry in
-                    Bucket newB = new Bucket(symbol, _collList[bucket]);
-                    _collList[bucket] = newB;
-                    maxColl = Math.max(maxColl, newB.length());
-                }
-            } // for (... buckets in the chain ...)
-        } // for (... list of bucket heads ... )
-
-        _longestCollisionList = maxColl;
-        
-        if (symbolsSeen != _count) { // sanity check
-            throw new RuntimeException("Internal error: count after rehash "+symbolsSeen+"; should be "+_count);
-        }
-    }
-
-    /**
-     * Helper method called to empty all shared symbols, but to leave
-     * arrays allocated
-     */
-    private void nukeSymbols()
-    {
-        _count = 0;
-        _longestCollisionList = 0;
-        Arrays.fill(_mainHash, 0);
-        Arrays.fill(_mainNames, null);
-        Arrays.fill(_collList, null);
-        _collCount = 0;
-        _collEnd = 0;
-    }
-    
-    /**
-     * Method called to find the best bucket to spill a Name over to:
-     * usually the first bucket that has only one entry, but in general
-     * first one of the buckets with least number of entries
-     */
-    private int findBestBucket()
-    {
-        Bucket[] buckets = _collList;
-        int bestCount = Integer.MAX_VALUE;
-        int bestIx = -1;
-
-        for (int i = 0, len = _collEnd; i < len; ++i) {
-            int count = buckets[i].length();
-            if (count < bestCount) {
-                if (count == 1) { // best possible
-                    return i;
-                }
-                bestCount = count;
-                bestIx = i;
-            }
-        }
-        return bestIx;
-    }
-
-    /**
-     * Method that needs to be called, if the main hash structure
-     * is (may be) shared. This happens every time something is added,
-     * even if addition is to the collision list (since collision list
-     * index comes from lowest 8 bits of the primary hash entry)
-     */
-    private void unshareMain()
-    {
-        int[] old = _mainHash;
-        int len = _mainHash.length;
-
-        _mainHash = new int[len];
-        System.arraycopy(old, 0, _mainHash, 0, len);
-        _mainHashShared = false;
-    }
-
-    private void unshareCollision()
-    {
-        Bucket[] old = _collList;
-        if (old == null) {
-            _collList = new Bucket[INITIAL_COLLISION_LEN];
-        } else {
-            int len = old.length;
-            _collList = new Bucket[len];
-            System.arraycopy(old, 0, _collList, 0, len);
-        }
-        _collListShared = false;
-    }
-
-    private void unshareNames()
-    {
-        Name[] old = _mainNames;
-        int len = old.length;
-        _mainNames = new Name[len];
-        System.arraycopy(old, 0, _mainNames, 0, len);
-        _mainNamesShared = false;
-    }
-
-    private void expandCollision()
-    {
-        Bucket[] old = _collList;
-        int len = old.length;
-        _collList = new Bucket[len+len];
-        System.arraycopy(old, 0, _collList, 0, len);
-    }
-
-
-    /*
-    /**********************************************************
-    /* Constructing name objects
-    /**********************************************************
-     */
-
-    private static Name constructName(int hash, String name, int q1, int q2)
-    {     
-        if (q2 == 0) { // one quad only?
-            return new Name1(name, hash, q1);
-        }
-        return new Name2(name, hash, q1, q2);
-    }
-
-    private static Name constructName(int hash, String name, int[] quads, int qlen)
-    {
-        if (qlen < 4) { // Need to check for 3 quad one, can do others too
-            switch (qlen) {
-            case 1:
-                return new Name1(name, hash, quads[0]);
-            case 2:
-                return new Name2(name, hash, quads[0], quads[1]);
-            case 3:
-                return new Name3(name, hash, quads[0], quads[1], quads[2]);
-            default:
-            }
-        }
-        // Otherwise, need to copy the incoming buffer
-        int[] buf = new int[qlen];
-        for (int i = 0; i < qlen; ++i) {
-            buf[i] = quads[i];
-        }
-        return new NameN(name, hash, buf, qlen);
-    }
-
-    /*
-    /**********************************************************
-    /* Other helper methods
-    /**********************************************************
-     */
-    
-    /**
-     * @since 2.1
-     */
-    protected void reportTooManyCollisions(int maxLen)
-    {
-        throw new IllegalStateException("Longest collision chain in symbol table (of size "+_count
-                +") now exceeds maximum, "+maxLen+" -- suspect a DoS attack based on hash collisions");
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Immutable value class used for sharing information as efficiently
-     * as possible, by only require synchronization of reference manipulation
-     * but not access to contents.
-     * 
-     * @since 2.1
-     */
-    private final static class TableInfo
-    {
-        public final int count;
-        public final int mainHashMask;
-        public final int[] mainHash;
-        public final Name[] mainNames;
-        public final Bucket[] collList;
-        public final int collCount;
-        public final int collEnd;
-        public final int longestCollisionList;
-
-        public TableInfo(int count, int mainHashMask, int[] mainHash, Name[] mainNames,
-                Bucket[] collList, int collCount, int collEnd, int longestCollisionList)
-        {
-            this.count = count;
-            this.mainHashMask = mainHashMask;
-            this.mainHash = mainHash;
-            this.mainNames = mainNames;
-            this.collList = collList;
-            this.collCount = collCount;
-            this.collEnd = collEnd;
-            this.longestCollisionList = longestCollisionList;
-        }
-
-        public TableInfo(BytesToNameCanonicalizer src)
-        {
-            count = src._count;
-            mainHashMask = src._mainHashMask;
-            mainHash = src._mainHash;
-            mainNames = src._mainNames;
-            collList = src._collList;
-            collCount = src._collCount;
-            collEnd = src._collEnd;
-            longestCollisionList = src._longestCollisionList;
-        }
-    
-    }
-    
-    /**
-     * 
-     */
-    final static class Bucket
-    {
-        protected final Name _name;
-        protected final Bucket _next;
-        private final int _length;
-
-        Bucket(Name name, Bucket next)
-        {
-            _name = name;
-            _next = next;
-            _length = (next == null) ? 1 : next._length+1;
-        }
-
-        public int length() { return _length; }
-
-        public Name find(int hash, int firstQuad, int secondQuad)
-        {
-            if (_name.hashCode() == hash) {
-                if (_name.equals(firstQuad, secondQuad)) {
-                    return _name;
-                }
-            }
-            for (Bucket curr = _next; curr != null; curr = curr._next) {
-                Name currName = curr._name;
-                if (currName.hashCode() == hash) {
-                    if (currName.equals(firstQuad, secondQuad)) {
-                        return currName;
-                    }
-                }
-            }
-            return null;
-        }
-
-        public Name find(int hash, int[] quads, int qlen)
-        {
-            if (_name.hashCode() == hash) {
-                if (_name.equals(quads, qlen)) {
-                    return _name;
-                }
-            }
-            for (Bucket curr = _next; curr != null; curr = curr._next) {
-                Name currName = curr._name;
-                if (currName.hashCode() == hash) {
-                    if (currName.equals(quads, qlen)) {
-                        return currName;
-                    }
-                }
-            }
-            return null;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java
deleted file mode 100644
index 63d9a81..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java
+++ /dev/null
@@ -1,730 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-import java.util.Arrays;
-
-import com.fasterxml.jackson.core.util.InternCache;
-
-/**
- * This class is a kind of specialized type-safe Map, from char array to
- * String value. Specialization means that in addition to type-safety
- * and specific access patterns (key char array, Value optionally interned
- * String; values added on access if necessary), and that instances are
- * meant to be used concurrently, but by using well-defined mechanisms
- * to obtain such concurrently usable instances. Main use for the class
- * is to store symbol table information for things like compilers and
- * parsers; especially when number of symbols (keywords) is limited.
- *<p>
- * For optimal performance, usage pattern should be one where matches
- * should be very common (especially after "warm-up"), and as with most hash-based
- * maps/sets, that hash codes are uniformly distributed. Also, collisions
- * are slightly more expensive than with HashMap or HashSet, since hash codes
- * are not used in resolving collisions; that is, equals() comparison is
- * done with all symbols in same bucket index.<br />
- * Finally, rehashing is also more expensive, as hash codes are not
- * stored; rehashing requires all entries' hash codes to be recalculated.
- * Reason for not storing hash codes is reduced memory usage, hoping
- * for better memory locality.
- *<p>
- * Usual usage pattern is to create a single "master" instance, and either
- * use that instance in sequential fashion, or to create derived "child"
- * instances, which after use, are asked to return possible symbol additions
- * to master instance. In either case benefit is that symbol table gets
- * initialized so that further uses are more efficient, as eventually all
- * symbols needed will already be in symbol table. At that point no more
- * Symbol String allocations are needed, nor changes to symbol table itself.
- *<p>
- * Note that while individual SymbolTable instances are NOT thread-safe
- * (much like generic collection classes), concurrently used "child"
- * instances can be freely used without synchronization. However, using
- * master table concurrently with child instances can only be done if
- * access to master instance is read-only (i.e. no modifications done).
- */
-public final class CharsToNameCanonicalizer
-{
-    /* If we use "multiply-add" based hash algorithm, this is the multiplier
-     * we use.
-     */
-    public final static int HASH_MULT = 33;
-    
-    /**
-     * Default initial table size. Shouldn't be miniscule (as there's
-     * cost to both array realloc and rehashing), but let's keep
-     * it reasonably small nonetheless. For systems that properly 
-     * reuse factories it doesn't matter either way; but when
-     * recreating factories often, initial overhead may dominate.
-     */
-    protected static final int DEFAULT_TABLE_SIZE = 64;
-
-    /**
-     * Let's not expand symbol tables past some maximum size;
-     * this should protected against OOMEs caused by large documents
-     * with uniquer (~= random) names.
-     */
-    protected static final int MAX_TABLE_SIZE = 0x10000; // 64k entries == 256k mem
-
-    /**
-     * Let's only share reasonably sized symbol tables. Max size set to 3/4 of 16k;
-     * this corresponds to 64k main hash index. This should allow for enough distinct
-     * names for almost any case.
-     */
-    final static int MAX_ENTRIES_FOR_REUSE = 12000;
-
-    /**
-     * Also: to thwart attacks based on hash collisions (which may or may not
-     * be cheap to calculate), we will need to detect "too long"
-     * collision chains. Let's start with static value of 255 entries
-     * for the longest legal chain.
-     *<p>
-     * Note: longest chain we have been able to produce without malicious
-     * intent has been 38 (with "com.fasterxml.jackson.core.main.TestWithTonsaSymbols");
-     * our setting should be reasonable here.
-     * 
-     * @since 2.1
-     */
-    final static int MAX_COLL_CHAIN_LENGTH = 255;
-
-    /**
-     * And to support reduce likelihood of accidental collisons causing
-     * exceptions, let's prevent reuse of tables with long collision
-     * overflow lists as well.
-     * 
-     * @since 2.1
-     */
-    final static int MAX_COLL_CHAIN_FOR_REUSE  = 63;
-    
-    final static CharsToNameCanonicalizer sBootstrapSymbolTable;
-    static {
-        sBootstrapSymbolTable = new CharsToNameCanonicalizer();
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Sharing of learnt symbols is done by optional linking of symbol
-     * table instances with their parents. When parent linkage is
-     * defined, and child instance is released (call to <code>release</code>),
-     * parent's shared tables may be updated from the child instance.
-     */
-    protected CharsToNameCanonicalizer _parent;
-
-    /**
-     * Seed value we use as the base to make hash codes non-static between
-     * different runs, but still stable for lifetime of a single symbol table
-     * instance.
-     * This is done for security reasons, to avoid potential DoS attack via
-     * hash collisions.
-     * 
-     * @since 2.1
-     */
-    final private int _hashSeed;
-    
-    /**
-     * Whether canonical symbol Strings are to be intern()ed before added
-     * to the table or not
-     */
-    final protected boolean _intern;
-
-    /**
-     * Whether any canonicalization should be attempted (whether using
-     * intern or not)
-     */
-    final protected boolean _canonicalize;
-    
-    /*
-    /**********************************************************
-    /* Actual symbol table data
-    /**********************************************************
-     */
-
-    /**
-     * Primary matching symbols; it's expected most match occur from
-     * here.
-     */
-    protected String[] _symbols;
-
-    /**
-     * Overflow buckets; if primary doesn't match, lookup is done
-     * from here.
-     *<p>
-     * Note: Number of buckets is half of number of symbol entries, on
-     * assumption there's less need for buckets.
-     */
-    protected Bucket[] _buckets;
-
-    /**
-     * Current size (number of entries); needed to know if and when
-     * rehash.
-     */
-    protected int _size;
-
-    /**
-     * Limit that indicates maximum size this instance can hold before
-     * it needs to be expanded and rehashed. Calculated using fill
-     * factor passed in to constructor.
-     */
-    protected int _sizeThreshold;
-
-    /**
-     * Mask used to get index from hash values; equal to
-     * <code>_buckets.length - 1</code>, when _buckets.length is
-     * a power of two.
-     */
-    protected int _indexMask;
-
-    /**
-     * We need to keep track of the longest collision list; this is needed
-     * both to indicate problems with attacks and to allow flushing for
-     * other cases.
-     * 
-     * @since 2.1
-     */
-    protected int _longestCollisionList;
-    
-    /*
-    /**********************************************************
-    /* State regarding shared arrays
-    /**********************************************************
-     */
-
-    /**
-     * Flag that indicates if any changes have been made to the data;
-     * used to both determine if bucket array needs to be copied when
-     * (first) change is made, and potentially if updated bucket list
-     * is to be resync'ed back to master instance.
-     */
-    protected boolean _dirty;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * Method called to create root canonicalizer for a {@link com.fasterxml.jackson.core.JsonFactory}
-     * instance. Root instance is never used directly; its main use is for
-     * storing and sharing underlying symbol arrays as needed.
-     */
-    public static CharsToNameCanonicalizer createRoot()
-    {
-        /* [Issue-21]: Need to use a variable seed, to thwart hash-collision
-         * based attacks.
-         */
-        long now = System.currentTimeMillis();
-        // ensure it's not 0; and might as well require to be odd so:
-        int seed = (((int) now) + ((int) (now >>> 32))) | 1;
-        return createRoot(seed);
-    }
-    
-    protected static CharsToNameCanonicalizer createRoot(int hashSeed) {
-        return sBootstrapSymbolTable.makeOrphan(hashSeed);
-    }
-
-    /**
-     * Main method for constructing a master symbol table instance.
-     *
-     * @param initialSize Minimum initial size for bucket array; internally
-     *   will always use a power of two equal to or bigger than this value.
-     */
-    private CharsToNameCanonicalizer()
-    {
-        // these settings don't really matter for the bootstrap instance
-        _canonicalize = true;
-        _intern = true;
-        // And we'll also set flags so no copying of buckets is needed:
-        _dirty = true;
-        _hashSeed = 0;
-        _longestCollisionList = 0;
-        initTables(DEFAULT_TABLE_SIZE);
-    }
-
-    private void initTables(int initialSize)
-    {
-        _symbols = new String[initialSize];
-        _buckets = new Bucket[initialSize >> 1];
-        // Mask is easy to calc for powers of two.
-        _indexMask = initialSize - 1;
-        _size = 0;
-        _longestCollisionList = 0;
-        // Hard-coded fill factor is 75%
-        _sizeThreshold = _thresholdSize(initialSize);
-    }
-
-    private static int _thresholdSize(int hashAreaSize) {
-        return hashAreaSize - (hashAreaSize >> 2);
-    }
-    
-    /**
-     * Internal constructor used when creating child instances.
-     */
-    private CharsToNameCanonicalizer(CharsToNameCanonicalizer parent,
-            boolean canonicalize, boolean intern,
-            String[] symbols, Bucket[] buckets, int size,
-            int hashSeed, int longestColl)
-    {
-        _parent = parent;
-        _canonicalize = canonicalize;
-        _intern = intern;
-
-        _symbols = symbols;
-        _buckets = buckets;
-        _size = size;
-        _hashSeed = hashSeed;
-        // Hard-coded fill factor, 75%
-        int arrayLen = (symbols.length);
-        _sizeThreshold = _thresholdSize(arrayLen);
-        _indexMask =  (arrayLen - 1);
-        _longestCollisionList = longestColl;
-
-        // Need to make copies of arrays, if/when adding new entries
-        _dirty = false;
-    }
-
-    /**
-     * "Factory" method; will create a new child instance of this symbol
-     * table. It will be a copy-on-write instance, ie. it will only use
-     * read-only copy of parent's data, but when changes are needed, a
-     * copy will be created.
-     *<p>
-     * Note: while this method is synchronized, it is generally not
-     * safe to both use makeChild/mergeChild, AND to use instance
-     * actively. Instead, a separate 'root' instance should be used
-     * on which only makeChild/mergeChild are called, but instance itself
-     * is not used as a symbol table.
-     */
-    public CharsToNameCanonicalizer makeChild(final boolean canonicalize,
-            final boolean intern)
-    {
-        /* 24-Jul-2012, tatu: Trying to reduce scope of synchronization, assuming
-         *   that synchronizing construction is the (potentially) expensive part,
-         *   and not so much short copy-the-variables thing.
-         */
-        final String[] symbols;
-        final Bucket[] buckets;
-        final int size;
-        final int hashSeed;
-        final int longestCollisionList;
-        
-        synchronized (this) {
-            symbols = _symbols;
-            buckets = _buckets;
-            size = _size;
-            hashSeed = _hashSeed;
-            longestCollisionList = _longestCollisionList;
-        }
-        
-        return new CharsToNameCanonicalizer(this, canonicalize, intern,
-                symbols, buckets, size, hashSeed, longestCollisionList);
-    }
-
-    private CharsToNameCanonicalizer makeOrphan(int seed)
-    {
-        return new CharsToNameCanonicalizer(null, true, true,
-                _symbols, _buckets, _size, seed, _longestCollisionList);
-    }
-
-    /**
-     * Method that allows contents of child table to potentially be
-     * "merged in" with contents of this symbol table.
-     *<p>
-     * Note that caller has to make sure symbol table passed in is
-     * really a child or sibling of this symbol table.
-     */
-    private void mergeChild(CharsToNameCanonicalizer child)
-    {
-        /* One caveat: let's try to avoid problems with
-         * degenerate cases of documents with generated "random"
-         * names: for these, symbol tables would bloat indefinitely.
-         * One way to do this is to just purge tables if they grow
-         * too large, and that's what we'll do here.
-         */
-        if (child.size() > MAX_ENTRIES_FOR_REUSE
-                || child._longestCollisionList > MAX_COLL_CHAIN_FOR_REUSE) {
-            // Should there be a way to get notified about this event, to log it or such?
-            // (as it's somewhat abnormal thing to happen)
-            // At any rate, need to clean up the tables, then:
-            synchronized (this) {
-                initTables(DEFAULT_TABLE_SIZE);
-                // Dirty flag... well, let's just clear it. Shouldn't really matter for master tables
-                // (which this is, given something is merged to it)
-                _dirty = false;
-            }
-        } else {
-            // Otherwise, we'll merge changed stuff in, if there are  more entries (which
-            // may not be the case if one of siblings has added symbols first or such)
-            if (child.size() <= size()) { // nothing to add
-                return;
-            }
-            // Okie dokie, let's get the data in!
-            synchronized (this) {
-                _symbols = child._symbols;
-                _buckets = child._buckets;
-                _size = child._size;
-                _sizeThreshold = child._sizeThreshold;
-                _indexMask = child._indexMask;
-                _longestCollisionList = child._longestCollisionList;
-                // Dirty flag... well, let's just clear it. Shouldn't really matter for master tables
-                // (which this is, given something is merged to it)
-                _dirty = false;
-            }
-        }
-    }
-
-    public void release()
-    {
-        // If nothing has been added, nothing to do
-        if (!maybeDirty()) {
-            return;
-        }
-        if (_parent != null) {
-            _parent.mergeChild(this);
-            /* Let's also mark this instance as dirty, so that just in
-             * case release was too early, there's no corruption
-             * of possibly shared data.
-             */
-            _dirty = false;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, generic accessors:
-    /**********************************************************
-     */
-
-    public int size() { return _size; }
-
-    /**
-     * Method for checking number of primary hash buckets this symbol
-     * table uses.
-     * 
-     * @since 2.1
-     */
-    public int bucketCount() { 
-       return _symbols.length; }
-    
-    public boolean maybeDirty() { return _dirty; }
-
-    public int hashSeed() { return _hashSeed; }
-    
-    /**
-     * Method mostly needed by unit tests; calculates number of
-     * entries that are in collision list. Value can be at most
-     * ({@link #size} - 1), but should usually be much lower, ideally 0.
-     * 
-     * @since 2.1
-     */
-    public int collisionCount()
-    {
-        int count = 0;
-        
-        for (Bucket bucket : _buckets) {
-            if (bucket != null) {
-                count += bucket.length();
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Method mostly needed by unit tests; calculates length of the
-     * longest collision chain. This should typically be a low number,
-     * but may be up to {@link #size} - 1 in the pathological case
-     * 
-     * @since 2.1
-     */
-    public int maxCollisionLength()
-    {
-        return _longestCollisionList;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, accessing symbols:
-    /**********************************************************
-     */
-
-    public String findSymbol(char[] buffer, int start, int len, int h)
-    {
-        if (len < 1) { // empty Strings are simplest to handle up front
-            return "";
-        }
-        if (!_canonicalize) { // [JACKSON-259]
-            return new String(buffer, start, len);
-        }
-
-        /* Related to problems with sub-standard hashing (somewhat
-         * relevant for collision attacks too), let's try little
-         * bit of shuffling to improve hash codes.
-         * (note, however, that this can't help with full collisions)
-         */
-        int index = _hashToIndex(h);
-        String sym = _symbols[index];
-
-        // Optimal case; checking existing primary symbol for hash index:
-        if (sym != null) {
-            // Let's inline primary String equality checking:
-            if (sym.length() == len) {
-                int i = 0;
-                do {
-                    if (sym.charAt(i) != buffer[start+i]) {
-                        break;
-                    }
-                } while (++i < len);
-                // Optimal case; primary match found
-                if (i == len) {
-                    return sym;
-                }
-            }
-            // How about collision bucket?
-            Bucket b = _buckets[index >> 1];
-            if (b != null) {
-                sym = b.find(buffer, start, len);
-                if (sym != null) {
-                    return sym;
-                }
-            }
-        }
-
-        if (!_dirty) { //need to do copy-on-write?
-            copyArrays();
-            _dirty = true;
-        } else if (_size >= _sizeThreshold) { // Need to expand?
-           rehash();
-           /* Need to recalc hash; rare occurence (index mask has been
-            * recalculated as part of rehash)
-            */
-           index = _hashToIndex(calcHash(buffer, start, len));
-        }
-
-        String newSymbol = new String(buffer, start, len);
-        if (_intern) {
-            newSymbol = InternCache.instance.intern(newSymbol);
-        }
-        ++_size;
-        // Ok; do we need to add primary entry, or a bucket?
-        if (_symbols[index] == null) {
-            _symbols[index] = newSymbol;
-        } else {
-            int bix = (index >> 1);
-            Bucket newB = new Bucket(newSymbol, _buckets[bix]);
-            _buckets[bix] = newB;
-            _longestCollisionList = Math.max(newB.length(), _longestCollisionList);
-            if (_longestCollisionList > MAX_COLL_CHAIN_LENGTH) {
-                reportTooManyCollisions(MAX_COLL_CHAIN_LENGTH);
-            }
-        }
-
-        return newSymbol;
-    }
-
-    /**
-     * Helper method that takes in a "raw" hash value, shuffles it as necessary,
-     * and truncates to be used as the index.
-     */
-    public int _hashToIndex(int rawHash)
-    {
-        rawHash += (rawHash >>> 15); // this seems to help quite a bit, at least for our tests
-        return (rawHash & _indexMask);
-    }
-    
-    /**
-     * Implementation of a hashing method for variable length
-     * Strings. Most of the time intention is that this calculation
-     * is done by caller during parsing, not here; however, sometimes
-     * it needs to be done for parsed "String" too.
-     *
-     * @param len Length of String; has to be at least 1 (caller guarantees
-     *   this pre-condition)
-     */
-    public int calcHash(char[] buffer, int start, int len)
-    {
-        int hash = _hashSeed;
-        for (int i = 0; i < len; ++i) {
-            hash = (hash * HASH_MULT) + (int) buffer[i];
-        }
-        // NOTE: shuffling, if any, is done in 'findSymbol()', not here:
-        return (hash == 0) ? 1 : hash;
-    }
-
-    public int calcHash(String key)
-    {
-        final int len = key.length();
-        
-        int hash = _hashSeed;
-        for (int i = 0; i < len; ++i) {
-            hash = (hash * HASH_MULT) + (int) key.charAt(i);
-        }
-        // NOTE: shuffling, if any, is done in 'findSymbol()', not here:
-        return (hash == 0) ? 1 : hash;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called when copy-on-write is needed; generally when first
-     * change is made to a derived symbol table.
-     */
-    private void copyArrays() {
-        String[] oldSyms = _symbols;
-        int size = oldSyms.length;
-        _symbols = new String[size];
-        System.arraycopy(oldSyms, 0, _symbols, 0, size);
-        Bucket[] oldBuckets = _buckets;
-        size = oldBuckets.length;
-        _buckets = new Bucket[size];
-        System.arraycopy(oldBuckets, 0, _buckets, 0, size);
-    }
-
-    /**
-     * Method called when size (number of entries) of symbol table grows
-     * so big that load factor is exceeded. Since size has to remain
-     * power of two, arrays will then always be doubled. Main work
-     * is really redistributing old entries into new String/Bucket
-     * entries.
-     */
-    private void rehash()
-    {
-        int size = _symbols.length;
-        int newSize = size + size;
-
-        /* 12-Mar-2010, tatu: Let's actually limit maximum size we are
-         *    prepared to use, to guard against OOME in case of unbounded
-         *    name sets (unique [non-repeating] names)
-         */
-        if (newSize > MAX_TABLE_SIZE) {
-            /* If this happens, there's no point in either growing or
-             * shrinking hash areas. Rather, it's better to just clean
-             * them up for reuse.
-             */
-            _size = 0;
-            Arrays.fill(_symbols, null);
-            Arrays.fill(_buckets, null);
-            _dirty = true;
-            return;
-        }
-        
-        String[] oldSyms = _symbols;
-        Bucket[] oldBuckets = _buckets;
-        _symbols = new String[newSize];
-        _buckets = new Bucket[newSize >> 1];
-        // Let's update index mask, threshold, now (needed for rehashing)
-        _indexMask = newSize - 1;
-        _sizeThreshold = _thresholdSize(newSize);
-        
-        int count = 0; // let's do sanity check
-
-        /* Need to do two loops, unfortunately, since spill-over area is
-         * only half the size:
-         */
-        int maxColl = 0;
-        for (int i = 0; i < size; ++i) {
-            String symbol = oldSyms[i];
-            if (symbol != null) {
-                ++count;
-                int index = _hashToIndex(calcHash(symbol));
-                if (_symbols[index] == null) {
-                    _symbols[index] = symbol;
-                } else {
-                    int bix = (index >> 1);
-                    Bucket newB = new Bucket(symbol, _buckets[bix]);
-                    _buckets[bix] = newB;
-                    maxColl = Math.max(maxColl, newB.length());
-                }
-            }
-        }
-
-        size >>= 1;
-        for (int i = 0; i < size; ++i) {
-            Bucket b = oldBuckets[i];
-            while (b != null) {
-                ++count;
-                String symbol = b.getSymbol();
-                int index = _hashToIndex(calcHash(symbol));
-                if (_symbols[index] == null) {
-                    _symbols[index] = symbol;
-                } else {
-                    int bix = (index >> 1);
-                    Bucket newB = new Bucket(symbol, _buckets[bix]);
-                    _buckets[bix] = newB;
-                    maxColl = Math.max(maxColl, newB.length());
-                }
-                b = b.getNext();
-            }
-        }
-        _longestCollisionList = maxColl;
-
-        if (count != _size) {
-            throw new Error("Internal error on SymbolTable.rehash(): had "+_size+" entries; now have "+count+".");
-        }
-    }
-
-    /**
-     * @since 2.1
-     */
-    protected void reportTooManyCollisions(int maxLen)
-    {
-        throw new IllegalStateException("Longest collision chain in symbol table (of size "+_size
-                +") now exceeds maximum, "+maxLen+" -- suspect a DoS attack based on hash collisions");
-    }
-    
-    /*
-    /**********************************************************
-    /* Bucket class
-    /**********************************************************
-     */
-
-    /**
-     * This class is a symbol table entry. Each entry acts as a node
-     * in a linked list.
-     */
-    static final class Bucket
-    {
-        private final String _symbol;
-        private final Bucket _next;
-        private final int _length;
-
-        public Bucket(String symbol, Bucket next) {
-            _symbol = symbol;
-            _next = next;
-            _length = (next == null) ? 1 : next._length+1;
-        }
-
-        public String getSymbol() { return _symbol; }
-        public Bucket getNext() { return _next; }
-        public int length() { return _length; }
-
-        public String find(char[] buf, int start, int len) {
-            String sym = _symbol;
-            Bucket b = _next;
-
-            while (true) { // Inlined equality comparison:
-                if (sym.length() == len) {
-                    int i = 0;
-                    do {
-                        if (sym.charAt(i) != buf[start+i]) {
-                            break;
-                        }
-                    } while (++i < len);
-                    if (i == len) {
-                        return sym;
-                    }
-                }
-                if (b == null) {
-                    break;
-                }
-                sym = b.getSymbol();
-                b = b.getNext();
-            }
-            return null;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name.java
deleted file mode 100644
index d26f55d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-/**
- * Base class for tokenized names (key strings in objects) that have
- * been tokenized from byte-based input sources (like
- * {@link java.io.InputStream}.
- *
- * @author Tatu Saloranta
- */
-public abstract class Name
-{
-    protected final String _name;
-
-    protected final int _hashCode;
-
-    protected Name(String name, int hashCode) {
-        _name = name;
-        _hashCode = hashCode;
-    }
-
-    public String getName() { return _name; }
-
-    /*
-    /**********************************************************
-    /* Methods for package/core parser
-    /**********************************************************
-     */
-
-    public abstract boolean equals(int quad1);
-
-    public abstract boolean equals(int quad1, int quad2);
-
-    public abstract boolean equals(int[] quads, int qlen);
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-
-    @Override public String toString() { return _name; }
-
-    @Override public final int hashCode() { return _hashCode; }
-
-    @Override public boolean equals(Object o)
-    {
-        // Canonical instances, can usually just do identity comparison
-        return (o == this);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name1.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name1.java
deleted file mode 100644
index f10f033..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-/**
- * Specialized implementation of PName: can be used for short Strings
- * that consists of at most 4 bytes. Usually this means short
- * ascii-only names.
- *<p>
- * The reason for such specialized classes is mostly space efficiency;
- * and to a lesser degree performance. Both are achieved for short
- * Strings by avoiding another level of indirection (via quad arrays)
- */
-public final class Name1
-    extends Name
-{
-    final static Name1 sEmptyName = new Name1("", 0, 0);
-
-    final int mQuad;
-
-    Name1(String name, int hash, int quad)
-    {
-        super(name, hash);
-        mQuad = quad;
-    }
-
-    static Name1 getEmptyName() { return sEmptyName; }
-
-    @Override
-    public boolean equals(int quad)
-    {
-        return (quad == mQuad);
-    }
-
-    @Override
-    public boolean equals(int quad1, int quad2)
-    {
-        return (quad1 == mQuad) && (quad2 == 0);
-    }
-
-    @Override
-    public boolean equals(int[] quads, int qlen)
-    {
-        return (qlen == 1 && quads[0] == mQuad);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name2.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name2.java
deleted file mode 100644
index cc425fb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-/**
- * Specialized implementation of PName: can be used for short Strings
- * that consists of 5 to 8 bytes. Usually this means relatively short
- * ascii-only names.
- *<p>
- * The reason for such specialized classes is mostly space efficiency;
- * and to a lesser degree performance. Both are achieved for short
- * Strings by avoiding another level of indirection (via quad arrays)
- */
-public final class Name2
-    extends Name
-{
-    final int mQuad1;
-
-    final int mQuad2;
-
-    Name2(String name, int hash, int quad1, int quad2)
-    {
-        super(name, hash);
-        mQuad1 = quad1;
-        mQuad2 = quad2;
-    }
-
-    @Override
-    public boolean equals(int quad) { return false; }
-
-    @Override
-    public boolean equals(int quad1, int quad2)
-    {
-        return (quad1 == mQuad1) && (quad2 == mQuad2);
-    }
-
-    @Override
-    public boolean equals(int[] quads, int qlen)
-    {
-        return (qlen == 2 && quads[0] == mQuad1 && quads[1] == mQuad2);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name3.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name3.java
deleted file mode 100644
index fe3a4d7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/Name3.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-/**
- * Specialized implementation of PName: can be used for short Strings
- * that consists of 9 to 12 bytes. It's the longest special purpose
- * implementaion; longer ones are expressed using {@link NameN}.
- */
-public final class Name3
-    extends Name
-{
-    final int mQuad1;
-    final int mQuad2;
-    final int mQuad3;
-
-    Name3(String name, int hash, int q1, int q2, int q3)
-    {
-        super(name, hash);
-        mQuad1 = q1;
-        mQuad2 = q2;
-        mQuad3 = q3;
-    }
-
-    // Implies quad length == 1, never matches
-    @Override
-    public boolean equals(int quad) { return false; }
-
-    // Implies quad length == 2, never matches
-    @Override
-    public boolean equals(int quad1, int quad2) { return false; }
-
-    @Override
-    public boolean equals(int[] quads, int qlen)
-    {
-        return (qlen == 3)
-            && (quads[0] == mQuad1)
-            && (quads[1] == mQuad2)
-            && (quads[2] == mQuad3);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/NameN.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/NameN.java
deleted file mode 100644
index 3040104..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/NameN.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.fasterxml.jackson.core.sym;
-
-/**
- * Generic implementation of PName used for "long" names, where long
- * means that its byte (UTF-8) representation is 13 bytes or more.
- */
-public final class NameN
-    extends Name
-{
-    final int[] mQuads;
-    final int mQuadLen;
-
-    NameN(String name, int hash, int[] quads, int quadLen)
-    {
-        super(name, hash);
-        /* We have specialized implementations for shorter
-         * names, so let's not allow runt instances here
-         */
-        if (quadLen < 3) {
-            throw new IllegalArgumentException("Qlen must >= 3");
-        }
-        mQuads = quads;
-        mQuadLen = quadLen;
-    }
-
-    // Implies quad length == 1, never matches
-    @Override
-	public boolean equals(int quad) { return false; }
-
-    // Implies quad length == 2, never matches
-    @Override
-	public boolean equals(int quad1, int quad2) { return false; }
-
-    @Override
-	public boolean equals(int[] quads, int qlen)
-    {
-        if (qlen != mQuadLen) {
-            return false;
-        }
-
-        /* 26-Nov-2008, tatus: Strange, but it does look like
-         *   unrolling here is counter-productive, reducing
-         *   speed. Perhaps it prevents inlining by HotSpot or
-         *   something...
-         */
-        // Will always have >= 3 quads, can unroll
-        /*
-        if (quads[0] == mQuads[0]
-            && quads[1] == mQuads[1]
-            && quads[2] == mQuads[2]) {
-            for (int i = 3; i < qlen; ++i) {
-                if (quads[i] != mQuads[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        */
-
-        // or simpler way without unrolling:
-        for (int i = 0; i < qlen; ++i) {
-            if (quads[i] != mQuads[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/sym/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/sym/package-info.java
deleted file mode 100644
index b0ae032..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/sym/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Internal implementation classes for efficient handling of
- * of symbols in JSON (field names in Objects)
- */
-package com.fasterxml.jackson.core.sym;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/type/ResolvedType.java b/showkeyHelper/src/com/fasterxml/jackson/core/type/ResolvedType.java
deleted file mode 100644
index e9931a0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/type/ResolvedType.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.fasterxml.jackson.core.type;
-
-/**
- * Type abstraction that represents Java type that has been resolved
- * (i.e. has all generic information, if any, resolved to concrete
- * types).
- * Note that this is an intermediate type, and all concrete instances
- * MUST be of type <code>JavaType</code> from "databind" bundle -- this
- * abstraction is only needed so that types can be passed through
- * {@link com.fasterxml.jackson.core.JsonParser#readValueAs} methods.
- * 
- * @since 2.0
- */
-public abstract class ResolvedType
-{
-    /*
-    /**********************************************************
-    /* Public API, simple property accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for type-erased {@link Class} of resolved type.
-     */
-    public abstract Class<?> getRawClass();
-
-    public abstract boolean hasRawClass(Class<?> clz);
-
-    public abstract boolean isAbstract();
-    
-    public abstract boolean isConcrete();
-
-    public abstract boolean isThrowable();
-
-    public abstract boolean isArrayType();
-
-    public abstract boolean isEnumType();
-
-    public abstract boolean isInterface();
-
-    public abstract boolean isPrimitive();
-
-    public abstract boolean isFinal();
-
-    public abstract boolean isContainerType();
-
-    public abstract boolean isCollectionLikeType();
-
-    public abstract boolean isMapLikeType();
-
-    /*
-    /**********************************************************
-    /* Public API, type parameter access
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be used to find out if the type directly declares generic
-     * parameters (for its direct super-class and/or super-interfaces).
-     */
-    public abstract boolean hasGenericTypes();
-    
-    /**
-     * Method for accessing key type for this type, assuming type
-     * has such a concept (only Map types do)
-     */
-    public abstract ResolvedType getKeyType();
-
-    /**
-     * Method for accessing content type of this type, if type has
-     * such a thing: simple types do not, structured types do
-     * (like arrays, Collections and Maps)
-     */
-    public abstract ResolvedType getContentType();
-
-    /**
-     * Method for checking how many contained types this type
-     * has. Contained types are usually generic types, so that
-     * generic Maps have 2 contained types.
-     */
-    public abstract int containedTypeCount();
-
-    /**
-     * Method for accessing definitions of contained ("child")
-     * types.
-     * 
-     * @param index Index of contained type to return
-     * 
-     * @return Contained type at index, or null if no such type
-     *    exists (no exception thrown)
-     */
-    public abstract ResolvedType containedType(int index);
-    
-    /**
-     * Method for accessing name of type variable in indicated
-     * position. If no name is bound, will use placeholders (derived
-     * from 0-based index); if no type variable or argument exists
-     * with given index, null is returned.
-     * 
-     * @param index Index of contained type to return
-     * 
-     * @return Contained type at index, or null if no such type
-     *    exists (no exception thrown)
-     */
-    public abstract String containedTypeName(int index);
-
-    /*
-    /**********************************************************
-    /* Public API, other
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to serialize type into form from which
-     * it can be fully deserialized from at a later point (using
-     * <code>TypeFactory</code> from mapper package).
-     * For simple types this is same as calling
-     * {@link Class#getName}, but for structured types it may additionally
-     * contain type information about contents.
-     */
-    public abstract String toCanonical();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/type/TypeReference.java b/showkeyHelper/src/com/fasterxml/jackson/core/type/TypeReference.java
deleted file mode 100644
index b0cc596..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/type/TypeReference.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.fasterxml.jackson.core.type;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * This generic abstract class is used for obtaining full generics type information
- * by sub-classing; it must be converted to {@link ResolvedType} implementation
- * (implemented by <code>JavaType</code> from "databind" bundle) to be used.
- * Class is based on ideas from
- * <a href="http://gafter.blogspot.com/2006/12/super-type-tokens.html"
- * >http://gafter.blogspot.com/2006/12/super-type-tokens.html</a>,
- * Additional idea (from a suggestion made in comments of the article)
- * is to require bogus implementation of <code>Comparable</code>
- * (any such generic interface would do, as long as it forces a method
- * with generic type to be implemented).
- * to ensure that a Type argument is indeed given.
- *<p>
- * Usage is by sub-classing: here is one way to instantiate reference
- * to generic type <code>List&lt;Integer></code>:
- *<pre>
- *  TypeReference ref = new TypeReference&lt;List&lt;Integer>>() { };
- *</pre>
- * which can be passed to methods that accept TypeReference, or resolved
- * using <code>TypeFactory</code> to obtain {@link ResolvedType}.
- */
-public abstract class TypeReference<T>
-    implements Comparable<TypeReference<T>>
-{
-    protected final Type _type;
-    
-    protected TypeReference()
-    {
-        Type superClass = getClass().getGenericSuperclass();
-        if (superClass instanceof Class<?>) { // sanity check, should never happen
-            throw new IllegalArgumentException("Internal error: TypeReference constructed without actual type information");
-        }
-        /* 22-Dec-2008, tatu: Not sure if this case is safe -- I suspect
-         *   it is possible to make it fail?
-         *   But let's deal with specific
-         *   case when we know an actual use case, and thereby suitable
-         *   workarounds for valid case(s) and/or error to throw
-         *   on invalid one(s).
-         */
-        _type = ((ParameterizedType) superClass).getActualTypeArguments()[0];
-    }
-
-    public Type getType() { return _type; }
-    
-    /**
-     * The only reason we define this method (and require implementation
-     * of <code>Comparable</code>) is to prevent constructing a
-     * reference without type information.
-     */
-//  @Override
-    public int compareTo(TypeReference<T> o) {
-        // just need an implementation, not a good one... hence:
-        return 0;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/type/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/type/package-info.java
deleted file mode 100644
index 4b28a37..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/type/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Contains classes needed for type introspection, mostly used by data binding
- * functionality. Most of this functionality is needed to properly handled
- * generic types, and to simplify and unify processing of things Jackson needs
- * to determine how contained types (of {@link java.util.Collection} and
- * {@link java.util.Map} classes) are to be handled.
- */
-package com.fasterxml.jackson.core.type;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/BufferRecycler.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/BufferRecycler.java
deleted file mode 100644
index 3ebd295..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/BufferRecycler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-/**
- * This is a small utility class, whose main functionality is to allow
- * simple reuse of raw byte/char buffers. It is usually used through
- * <code>ThreadLocal</code> member of the owning class pointing to
- * instance of this class through a <code>SoftReference</code>. The
- * end result is a low-overhead GC-cleanable recycling: hopefully
- * ideal for use by stream readers.
- */
-public class BufferRecycler
-{
-    public final static int DEFAULT_WRITE_CONCAT_BUFFER_LEN = 2000;
-    
-    public enum ByteBufferType {
-        READ_IO_BUFFER(4000)
-        /**
-         * Buffer used for temporarily storing encoded content; used
-         * for example by UTF-8 encoding writer
-         */
-        ,WRITE_ENCODING_BUFFER(4000)
-
-        /**
-         * Buffer used for temporarily concatenating output; used for
-         * example when requesting output as byte array.
-         */
-        ,WRITE_CONCAT_BUFFER(2000)
-        
-        /**
-         * Buffer used for concatenating binary data that is either being
-         * encoded as base64 output, or decoded from base64 input.
-         * 
-         * @since 2.1
-         */
-        ,BASE64_CODEC_BUFFER(2000)
-        ;
-            
-        protected final int size;
-
-        ByteBufferType(int size) { this.size = size; }
-    }
-
-    public enum CharBufferType {
-        TOKEN_BUFFER(2000) // Tokenizable input
-            ,CONCAT_BUFFER(2000) // concatenated output
-            ,TEXT_BUFFER(200) // Text content from input
-            ,NAME_COPY_BUFFER(200) // Temporary buffer for getting name characters
-            ;
-        
-        protected final int size;
-
-        CharBufferType(int size) { this.size = size; }
-    }
-
-    final protected byte[][] _byteBuffers = new byte[ByteBufferType.values().length][];
-    final protected char[][] _charBuffers = new char[CharBufferType.values().length][];
-
-    public BufferRecycler() { }
-
-    public final byte[] allocByteBuffer(ByteBufferType type)
-    {
-        int ix = type.ordinal();
-        byte[] buffer = _byteBuffers[ix];
-        if (buffer == null) {
-            buffer = balloc(type.size);
-        } else {
-            _byteBuffers[ix] = null;
-        }
-        return buffer;
-    }
-
-    public final void releaseByteBuffer(ByteBufferType type, byte[] buffer)
-    {
-        _byteBuffers[type.ordinal()] = buffer;
-    }
-
-    public final char[] allocCharBuffer(CharBufferType type)
-    {
-        return allocCharBuffer(type, 0);
-    }
-
-    public final char[] allocCharBuffer(CharBufferType type, int minSize)
-    {
-        if (type.size > minSize) {
-            minSize = type.size;
-        }
-        int ix = type.ordinal();
-        char[] buffer = _charBuffers[ix];
-        if (buffer == null || buffer.length < minSize) {
-            buffer = calloc(minSize);
-        } else {
-            _charBuffers[ix] = null;
-        }
-        return buffer;
-    }
-
-    public final void releaseCharBuffer(CharBufferType type, char[] buffer)
-    {
-        _charBuffers[type.ordinal()] = buffer;
-    }
-
-    /*
-    /**********************************************************
-    /* Actual allocations separated for easier debugging/profiling
-    /**********************************************************
-     */
-
-    private byte[] balloc(int size)
-    {
-        return new byte[size];
-    }
-
-    private char[] calloc(int size)
-    {
-        return new char[size];
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/ByteArrayBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/ByteArrayBuilder.java
deleted file mode 100644
index a3d2e49..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/ByteArrayBuilder.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.fasterxml.jackson.core.util;
-
-import java.io.OutputStream;
-import java.util.*;
-
-/**
- * Helper class that is similar to {@link java.io.ByteArrayOutputStream}
- * in usage, but more geared to Jackson use cases internally.
- * Specific changes include segment storage (no need to have linear
- * backing buffer, can avoid reallocs, copying), as well API
- * not based on {@link java.io.OutputStream}. In short, a very much
- * specialized builder object.
- *<p>
- * Since version 1.5, also implements {@link OutputStream} to allow
- * efficient aggregation of output content as a byte array, similar
- * to how {@link java.io.ByteArrayOutputStream} works, but somewhat more
- * efficiently for many use cases.
- */
-public final class ByteArrayBuilder
-    extends OutputStream
-{
-    private final static byte[] NO_BYTES = new byte[0];
-    
-    /**
-     * Size of the first block we will allocate.
-     */
-    private final static int INITIAL_BLOCK_SIZE = 500;
-    
-    /**
-     * Maximum block size we will use for individual non-aggregated
-     * blocks. Let's limit to using 256k chunks.
-     */
-    private final static int MAX_BLOCK_SIZE = (1 << 18);
-    
-    final static int DEFAULT_BLOCK_ARRAY_SIZE = 40;
-
-    /**
-     * Optional buffer recycler instance that we can use for allocating
-     * the first block.
-     */
-    private final BufferRecycler _bufferRecycler;
-    
-    private final LinkedList<byte[]> _pastBlocks = new LinkedList<byte[]>();
-    
-    /**
-     * Number of bytes within byte arrays in {@link _pastBlocks}.
-     */
-    private int _pastLen;
-
-    private byte[] _currBlock;
-
-    private int _currBlockPtr;
-    
-    public ByteArrayBuilder() { this(null); }
-
-    public ByteArrayBuilder(BufferRecycler br) { this(br, INITIAL_BLOCK_SIZE); }
-
-    public ByteArrayBuilder(int firstBlockSize) { this(null, firstBlockSize); }
-
-    public ByteArrayBuilder(BufferRecycler br, int firstBlockSize)
-    {
-        _bufferRecycler = br;
-        if (br == null) {
-            _currBlock = new byte[firstBlockSize];
-        } else {
-            _currBlock = br.allocByteBuffer(BufferRecycler.ByteBufferType.WRITE_CONCAT_BUFFER);
-        }
-    }
-
-    public void reset()
-    {
-        _pastLen = 0;
-        _currBlockPtr = 0;
-
-        if (!_pastBlocks.isEmpty()) {
-            _pastBlocks.clear();
-        }
-    }
-
-    /**
-     * Clean up method to call to release all buffers this object may be
-     * using. After calling the method, no other accessors can be used (and
-     * attempt to do so may result in an exception)
-     */
-    public void release() {
-        reset();
-        if (_bufferRecycler != null && _currBlock != null) {
-            _bufferRecycler.releaseByteBuffer(BufferRecycler.ByteBufferType.WRITE_CONCAT_BUFFER, _currBlock);
-            _currBlock = null;
-        }
-    }
-
-    public void append(int i)
-    {
-        if (_currBlockPtr >= _currBlock.length) {
-            _allocMore();
-        }
-        _currBlock[_currBlockPtr++] = (byte) i;
-    }
-
-    public void appendTwoBytes(int b16)
-    {
-        if ((_currBlockPtr + 1) < _currBlock.length) {
-            _currBlock[_currBlockPtr++] = (byte) (b16 >> 8);
-            _currBlock[_currBlockPtr++] = (byte) b16;
-        } else {
-            append(b16 >> 8);
-            append(b16);
-        }
-    }
-
-    public void appendThreeBytes(int b24)
-    {
-        if ((_currBlockPtr + 2) < _currBlock.length) {
-            _currBlock[_currBlockPtr++] = (byte) (b24 >> 16);
-            _currBlock[_currBlockPtr++] = (byte) (b24 >> 8);
-            _currBlock[_currBlockPtr++] = (byte) b24;
-        } else {
-            append(b24 >> 16);
-            append(b24 >> 8);
-            append(b24);
-        }
-    }
-
-    /**
-     * Method called when results are finalized and we can get the
-     * full aggregated result buffer to return to the caller
-     */
-    public byte[] toByteArray()
-    {
-        int totalLen = _pastLen + _currBlockPtr;
-        
-        if (totalLen == 0) { // quick check: nothing aggregated?
-            return NO_BYTES;
-        }
-        
-        byte[] result = new byte[totalLen];
-        int offset = 0;
-
-        for (byte[] block : _pastBlocks) {
-            int len = block.length;
-            System.arraycopy(block, 0, result, offset, len);
-            offset += len;
-        }
-        System.arraycopy(_currBlock, 0, result, offset, _currBlockPtr);
-        offset += _currBlockPtr;
-        if (offset != totalLen) { // just a sanity check
-            throw new RuntimeException("Internal error: total len assumed to be "+totalLen+", copied "+offset+" bytes");
-        }
-        // Let's only reset if there's sizable use, otherwise will get reset later on
-        if (!_pastBlocks.isEmpty()) {
-            reset();
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Non-stream API (similar to TextBuffer), since 1.6
-    /**********************************************************
-     */
-
-    /**
-     * Method called when starting "manual" output: will clear out
-     * current state and return the first segment buffer to fill
-     */
-    public byte[] resetAndGetFirstSegment() {
-        reset();
-        return _currBlock;
-    }
-
-    /**
-     * Method called when the current segment buffer is full; will
-     * append to current contents, allocate a new segment buffer
-     * and return it
-     */
-    public byte[] finishCurrentSegment() {
-        _allocMore();
-        return _currBlock;
-    }
-
-    /**
-     * Method that will complete "manual" output process, coalesce
-     * content (if necessary) and return results as a contiguous buffer.
-     * 
-     * @param lastBlockLength Amount of content in the current segment
-     * buffer.
-     * 
-     * @return Coalesced contents
-     */
-    public byte[] completeAndCoalesce(int lastBlockLength)
-    {
-        _currBlockPtr = lastBlockLength;
-        return toByteArray();
-    }
-
-    public byte[] getCurrentSegment() {
-        return _currBlock;
-    }
-
-    public void setCurrentSegmentLength(int len) {
-        _currBlockPtr = len;
-    }
-
-    public int getCurrentSegmentLength() {
-        return _currBlockPtr;
-    }
-    
-    /*
-    /**********************************************************
-    /* OutputStream implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public void write(byte[] b) {
-        write(b, 0, b.length);
-    }
-
-    @Override
-    public void write(byte[] b, int off, int len)
-    {
-        while (true) {
-            int max = _currBlock.length - _currBlockPtr;
-            int toCopy = Math.min(max, len);
-            if (toCopy > 0) {
-                System.arraycopy(b, off, _currBlock, _currBlockPtr, toCopy);
-                off += toCopy;
-                _currBlockPtr += toCopy;
-                len -= toCopy;
-            }
-            if (len <= 0) break;
-            _allocMore();
-        }
-    }
-
-    @Override
-    public void write(int b) {
-        append(b);
-    }
-
-    @Override public void close() { /* NOP */ }
-
-    @Override public void flush() { /* NOP */ }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    private void _allocMore()
-    {
-        _pastLen += _currBlock.length;
-
-        /* Let's allocate block that's half the total size, except
-         * never smaller than twice the initial block size.
-         * The idea is just to grow with reasonable rate, to optimize
-         * between minimal number of chunks and minimal amount of
-         * wasted space.
-         */
-        int newSize = Math.max((_pastLen >> 1), (INITIAL_BLOCK_SIZE + INITIAL_BLOCK_SIZE));
-        // plus not to exceed max we define...
-        if (newSize > MAX_BLOCK_SIZE) {
-            newSize = MAX_BLOCK_SIZE;
-        }
-        _pastBlocks.add(_currBlock);
-        _currBlock = new byte[newSize];
-        _currBlockPtr = 0;
-    }
-
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
deleted file mode 100644
index 515bb2d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
+++ /dev/null
@@ -1,396 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.*;
-import java.util.Arrays;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-
-/**
- * Default {@link PrettyPrinter} implementation that uses 2-space
- * indentation with platform-default linefeeds.
- * Usually this class is not instantiated directly, but instead
- * method {@link JsonGenerator#useDefaultPrettyPrinter} is
- * used, which will use an instance of this class for operation.
- */
-public class DefaultPrettyPrinter
-    implements PrettyPrinter, Instantiatable<DefaultPrettyPrinter>,
-        java.io.Serializable
-{
-    private static final long serialVersionUID = -5512586643324525213L;
-
-    /**
-     * Constant that specifies default "root-level" separator to use between
-     * root values: a single space character.
-     * 
-     * @since 2.1
-     */
-    public final static SerializedString DEFAULT_ROOT_VALUE_SEPARATOR = new SerializedString(" ");
-    
-    /**
-     * Interface that defines objects that can produce indentation used
-     * to separate object entries and array values. Indentation in this
-     * context just means insertion of white space, independent of whether
-     * linefeeds are output.
-     */
-    public interface Indenter
-    {
-        void writeIndentation(JsonGenerator jg, int level)
-            throws IOException, JsonGenerationException;
-
-        /**
-         * @return True if indenter is considered inline (does not add linefeeds),
-         *   false otherwise
-         */
-        boolean isInline();
-    }
-    
-    // // // Config, indentation
-
-    /**
-     * By default, let's use only spaces to separate array values.
-     */
-    protected Indenter _arrayIndenter = FixedSpaceIndenter.instance;
-
-    /**
-     * By default, let's use linefeed-adding indenter for separate
-     * object entries. We'll further configure indenter to use
-     * system-specific linefeeds, and 2 spaces per level (as opposed to,
-     * say, single tabs)
-     */
-    protected Indenter _objectIndenter = Lf2SpacesIndenter.instance;
-
-    /**
-     * String printed between root-level values, if any.
-     */
-    protected final SerializableString _rootSeparator;
-    
-    // // // Config, other white space configuration
-
-    /**
-     * By default we will add spaces around colons used to
-     * separate object fields and values.
-     * If disabled, will not use spaces around colon.
-     */
-    protected boolean _spacesInObjectEntries = true;
-
-    // // // State:
-
-    /**
-     * Number of open levels of nesting. Used to determine amount of
-     * indentation to use.
-     */
-    protected transient int _nesting = 0;
-
-    /*
-    /**********************************************************
-    /* Life-cycle (construct, configure)
-    /**********************************************************
-    */
-
-    public DefaultPrettyPrinter() {
-        this(DEFAULT_ROOT_VALUE_SEPARATOR);
-    }
-
-    /**
-     * Constructor that specifies separator String to use between root values;
-     * if null, no separator is printed.
-     *<p>
-     * Note: simply constructs a {@link SerializedString} out of parameter,
-     * calls {@link #DefaultPrettyPrinter(SerializableString)}
-     * 
-     * @param rootSeparator
-     * 
-     * @since 2.1
-     */
-    public DefaultPrettyPrinter(String rootSeparator) {
-        this((rootSeparator == null) ? null : new SerializedString(rootSeparator));
-    }
-
-    /**
-     * Constructor that specifies separator String to use between root values;
-     * if null, no separator is printed.
-     * 
-     * @param rootSeparator
-     * 
-     * @since 2.1
-     */
-    public DefaultPrettyPrinter(SerializableString rootSeparator) {
-        _rootSeparator = rootSeparator;
-    }
-    
-    public DefaultPrettyPrinter(DefaultPrettyPrinter base) {
-        this(base, base._rootSeparator);
-    }
-
-    public DefaultPrettyPrinter(DefaultPrettyPrinter base,
-            SerializableString rootSeparator)
-    {
-        _arrayIndenter = base._arrayIndenter;
-        _objectIndenter = base._objectIndenter;
-        _spacesInObjectEntries = base._spacesInObjectEntries;
-        _nesting = base._nesting;
-
-        _rootSeparator = rootSeparator;
-    }
-
-    public DefaultPrettyPrinter withRootSeparator(SerializableString rootSeparator)
-    {
-        if (_rootSeparator == rootSeparator ||
-                (rootSeparator != null && rootSeparator.equals(_rootSeparator))) {
-            return this;
-        }
-        return new DefaultPrettyPrinter(this, rootSeparator);
-    }
-    
-    public void indentArraysWith(Indenter i)
-    {
-        _arrayIndenter = (i == null) ? NopIndenter.instance : i;
-    }
-
-    public void indentObjectsWith(Indenter i)
-    {
-        _objectIndenter = (i == null) ? NopIndenter.instance : i;
-    }
-
-    public void spacesInObjectEntries(boolean b) { _spacesInObjectEntries = b; }
-
-    /*
-    /**********************************************************
-    /* Instantiatable impl
-    /**********************************************************
-     */
-    
-    // @Override
-    public DefaultPrettyPrinter createInstance() {
-        return new DefaultPrettyPrinter(this);
-    }
-    
-    /*
-    /**********************************************************
-    /* PrettyPrinter impl
-    /**********************************************************
-     */
-
-//  @Override
-    public void writeRootValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        if (_rootSeparator != null) {
-            jg.writeRaw(_rootSeparator);
-        }
-    }
-
-//  @Override
-    public void writeStartObject(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw('{');
-        if (!_objectIndenter.isInline()) {
-            ++_nesting;
-        }
-    }
-
-//  @Override
-    public void beforeObjectEntries(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        _objectIndenter.writeIndentation(jg, _nesting);
-    }
-
-    /**
-     * Method called after an object field has been output, but
-     * before the value is output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * colon to separate the two. Pretty-printer is
-     * to output a colon as well, but can surround that with other
-     * (white-space) decoration.
-     */
-//  @Override
-    public void writeObjectFieldValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        if (_spacesInObjectEntries) {
-            jg.writeRaw(" : ");
-        } else {
-            jg.writeRaw(':');
-        }
-    }
-
-    /**
-     * Method called after an object entry (field:value) has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate the two. Pretty-printer is
-     * to output a comma as well, but can surround that with other
-     * (white-space) decoration.
-     */
-//  @Override
-    public void writeObjectEntrySeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(',');
-        _objectIndenter.writeIndentation(jg, _nesting);
-    }
-
-//  @Override
-    public void writeEndObject(JsonGenerator jg, int nrOfEntries)
-        throws IOException, JsonGenerationException
-    {
-        if (!_objectIndenter.isInline()) {
-            --_nesting;
-        }
-        if (nrOfEntries > 0) {
-            _objectIndenter.writeIndentation(jg, _nesting);
-        } else {
-            jg.writeRaw(' ');
-        }
-        jg.writeRaw('}');
-    }
-
-//  @Override
-    public void writeStartArray(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        if (!_arrayIndenter.isInline()) {
-            ++_nesting;
-        }
-        jg.writeRaw('[');
-    }
-
-//  @Override
-    public void beforeArrayValues(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        _arrayIndenter.writeIndentation(jg, _nesting);
-    }
-
-    /**
-     * Method called after an array value has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate the two. Pretty-printer is
-     * to output a comma as well, but can surround that with other
-     * (white-space) decoration.
-     */
-//  @Override
-    public void writeArrayValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(',');
-        _arrayIndenter.writeIndentation(jg, _nesting);
-    }
-
-//  @Override
-    public void writeEndArray(JsonGenerator jg, int nrOfValues)
-        throws IOException, JsonGenerationException
-    {
-        if (!_arrayIndenter.isInline()) {
-            --_nesting;
-        }
-        if (nrOfValues > 0) {
-            _arrayIndenter.writeIndentation(jg, _nesting);
-        } else {
-            jg.writeRaw(' ');
-        }
-        jg.writeRaw(']');
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Dummy implementation that adds no indentation whatsoever
-     */
-    public static class NopIndenter
-        implements Indenter, java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        public static NopIndenter instance = new NopIndenter();
-        
-        public NopIndenter() { }
-//      @Override
-        public void writeIndentation(JsonGenerator jg, int level) { }
-//      @Override
-        public boolean isInline() { return true; }
-    }
-
-    /**
-     * This is a very simple indenter that only every adds a
-     * single space for indentation. It is used as the default
-     * indenter for array values.
-     */
-    public static class FixedSpaceIndenter
-        implements Indenter, java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        public static FixedSpaceIndenter instance = new FixedSpaceIndenter();
-
-        public FixedSpaceIndenter() { }
-
-//      @Override
-        public void writeIndentation(JsonGenerator jg, int level)
-            throws IOException, JsonGenerationException
-        {
-            jg.writeRaw(' ');
-        }
-
-//      @Override
-        public boolean isInline() { return true; }
-    }
-
-    /**
-     * Default linefeed-based indenter uses system-specific linefeeds and
-     * 2 spaces for indentation per level.
-     */
-    public static class Lf2SpacesIndenter
-        implements Indenter, java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        public static Lf2SpacesIndenter instance = new Lf2SpacesIndenter();
-
-        final static String SYSTEM_LINE_SEPARATOR;
-        static {
-            String lf = null;
-            try {
-                lf = System.getProperty("line.separator");
-            } catch (Throwable t) { } // access exception?
-            SYSTEM_LINE_SEPARATOR = (lf == null) ? "\n" : lf;
-        }
-
-        final static int SPACE_COUNT = 64;
-        final static char[] SPACES = new char[SPACE_COUNT];
-        static {
-            Arrays.fill(SPACES, ' ');
-        }
-
-        public Lf2SpacesIndenter() { }
-
-//      @Override
-        public boolean isInline() { return false; }
-
-//      @Override
-        public void writeIndentation(JsonGenerator jg, int level)
-            throws IOException, JsonGenerationException
-        {
-            jg.writeRaw(SYSTEM_LINE_SEPARATOR);
-            if (level > 0) { // should we err on negative values (as there's some flaw?)
-                level += level; // 2 spaces per level
-                while (level > SPACE_COUNT) { // should never happen but...
-                    jg.writeRaw(SPACES, 0, SPACE_COUNT); 
-                    level -= SPACES.length;
-                }
-                jg.writeRaw(SPACES, 0, level);
-            }
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/Instantiatable.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/Instantiatable.java
deleted file mode 100644
index 997293c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/Instantiatable.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-/**
- * Add-on interface used to indicate things that may be "blueprint" objects
- * which can not be used as is, but are used for creating usable per-process
- * (serialization, deserialization) instances, using
- * {@link #createInstance} method.
- *<p>
- * Note that some implementations may choose to implement {@link #createInstance}
- * by simply returning 'this': this is acceptable if instances are stateless.
- * 
- * @see DefaultPrettyPrinter
- * 
- * @since 2.1
- */
-public interface Instantiatable<T>
-{
-    /**
-     * Method called to ensure that we have a non-blueprint object to use;
-     * it is either this object (if stateless), or a newly created object
-     * with separate state.
-     */
-    T createInstance();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/InternCache.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/InternCache.java
deleted file mode 100644
index 50711e1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/InternCache.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.util.Map;
-import java.util.LinkedHashMap;
-
-/**
- * Singleton class that adds a simple first-level cache in front of
- * regular String.intern() functionality. This is done as a minor
- * performance optimization, to avoid calling native intern() method
- * in cases where same String is being interned multiple times.
- *<p>
- * Note: that this class extends {@link LinkedHashMap} is an implementation
- * detail -- no code should ever directly call Map methods.
- */
-@SuppressWarnings("serial")
-public final class InternCache
-    extends LinkedHashMap<String,String>
-{
-    /**
-     * Size to use is somewhat arbitrary, so let's choose something that's
-     * neither too small (low hit ratio) nor too large (waste of memory).
-     *<p>
-     * 11-Jul-2012, tatu: Also, consider the nasty case of String hashCode()
-     *    collisions; size needs to be small enough to survive linear list
-     *    lookup... so let's go down a notch (from 192 to 100)
-     */
-    private final static int MAX_ENTRIES = 100;
-
-    public final static InternCache instance = new InternCache();
-
-    private InternCache() {
-        super(MAX_ENTRIES, 0.8f, true);
-    }
-
-    @Override
-    protected boolean removeEldestEntry(Map.Entry<String,String> eldest)
-    {
-        return size() > MAX_ENTRIES;
-    }
-
-    public synchronized String intern(String input)
-    {
-        String result = get(input);
-        if (result == null) {
-            result = input.intern();
-            put(result, result);
-        }
-        return result;
-    }
-
-
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.java
deleted file mode 100644
index 9eb5c88..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-
-public class JsonGeneratorDelegate extends JsonGenerator
-{
-    /**
-     * Delegate object that method calls are delegated to.
-     */
-    protected JsonGenerator delegate;
-
-    public JsonGeneratorDelegate(JsonGenerator d) {
-        delegate = d;
-    }   
-
-    @Override
-    public void close() throws IOException {
-        delegate.close();
-    }
-
-    @Override
-    public void copyCurrentEvent(JsonParser jp) throws IOException, JsonProcessingException {
-        delegate.copyCurrentEvent(jp);
-    }
-
-    @Override
-    public void copyCurrentStructure(JsonParser jp) throws IOException, JsonProcessingException {
-        delegate.copyCurrentStructure(jp);
-    }
-
-    @Override
-    public JsonGenerator disable(Feature f) {
-        delegate.disable(f);
-        return this;
-    }
-
-    @Override
-    public JsonGenerator enable(Feature f) {
-        delegate.enable(f);
-        return this;
-    }
-
-    @Override
-    public void flush() throws IOException {
-        delegate.flush();
-    }
-
-    @Override
-    public ObjectCodec getCodec() {
-        return delegate.getCodec();
-    }
-
-    @Override
-    public JsonStreamContext getOutputContext() {
-        return delegate.getOutputContext();
-    }
-
-    @Override
-    public void setSchema(FormatSchema schema) {
-        delegate.setSchema(schema);
-    }
-    
-    @Override
-    public boolean canUseSchema(FormatSchema schema) {
-        return delegate.canUseSchema(schema);
-    }
-    
-    @Override
-    public Version version() {
-        return delegate.version();
-    }
-    
-    @Override
-    public Object getOutputTarget() {
-        return delegate.getOutputTarget();
-    }
-
-    @Override
-    public JsonGenerator setRootValueSeparator(SerializableString sep) {
-        delegate.setRootValueSeparator(sep);
-        return this;
-    }
-    
-    @Override
-    public boolean isClosed() {
-        return delegate.isClosed();
-    }
-
-    @Override
-    public boolean isEnabled(Feature f) {
-        return delegate.isEnabled(f);
-    }
-
-    @Override
-    public JsonGenerator setCodec(ObjectCodec oc) {
-        delegate.setCodec(oc);
-        return this;
-    }
-
-    @Override
-    public JsonGenerator useDefaultPrettyPrinter() {
-        delegate.useDefaultPrettyPrinter();
-        return this;
-    }
-
-    @Override
-    public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        delegate.writeBinary(b64variant, data, offset, len);
-    }
-
-    @Override
-    public int writeBinary(Base64Variant b64variant, InputStream data, int dataLength)
-        throws IOException, JsonGenerationException {
-        return delegate.writeBinary(b64variant, data, dataLength);
-    }
-    
-    @Override
-    public void writeBoolean(boolean state) throws IOException, JsonGenerationException {
-        delegate.writeBoolean(state);
-    }
-
-    @Override
-    public void writeEndArray() throws IOException, JsonGenerationException {
-        delegate.writeEndArray();
-    }
-
-    @Override
-    public void writeEndObject() throws IOException, JsonGenerationException {
-        delegate.writeEndObject();
-    }
-
-    @Override
-    public void writeFieldName(String name)
-        throws IOException, JsonGenerationException
-    {
-        delegate.writeFieldName(name);
-    }
-
-    @Override
-    public void writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException
-    {
-        delegate.writeFieldName(name);
-    }
-    
-    @Override
-    public void writeNull() throws IOException, JsonGenerationException {
-        delegate.writeNull();
-    }
-
-    @Override
-    public void writeNumber(int v) throws IOException, JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(long v) throws IOException, JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(BigInteger v) throws IOException,
-            JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(double v) throws IOException,
-            JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(float v) throws IOException,
-            JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(BigDecimal v) throws IOException,
-            JsonGenerationException {
-        delegate.writeNumber(v);
-    }
-
-    @Override
-    public void writeNumber(String encodedValue) throws IOException, JsonGenerationException, UnsupportedOperationException {
-        delegate.writeNumber(encodedValue);
-    }
-
-    @Override
-    public void writeObject(Object pojo) throws IOException,JsonProcessingException {
-        delegate.writeObject(pojo);
-    }
-
-    @Override
-    public void writeRaw(String text) throws IOException, JsonGenerationException {
-        delegate.writeRaw(text);
-    }
-
-    @Override
-    public void writeRaw(String text, int offset, int len) throws IOException, JsonGenerationException {
-        delegate.writeRaw(text, offset, len);
-    }
-
-    @Override
-    public void writeRaw(SerializableString raw)
-        throws IOException, JsonGenerationException {
-        delegate.writeRaw(raw);
-    }
-    
-    @Override
-    public void writeRaw(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-        delegate.writeRaw(text, offset, len);
-    }
-
-    @Override
-    public void writeRaw(char c) throws IOException, JsonGenerationException {
-        delegate.writeRaw(c);
-    }
-
-    @Override
-    public void writeRawValue(String text) throws IOException, JsonGenerationException {
-        delegate.writeRawValue(text);
-    }
-
-    @Override
-    public void writeRawValue(String text, int offset, int len) throws IOException, JsonGenerationException {
-         delegate.writeRawValue(text, offset, len);
-    }
-
-    @Override
-    public void writeRawValue(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-         delegate.writeRawValue(text, offset, len);
-    }
-
-    @Override
-    public void writeStartArray() throws IOException, JsonGenerationException {
-         delegate.writeStartArray();
-    }
-
-    @Override
-    public void writeStartObject() throws IOException, JsonGenerationException {
-        delegate.writeStartObject();
-    }
-
-    @Override
-    public void writeString(String text) throws IOException,JsonGenerationException {
-        delegate.writeString(text);
-    }
-
-    @Override
-    public void writeString(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-        delegate.writeString(text, offset, len);
-    }
-
-    @Override
-    public void writeString(SerializableString text) throws IOException, JsonGenerationException {
-        delegate.writeString(text);
-    }
-
-    @Override
-    public void writeRawUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        delegate.writeRawUTF8String(text, offset, length);
-    }
-
-    @Override
-    public void writeUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        delegate.writeUTF8String(text, offset, length);
-    }
-    
-    @Override
-    public void writeTree(TreeNode rootNode) throws IOException, JsonProcessingException {
-        delegate.writeTree(rootNode);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserDelegate.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserDelegate.java
deleted file mode 100644
index 7e2f80a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserDelegate.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Helper class that implements
- * <a href="http://en.wikipedia.org/wiki/Delegation_pattern">delegation pattern</a> for {@link JsonParser},
- * to allow for simple overridability of basic parsing functionality.
- * The idea is that any functionality to be modified can be simply
- * overridden; and anything else will be delegated by default.
- */
-public class JsonParserDelegate extends JsonParser
-{
-    /**
-     * Delegate object that method calls are delegated to.
-     */
-    protected JsonParser delegate;
-
-    public JsonParserDelegate(JsonParser d) {
-        delegate = d;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, configuration
-    /**********************************************************
-     */
-
-    @Override
-    public void setCodec(ObjectCodec c) {
-        delegate.setCodec(c);
-    }
-
-    @Override
-    public ObjectCodec getCodec() {
-        return delegate.getCodec();
-    }
-
-    @Override
-    public JsonParser enable(Feature f) {
-        delegate.enable(f);
-        return this;
-    }
-
-    @Override
-    public JsonParser disable(Feature f) {
-        delegate.disable(f);
-        return this;
-    }
- 
-    @Override
-    public boolean isEnabled(Feature f) {
-        return delegate.isEnabled(f);
-    }
-
-    @Override
-    public FormatSchema getSchema() {
-        return delegate.getSchema();
-    }
-    
-    @Override
-    public void setSchema(FormatSchema schema) {
-        delegate.setSchema(schema);
-    }
-
-    @Override
-    public boolean canUseSchema(FormatSchema schema) {
-        return delegate.canUseSchema(schema);
-    }
-
-    @Override
-    public boolean requiresCustomCodec() {
-        return delegate.requiresCustomCodec();
-    }
-    
-    @Override
-    public Version version() {
-        return delegate.version();
-    }
-
-    @Override
-    public Object getInputSource() {
-        return delegate.getInputSource();
-    }
-    
-    /*
-    /**********************************************************
-    /* Closeable impl
-    /**********************************************************
-     */
-
-    @Override
-    public void close() throws IOException {
-        delegate.close();
-    }
-
-    @Override
-    public boolean isClosed() {
-        return delegate.isClosed();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, token accessors
-    /**********************************************************
-     */
-
-    @Override
-    public JsonToken getCurrentToken() {
-        return delegate.getCurrentToken();
-    }
-
-    @Override
-    public boolean hasCurrentToken() {
-        return delegate.hasCurrentToken();
-    }
-
-    @Override
-    public String getCurrentName() throws IOException, JsonParseException {
-        return delegate.getCurrentName();
-    }
-
-    @Override
-    public JsonLocation getCurrentLocation() {
-        return delegate.getCurrentLocation();
-    }
-
-    @Override
-    public JsonStreamContext getParsingContext() {
-        return delegate.getParsingContext();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, token state overrides
-    /**********************************************************
-     */
-    
-    @Override
-    public void clearCurrentToken() {
-        delegate.clearCurrentToken();        
-    }
-
-    @Override
-    public JsonToken getLastClearedToken() {
-        return delegate.getLastClearedToken();
-    }
-    
-    @Override
-    public void overrideCurrentName(String name) {
-        delegate.overrideCurrentName(name);
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, text
-    /**********************************************************
-     */
-
-    @Override
-    public String getText() throws IOException, JsonParseException {
-        return delegate.getText();
-    }
-
-    @Override
-    public boolean hasTextCharacters() {
-        return delegate.hasTextCharacters();
-    }
-    
-    @Override
-    public char[] getTextCharacters() throws IOException, JsonParseException {
-        return delegate.getTextCharacters();
-    }
-
-    @Override
-    public int getTextLength() throws IOException, JsonParseException {
-        return delegate.getTextLength();
-    }
-
-    @Override
-    public int getTextOffset() throws IOException, JsonParseException {
-        return delegate.getTextOffset();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, numeric
-    /**********************************************************
-     */
-    
-    @Override
-    public BigInteger getBigIntegerValue() throws IOException,JsonParseException {
-        return delegate.getBigIntegerValue();
-    }
-
-    @Override
-    public boolean getBooleanValue() throws IOException, JsonParseException {
-        return delegate.getBooleanValue();
-    }
-    
-    @Override
-    public byte getByteValue() throws IOException, JsonParseException {
-        return delegate.getByteValue();
-    }
-
-    @Override
-    public short getShortValue() throws IOException, JsonParseException {
-        return delegate.getShortValue();
-    }
-
-    @Override
-    public BigDecimal getDecimalValue() throws IOException, JsonParseException {
-        return delegate.getDecimalValue();
-    }
-
-    @Override
-    public double getDoubleValue() throws IOException, JsonParseException {
-        return delegate.getDoubleValue();
-    }
-
-    @Override
-    public float getFloatValue() throws IOException, JsonParseException {
-        return delegate.getFloatValue();
-    }
-
-    @Override
-    public int getIntValue() throws IOException, JsonParseException {
-        return delegate.getIntValue();
-    }
-
-    @Override
-    public long getLongValue() throws IOException, JsonParseException {
-        return delegate.getLongValue();
-    }
-
-    @Override
-    public NumberType getNumberType() throws IOException, JsonParseException {
-        return delegate.getNumberType();
-    }
-
-    @Override
-    public Number getNumberValue() throws IOException, JsonParseException {
-        return delegate.getNumberValue();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, access to token information, coercion/conversion
-    /**********************************************************
-     */
-    
-    @Override
-    public int getValueAsInt() throws IOException, JsonParseException {
-        return delegate.getValueAsInt();
-    }
-    
-    @Override
-    public int getValueAsInt(int defaultValue) throws IOException, JsonParseException {
-        return delegate.getValueAsInt(defaultValue);
-    }
-
-    @Override
-    public long getValueAsLong() throws IOException, JsonParseException {
-        return delegate.getValueAsLong();
-    }
-    
-    @Override
-    public long getValueAsLong(long defaultValue) throws IOException, JsonParseException {
-        return delegate.getValueAsLong(defaultValue);
-    }
-    
-    @Override
-    public double getValueAsDouble() throws IOException, JsonParseException {
-        return delegate.getValueAsDouble();
-    }
-    
-    @Override
-    public double getValueAsDouble(double defaultValue) throws IOException, JsonParseException {
-        return delegate.getValueAsDouble(defaultValue);
-    }
-
-    @Override
-    public boolean getValueAsBoolean() throws IOException, JsonParseException {
-        return delegate.getValueAsBoolean();
-    }
-
-    @Override
-    public boolean getValueAsBoolean(boolean defaultValue) throws IOException, JsonParseException {
-        return delegate.getValueAsBoolean(defaultValue);
-    }
-
-    @Override
-    public String getValueAsString() throws IOException, JsonParseException {
-        return delegate.getValueAsString();
-    }
-    
-    @Override
-    public String getValueAsString(String defaultValue) throws IOException, JsonParseException {
-        return delegate.getValueAsString(defaultValue);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, access to token values, other
-    /**********************************************************
-     */
-
-    @Override
-    public Object getEmbeddedObject() throws IOException, JsonParseException {
-        return delegate.getEmbeddedObject();
-    }
-    
-    @Override
-    public byte[] getBinaryValue(Base64Variant b64variant) throws IOException, JsonParseException {
-        return delegate.getBinaryValue(b64variant);
-    }
-
-    @Override
-    public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-            throws IOException, JsonParseException {
-        return delegate.readBinaryValue(b64variant, out);
-    }
-    
-    @Override
-    public JsonLocation getTokenLocation() {
-        return delegate.getTokenLocation();
-    }
-
-    @Override
-    public JsonToken nextToken() throws IOException, JsonParseException {
-        return delegate.nextToken();
-    }
-
-    @Override
-    public JsonToken nextValue() throws IOException, JsonParseException {
-        return delegate.nextValue();
-    }
-    
-    @Override
-    public JsonParser skipChildren() throws IOException, JsonParseException {
-        delegate.skipChildren();
-        // NOTE: must NOT delegate this method to delegate, needs to be self-reference for chaining
-        return this;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserSequence.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserSequence.java
deleted file mode 100644
index b2f188a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/JsonParserSequence.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Helper class that can be used to sequence multiple physical
- * {@link JsonParser}s to create a single logical sequence of
- * tokens, as a single {@link JsonParser}.
- *<p>
- * Fairly simple use of {@link JsonParserDelegate}: only need
- * to override {@link #nextToken} to handle transition
- */
-public class JsonParserSequence extends JsonParserDelegate
-{
-    /**
-     * Parsers other than the first one (which is initially assigned
-     * as delegate)
-     */
-    protected final JsonParser[] _parsers;
-    
-    /**
-     * Index of the next parser in {@link #_parsers}.
-     */
-    protected int _nextParser;
-    
-    /*
-     *******************************************************
-     * Construction
-     *******************************************************
-     */
-
-    protected JsonParserSequence(JsonParser[] parsers)
-    {
-        super(parsers[0]);
-        _parsers = parsers;
-        _nextParser = 1;
-    }
-
-    /**
-     * Method that will construct a parser (possibly a sequence) that
-     * contains all given sub-parsers.
-     * All parsers given are checked to see if they are sequences: and
-     * if so, they will be "flattened", that is, contained parsers are
-     * directly added in a new sequence instead of adding sequences
-     * within sequences. This is done to minimize delegation depth,
-     * ideally only having just a single level of delegation.
-     */
-    public static JsonParserSequence createFlattened(JsonParser first, JsonParser second)
-    {
-        if (!(first instanceof JsonParserSequence || second instanceof JsonParserSequence)) {
-            // simple:
-            return new JsonParserSequence(new JsonParser[] { first, second });
-        }
-        ArrayList<JsonParser> p = new ArrayList<JsonParser>();
-        if (first instanceof JsonParserSequence) {
-            ((JsonParserSequence) first).addFlattenedActiveParsers(p);
-        } else {
-            p.add(first);
-        }
-        if (second instanceof JsonParserSequence) {
-            ((JsonParserSequence) second).addFlattenedActiveParsers(p);
-        } else {
-            p.add(second);
-        }
-        return new JsonParserSequence(p.toArray(new JsonParser[p.size()]));
-    }
-
-    protected void addFlattenedActiveParsers(List<JsonParser> result)
-    {
-        for (int i = _nextParser-1, len = _parsers.length; i < len; ++i) {
-            JsonParser p = _parsers[i];
-            if (p instanceof JsonParserSequence) {
-                ((JsonParserSequence) p).addFlattenedActiveParsers(result);
-            } else {
-                result.add(p);
-            }
-        }
-    }
-    
-    /*
-     *******************************************************
-     * Overridden methods, needed: cases where default
-     * delegation does not work
-     *******************************************************
-     */
-    
-    @Override
-    public void close() throws IOException
-    {
-        do {
-            delegate.close();
-        } while (switchToNext());
-    }
-
-    @Override
-    public JsonToken nextToken() throws IOException, JsonParseException
-    {
-        JsonToken t = delegate.nextToken();
-        if (t != null) return t;
-        while (switchToNext()) {
-            t = delegate.nextToken();
-            if (t != null) return t;
-        }
-        return null;
-    }
-
-    /*
-    /*******************************************************
-    /* Additional extended API
-    /*******************************************************
-     */
-
-    /**
-     * Method that is most useful for debugging or testing;
-     * returns actual number of underlying parsers sequence
-     * was constructed with (nor just ones remaining active)
-     */
-    public int containedParsersCount() {
-        return _parsers.length;
-    }
-    
-    /*
-    /*******************************************************
-    /* Helper methods
-    /*******************************************************
-     */
-
-    /**
-     * Method that will switch active parser from the current one
-     * to next parser in sequence, if there is another parser left,
-     * making this the new delegate. Old delegate is returned if
-     * switch succeeds.
-     * 
-     * @return True if switch succeeded; false otherwise
-     */
-    protected boolean switchToNext()
-    {
-        if (_nextParser >= _parsers.length) {
-            return false;
-        }
-        delegate = _parsers[_nextParser++];
-        return true;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/MinimalPrettyPrinter.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/MinimalPrettyPrinter.java
deleted file mode 100644
index 459d3fb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/MinimalPrettyPrinter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.PrettyPrinter;
-
-/**
- * {@link PrettyPrinter} implementation that adds no indentation,
- * just implements everything necessary for value output to work
- * as expected, and provide simpler extension points to allow
- * for creating simple custom implementations that add specific
- * decoration or overrides. Since behavior then is very similar
- * to using no pretty printer at all, usually sub-classes are used.
- *<p>
- * Beyond purely minimal implementation, there is limited amount of
- * configurability which may be useful for actual use: for example,
- * it is possible to redefine separator used between root-level
- * values (default is single space; can be changed to line-feed).
- *<p>
- * Note: does NOT implement {@link Instantiatable} since this is
- * a stateless implementation; that is, a single instance can be
- * shared between threads.
- */
-public class MinimalPrettyPrinter
-    implements PrettyPrinter, java.io.Serializable
-{
-    private static final long serialVersionUID = -562765100295218442L;
-
-    /**
-     * Default String used for separating root values is single space.
-     */
-    public final static String DEFAULT_ROOT_VALUE_SEPARATOR = " ";
-    
-    protected String _rootValueSeparator = DEFAULT_ROOT_VALUE_SEPARATOR;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, configuration
-    /**********************************************************
-     */
-    
-    public MinimalPrettyPrinter() {
-        this(DEFAULT_ROOT_VALUE_SEPARATOR);
-    }
-
-    public MinimalPrettyPrinter(String rootValueSeparator) {
-        _rootValueSeparator = rootValueSeparator;
-    }
-    
-    public void setRootValueSeparator(String sep) {
-        _rootValueSeparator = sep;
-    }
-    
-    /*
-    /**********************************************************
-    /* PrettyPrinter impl
-    /**********************************************************
-     */
-
-//  @Override
-    public void writeRootValueSeparator(JsonGenerator jg) throws IOException, JsonGenerationException
-    {
-        if (_rootValueSeparator != null) {
-            jg.writeRaw(_rootValueSeparator);    
-        }
-    }
-    
-//  @Override
-    public void writeStartObject(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw('{');
-    }
-    
-//  @Override
-    public void beforeObjectEntries(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        // nothing special, since no indentation is added
-    }
-
-    /**
-     * Method called after an object field has been output, but
-     * before the value is output.
-     *<p>
-     * Default handling will just output a single
-     * colon to separate the two, without additional spaces.
-     */
-//  @Override
-    public void writeObjectFieldValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(':');
-    }
-    
-    /**
-     * Method called after an object entry (field:value) has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate the two.
-     */
-//  @Override
-    public void writeObjectEntrySeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(',');
-    }
-
-//  @Override
-    public void writeEndObject(JsonGenerator jg, int nrOfEntries)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw('}');
-    }
-    
-//  @Override
-    public void writeStartArray(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw('[');
-    }
-    
-//  @Override
-    public void beforeArrayValues(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        // nothing special, since no indentation is added
-    }
-
-    /**
-     * Method called after an array value has been completely
-     * output, and before another value is to be output.
-     *<p>
-     * Default handling (without pretty-printing) will output a single
-     * comma to separate values.
-     */
-//  @Override
-    public void writeArrayValueSeparator(JsonGenerator jg)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(',');
-    }
-    
-//  @Override
-    public void writeEndArray(JsonGenerator jg, int nrOfValues)
-        throws IOException, JsonGenerationException
-    {
-        jg.writeRaw(']');
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/TextBuffer.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/TextBuffer.java
deleted file mode 100644
index eebe9ac..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/TextBuffer.java
+++ /dev/null
@@ -1,718 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-
-import com.fasterxml.jackson.core.io.NumberInput;
-
-/**
- * TextBuffer is a class similar to {@link StringBuffer}, with
- * following differences:
- *<ul>
- *  <li>TextBuffer uses segments character arrays, to avoid having
- *     to do additional array copies when array is not big enough.
- *     This means that only reallocating that is necessary is done only once:
- *     if and when caller
- *     wants to access contents in a linear array (char[], String).
- *    </li>
-*  <li>TextBuffer can also be initialized in "shared mode", in which
-*     it will just act as a wrapper to a single char array managed
-*     by another object (like parser that owns it)
- *    </li>
- *  <li>TextBuffer is not synchronized.
- *    </li>
- * </ul>
- */
-public final class TextBuffer
-{
-    final static char[] NO_CHARS = new char[0];
-
-    /**
-     * Let's start with sizable but not huge buffer, will grow as necessary
-     */
-    final static int MIN_SEGMENT_LEN = 1000;
-    
-    /**
-     * Let's limit maximum segment length to something sensible
-     * like 256k
-     */
-    final static int MAX_SEGMENT_LEN = 0x40000;
-    
-    /*
-    /**********************************************************
-    /* Configuration:
-    /**********************************************************
-     */
-
-    private final BufferRecycler _allocator;
-
-    /*
-    /**********************************************************
-    /* Shared input buffers
-    /**********************************************************
-     */
-
-    /**
-     * Shared input buffer; stored here in case some input can be returned
-     * as is, without being copied to collector's own buffers. Note that
-     * this is read-only for this Object.
-     */
-    private char[] _inputBuffer;
-
-    /**
-     * Character offset of first char in input buffer; -1 to indicate
-     * that input buffer currently does not contain any useful char data
-     */
-    private int _inputStart;
-
-    private int _inputLen;
-
-    /*
-    /**********************************************************
-    /* Aggregation segments (when not using input buf)
-    /**********************************************************
-     */
-
-    /**
-     * List of segments prior to currently active segment.
-     */
-    private ArrayList<char[]> _segments;
-
-    /**
-     * Flag that indicates whether _seqments is non-empty
-     */
-    private boolean _hasSegments = false;
-
-    // // // Currently used segment; not (yet) contained in _seqments
-
-    /**
-     * Amount of characters in segments in {@link _segments}
-     */
-    private int _segmentSize;
-
-    private char[] _currentSegment;
-
-    /**
-     * Number of characters in currently active (last) segment
-     */
-    private int _currentSize;
-
-    /*
-    /**********************************************************
-    /* Caching of results
-    /**********************************************************
-     */
-
-    /**
-     * String that will be constructed when the whole contents are
-     * needed; will be temporarily stored in case asked for again.
-     */
-    private String _resultString;
-
-    private char[] _resultArray;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public TextBuffer(BufferRecycler allocator)
-    {
-        _allocator = allocator;
-    }
-
-    /**
-     * Method called to indicate that the underlying buffers should now
-     * be recycled if they haven't yet been recycled. Although caller
-     * can still use this text buffer, it is not advisable to call this
-     * method if that is likely, since next time a buffer is needed,
-     * buffers need to reallocated.
-     * Note: calling this method automatically also clears contents
-     * of the buffer.
-     */
-    public void releaseBuffers()
-    {
-        if (_allocator == null) {
-            resetWithEmpty();
-        } else {
-            if (_currentSegment != null) {
-                // First, let's get rid of all but the largest char array
-                resetWithEmpty();
-                // And then return that array
-                char[] buf = _currentSegment;
-                _currentSegment = null;
-                _allocator.releaseCharBuffer(BufferRecycler.CharBufferType.TEXT_BUFFER, buf);
-            }
-        }
-    }
-
-    /**
-     * Method called to clear out any content text buffer may have, and
-     * initializes buffer to use non-shared data.
-     */
-    public void resetWithEmpty()
-    {
-        _inputStart = -1; // indicates shared buffer not used
-        _currentSize = 0;
-        _inputLen = 0;
-
-        _inputBuffer = null;
-        _resultString = null;
-        _resultArray = null;
-
-        // And then reset internal input buffers, if necessary:
-        if (_hasSegments) {
-            clearSegments();
-        }
-    }
-
-    /**
-     * Method called to initialize the buffer with a shared copy of data;
-     * this means that buffer will just have pointers to actual data. It
-     * also means that if anything is to be appended to the buffer, it
-     * will first have to unshare it (make a local copy).
-     */
-    public void resetWithShared(char[] buf, int start, int len)
-    {
-        // First, let's clear intermediate values, if any:
-        _resultString = null;
-        _resultArray = null;
-
-        // Then let's mark things we need about input buffer
-        _inputBuffer = buf;
-        _inputStart = start;
-        _inputLen = len;
-
-        // And then reset internal input buffers, if necessary:
-        if (_hasSegments) {
-            clearSegments();
-        }
-    }
-
-    public void resetWithCopy(char[] buf, int start, int len)
-    {
-        _inputBuffer = null;
-        _inputStart = -1; // indicates shared buffer not used
-        _inputLen = 0;
-
-        _resultString = null;
-        _resultArray = null;
-
-        // And then reset internal input buffers, if necessary:
-        if (_hasSegments) {
-            clearSegments();
-        } else if (_currentSegment == null) {
-            _currentSegment = findBuffer(len);
-        }
-        _currentSize = _segmentSize = 0;
-        append(buf, start, len);
-    }
-
-    public void resetWithString(String value)
-    {
-        _inputBuffer = null;
-        _inputStart = -1;
-        _inputLen = 0;
-
-        _resultString = value;
-        _resultArray = null;
-
-        if (_hasSegments) {
-            clearSegments();
-        }
-        _currentSize = 0;
-        
-    }
-    
-    /**
-     * Helper method used to find a buffer to use, ideally one
-     * recycled earlier.
-     */
-    private char[] findBuffer(int needed)
-    {
-        if (_allocator != null) {
-            return _allocator.allocCharBuffer(BufferRecycler.CharBufferType.TEXT_BUFFER, needed);
-        }
-        return new char[Math.max(needed, MIN_SEGMENT_LEN)];
-    }
-
-    private void clearSegments()
-    {
-        _hasSegments = false;
-        /* Let's start using _last_ segment from list; for one, it's
-         * the biggest one, and it's also most likely to be cached
-         */
-        /* 28-Aug-2009, tatu: Actually, the current segment should
-         *   be the biggest one, already
-         */
-        //_currentSegment = _segments.get(_segments.size() - 1);
-        _segments.clear();
-        _currentSize = _segmentSize = 0;
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors for implementing public interface
-    /**********************************************************
-     */
-
-    /**
-     * @return Number of characters currently stored by this collector
-     */
-    public int size() {
-        if (_inputStart >= 0) { // shared copy from input buf
-            return _inputLen;
-        }
-        if (_resultArray != null) {
-            return _resultArray.length;
-        }
-        if (_resultString != null) {
-            return _resultString.length();
-        }
-        // local segmented buffers
-        return _segmentSize + _currentSize;
-    }
-
-    public int getTextOffset()
-    {
-        /* Only shared input buffer can have non-zero offset; buffer
-         * segments start at 0, and if we have to create a combo buffer,
-         * that too will start from beginning of the buffer
-         */
-        return (_inputStart >= 0) ? _inputStart : 0;
-    }
-
-    /**
-     * Method that can be used to check whether textual contents can
-     * be efficiently accessed using {@link #getTextBuffer}.
-     */
-    public boolean hasTextAsCharacters()
-    {
-        // if we have array in some form, sure
-        if (_inputStart >= 0 || _resultArray != null) {
-            return true;
-        }
-        // not if we have String as value
-        if (_resultString != null) {
-            return false;
-        }
-        return true;
-    }
-    
-    public char[] getTextBuffer()
-    {
-        // Are we just using shared input buffer?
-        if (_inputStart >= 0) {
-            return _inputBuffer;
-        }
-        if (_resultArray != null) {
-            return _resultArray;
-        }
-        if (_resultString != null) {
-            return (_resultArray = _resultString.toCharArray());
-        }
-        // Nope; but does it fit in just one segment?
-        if (!_hasSegments) {
-            return _currentSegment;
-        }
-        // Nope, need to have/create a non-segmented array and return it
-        return contentsAsArray();
-    }
-
-    /*
-    /**********************************************************
-    /* Other accessors:
-    /**********************************************************
-     */
-
-    public String contentsAsString()
-    {
-        if (_resultString == null) {
-            // Has array been requested? Can make a shortcut, if so:
-            if (_resultArray != null) {
-                _resultString = new String(_resultArray);
-            } else {
-                // Do we use shared array?
-                if (_inputStart >= 0) {
-                    if (_inputLen < 1) {
-                        return (_resultString = "");
-                    }
-                    _resultString = new String(_inputBuffer, _inputStart, _inputLen);
-                } else { // nope... need to copy
-                    // But first, let's see if we have just one buffer
-                    int segLen = _segmentSize;
-                    int currLen = _currentSize;
-                    
-                    if (segLen == 0) { // yup
-                        _resultString = (currLen == 0) ? "" : new String(_currentSegment, 0, currLen);
-                    } else { // no, need to combine
-                        StringBuilder sb = new StringBuilder(segLen + currLen);
-                        // First stored segments
-                        if (_segments != null) {
-                            for (int i = 0, len = _segments.size(); i < len; ++i) {
-                                char[] curr = _segments.get(i);
-                                sb.append(curr, 0, curr.length);
-                            }
-                        }
-                        // And finally, current segment:
-                        sb.append(_currentSegment, 0, _currentSize);
-                        _resultString = sb.toString();
-                    }
-                }
-            }
-        }
-        return _resultString;
-    }
- 
-    public char[] contentsAsArray()
-    {
-        char[] result = _resultArray;
-        if (result == null) {
-            _resultArray = result = buildResultArray();
-        }
-        return result;
-    }
-
-    /**
-     * Convenience method for converting contents of the buffer
-     * into a {@link BigDecimal}.
-     */
-    public BigDecimal contentsAsDecimal()
-        throws NumberFormatException
-    {
-        // Already got a pre-cut array?
-        if (_resultArray != null) {
-            return new BigDecimal(_resultArray);
-        }
-        // Or a shared buffer?
-        if (_inputStart >= 0) {
-            return new BigDecimal(_inputBuffer, _inputStart, _inputLen);
-        }
-        // Or if not, just a single buffer (the usual case)
-        if (_segmentSize == 0) {
-            return new BigDecimal(_currentSegment, 0, _currentSize);
-        }
-        // If not, let's just get it aggregated...
-        return new BigDecimal(contentsAsArray());
-    }
-
-    /**
-     * Convenience method for converting contents of the buffer
-     * into a Double value.
-     */
-    public double contentsAsDouble()
-        throws NumberFormatException
-    {
-        return NumberInput.parseDouble(contentsAsString());
-    }
-
-    /*
-    /**********************************************************
-    /* Public mutators:
-    /**********************************************************
-     */
-
-    /**
-     * Method called to make sure that buffer is not using shared input
-     * buffer; if it is, it will copy such contents to private buffer.
-     */
-    public void ensureNotShared() {
-        if (_inputStart >= 0) {
-            unshare(16);
-        }
-    }
-
-    public void append(char c) {
-        // Using shared buffer so far?
-        if (_inputStart >= 0) {
-            unshare(16);
-        }
-        _resultString = null;
-        _resultArray = null;
-        // Room in current segment?
-        char[] curr = _currentSegment;
-        if (_currentSize >= curr.length) {
-            expand(1);
-            curr = _currentSegment;
-        }
-        curr[_currentSize++] = c;
-    }
-
-    public void append(char[] c, int start, int len)
-    {
-        // Can't append to shared buf (sanity check)
-        if (_inputStart >= 0) {
-            unshare(len);
-        }
-        _resultString = null;
-        _resultArray = null;
-
-        // Room in current segment?
-        char[] curr = _currentSegment;
-        int max = curr.length - _currentSize;
-            
-        if (max >= len) {
-            System.arraycopy(c, start, curr, _currentSize, len);
-            _currentSize += len;
-            return;
-        }
-        // No room for all, need to copy part(s):
-        if (max > 0) {
-            System.arraycopy(c, start, curr, _currentSize, max);
-            start += max;
-            len -= max;
-        }
-        /* And then allocate new segment; we are guaranteed to now
-         * have enough room in segment.
-         */
-        // Except, as per [Issue-24], not for HUGE appends... so:
-        do {
-            expand(len);
-            int amount = Math.min(_currentSegment.length, len);
-            System.arraycopy(c, start, _currentSegment, 0, amount);
-            _currentSize += amount;
-            start += amount;
-            len -= amount;
-        } while (len > 0);
-    }
-
-    public void append(String str, int offset, int len)
-    {
-        // Can't append to shared buf (sanity check)
-        if (_inputStart >= 0) {
-            unshare(len);
-        }
-        _resultString = null;
-        _resultArray = null;
-
-        // Room in current segment?
-        char[] curr = _currentSegment;
-        int max = curr.length - _currentSize;
-        if (max >= len) {
-            str.getChars(offset, offset+len, curr, _currentSize);
-            _currentSize += len;
-            return;
-        }
-        // No room for all, need to copy part(s):
-        if (max > 0) {
-            str.getChars(offset, offset+max, curr, _currentSize);
-            len -= max;
-            offset += max;
-        }
-        /* And then allocate new segment; we are guaranteed to now
-         * have enough room in segment.
-         */
-        // Except, as per [Issue-24], not for HUGE appends... so:
-        do {
-            expand(len);
-            int amount = Math.min(_currentSegment.length, len);
-            str.getChars(offset, offset+amount, _currentSegment, 0);
-            _currentSize += amount;
-            offset += amount;
-            len -= amount;
-        } while (len > 0);
-    }
-
-    /*
-    /**********************************************************
-    /* Raw access, for high-performance use:
-    /**********************************************************
-     */
-
-    public char[] getCurrentSegment()
-    {
-        /* Since the intention of the caller is to directly add stuff into
-         * buffers, we should NOT have anything in shared buffer... ie. may
-         * need to unshare contents.
-         */
-        if (_inputStart >= 0) {
-            unshare(1);
-        } else {
-            char[] curr = _currentSegment;
-            if (curr == null) {
-                _currentSegment = findBuffer(0);
-            } else if (_currentSize >= curr.length) {
-                // Plus, we better have room for at least one more char
-                expand(1);
-            }
-        }
-        return _currentSegment;
-    }
-
-    public char[] emptyAndGetCurrentSegment()
-    {
-        // inlined 'resetWithEmpty()'
-        _inputStart = -1; // indicates shared buffer not used
-        _currentSize = 0;
-        _inputLen = 0;
-
-        _inputBuffer = null;
-        _resultString = null;
-        _resultArray = null;
-
-        // And then reset internal input buffers, if necessary:
-        if (_hasSegments) {
-            clearSegments();
-        }
-        char[] curr = _currentSegment;
-        if (curr == null) {
-            _currentSegment = curr = findBuffer(0);
-        }
-        return curr;
-    }
-
-    public int getCurrentSegmentSize() {
-        return _currentSize;
-    }
-
-    public void setCurrentLength(int len) {
-        _currentSize = len;
-    }
-
-    public char[] finishCurrentSegment()
-    {
-        if (_segments == null) {
-            _segments = new ArrayList<char[]>();
-        }
-        _hasSegments = true;
-        _segments.add(_currentSegment);
-        int oldLen = _currentSegment.length;
-        _segmentSize += oldLen;
-        // Let's grow segments by 50%
-        int newLen = Math.min(oldLen + (oldLen >> 1), MAX_SEGMENT_LEN);
-        char[] curr = _charArray(newLen);
-        _currentSize = 0;
-        _currentSegment = curr;
-        return curr;
-    }
-
-    /**
-     * Method called to expand size of the current segment, to
-     * accomodate for more contiguous content. Usually only
-     * used when parsing tokens like names.
-     */
-    public char[] expandCurrentSegment()
-    {
-        char[] curr = _currentSegment;
-        // Let's grow by 50%
-        int len = curr.length;
-        // Must grow by at least 1 char, no matter what
-        int newLen = (len == MAX_SEGMENT_LEN) ?
-            (MAX_SEGMENT_LEN + 1) : Math.min(MAX_SEGMENT_LEN, len + (len >> 1));
-        _currentSegment = _charArray(newLen);
-        System.arraycopy(curr, 0, _currentSegment, 0, len);
-        return _currentSegment;
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods:
-    /**********************************************************
-     */
-
-    /**
-     * Note: calling this method may not be as efficient as calling
-     * {@link #contentsAsString}, since it's not guaranteed that resulting
-     * String is cached.
-     */
-    @Override
-    public String toString() {
-         return contentsAsString();
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods:
-    /**********************************************************
-     */
-
-    /**
-     * Method called if/when we need to append content when we have been
-     * initialized to use shared buffer.
-     */
-    private void unshare(int needExtra)
-    {
-        int sharedLen = _inputLen;
-        _inputLen = 0;
-        char[] inputBuf = _inputBuffer;
-        _inputBuffer = null;
-        int start = _inputStart;
-        _inputStart = -1;
-
-        // Is buffer big enough, or do we need to reallocate?
-        int needed = sharedLen+needExtra;
-        if (_currentSegment == null || needed > _currentSegment.length) {
-            _currentSegment = findBuffer(needed);
-        }
-        if (sharedLen > 0) {
-            System.arraycopy(inputBuf, start, _currentSegment, 0, sharedLen);
-        }
-        _segmentSize = 0;
-        _currentSize = sharedLen;
-    }
-
-    /**
-     * Method called when current segment is full, to allocate new
-     * segment.
-     */
-    private void expand(int minNewSegmentSize)
-    {
-        // First, let's move current segment to segment list:
-        if (_segments == null) {
-            _segments = new ArrayList<char[]>();
-        }
-        char[] curr = _currentSegment;
-        _hasSegments = true;
-        _segments.add(curr);
-        _segmentSize += curr.length;
-        int oldLen = curr.length;
-        // Let's grow segments by 50% minimum
-        int sizeAddition = oldLen >> 1;
-        if (sizeAddition < minNewSegmentSize) {
-            sizeAddition = minNewSegmentSize;
-        }
-        curr = _charArray(Math.min(MAX_SEGMENT_LEN, oldLen + sizeAddition));
-        _currentSize = 0;
-        _currentSegment = curr;
-    }
-
-    private char[] buildResultArray()
-    {
-        if (_resultString != null) { // Can take a shortcut...
-            return _resultString.toCharArray();
-        }
-        char[] result;
-        
-        // Do we use shared array?
-        if (_inputStart >= 0) {
-            if (_inputLen < 1) {
-                return NO_CHARS;
-            }
-            result = _charArray(_inputLen);
-            System.arraycopy(_inputBuffer, _inputStart, result, 0,
-                             _inputLen);
-        } else { // nope 
-            int size = size();
-            if (size < 1) {
-                return NO_CHARS;
-            }
-            int offset = 0;
-            result = _charArray(size);
-            if (_segments != null) {
-                for (int i = 0, len = _segments.size(); i < len; ++i) {
-                    char[] curr = (char[]) _segments.get(i);
-                    int currLen = curr.length;
-                    System.arraycopy(curr, 0, result, offset, currLen);
-                    offset += currLen;
-                }
-            }
-            System.arraycopy(_currentSegment, 0, result, offset, _currentSize);
-        }
-        return result;
-    }
-
-    private char[] _charArray(int len) {
-        return new char[len];
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/VersionUtil.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/VersionUtil.java
deleted file mode 100644
index a70913d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/VersionUtil.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.fasterxml.jackson.core.util;
-
-import java.io.*;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import com.fasterxml.jackson.core.Version;
-
-/**
- * Functionality for supporting exposing of component {@link Version}s.
- *<p>
- * Note that this class can be used in two roles: first, as a static
- * utility class for loading purposes, and second, as a singleton
- * loader of per-module version information.
- * In latter case one must sub-class to get proper per-module instance;
- * and sub-class must reside in same Java package as matching "VERSION.txt"
- * file.
- */
-public class VersionUtil
-{
-    public final static String VERSION_FILE = "VERSION.txt";
-
-    private final static Pattern VERSION_SEPARATOR = Pattern.compile("[-_./;:]");
-
-    private final Version _version;
-
-    /*
-    /**********************************************************
-    /* Instance life-cycle, accesso
-    /**********************************************************
-     */
-    
-    protected VersionUtil()
-    {
-        Version v = null;
-        try {
-            /* Class we pass only matters for resource-loading: can't use this Class
-             * (as it's just being loaded at this point), nor anything that depends on it.
-             */
-            v = VersionUtil.versionFor(getClass());
-        } catch (Exception e) { // not good to dump to stderr; but that's all we have at this low level
-            System.err.println("ERROR: Failed to load Version information for bundle (via "+getClass().getName()+").");
-        }
-        if (v == null) {
-            v = Version.unknownVersion();
-        }
-        _version = v;
-    }
-
-    public Version version() { return _version; }
-    
-    /*
-    /**********************************************************
-    /* Static load methods
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method that will try to load version information for specified
-     * class. Implementation is simple: class loader that loaded specified
-     * class is asked to load resource with name "VERSION" from same
-     * location (package) as class itself had.
-     * If no version information is found, {@link Version#unknownVersion()} is
-     * returned.
-     */
-    public static Version versionFor(Class<?> cls)
-    {
-        InputStream in;
-        Version version = null;
-
-        try {
-            in = cls.getResourceAsStream(VERSION_FILE);
-            if (in != null) {
-                try {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(in, "UTF-8"));
-                    String groupStr = null, artifactStr = null;
-                    String versionStr = br.readLine();
-                    if (versionStr != null) {
-                        groupStr = br.readLine();
-                        if (groupStr != null) {
-                            groupStr = groupStr.trim();
-                            artifactStr = br.readLine();
-                            if (artifactStr != null) {
-                                artifactStr = artifactStr.trim();
-                            }
-                        }
-                    }
-                    version = parseVersion(versionStr, groupStr, artifactStr);
-                } finally {
-                    try {
-                        in.close();
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        } catch (IOException e) { }
-        return (version == null) ? Version.unknownVersion() : version;
-    }
-
-    /**
-     * Will attempt to load the maven version for the given groupId and
-     * artifactId.  Maven puts a pom.properties file in
-     * META-INF/maven/groupId/artifactId, containing the groupId,
-     * artifactId and version of the library.
-     *
-     * @param classLoader the ClassLoader to load the pom.properties file from
-     * @param groupId the groupId of the library
-     * @param artifactId the artifactId of the library
-     * @return The version
-     */
-    public static Version mavenVersionFor(ClassLoader classLoader, String groupId, String artifactId) {
-        InputStream pomPoperties = classLoader.getResourceAsStream("META-INF/maven/" + groupId.replaceAll("\\.", "/")
-                + "/" + artifactId + "/pom.properties");
-        if (pomPoperties != null) {
-            try {
-                Properties props = new Properties();
-                props.load(pomPoperties);
-                String versionStr = props.getProperty("version");
-                String pomPropertiesArtifactId = props.getProperty("artifactId");
-                String pomPropertiesGroupId = props.getProperty("groupId");
-                return parseVersion(versionStr, pomPropertiesGroupId, pomPropertiesArtifactId);
-            } catch (IOException e) {
-                // Ignore
-            } finally {
-                try {
-                    pomPoperties.close();
-                } catch (IOException e) {
-                    // Ignore
-                }
-            }
-        }
-        return Version.unknownVersion();
-    }
-
-    /**
-     * Use variant that takes three arguments instead
-     * 
-     * @deprecated
-     */
-    @Deprecated
-    public static Version parseVersion(String versionStr) {
-        return parseVersion(versionStr, null, null);
-    }
-
-    public static Version parseVersion(String versionStr, String groupId, String artifactId)
-    {
-        if (versionStr == null) {
-            return null;
-        }
-        versionStr = versionStr.trim();
-        if (versionStr.length() == 0) {
-            return null;
-        }
-        String[] parts = VERSION_SEPARATOR.split(versionStr);
-        int major = parseVersionPart(parts[0]);
-        int minor = (parts.length > 1) ? parseVersionPart(parts[1]) : 0;
-        int patch = (parts.length > 2) ? parseVersionPart(parts[2]) : 0;
-        String snapshot = (parts.length > 3) ? parts[3] : null;
-
-        return new Version(major, minor, patch, snapshot,
-                groupId, artifactId);
-    }
-
-    protected static int parseVersionPart(String partStr)
-    {
-        partStr = partStr.toString();
-        int len = partStr.length();
-        int number = 0;
-        for (int i = 0; i < len; ++i) {
-            char c = partStr.charAt(i);
-            if (c > '9' || c < '0') break;
-            number = (number * 10) + (c - '0');
-        }
-        return number;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/core/util/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/core/util/package-info.java
deleted file mode 100644
index 9ad785f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/core/util/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Utility classes used by Jackson Core functionality.
- */
-package com.fasterxml.jackson.core.util;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/AbstractTypeResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/AbstractTypeResolver.java
deleted file mode 100644
index e60c474..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/AbstractTypeResolver.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-
-/**
- * Defines interface for resolvers that can resolve abstract types into concrete
- * ones; either by using static mappings, or possibly by materializing
- * implementations dynamically.
- */
-public abstract class AbstractTypeResolver
-{
-    /**
-     * Try to locate a subtype for given abstract type, to either resolve
-     * to a concrete type, or at least to a more-specific (and hopefully supported)
-     * abstract type, one which may have registered deserializers.
-     * Method is called before trying to locate registered deserializers
-     * (as well as standard abstract type defaulting that core Jackson does),
-     * so it is typically implemented to add custom mappings of common abstract
-     * types (like specify which concrete implementation to use for binding
-     * {@link java.util.List}s).
-     *<p>
-     * Note that this method does not necessarily have to do full resolution
-     * of bindings; that is, it is legal to return type that could be further
-     * resolved: caller is expected to keep calling this method on registered
-     * resolvers, until a concrete type is located.
-     * 
-     * @param config Configuration in use; should always be of type
-     *    <code>DeserializationConfig</code>
-     */
-    public JavaType findTypeMapping(DeserializationConfig config, JavaType type) {
-        return null;
-    }
-    
-    /**
-     * Method called to try to resolve an abstract type into
-     * concrete type (usually for purposes of deserializing),
-     * when no concrete implementation was found.
-     * It will be called after checking all other possibilities,
-     * including defaulting.
-     * 
-     * @param config Configuration in use; should always be of type
-     *    <code>DeserializationConfig</code>
-     * @param type Type for which materialization maybe needed
-     * 
-     * @return Resolved concrete type (which should retain generic
-     *    type parameters of input type, if any), if resolution succeeds;
-     *    null if resolver does not know how to resolve type
-     */
-    public JavaType resolveAbstractType(DeserializationConfig config,
-            JavaType type) {
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/AnnotationIntrospector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/AnnotationIntrospector.java
deleted file mode 100644
index ff9f2a2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/AnnotationIntrospector.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.Versioned;
-
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Abstract class that defines API used for introspecting annotation-based
- * configuration for serialization and deserialization. Separated
- * so that different sets of annotations can be supported, and support
- * plugged-in dynamically.
- *<p>
- * NOTE: due to rapid addition of new methods (and changes to existing methods),
- * it is <b>strongly</b> recommended that custom implementations should not directly
- * extend this class, but rather extend {@link NopAnnotationIntrospector}.
- * This way added methods will not break backwards compatibility of custom annotation
- * introspectors.
- */
-public abstract class AnnotationIntrospector implements Versioned
-{    
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-
-    /**
-     * Value type used with managed and back references; contains type and
-     * logic name, used to link related references
-     */
-    public static class ReferenceProperty
-    {
-        public enum Type {
-            /**
-             * Reference property that Jackson manages and that is serialized normally (by serializing
-             * reference object), but is used for resolving back references during
-             * deserialization.
-             * Usually this can be defined by using
-             * {@link com.fasterxml.jackson.annotation.JsonManagedReference}
-             */
-            MANAGED_REFERENCE
-    
-            /**
-             * Reference property that Jackson manages by suppressing it during serialization,
-             * and reconstructing during deserialization.
-             * Usually this can be defined by using
-             * {@link com.fasterxml.jackson.annotation.JsonBackReference}
-             */
-            ,BACK_REFERENCE
-            ;
-        }
-
-        private final Type _type;
-        private final String _name;
-
-        public ReferenceProperty(Type t, String n) {
-            _type = t;
-            _name = n;
-        }
-
-        public static ReferenceProperty managed(String name) { return new ReferenceProperty(Type.MANAGED_REFERENCE, name); }
-        public static ReferenceProperty back(String name) { return new ReferenceProperty(Type.BACK_REFERENCE, name); }
-        
-        public Type getType() { return _type; }
-        public String getName() { return _name; }
-
-        public boolean isManagedReference() { return _type == Type.MANAGED_REFERENCE; }
-        public boolean isBackReference() { return _type == Type.BACK_REFERENCE; }
-    }
-    
-    /*
-    /**********************************************************
-    /* Factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Factory method for accessing "no operation" implementation
-     * of introspector: instance that will never find any annotation-based
-     * configuration.
-     */
-    public static AnnotationIntrospector nopInstance() {
-        return NopAnnotationIntrospector.instance;
-    }
-
-    public static AnnotationIntrospector pair(AnnotationIntrospector a1, AnnotationIntrospector a2) {
-        return new AnnotationIntrospectorPair(a1, a2);
-    }
-
-    /*
-    /**********************************************************
-    /* Access to possibly chained introspectors (1.7)
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to collect all "real" introspectors that
-     * this introspector contains, if any; or this introspector
-     * if it is not a container. Used to get access to all container
-     * introspectors in their priority order.
-     *<p>
-     * Default implementation returns a Singleton list with this introspector
-     * as contents.
-     * This usually works for sub-classes, except for proxy or delegating "container
-     * introspectors" which need to override implementation.
-     */
-    public Collection<AnnotationIntrospector> allIntrospectors() {
-        return Collections.singletonList(this);
-    }
-    
-    /**
-     * Method that can be used to collect all "real" introspectors that
-     * this introspector contains, if any; or this introspector
-     * if it is not a container. Used to get access to all container
-     * introspectors in their priority order.
-     *<p>
-     * Default implementation adds this introspector in result; this usually
-     * works for sub-classes, except for proxy or delegating "container
-     * introspectors" which need to override implementation.
-     */
-    public Collection<AnnotationIntrospector> allIntrospectors(Collection<AnnotationIntrospector> result) {
-        result.add(this);
-        return result;
-    }
-    
-    /*
-    /**********************************************************
-    /* Default Versioned impl
-    /**********************************************************
-     */
-
-//  @Override
-    public abstract Version version();
-    
-    /*
-    /**********************************************************
-    /* Meta-annotations (annotations for annotation types)
-    /**********************************************************
-     */
-    
-    /**
-     * Method called by framework to determine whether given annotation
-     * is handled by this introspector.
-     *
-     * @deprecated Not used since 2.0; deprecated sicne 2.1
-     */
-    @Deprecated
-    public boolean isHandled(Annotation ann) {
-        return false;
-    }
-
-    /**
-     * Method for checking whether given annotation is considered an
-     * annotation bundle: if so, all meta-annotations it has will
-     * be used instead of annotation ("bundle") itself.
-     * 
-     * @since 2.0
-     */
-    public boolean isAnnotationBundle(Annotation ann) {
-        return false;
-    }
-
-    /*
-    /**********************************************************
-    /* General annotations (for classes, properties)
-    /**********************************************************
-     */
-    
-    /**
-     * Method for checking whether given annotated thing
-     * (type, or accessor) indicates that values
-     * referenced (values of type of annotated class, or
-     * values referenced by annotated property; latter
-     * having precedence) should include Object Identifier,
-     * and if so, specify details of Object Identity used.
-     * 
-     * @since 2.0
-     */
-    public ObjectIdInfo findObjectIdInfo(Annotated ann) {
-        return null;
-    }
-
-    /**
-     * Method for figuring out additional properties of an Object Identity reference
-     * 
-     * @since 2.1
-     */
-    public ObjectIdInfo findObjectReferenceInfo(Annotated ann, ObjectIdInfo objectIdInfo) {
-        return objectIdInfo;
-    }
-    
-    /*
-    /**********************************************************
-    /* General class annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for locating name used as "root name" (for use by
-     * some serializers when outputting root-level object -- mostly
-     * for XML compatibility purposes) for given class, if one
-     * is defined. Returns null if no declaration found; can return
-     * explicit empty String, which is usually ignored as well as null.
-     *<p> 
-     * NOTE: method signature changed in 2.1, to return {@link PropertyName}
-     * instead of String.
-     */
-    public PropertyName findRootName(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for finding list of properties to ignore for given class
-     * (null is returned if not specified).
-     * List of property names is applied
-     * after other detection mechanisms, to filter out these specific
-     * properties from being serialized and deserialized.
-     */
-    public String[] findPropertiesToIgnore(Annotated ac) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether an annotation indicates that all unknown properties
-     */
-    public Boolean findIgnoreUnknownProperties(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether properties that have specified type
-     * (class, not generics aware) should be completely ignored for
-     * serialization and deserialization purposes.
-     * 
-     * @param ac Type to check
-     * 
-     * @return Boolean.TRUE if properties of type should be ignored;
-     *   Boolean.FALSE if they are not to be ignored, null for default
-     *   handling (which is 'do not ignore')
-     */
-    public Boolean isIgnorableType(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for finding if annotated class has associated filter; and if so,
-     * to return id that is used to locate filter.
-     * 
-     * @return Id of the filter to use for filtering properties of annotated
-     *    class, if any; or null if none found.
-     */
-    public Object findFilterId(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for finding {@link PropertyNamingStrategy} for given
-     * class, if any specified by annotations; and if so, either return
-     * a {@link PropertyNamingStrategy} instance, or Class to use for
-     * creating instance
-     * 
-     * @return Sub-class or instance of {@link PropertyNamingStrategy}, if one
-     *   is specified for given class; null if not.
-     * 
-     * @since 2.1
-     */
-    public Object findNamingStrategy(AnnotatedClass ac) {
-        return null;
-    }    
-
-    /*
-    /**********************************************************
-    /* Property auto-detection
-    /**********************************************************
-     */
-
-    /**
-     * Method for checking if annotations indicate changes to minimum visibility levels
-     * needed for auto-detecting property elements (fields, methods, constructors).
-     * A baseline checker is given, and introspector is to either return it as is
-     * (if no annotations are found), or build and return a derived instance (using
-     * checker's build methods).
-     */
-    public VisibilityChecker<?> findAutoDetectVisibility(AnnotatedClass ac,
-            VisibilityChecker<?> checker) {
-        return checker;
-    }
-    
-    /*
-    /**********************************************************
-    /* Class annotations for Polymorphic type handling (1.5+)
-    /**********************************************************
-    */
-    
-    /**
-     * Method for checking if given class has annotations that indicate
-     * that specific type resolver is to be used for handling instances.
-     * This includes not only
-     * instantiating resolver builder, but also configuring it based on
-     * relevant annotations (not including ones checked with a call to
-     * {@link #findSubtypes}
-     * 
-     * @param config Configuration settings in effect (for serialization or deserialization)
-     * @param ac Annotated class to check for annotations
-     * @param baseType Base java type of value for which resolver is to be found
-     * 
-     * @return Type resolver builder for given type, if one found; null if none
-     */
-    public TypeResolverBuilder<?> findTypeResolver(MapperConfig<?> config,
-            AnnotatedClass ac, JavaType baseType) {
-        return null;
-    }
-
-    /**
-     * Method for checking if given property entity (field or method) has annotations
-     * that indicate that specific type resolver is to be used for handling instances.
-     * This includes not only
-     * instantiating resolver builder, but also configuring it based on
-     * relevant annotations (not including ones checked with a call to
-     * {@link #findSubtypes}
-     * 
-     * @param config Configuration settings in effect (for serialization or deserialization)
-     * @param am Annotated member (field or method) to check for annotations
-     * @param baseType Base java type of property for which resolver is to be found
-     * 
-     * @return Type resolver builder for properties of given entity, if one found;
-     *    null if none
-     */
-    public TypeResolverBuilder<?> findPropertyTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType baseType) {
-        return null;
-    }
-
-    /**
-     * Method for checking if given structured property entity (field or method that
-     * has nominal value of Map, Collection or array type) has annotations
-     * that indicate that specific type resolver is to be used for handling type
-     * information of contained values.
-     * This includes not only
-     * instantiating resolver builder, but also configuring it based on
-     * relevant annotations (not including ones checked with a call to
-     * {@link #findSubtypes}
-     * 
-     * @param config Configuration settings in effect (for serialization or deserialization)
-     * @param am Annotated member (field or method) to check for annotations
-     * @param containerType Type of property for which resolver is to be found (must be a container type)
-     * 
-     * @return Type resolver builder for values contained in properties of given entity,
-     *    if one found; null if none
-     */    
-    public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType containerType) {
-        return null;
-    }
-
-    /**
-     * Method for locating annotation-specified subtypes related to annotated
-     * entity (class, method, field). Note that this is only guaranteed to be
-     * a list of directly
-     * declared subtypes, no recursive processing is guarantees (i.e. caller
-     * has to do it if/as necessary)
-     * 
-     * @param a Annotated entity (class, field/method) to check for annotations
-     */
-    public List<NamedType> findSubtypes(Annotated a) {
-        return null;
-    }
-
-    /**
-     * Method for checking if specified type has explicit name.
-     * 
-     * @param ac Class to check for type name annotations
-     */
-    public String findTypeName(AnnotatedClass ac) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* General member (field, method/constructor) annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for checking if given member indicates that it is part
-     * of a reference (parent/child).
-     */
-    public ReferenceProperty findReferenceType(AnnotatedMember member) {
-        return null;
-    }
-
-    /**
-     * Method called to check whether given property is marked to be "unwrapped"
-     * when being serialized (and appropriately handled in reverse direction,
-     * i.e. expect unwrapped representation during deserialization).
-     * Return value is the name transformation to use, if wrapping/unwrapping
-     * should  be done, or null if not -- note that transformation may simply
-     * be identity transformation (no changes).
-     */
-    public NameTransformer findUnwrappingNameTransformer(AnnotatedMember member) {
-        return null;
-    }
-
-    /**
-     * Method called to check whether given property is marked to
-     * be ignored. This is used to determine whether to ignore
-     * properties, on per-property basis, usually combining
-     * annotations from multiple accessors (getters, setters, fields,
-     * constructor parameters).
-     */
-    public boolean hasIgnoreMarker(AnnotatedMember m) {
-        return false;
-    }
-
-    /**
-     * Method called to find out whether given member expectes a value
-     * to be injected, and if so, what is the identifier of the value
-     * to use during injection.
-     * Type if identifier needs to be compatible with provider of
-     * values (of type {@link InjectableValues}); often a simple String
-     * id is used.
-     * 
-     * @param m Member to check
-     * 
-     * @return Identifier of value to inject, if any; null if no injection
-     *   indicator is found
-     */
-    public Object findInjectableValueId(AnnotatedMember m) {
-        return null;
-    }
-
-    /**
-     * Method that can be called to check whether this member has
-     * an annotation that suggests whether value for matching property
-     * is required or not.
-     * 
-     * @since 2.0
-     */
-    public Boolean hasRequiredMarker(AnnotatedMember m) {
-        return null;
-    }
-    
-    /**
-     * Method for checking if annotated property (represented by a field or
-     * getter/setter method) has definitions for views it is to be included in.
-     * If null is returned, no view definitions exist and property is always
-     * included (or always excluded as per default view inclusion configuration);
-     * otherwise it will only be included for views included in returned
-     * array. View matches are checked using class inheritance rules (sub-classes
-     * inherit inclusions of super-classes)
-     * 
-     * @param a Annotated property (represented by a method, field or ctor parameter)
-     * @return Array of views (represented by classes) that the property is included in;
-     *    if null, always included (same as returning array containing <code>Object.class</code>)
-     */
-    public Class<?>[] findViews(Annotated a) {
-        return null;
-    }
-
-    /**
-     * Method for finding format annotations for given member.
-     * Return value is typically used by serializers and/or
-     * deserializers to customize presentation aspects of the
-     * serialized value.
-     * 
-     * @since 2.0
-     * 
-     * @deprecated Since 2.1, use {@link #findFormat(Annotated)} instead.
-     */
-    @Deprecated
-    public JsonFormat.Value findFormat(AnnotatedMember member) {
-        return null;
-    }
-
-    /**
-     * Method for finding format annotations for property or class.
-     * Return value is typically used by serializers and/or
-     * deserializers to customize presentation aspects of the
-     * serialized value.
-     * 
-     * @since 2.1
-     */
-    public JsonFormat.Value findFormat(Annotated memberOrClass) {
-        if (memberOrClass instanceof AnnotatedMember) {
-            return findFormat((AnnotatedMember) memberOrClass);
-        }
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given accessor claims to represent
-     * type id: if so, its value may be used as an override,
-     * instead of generated type id.
-     * 
-     * @since 2.0
-     */
-    public Boolean isTypeId(AnnotatedMember member) {
-        return null;
-    }
-
-
-    /**
-     * Method used to check if specified property has annotation that indicates
-     * that it should be wrapped in an element; and if so, name to use.
-     * Note that not all serializers and deserializers support use this method:
-     * currently (2.1) it is only used by XML-backed handlers.
-     * 
-     * @return Wrapper name to use, if any, or {@link PropertyName#USE_DEFAULT}
-     *   to indicate that no wrapper element should be used.
-     * 
-     * @since 2.1
-     */
-    public PropertyName findWrapperName(Annotated ann) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization: general annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for getting a serializer definition on specified method
-     * or field. Type of definition is either instance (of type
-     * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findSerializer(Annotated am) {
-        return null;
-    }
-
-    /**
-     * Method for getting a serializer definition for keys of associated <code>Map</code> property.
-     * Type of definition is either instance (of type
-     * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findKeySerializer(Annotated am) {
-        return null;
-    }
-
-    /**
-     * Method for getting a serializer definition for content (values) of
-     * associated <code>Collection</code>, <code>array</code> or <code>Map</code> property.
-     * Type of definition is either instance (of type
-     * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findContentSerializer(Annotated am) {
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given annotated entity (class, method,
-     * field) defines which Bean/Map properties are to be included in
-     * serialization.
-     * If no annotation is found, method should return given second
-     * argument; otherwise value indicated by the annotation
-     *
-     * @return Enumerated value indicating which properties to include
-     *   in serialization
-     */
-    public JsonInclude.Include findSerializationInclusion(Annotated a, JsonInclude.Include defValue) {
-        return defValue;
-    }
-
-    /**
-     * Method for accessing annotated type definition that a
-     * method/field can have, to be used as the type for serialization
-     * instead of the runtime type.
-     * Type returned (if any) needs to be widening conversion (super-type).
-     * Declared return type of the method is also considered acceptable.
-     *
-     * @return Class to use instead of runtime type
-     */
-    public Class<?> findSerializationType(Annotated a) {
-        return null;
-    }
-
-    /**
-     * Method for finding possible widening type definition that a property
-     * value can have, to define less specific key type to use for serialization.
-     * It should be only be used with {@link java.util.Map} types.
-     * 
-     * @return Class specifying more general type to use instead of
-     *   declared type, if annotation found; null if not
-     */
-    public Class<?> findSerializationKeyType(Annotated am, JavaType baseType) {
-        return null;
-    }
-
-    /**
-     * Method for finding possible widening type definition that a property
-     * value can have, to define less specific key type to use for serialization.
-     * It should be only used with structured types (arrays, collections, maps).
-     * 
-     * @return Class specifying more general type to use instead of
-     *   declared type, if annotation found; null if not
-     */
-    public Class<?> findSerializationContentType(Annotated am, JavaType baseType) {
-        return null;
-    }
-    
-    /**
-     * Method for accessing declared typing mode annotated (if any).
-     * This is used for type detection, unless more granular settings
-     * (such as actual exact type; or serializer to use which means
-     * no type information is needed) take precedence.
-     *
-     * @return Typing mode to use, if annotation is found; null otherwise
-     */
-    public JsonSerialize.Typing findSerializationTyping(Annotated a) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization: class annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing defined property serialization order (which may be
-     * partial). May return null if no ordering is defined.
-     */
-    public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether an annotation indicates that serialized properties
-     * for which no explicit is defined should be alphabetically (lexicograpically)
-     * ordered
-     */
-    public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization: property annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for checking whether given property accessors (method,
-     * field) has an annotation that suggests property name to use
-     * for serialization.
-     * Should return null if no annotation
-     * is found; otherwise a non-null name (possibly
-     * {@link PropertyName#USE_DEFAULT}, which means "use default heuristics").
-     * 
-     * @param a Property accessor to check
-     * 
-     * @return Name to use if found; null if not.
-     * 
-     * @since 2.1
-     */
-    public PropertyName findNameForSerialization(Annotated a)
-    {
-        // [Issue#69], need bit of delegation 
-        // !!! TODO: in 2.2, remove old methods?
-        String name;
-        if (a instanceof AnnotatedField) {
-            name = findSerializationName((AnnotatedField) a);
-        } else if (a instanceof AnnotatedMethod) {
-            name = findSerializationName((AnnotatedMethod) a);
-        } else {
-            name = null;
-        }
-        if (name != null) {
-            if (name.length() == 0) { // empty String means 'default'
-                return PropertyName.USE_DEFAULT;
-            }
-            return new PropertyName(name);
-        }
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given method has an annotation
-     * that suggests property name associated with method that
-     * may be a "getter". Should return null if no annotation
-     * is found; otherwise a non-null String.
-     * If non-null value is returned, it is used as the property
-     * name, except for empty String ("") which is taken to mean
-     * "use standard bean name detection if applicable;
-     * method name if not".
-     * 
-     * @deprecated Since 2.1 should use {@link #findNameForSerialization} instead
-     */
-    @Deprecated
-    public String findSerializationName(AnnotatedMethod am) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether given member field represent
-     * a serializable logical property; and if so, returns the
-     * name of that property.
-     * Should return null if no annotation is found (indicating it
-     * is not a serializable field); otherwise a non-null String.
-     * If non-null value is returned, it is used as the property
-     * name, except for empty String ("") which is taken to mean
-     * "use the field name as is".
-     * 
-     * @deprecated Since 2.1 should use {@link #findNameForSerialization} instead
-     */
-    @Deprecated
-    public String findSerializationName(AnnotatedField af) {
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given method has an annotation
-     * that suggests that the return value of annotated method
-     * should be used as "the value" of the object instance; usually
-     * serialized as a primitive value such as String or number.
-     *
-     * @return True if such annotation is found (and is not disabled);
-     *   false if no enabled annotation is found
-     */
-    public boolean hasAsValueAnnotation(AnnotatedMethod am) {
-        return false;
-    }
-    
-    /**
-     * Method for determining the String value to use for serializing
-     * given enumeration entry; used when serializing enumerations
-     * as Strings (the standard method).
-     *
-     * @return Serialized enum value.
-     */
-    public String findEnumValue(Enum<?> value) {
-        return null;
-    }
-    /*
-    /**********************************************************
-    /* Deserialization: general annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for getting a deserializer definition on specified method
-     * or field.
-     * Type of definition is either instance (of type
-     * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findDeserializer(Annotated am) {
-        return null;
-    }
-
-    /**
-     * Method for getting a deserializer definition for keys of
-     * associated <code>Map</code> property.
-     * Type of definition is either instance (of type
-     * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findKeyDeserializer(Annotated am) {
-        return null;
-    }
-
-    /**
-     * Method for getting a deserializer definition for content (values) of
-     * associated <code>Collection</code>, <code>array</code> or
-     * <code>Map</code> property.
-     * Type of definition is either instance (of type
-     * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
-     * type is returned, a runtime exception may be thrown by caller.
-     */
-    public Object findContentDeserializer(Annotated am) {
-        return null;
-    }
-
-    /**
-     * Method for accessing annotated type definition that a
-     * method can have, to be used as the type for serialization
-     * instead of the runtime type.
-     * Type must be a narrowing conversion
-     * (i.e.subtype of declared type).
-     * Declared return type of the method is also considered acceptable.
-     *
-     * @param baseType Assumed type before considering annotations
-     *
-     * @return Class to use for deserialization instead of declared type
-     */
-    public Class<?> findDeserializationType(Annotated am, JavaType baseType) {
-        return null;
-    }
-
-    /**
-     * Method for accessing additional narrowing type definition that a
-     * method can have, to define more specific key type to use.
-     * It should be only be used with {@link java.util.Map} types.
-     * 
-     * @param baseKeyType Assumed key type before considering annotations
-     *
-     * @return Class specifying more specific type to use instead of
-     *   declared type, if annotation found; null if not
-     */
-    public Class<?> findDeserializationKeyType(Annotated am, JavaType baseKeyType) {
-        return null;
-    }
-
-    /**
-     * Method for accessing additional narrowing type definition that a
-     * method can have, to define more specific content type to use;
-     * content refers to Map values and Collection/array elements.
-     * It should be only be used with Map, Collection and array types.
-     * 
-     * @param baseContentType Assumed content (value) type before considering annotations
-     *
-     * @return Class specifying more specific type to use instead of
-     *   declared type, if annotation found; null if not
-     */
-    public Class<?> findDeserializationContentType(Annotated am, JavaType baseContentType) {
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Deserialization: class annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method getting {@link ValueInstantiator} to use for given
-     * type (class): return value can either be an instance of
-     * instantiator, or class of instantiator to create.
-     */
-    public Object findValueInstantiator(AnnotatedClass ac) {
-        return null;
-    }
-
-    /**
-     * Method for finding Builder object to use for constructing
-     * value instance and binding data (sort of combining value
-     * instantiators that can construct, and deserializers
-     * that can bind data).
-     *<p>
-     * Note that unlike accessors for some helper Objects, this
-     * method does not allow returning instances: the reason is
-     * that builders have state, and a separate instance needs
-     * to be created for each deserialization call.
-     * 
-     * @since 2.0
-     */
-    public Class<?> findPOJOBuilder(AnnotatedClass ac) {
-    	return null;
-    }
-
-    /**
-     * @since 2.0
-     */
-    public JsonPOJOBuilder.Value findPOJOBuilderConfig(AnnotatedClass ac) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserialization: property annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method for checking whether given property accessors (method,
-     * field) has an annotation that suggests property name to use
-     * for deserialization (reading JSON into POJOs).
-     * Should return null if no annotation
-     * is found; otherwise a non-null name (possibly
-     * {@link PropertyName#USE_DEFAULT}, which means "use default heuristics").
-     * 
-     * @param a Property accessor to check
-     * 
-     * @return Name to use if found; null if not.
-     * 
-     * @since 2.1
-     */
-    public PropertyName findNameForDeserialization(Annotated a)
-    {
-        // [Issue#69], need bit of delegation 
-        // !!! TODO: in 2.2, remove old methods?
-        String name;
-        if (a instanceof AnnotatedField) {
-            name = findDeserializationName((AnnotatedField) a);
-        } else if (a instanceof AnnotatedMethod) {
-            name = findDeserializationName((AnnotatedMethod) a);
-        } else if (a instanceof AnnotatedParameter) {
-            name = findDeserializationName((AnnotatedParameter) a);
-        } else {
-            name = null;
-        }
-        if (name != null) {
-            if (name.length() == 0) { // empty String means 'default'
-                return PropertyName.USE_DEFAULT;
-            }
-            return new PropertyName(name);
-        }
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given method has an annotation
-     * that suggests property name associated with method that
-     * may be a "setter". Should return null if no annotation
-     * is found; otherwise a non-null String.
-     * If non-null value is returned, it is used as the property
-     * name, except for empty String ("") which is taken to mean
-     * "use standard bean name detection if applicable;
-     * method name if not".
-     * 
-     * @deprecated Since 2.1 should use {@link #findNameForDeserialization} instead
-     */
-    @Deprecated
-    public String findDeserializationName(AnnotatedMethod am) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether given member field represent
-     * a deserializable logical property; and if so, returns the
-     * name of that property.
-     * Should return null if no annotation is found (indicating it
-     * is not a deserializable field); otherwise a non-null String.
-     * If non-null value is returned, it is used as the property
-     * name, except for empty String ("") which is taken to mean
-     * "use the field name as is".
-     * 
-     * @deprecated Since 2.1 should use {@link #findNameForDeserialization} instead
-     */
-    @Deprecated
-    public String findDeserializationName(AnnotatedField af) {
-        return null;
-    }
-
-    /**
-     * Method for checking whether given set of annotations indicates
-     * property name for associated parameter.
-     * No actual parameter object can be passed since JDK offers no
-     * representation; just annotations.
-     * 
-     * @deprecated Since 2.1 should use {@link #findNameForDeserialization} instead
-     */
-    @Deprecated
-    public String findDeserializationName(AnnotatedParameter param) {
-        return null;
-    }
-    
-    /**
-     * Method for checking whether given method has an annotation
-     * that suggests that the method is to serve as "any setter";
-     * method to be used for setting values of any properties for
-     * which no dedicated setter method is found.
-     *
-     * @return True if such annotation is found (and is not disabled),
-     *   false otherwise
-     */
-    public boolean hasAnySetterAnnotation(AnnotatedMethod am) {
-        return false;
-    }
-
-    /**
-     * Method for checking whether given method has an annotation
-     * that suggests that the method is to serve as "any setter";
-     * method to be used for accessing set of miscellaneous "extra"
-     * properties, often bound with matching "any setter" method.
-     *
-     * @return True if such annotation is found (and is not disabled),
-     *   false otherwise
-     */
-    public boolean hasAnyGetterAnnotation(AnnotatedMethod am) {
-        return false;
-    }
-    
-    /**
-     * Method for checking whether given annotated item (method, constructor)
-     * has an annotation
-     * that suggests that the method is a "creator" (aka factory)
-     * method to be used for construct new instances of deserialized
-     * values.
-     *
-     * @return True if such annotation is found (and is not disabled),
-     *   false otherwise
-     */
-    public boolean hasCreatorAnnotation(Annotated a) {
-        return false;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Old version of {@link AnnotationIntrospectorPair}.
-     * 
-     * @deprecated Starting with 2.1, use {@link AnnotationIntrospectorPair} instead.
-     */
-    @Deprecated
-    public static class Pair
-        extends AnnotationIntrospectorPair
-    {
-        private static final long serialVersionUID = 1L;
-
-        @Deprecated
-        public Pair(AnnotationIntrospector p, AnnotationIntrospector s) {
-            super(p, s);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/BeanDescription.java b/showkeyHelper/src/com/fasterxml/jackson/databind/BeanDescription.java
deleted file mode 100644
index 8d547d0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/BeanDescription.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Basic container for information gathered by {@link ClassIntrospector} to
- * help in constructing serializers and deserializers.
- * Note that the main implementation type is
- * {@link com.fasterxml.jackson.databind.introspect.BasicBeanDescription},
- * meaning that it is safe to upcast to this type.
- */
-public abstract class BeanDescription
-{
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Bean type information, including raw class and possible
-     * * generics information
-     */
-    protected final JavaType _type;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected BeanDescription(JavaType type)
-    {
-    	_type = type;
-    }
-
-    /*
-    /**********************************************************
-    /* Simple accesors
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing declared type of bean being introspected,
-     * including full generic type information (from declaration)
-     */
-    public JavaType getType() { return _type; }
-
-    public Class<?> getBeanClass() { return _type.getRawClass(); }
-
-    /**
-     * Method for accessing low-level information about Class this
-     * item describes.
-     */
-    public abstract AnnotatedClass getClassInfo();
-
-    /**
-     * Accessor for getting information about Object Id expected to
-     * be used for this POJO type, if any.
-     */
-    public abstract ObjectIdInfo getObjectIdInfo();
-    
-    /**
-     * Method for checking whether class being described has any
-     * annotations recognized by registered annotation introspector.
-     */
-    public abstract boolean hasKnownClassAnnotations();
-
-    /**
-     * Accessor for type bindings that may be needed to fully resolve
-     * types of member object, such as return and argument types of
-     * methods and constructors, and types of fields.
-     */
-    public abstract TypeBindings bindingsForBeanType();
-
-    /**
-     * Method for resolving given JDK type, using this bean as the
-     * generic type resolution context.
-     */
-    public abstract JavaType resolveType(java.lang.reflect.Type jdkType);
-    
-    /**
-     * Method for accessing collection of annotations the bean
-     * class has.
-     */
-    public abstract Annotations getClassAnnotations();
-   
-    /*
-    /**********************************************************
-    /* Basic API for finding properties
-    /**********************************************************
-     */
-    
-    /**
-     * @return Ordered Map with logical property name as key, and
-     *    matching getter method as value.
-     */
-    public abstract List<BeanPropertyDefinition> findProperties();
-    
-    /**
-     * Method for locating all back-reference properties (setters, fields) bean has
-     */
-    public abstract Map<String,AnnotatedMember> findBackReferenceProperties();
-
-    public abstract Set<String> getIgnoredPropertyNames();
-    
-    /*
-    /**********************************************************
-    /* Basic API for finding creator members
-    /**********************************************************
-     */
-    
-    public abstract List<AnnotatedConstructor> getConstructors();
-    
-    public abstract List<AnnotatedMethod> getFactoryMethods();
-    
-    /**
-     * Method that will locate the no-arg constructor for this class,
-     * if it has one, and that constructor has not been marked as
-     * ignorable.
-     */
-    public abstract AnnotatedConstructor findDefaultConstructor();
-
-    /**
-     * Method that can be called to locate a single-arg constructor that
-     * takes specified exact type (will not accept supertype constructors)
-     *
-     * @param argTypes Type(s) of the argument that we are looking for
-     */
-    public abstract Constructor<?> findSingleArgConstructor(Class<?>... argTypes);
-
-    /**
-     * Method that can be called to find if introspected class declares
-     * a static "valueOf" factory method that returns an instance of
-     * introspected type, given one of acceptable types.
-     *
-     * @param expArgTypes Types that the matching single argument factory
-     *   method can take: will also accept super types of these types
-     *   (ie. arg just has to be assignable from expArgType)
-     */
-    public abstract Method findFactoryMethod(Class<?>... expArgTypes);
-
-    /*
-    /**********************************************************
-    /* Basic API for finding property accessors
-    /**********************************************************
-     */
-    
-    public abstract AnnotatedMember findAnyGetter();
-
-    /**
-     * Method used to locate the method of introspected class that
-     * implements {@link com.fasterxml.jackson.annotation.JsonAnySetter}. If no such method exists
-     * null is returned. If more than one are found, an exception
-     * is thrown.
-     * Additional checks are also made to see that method signature
-     * is acceptable: needs to take 2 arguments, first one String or
-     * Object; second any can be any type.
-     */
-    public abstract AnnotatedMethod findAnySetter();
-
-    /**
-     * Method for locating the getter method that is annotated with
-     * {@link com.fasterxml.jackson.annotation.JsonValue} annotation,
-     * if any. If multiple ones are found,
-     * an error is reported by throwing {@link IllegalArgumentException}
-     */
-    public abstract AnnotatedMethod findJsonValueMethod();
-
-    public abstract AnnotatedMethod findMethod(String name, Class<?>[] paramTypes);
-    
-    /*
-    /**********************************************************
-    /* Basic API, class configuration
-    /**********************************************************
-     */
-
-    public abstract JsonInclude.Include findSerializationInclusion(JsonInclude.Include defValue);
-
-    /**
-     * Method for checking what is the expected format for POJO, as
-     * defined by defaults and possible annotations.
-     * Note that this may be further refined by per-property annotations.
-     * 
-     * @since 2.1s
-     */
-    public abstract JsonFormat.Value findExpectedFormat(JsonFormat.Value defValue);
-    
-    /*
-    /**********************************************************
-    /* Basic API, other
-    /**********************************************************
-     */
-
-    public abstract Map<Object, AnnotatedMember> findInjectables();
-    
-    /**
-     * Method for checking if the POJO type has annotations to
-     * indicate that a builder is to be used for instantiating
-     * instances and handling data binding, instead of standard
-     * bean deserializer.
-     */
-    public abstract Class<?> findPOJOBuilder();
-
-    /**
-     * Method for finding configuration for POJO Builder class.
-     */
-    public abstract JsonPOJOBuilder.Value findPOJOBuilderConfig();
-    
-    /**
-     * Method called to create a "default instance" of the bean, currently
-     * only needed for obtaining default field values which may be used for
-     * suppressing serialization of fields that have "not changed".
-     * 
-     * @param fixAccess If true, method is allowed to fix access to the
-     *   default constructor (to be able to call non-public constructor);
-     *   if false, has to use constructor as is.
-     *
-     * @return Instance of class represented by this descriptor, if
-     *   suitable default constructor was found; null otherwise.
-     */
-    public abstract Object instantiateBean(boolean fixAccess);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/BeanProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/BeanProperty.java
deleted file mode 100644
index d56c8fe..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/BeanProperty.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.lang.annotation.Annotation;
-
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.util.Annotations;
-import com.fasterxml.jackson.databind.util.Named;
-
-/**
- * Bean properties are logical entities that represent data
- * that Java objects (POJOs (Plain Old Java Objects), sometimes also called "beans")
- * contain; and that are accessed using accessors (methods like getters
- * and setters, fields, contstructor parametrers).
- * Instances allow access to annotations directly associated
- * to property (via field or method), as well as contextual
- * annotations (annotations for class that contains properties).
- *<p>
- * Instances are not typically passed when constructing serializers
- * and deserializers, but rather only passed when context
- * is known when
- * {@link com.fasterxml.jackson.databind.ser.ContextualSerializer} and
- * {@link com.fasterxml.jackson.databind.deser.ContextualDeserializer}
- * resolution occurs (<code>createContextual(...)</code> method is called).
- * References may (need to) be retained by serializers and deserializers,
- * especially when further resolving dependant handlers like value
- * serializers/deserializers or structured types.
- */
-public interface BeanProperty extends Named
-{
-    /**
-     * Method to get logical name of the property
-     */
-//  @Override
-    public String getName();
-    
-    /**
-     * Method to get declared type of the property.
-     */
-    public JavaType getType();
-
-    /**
-     * Method for finding annotation associated with this property;
-     * meaning annotation associated with one of entities used to
-     * access property.
-     */
-    public <A extends Annotation> A getAnnotation(Class<A> acls);
-
-    /**
-     * Method for finding annotation associated with context of
-     * this property; usually class in which member is declared
-     * (or its subtype if processing subtype).
-     */
-    public <A extends Annotation> A getContextAnnotation(Class<A> acls);
-
-    /**
-     * Method for accessing primary physical entity that represents the property;
-     * annotated field, method or constructor property.
-     */
-    public AnnotatedMember getMember();
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Simple stand-alone implementation, useful as a placeholder
-     * or base class for more complex implementations.
-     */
-    public static class Std implements BeanProperty
-    {
-        protected final String _name;
-        protected final JavaType _type;
-
-        /**
-         * Physical entity (field, method or constructor argument) that
-         * is used to access value of property (or in case of constructor
-         * property, just placeholder)
-         */
-        protected final AnnotatedMember _member;
-
-        /**
-         * Annotations defined in the context class (if any); may be null
-         * if no annotations were found
-         */
-        protected final Annotations _contextAnnotations;
-        
-        public Std(String name, JavaType type, Annotations contextAnnotations, AnnotatedMember member)
-        {
-            _name = name;
-            _type = type;
-            _member = member;
-            _contextAnnotations = contextAnnotations;
-        }
-        
-        public Std withType(JavaType type) {
-            return new Std(_name, type, _contextAnnotations, _member);
-        }
-        
-//        @Override
-        public <A extends Annotation> A getAnnotation(Class<A> acls) {
-            return (_member == null) ? null : _member.getAnnotation(acls);
-        }
-
-//        @Override
-        public <A extends Annotation> A getContextAnnotation(Class<A> acls) {
-            return (_contextAnnotations == null) ? null : _contextAnnotations.get(acls);
-        }
-        
-//      @Override
-        public String getName() {
-            return _name;
-        }
-
-//      @Override
-        public JavaType getType() {
-            return _type;
-        }
-
-//      @Override
-        public AnnotatedMember getMember() {
-            return _member;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationConfig.java b/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationConfig.java
deleted file mode 100644
index 4824d7d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationConfig.java
+++ /dev/null
@@ -1,526 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.text.DateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.cfg.BaseSettings;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.cfg.MapperConfigBase;
-import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.LinkedNode;
-
-/**
- * Object that contains baseline configuration for deserialization
- * process. An instance is owned by {@link ObjectMapper}, which
- * passes an immutable instance to be used for deserialization process.
- *<p>
- * Note that instances are considered immutable and as such no copies
- * should need to be created for sharing; all copying is done with
- * "fluent factory" methods.
- * Note also that unlike with Jackson 1, these instances can not be
- * assigned to {@link ObjectMapper}; in fact, application code should
- * rarely interact directly with these instance (unlike core Jackson code)
- */
-public final class DeserializationConfig
-    extends MapperConfigBase<DeserializationFeature, DeserializationConfig>
-    implements java.io.Serializable // since 2.1
-{
-    // for 2.1.0
-    private static final long serialVersionUID = -4227480407273773599L;
-
-    /**
-     * Set of features enabled; actual type (kind of features)
-     * depends on sub-classes.
-     */
-    protected final int _deserFeatures;
-
-    /**
-     * Linked list that contains all registered problem handlers.
-     * Implementation as front-added linked list allows for sharing
-     * of the list (tail) without copying the list.
-     */
-    protected final LinkedNode<DeserializationProblemHandler> _problemHandlers;
-    
-    /**
-     * Factory used for constructing {@link com.fasterxml.jackson.databind.JsonNode} instances.
-     */
-    protected final JsonNodeFactory _nodeFactory;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by ObjectMapper to create default configuration object instance.
-     */
-    public DeserializationConfig(BaseSettings base,
-            SubtypeResolver str, Map<ClassKey,Class<?>> mixins)
-    {
-        super(base, str, mixins);
-        _deserFeatures = collectFeatureDefaults(DeserializationFeature.class);
-        _nodeFactory = JsonNodeFactory.instance;
-        _problemHandlers = null;
-    }
-
-    /**
-     * Copy constructor used to create a non-shared instance with given mix-in
-     * annotation definitions and subtype resolver.
-     */
-    private DeserializationConfig(DeserializationConfig src, SubtypeResolver str)
-    {
-        super(src, str);
-        _deserFeatures = src._deserFeatures;
-        _nodeFactory = src._nodeFactory;
-        _problemHandlers = src._problemHandlers;
-    }
-
-    private DeserializationConfig(DeserializationConfig src,
-            int mapperFeatures, int deserFeatures)
-    {
-        super(src, mapperFeatures);
-        _deserFeatures = deserFeatures;
-        _nodeFactory = src._nodeFactory;
-        _problemHandlers = src._problemHandlers;
-    }
-    
-    private DeserializationConfig(DeserializationConfig src, BaseSettings base)
-    {
-        super(src, base);
-        _deserFeatures = src._deserFeatures;
-        _nodeFactory = src._nodeFactory;
-        _problemHandlers = src._problemHandlers;
-    }
-    
-    private DeserializationConfig(DeserializationConfig src, JsonNodeFactory f)
-    {
-        super(src);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _nodeFactory = f;
-    }
-
-    private DeserializationConfig(DeserializationConfig src,
-            LinkedNode<DeserializationProblemHandler> problemHandlers)
-    {
-        super(src);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = problemHandlers;
-        _nodeFactory = src._nodeFactory;
-    }
-
-    private DeserializationConfig(DeserializationConfig src, String rootName)
-    {
-        super(src, rootName);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _nodeFactory = src._nodeFactory;
-    }
-
-    private DeserializationConfig(DeserializationConfig src, Class<?> view)
-    {
-        super(src, view);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _nodeFactory = src._nodeFactory;
-    }
-
-    /**
-     * @since 2.1
-     */
-    protected DeserializationConfig(DeserializationConfig src, Map<ClassKey,Class<?>> mixins)
-    {
-        super(src, mixins);
-        _deserFeatures = src._deserFeatures;
-        _problemHandlers = src._problemHandlers;
-        _nodeFactory = src._nodeFactory;
-    }
-    
-    // for unit tests only:
-    protected BaseSettings getBaseSettings() { return _base; }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, factory methods from MapperConfig
-    /**********************************************************
-     */
-
-    @Override
-    public DeserializationConfig with(MapperFeature... features)
-    {
-        int newMapperFlags = _mapperFeatures;
-        for (MapperFeature f : features) {
-            newMapperFlags |= f.getMask();
-        }
-        return (newMapperFlags == _mapperFeatures) ? this :
-            new DeserializationConfig(this, newMapperFlags, _deserFeatures);
-    }
-
-    @Override
-    public DeserializationConfig without(MapperFeature... features)
-    {
-        int newMapperFlags = _mapperFeatures;
-        for (MapperFeature f : features) {
-             newMapperFlags &= ~f.getMask();
-        }
-        return (newMapperFlags == _mapperFeatures) ? this :
-            new DeserializationConfig(this, newMapperFlags, _deserFeatures);
-    }
-    
-    @Override
-    public DeserializationConfig with(ClassIntrospector ci) {
-        return _withBase(_base.withClassIntrospector(ci));
-    }
-
-    @Override
-    public DeserializationConfig with(AnnotationIntrospector ai) {
-        return _withBase(_base.withAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public DeserializationConfig with(VisibilityChecker<?> vc) {
-        return _withBase(_base.withVisibilityChecker(vc));
-    }
-
-    @Override
-    public DeserializationConfig withVisibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibility) {
-        return _withBase( _base.withVisibility(forMethod, visibility));
-    }
-    
-    @Override
-    public DeserializationConfig with(TypeResolverBuilder<?> trb) {
-        return _withBase(_base.withTypeResolverBuilder(trb));
-    }
-
-    @Override
-    public DeserializationConfig with(SubtypeResolver str) {
-        return (_subtypeResolver == str) ? this : new DeserializationConfig(this, str);
-    }
-    
-    @Override
-    public DeserializationConfig with(PropertyNamingStrategy pns) {
-        return _withBase(_base.withPropertyNamingStrategy(pns));
-    }
-
-    @Override
-    public DeserializationConfig withRootName(String rootName) {
-        if (rootName == null) {
-            if (_rootName == null) {
-                return this;
-            }
-        } else if (rootName.equals(_rootName)) {
-            return this;
-        }
-        return new DeserializationConfig(this, rootName);
-    }
-    
-    @Override
-    public DeserializationConfig with(TypeFactory tf) {
-        return _withBase( _base.withTypeFactory(tf));
-    }
-
-    @Override
-    public DeserializationConfig with(DateFormat df) {
-        return _withBase(_base.withDateFormat(df));
-    }
-    
-    @Override
-    public DeserializationConfig with(HandlerInstantiator hi) {
-        return _withBase(_base.withHandlerInstantiator(hi));
-    }
-
-    @Override
-    public DeserializationConfig withInsertedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return _withBase(_base.withInsertedAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public DeserializationConfig withAppendedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return _withBase(_base.withAppendedAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public DeserializationConfig withView(Class<?> view) {
-        return (_view == view) ? this : new DeserializationConfig(this, view);
-    }
-
-    @Override
-    public DeserializationConfig with(Locale l) {
-        return _withBase(_base.with(l));
-    }
-
-    @Override
-    public DeserializationConfig with(TimeZone tz) {
-        return _withBase(_base.with(tz));
-    }
-
-    @Override
-    public DeserializationConfig with(Base64Variant base64) {
-        return _withBase(_base.with(base64));
-    }
-    
-    private final DeserializationConfig _withBase(BaseSettings newBase) {
-        return (_base == newBase) ? this : new DeserializationConfig(this, newBase);
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, deserialization-specific factory methods
-    /**********************************************************
-     */
-
-    /**
-     * Fluent factory method that will construct a new instance with
-     * specified {@link JsonNodeFactory}
-     */
-    public DeserializationConfig with(JsonNodeFactory f) {
-        if (_nodeFactory == f) {
-            return this;
-        }
-        return new DeserializationConfig(this, f);
-    }
-
-    /**
-     * Method that can be used to add a handler that can (try to)
-     * resolve non-fatal deserialization problems.
-     */
-    public DeserializationConfig withHandler(DeserializationProblemHandler h)
-    {
-        // Sanity check: let's prevent adding same handler multiple times
-        if (LinkedNode.contains(_problemHandlers, h)) {
-            return this;
-        }
-        return new DeserializationConfig(this,
-                new LinkedNode<DeserializationProblemHandler>(h, _problemHandlers));
-    }
-
-    /**
-     * Method for removing all configured problem handlers; usually done to replace
-     * existing handler(s) with different one(s)
-     */
-    public DeserializationConfig withNoProblemHandlers() {
-        if (_problemHandlers == null) {
-            return this;
-        }
-        return new DeserializationConfig(this,
-                (LinkedNode<DeserializationProblemHandler>) null);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    public DeserializationConfig with(DeserializationFeature feature)
-    {
-        int newDeserFeatures = (_deserFeatures | feature.getMask());
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    public DeserializationConfig with(DeserializationFeature first,
-            DeserializationFeature... features)
-    {
-        int newDeserFeatures = _deserFeatures | first.getMask();
-        for (DeserializationFeature f : features) {
-            newDeserFeatures |= f.getMask();
-        }
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    public DeserializationConfig withFeatures(DeserializationFeature... features)
-    {
-        int newDeserFeatures = _deserFeatures;
-        for (DeserializationFeature f : features) {
-            newDeserFeatures |= f.getMask();
-        }
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-    
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified feature disabled.
-     */
-    public DeserializationConfig without(DeserializationFeature feature)
-    {
-        int newDeserFeatures = _deserFeatures & ~feature.getMask();
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features disabled.
-     */
-    public DeserializationConfig without(DeserializationFeature first,
-            DeserializationFeature... features)
-    {
-        int newDeserFeatures = _deserFeatures & ~first.getMask();
-        for (DeserializationFeature f : features) {
-            newDeserFeatures &= ~f.getMask();
-        }
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features disabled.
-     */
-    public DeserializationConfig withoutFeatures(DeserializationFeature... features)
-    {
-        int newDeserFeatures = _deserFeatures;
-        for (DeserializationFeature f : features) {
-            newDeserFeatures &= ~f.getMask();
-        }
-        return (newDeserFeatures == _deserFeatures) ? this :
-            new DeserializationConfig(this, _mapperFeatures, newDeserFeatures);
-    }
-    
-    /*
-    /**********************************************************
-    /* MapperConfig implementation
-    /**********************************************************
-     */
-    
-    /**
-     * Method for getting {@link AnnotationIntrospector} configured
-     * to introspect annotation values used for configuration.
-     */
-    @Override
-    public AnnotationIntrospector getAnnotationIntrospector()
-    {
-        /* 29-Jul-2009, tatu: it's now possible to disable use of
-         *   annotations; can be done using "no-op" introspector
-         */
-        if (isEnabled(MapperFeature.USE_ANNOTATIONS)) {
-            return super.getAnnotationIntrospector();
-        }
-        return NopAnnotationIntrospector.instance;
-    }
-
-    @Override
-    public boolean useRootWrapping()
-    {
-        if (_rootName != null) { // empty String disables wrapping; non-empty enables
-            return (_rootName.length() > 0);
-        }
-        return isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE);
-    }
-    
-    /**
-     * Accessor for getting bean description that only contains class
-     * annotations: useful if no getter/setter/creator information is needed.
-     */
-    @Override
-    public BeanDescription introspectClassAnnotations(JavaType type) {
-        return getClassIntrospector().forClassAnnotations(this, type, this);
-    }
-
-    /**
-     * Accessor for getting bean description that only contains immediate class
-     * annotations: ones from the class, and its direct mix-in, if any, but
-     * not from super types.
-     */
-    @Override
-    public BeanDescription introspectDirectClassAnnotations(JavaType type) {
-        return getClassIntrospector().forDirectClassAnnotations(this, type, this);
-    }
-
-    @Override
-    public VisibilityChecker<?> getDefaultVisibilityChecker()
-    {
-        VisibilityChecker<?> vchecker = super.getDefaultVisibilityChecker();
-        if (!isEnabled(MapperFeature.AUTO_DETECT_SETTERS)) {
-            vchecker = vchecker.withSetterVisibility(Visibility.NONE);
-        }
-        if (!isEnabled(MapperFeature.AUTO_DETECT_CREATORS)) {
-            vchecker = vchecker.withCreatorVisibility(Visibility.NONE);
-        }
-        if (!isEnabled(MapperFeature.AUTO_DETECT_FIELDS)) {
-            vchecker = vchecker.withFieldVisibility(Visibility.NONE);
-        }
-        return vchecker;
-    }
-
-    public final boolean isEnabled(DeserializationFeature f) {
-        return (_deserFeatures & f.getMask()) != 0;
-    }
-
-    /*
-    /**********************************************************
-    /* Other configuration
-    /**********************************************************
-     */
-
-    public final int getDeserializationFeatures() {
-        return _deserFeatures;
-    }
-    
-    /**
-     * Method for getting head of the problem handler chain. May be null,
-     * if no handlers have been added.
-     */
-    public LinkedNode<DeserializationProblemHandler> getProblemHandlers() {
-        return _problemHandlers;
-    }
-
-    public final JsonNodeFactory getNodeFactory() {
-        return _nodeFactory;
-    }
-    
-    /*
-    /**********************************************************
-    /* Introspection methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that will introspect full bean properties for the purpose
-     * of building a bean deserializer
-     *
-     * @param type Type of class to be introspected
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends BeanDescription> T introspect(JavaType type) {
-        return (T) getClassIntrospector().forDeserialization(this, type, this);
-    }
-
-    /**
-     * Method that will introspect subset of bean properties needed to
-     * construct bean instance.
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends BeanDescription> T introspectForCreation(JavaType type) {
-        return (T) getClassIntrospector().forCreation(this, type, this);
-    }
-
-    /**
-     * @since 2.0
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends BeanDescription> T introspectForBuilder(JavaType type) {
-        return (T) getClassIntrospector().forDeserializationWithBuilder(this, type, this);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationContext.java b/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationContext.java
deleted file mode 100644
index 16efabb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationContext.java
+++ /dev/null
@@ -1,768 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
-import com.fasterxml.jackson.databind.deser.impl.TypeWrappedDeserializer;
-import com.fasterxml.jackson.databind.exc.InvalidFormatException;
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.*;
-
-/**
- * Context for the process of deserialization a single root-level value.
- * Used to allow passing in configuration settings and reusable temporary
- * objects (scrap arrays, containers).
- *<p>
- * Instance life-cycle is such that an partially configured "blueprint" object
- * is registered with {@link ObjectMapper} (and {@link ObjectReader},
- * and when an actual instance is needed for deserialization,
- * a fully configured instance will
- * be created using a method in excented API of sub-class
- * ({@link com.fasterxml.jackson.databind.deser.DefaultDeserializationContext#createInstance}).
- * Each instance is guaranteed to only be used from single-threaded context;
- * instances may be reused iff no configuration has changed.
- *<p>
- * Defined as abstract class so that implementations must define methods
- * for reconfiguring blueprints and creating instances.
- */
-public abstract class DeserializationContext
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = -7727373309391091315L;
-
-    /**
-     * Let's limit length of error messages, for cases where underlying data
-     * may be very large -- no point in spamming logs with megs of meaningless
-     * data.
-     */
-    private final static int MAX_ERROR_STR_LEN = 500;
-
-    /*
-    /**********************************************************
-    /* Configuration, immutable
-    /**********************************************************
-     */
-    
-    /**
-     * Object that handle details of {@link JsonDeserializer} caching.
-     */
-    protected final DeserializerCache _cache;
-
-    /*
-    /**********************************************************
-    /* Configuration, changeable via fluent factories
-    /**********************************************************
-     */
-
-    /**
-     * Read-only factory instance; exposed to let
-     * owners (<code>ObjectMapper</code>, <code>ObjectReader</code>)
-     * access it.
-     */
-    protected final DeserializerFactory _factory;
-
-    /*
-    /**********************************************************
-    /* Configuration that gets set for instances (not blueprints)
-    /* (partly denormalized for performance)
-    /**********************************************************
-     */
-
-    /**
-     * Generic deserialization processing configuration
-     */
-    protected final DeserializationConfig _config;
-
-    /**
-     * Bitmap of {@link DeserializationFeature}s that are enabled
-     */
-    protected final int _featureFlags;
-
-    /**
-     * Currently active view, if any.
-     */
-    protected final Class<?> _view;
-
-    /**
-     * Currently active parser used for deserialization.
-     * May be different from the outermost parser
-     * when content is buffered.
-     */
-    protected transient JsonParser _parser;
-    
-    /**
-     * Object used for resolving references to injectable
-     * values.
-     */
-    protected final InjectableValues _injectableValues;
-    
-    /*
-    /**********************************************************
-    /* Per-operation reusable helper objects (not for blueprints)
-    /**********************************************************
-     */
-
-    protected transient ArrayBuilders _arrayBuilders;
-
-    protected transient ObjectBuffer _objectBuffer;
-
-    protected transient DateFormat _dateFormat;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected DeserializationContext(DeserializerFactory df) {
-        this(df, null);
-    }
-    
-    protected DeserializationContext(DeserializerFactory df,
-            DeserializerCache cache)
-    {
-        if (df == null) {
-            throw new IllegalArgumentException("Can not pass null DeserializerFactory");
-        }
-        _factory = df;
-        _cache = (cache == null) ? new DeserializerCache() : cache;
-        
-        _featureFlags = 0;
-        _config = null;
-        _injectableValues = null;
-        _view = null;
-    }
-
-    protected DeserializationContext(DeserializationContext src,
-            DeserializerFactory factory)
-    {
-        _cache = src._cache;
-        _factory = factory;
-        
-        _config = src._config;
-        _featureFlags = src._featureFlags;
-        _view = src._view;
-        _parser = src._parser;
-        _injectableValues = src._injectableValues;
-    }
-    
-    protected DeserializationContext(DeserializationContext src,
-            DeserializationConfig config, JsonParser jp,
-            InjectableValues injectableValues)
-    {
-        _cache = src._cache;
-        _factory = src._factory;
-        
-        _config = config;
-        _featureFlags = config.getDeserializationFeatures();
-        _view = config.getActiveView();
-        _parser = jp;
-        _injectableValues = injectableValues;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, accessors
-    /**********************************************************
-     */
-
-    /**
-     * Method for getting current {@link DeserializerFactory}.
-     */
-    public DeserializerFactory getFactory() {
-        return _factory;
-    }
-
-    /**
-     * Method for accessing configuration setting object for
-     * currently active deserialization.
-     */
-    public DeserializationConfig getConfig() { return _config; }
-
-    /**
-     * Convenience method for checking whether specified on/off
-     * feature is enabled
-     */
-    public final boolean isEnabled(DeserializationFeature feat) {
-        /* 03-Dec-2010, tatu: minor shortcut; since this is called quite often,
-         *   let's use a local copy of feature settings:
-         */
-        return (_featureFlags & feat.getMask()) != 0;
-    }
-
-    public final boolean isEnabled(MapperFeature feat) {
-        return _config.isEnabled(feat);
-    }
-    
-    public final AnnotationIntrospector getAnnotationIntrospector() {
-        return _config.getAnnotationIntrospector();
-    }
-
-    /**
-     * Method for accessing the currently active parser.
-     * May be different from the outermost parser
-     * when content is buffered.
-     *<p>
-     * Use of this method is discouraged: if code has direct access
-     * to the active parser, that should be used instead.
-     */
-    public final JsonParser getParser() { return _parser; }
-
-    public final Object findInjectableValue(Object valueId,
-            BeanProperty forProperty, Object beanInstance)
-    {
-        if (_injectableValues == null) {
-            throw new IllegalStateException("No 'injectableValues' configured, can not inject value with id ["+valueId+"]");
-        }
-        return _injectableValues.findInjectableValue(valueId, this, forProperty, beanInstance);
-    }
-
-    /**
-     * Accessor for locating currently active view, if any;
-     * returns null if no view has been set.
-     */
-    public final Class<?> getActiveView() {
-        return _view;
-    }
-
-    /**
-     * Convenience method, functionally equivalent to:
-     *<pre>
-     *  getConfig().canOverrideAccessModifiers();
-     * </pre>
-     */
-    public final boolean canOverrideAccessModifiers() {
-        return _config.canOverrideAccessModifiers();
-    }
-
-    /**
-     * Convenience method for accessing the default Base64 encoding
-     * used for decoding base64 encoded binary content.
-     * Same as calling:
-     *<pre>
-     *  getConfig().getBase64Variant();
-     *</pre>
-     */
-    public final Base64Variant getBase64Variant() {
-        return _config.getBase64Variant();
-    }
-
-    /**
-     * Convenience method, functionally equivalent to:
-     *<pre>
-     *  getConfig().getNodeFactory();
-     * </pre>
-     */
-    public final JsonNodeFactory getNodeFactory() {
-        return _config.getNodeFactory();
-    }
-
-    /**
-     * Convenience method, functionally equivalent to:
-     *<pre>
-     *  getConfig().getTypeFactory();
-     * </pre>
-     */
-    public final TypeFactory getTypeFactory() {
-        return _config.getTypeFactory();
-    }
-
-    /**
-     * Method for accessing default Locale to use: convenience method for
-     *<pre>
-     *   getConfig().getLocale();
-     *</pre>
-     */
-    public Locale getLocale() {
-        return _config.getLocale();
-    }
-
-    /**
-     * Method for accessing default TimeZone to use: convenience method for
-     *<pre>
-     *   getConfig().getTimeZone();
-     *</pre>
-     */
-    public TimeZone getTimeZone() {
-        return _config.getTimeZone();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, pass-through to DeserializerCache
-    /**********************************************************
-     */
-
-    /**
-     * Method for checking whether we could find a deserializer
-     * for given type.
-     */
-    public boolean hasValueDeserializerFor(JavaType type) {
-        return _cache.hasValueDeserializerFor(this, _factory, type);
-    }
-    
-    
-    /**
-     * Method for finding a value deserializer, and creating a contextual
-     * version if necessary, for value reached via specified property.
-     */
-    @SuppressWarnings("unchecked")
-    public final JsonDeserializer<Object> findContextualValueDeserializer(JavaType type,
-            BeanProperty property) throws JsonMappingException
-    {
-        JsonDeserializer<Object> deser = _cache.findValueDeserializer(this,
-                _factory, type);
-        if (deser != null) {
-            if (deser instanceof ContextualDeserializer) {
-                deser = (JsonDeserializer<Object>)((ContextualDeserializer) deser).createContextual(this, property);
-            }
-        }
-        return deser;
-    }
-    
-    /**
-     * Method for finding a deserializer for root-level value.
-     */
-    @SuppressWarnings("unchecked")
-    public final JsonDeserializer<Object> findRootValueDeserializer(JavaType type)
-            throws JsonMappingException
-    {
-        JsonDeserializer<Object> deser = _cache.findValueDeserializer(this,
-                _factory, type);
-        if (deser == null) { // can this occur?
-            return null;
-        }
-        if (deser instanceof ContextualDeserializer) {
-            deser = (JsonDeserializer<Object>)((ContextualDeserializer) deser).createContextual(this, null);
-        }
-        TypeDeserializer typeDeser = _factory.findTypeDeserializer(_config, type);
-        if (typeDeser != null) {
-            // important: contextualize to indicate this is for root value
-            typeDeser = typeDeser.forProperty(null);
-            return new TypeWrappedDeserializer(typeDeser, deser);
-        }
-        return deser;
-    }
-
-    /**
-     * Convenience method, functionally same as:
-     *<pre>
-     *  getDeserializerProvider().findKeyDeserializer(getConfig(), propertyType, property);
-     *</pre>
-     */
-    public final KeyDeserializer findKeyDeserializer(JavaType keyType,
-            BeanProperty property) throws JsonMappingException {
-        KeyDeserializer kd = _cache.findKeyDeserializer(this,
-                _factory, keyType);
-        // Second: contextualize?
-        if (kd instanceof ContextualKeyDeserializer) {
-            kd = ((ContextualKeyDeserializer) kd).createContextual(this, property);
-        }
-        return kd;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, ObjectId handling
-    /**********************************************************
-     */
-
-    /**
-     * Method called to find and return entry corresponding to given
-     * Object Id: will add an entry if necessary, and never returns null
-     */
-    public abstract ReadableObjectId findObjectId(Object id,
-            ObjectIdGenerator<?> generator);
-
-    /*
-    /**********************************************************
-    /* Public API, type handling
-    /**********************************************************
-     */
-    
-    /**
-     * Convenience method, functionally equivalent to:
-     *<pre>
-     *  getConfig().constructType(cls);
-     * </pre>
-     */
-    public final JavaType constructType(Class<?> cls) {
-        return _config.constructType(cls);
-    }
-
-    /**
-     * Helper method to use for locating Class for given name. Should be used
-     * instead of basic <code>Class.forName(className);</code> as it can
-     * try using contextual class loader, or use platform-specific workarounds
-     * (like on Android, GAE).
-     */
-    public Class<?> findClass(String className) throws ClassNotFoundException
-    {
-        // By default, delegate to ClassUtil: can be overridden with custom handling
-        return ClassUtil.findClass(className);
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API: handler instantiation
-    /**********************************************************
-     */
-
-    public abstract JsonDeserializer<Object> deserializerInstance(Annotated annotated,
-            Object deserDef)
-        throws JsonMappingException;
-
-    public abstract KeyDeserializer keyDeserializerInstance(Annotated annotated,
-            Object deserDef)
-        throws JsonMappingException;
-
-    public abstract ObjectIdGenerator<?> objectIdGeneratorInstance(Annotated annotated,
-            ObjectIdInfo objectIdInfo)
-        throws JsonMappingException;
-    
-    /*
-    /**********************************************************
-    /* Public API, helper object recycling
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to get access to a reusable ObjectBuffer,
-     * useful for efficiently constructing Object arrays and Lists.
-     * Note that leased buffers should be returned once deserializer
-     * is done, to allow for reuse during same round of deserialization.
-     */
-    public final ObjectBuffer leaseObjectBuffer()
-    {
-        ObjectBuffer buf = _objectBuffer;
-        if (buf == null) {
-            buf = new ObjectBuffer();
-        } else {
-            _objectBuffer = null;
-        }
-        return buf;
-    }
-
-    /**
-     * Method to call to return object buffer previously leased with
-     * {@link #leaseObjectBuffer}.
-     * 
-     * @param buf Returned object buffer
-     */
-    public final void returnObjectBuffer(ObjectBuffer buf)
-    {
-        /* Already have a reusable buffer? Let's retain bigger one
-         * (or if equal, favor newer one, shorter life-cycle)
-         */
-        if (_objectBuffer == null
-            || buf.initialCapacity() >= _objectBuffer.initialCapacity()) {
-            _objectBuffer = buf;
-        }
-    }
-
-    /**
-     * Method for accessing object useful for building arrays of
-     * primitive types (such as int[]).
-     */
-    public final ArrayBuilders getArrayBuilders()
-    {
-        if (_arrayBuilders == null) {
-            _arrayBuilders = new ArrayBuilders();
-        }
-        return _arrayBuilders;
-    }
-
-    /*
-    /**********************************************************
-    /* Parsing methods that may use reusable/-cyclable objects
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method for parsing a Date from given String, using
-     * currently configured date format (accessed using
-     * {@link DeserializationConfig#getDateFormat()}).
-     *<p>
-     * Implementation will handle thread-safety issues related to
-     * date formats such that first time this method is called,
-     * date format is cloned, and cloned instance will be retained
-     * for use during this deserialization round.
-     */
-    public Date parseDate(String dateStr)
-        throws IllegalArgumentException
-    {
-        try {
-            return getDateFormat().parse(dateStr);
-        } catch (ParseException e) {
-            throw new IllegalArgumentException("Failed to parse Date value '"+dateStr+"': "+e.getMessage());
-        }
-    }
-
-    /**
-     * Convenience method for constructing Calendar instance set
-     * to specified time, to be modified and used by caller.
-     */
-    public Calendar constructCalendar(Date d)
-    {
-        /* 08-Jan-2008, tatu: not optimal, but should work for the
-         *   most part; let's revise as needed.
-         */
-        Calendar c = Calendar.getInstance(getTimeZone());
-        c.setTime(d);
-        return c;
-    }
-
-    /*
-    /**********************************************************
-    /* Methods for problem handling, reporting
-    /**********************************************************
-     */
-
-    /**
-     * Method deserializers can call to inform configured {@link DeserializationProblemHandler}s
-     * of an unrecognized property.
-     * 
-     * @return True if there was a configured problem handler that was able to handle the
-     *   problem
-     */
-    /**
-     * Method deserializers can call to inform configured {@link DeserializationProblemHandler}s
-     * of an unrecognized property.
-     */
-    public boolean handleUnknownProperty(JsonParser jp, JsonDeserializer<?> deser,
-            Object instanceOrClass, String propName)
-        throws IOException, JsonProcessingException
-    {
-        LinkedNode<DeserializationProblemHandler> h = _config.getProblemHandlers();
-        if (h != null) {
-            while (h != null) {
-                // Can bail out if it's handled
-                if (h.value().handleUnknownProperty(this, jp, deser, instanceOrClass, propName)) {
-                    return true;
-                }
-                h = h.next();
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Helper method for reporting a problem with unhandled unknown exception
-     * 
-     * @param instanceOrClass Either value being populated (if one has been
-     *   instantiated), or Class that indicates type that would be (or
-     *   have been) instantiated
-     * @param deser Deserializer that had the problem, if called by deserializer
-     *   (or on behalf of one)
-     */
-    public void reportUnknownProperty(Object instanceOrClass, String fieldName,
-            JsonDeserializer<?> deser)
-        throws JsonMappingException
-    {
-
-        if (!isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {
-            return;
-        }
-        // Do we know properties that are expected instead?
-        Collection<Object> propIds = (deser == null) ? null : deser.getKnownPropertyNames();
-        throw UnrecognizedPropertyException.from(_parser,
-                instanceOrClass, fieldName, propIds);
-
-    }
-    
-    /*
-    /**********************************************************
-    /* Methods for constructing exceptions
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method for constructing generic mapping exception for specified type
-     */
-    public JsonMappingException mappingException(Class<?> targetClass) {
-        return mappingException(targetClass, _parser.getCurrentToken());
-    }
-
-    public JsonMappingException mappingException(Class<?> targetClass, JsonToken token)
-    {
-        String clsName = _calcName(targetClass);
-        return JsonMappingException.from(_parser,
-                "Can not deserialize instance of "+clsName+" out of "+token+" token");
-    }
-    
-    /**
-     * Helper method for constructing generic mapping exception with specified
-     * message and current location information
-     */
-    public JsonMappingException mappingException(String message) {
-        return JsonMappingException.from(getParser(), message);
-    }
-    
-    /**
-     * Helper method for constructing instantiation exception for specified type,
-     * to indicate problem with physically constructing instance of
-     * specified class (missing constructor, exception from constructor)
-     */
-    public JsonMappingException instantiationException(Class<?> instClass, Throwable t)
-    {
-        return JsonMappingException.from(_parser,
-                "Can not construct instance of "+instClass.getName()+", problem: "+t.getMessage(),
-                t);
-    }
-
-    public JsonMappingException instantiationException(Class<?> instClass, String msg) {
-        return JsonMappingException.from(_parser, "Can not construct instance of "+instClass.getName()+", problem: "+msg);
-    }
-    
-    /**
-     * Method that will construct an exception suitable for throwing when
-     * some String values are acceptable, but the one encountered is not.
-     * 
-     * 
-     * @deprecated Since 2.1 should use variant that takes value
-     */
-    @Deprecated
-    public JsonMappingException weirdStringException(Class<?> instClass, String msg) {
-        return weirdStringException(null, instClass, msg);
-    }
-
-    /**
-     * Method that will construct an exception suitable for throwing when
-     * some String values are acceptable, but the one encountered is not.
-     * 
-     * @param value String value from input being deserialized
-     * @param instClass Type that String should be deserialized into
-     * @param msg Message that describes specific problem
-     * 
-     * @since 2.1
-     */
-    public JsonMappingException weirdStringException(String value, Class<?> instClass, String msg) {
-        return InvalidFormatException.from(_parser,
-                "Can not construct instance of "+instClass.getName()+" from String value '"+_valueDesc()+"': "+msg,
-                value, instClass);
-    }
-
-    /**
-     * Helper method for constructing exception to indicate that input JSON
-     * Number was not suitable for deserializing into given type.
-     */
-    @Deprecated
-    public JsonMappingException weirdNumberException(Class<?> instClass, String msg) {
-        return weirdStringException(null, instClass, msg);
-    }
-
-    /**
-     * Helper method for constructing exception to indicate that input JSON
-     * Number was not suitable for deserializing into given target type.
-     */
-    public JsonMappingException weirdNumberException(Number value, Class<?> instClass, String msg) {
-        return InvalidFormatException.from(_parser,
-                "Can not construct instance of "+instClass.getName()+" from number value ("+_valueDesc()+"): "+msg,
-                null, instClass);
-    }
-    
-    /**
-     * Helper method for constructing exception to indicate that given JSON
-     * Object field name was not in format to be able to deserialize specified
-     * key type.
-     */
-    public JsonMappingException weirdKeyException(Class<?> keyClass, String keyValue, String msg)
-    {
-        return InvalidFormatException.from(_parser,
-                "Can not construct Map key of type "+keyClass.getName()+" from String \""+_desc(keyValue)+"\": "+msg,
-                keyValue, keyClass);
-    }
-
-    /**
-     * Helper method for indicating that the current token was expected to be another
-     * token.
-     */
-    public JsonMappingException wrongTokenException(JsonParser jp, JsonToken expToken, String msg)
-    {
-        return JsonMappingException.from(jp, "Unexpected token ("+jp.getCurrentToken()+"), expected "+expToken+": "+msg);
-    }
-
-    /**
-     * Helper method for constructing exception to indicate that given
-     * type id (parsed from JSON) could not be converted to a Java type.
-     */
-    public JsonMappingException unknownTypeException(JavaType type, String id)
-    {
-        return JsonMappingException.from(_parser, "Could not resolve type id '"+id+"' into a subtype of "+type);
-    }
-
-    public JsonMappingException endOfInputException(Class<?> instClass)
-    {
-        return JsonMappingException.from(_parser, "Unexpected end-of-input when trying to deserialize a "
-                +instClass.getName());
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable internal methods
-    /**********************************************************
-     */
-
-    protected DateFormat getDateFormat()
-    {
-        if (_dateFormat != null) {
-            return _dateFormat;
-        }
-        /* 24-Feb-2012, tatu: At this point, all timezone configuration
-         *    should have occured, with respect to default dateformat
-         *    and timezone configuration. But we still better clone
-         *    an instance as formatters may be stateful.
-         */
-        DateFormat df = _config.getDateFormat();
-        _dateFormat = df = (DateFormat) df.clone();
-        return df;
-    }
-
-    protected String determineClassName(Object instance)
-    {
-        return ClassUtil.getClassDescription(instance);
-    }
-    
-    /*
-    /**********************************************************
-    /* Other internal methods
-    /**********************************************************
-     */
-
-    protected String _calcName(Class<?> cls)
-    {
-        if (cls.isArray()) {
-            return _calcName(cls.getComponentType())+"[]";
-        }
-        return cls.getName();
-    }
-    
-    protected String _valueDesc()
-    {
-        try {
-            return _desc(_parser.getText());
-        } catch (Exception e) {
-            return "[N/A]";
-        }
-    }
-    protected String _desc(String desc)
-    {
-        // !!! should we quote it? (in case there are control chars, linefeeds)
-        if (desc.length() > MAX_ERROR_STR_LEN) {
-            desc = desc.substring(0, MAX_ERROR_STR_LEN) + "]...[" + desc.substring(desc.length() - MAX_ERROR_STR_LEN);
-        }
-        return desc;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationFeature.java b/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationFeature.java
deleted file mode 100644
index 606194b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/DeserializationFeature.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import com.fasterxml.jackson.databind.cfg.ConfigFeature;
-
-/**
- * Enumeration that defines simple on/off features that affect
- * the way Java objects are deserialized from JSON
- *<p>
- * Note that features can be set both through
- * {@link ObjectMapper} (as sort of defaults) and through
- * {@link ObjectReader}.
- * In first case these defaults must follow "config-then-use" patterns
- * (i.e. defined once, not changed afterwards); all per-call
- * changes must be done using {@link ObjectReader}.
- */
-public enum DeserializationFeature implements ConfigFeature
-{
-    /*
-    /******************************************************
-    /* Type conversion features
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether JSON floating point numbers
-     * are to be deserialized into {@link java.math.BigDecimal}s
-     * if only generic type description (either {@link Object} or
-     * {@link Number}, or within untyped {@link java.util.Map}
-     * or {@link java.util.Collection} context) is available.
-     * If enabled such values will be deserialized as {@link java.math.BigDecimal}s;
-     * if disabled, will be deserialized as {@link Double}s.
-     * <p>
-     * Feature is disabled by default, meaning that "untyped" floating
-     * point numbers will by default be deserialized as {@link Double}s
-     * (choice is for performance reason -- BigDecimals are slower than
-     * Doubles).
-     */
-    USE_BIG_DECIMAL_FOR_FLOATS(false),
-
-    /**
-     * Feature that determines whether JSON integral (non-floating-point)
-     * numbers are to be deserialized into {@link java.math.BigInteger}s
-     * if only generic type description (either {@link Object} or
-     * {@link Number}, or within untyped {@link java.util.Map}
-     * or {@link java.util.Collection} context) is available.
-     * If enabled such values will be deserialized as
-     * {@link java.math.BigInteger}s;
-     * if disabled, will be deserialized as "smallest" available type,
-     * which is either {@link Integer}, {@link Long} or
-     * {@link java.math.BigInteger}, depending on number of digits.
-     * <p>
-     * Feature is disabled by default, meaning that "untyped" floating
-     * point numbers will by default be deserialized using whatever
-     * is the most compact integral type, to optimize efficiency.
-     */
-    USE_BIG_INTEGER_FOR_INTS(false),
-
-    // [JACKSON-652]
-    /**
-     * Feature that determines whether JSON Array is mapped to
-     * <code>Object[]</code> or <code>List&lt;Object></code> when binding
-     * "untyped" objects (ones with nominal type of <code>java.lang.Object</code>).
-     * If true, binds as <code>Object[]</code>; if false, as <code>List&lt;Object></code>.
-     *<p>
-     * Feature is disabled by default, meaning that JSON arrays are bound as
-     * {@link java.util.List}s.
-     */
-    USE_JAVA_ARRAY_FOR_JSON_ARRAY(false),
-    
-    /**
-     * Feature that determines standard deserialization mechanism used for
-     * Enum values: if enabled, Enums are assumed to have been serialized  using
-     * return value of <code>Enum.toString()</code>;
-     * if disabled, return value of <code>Enum.name()</code> is assumed to have been used.
-     *<p>
-     * Note: this feature should usually have same value
-     * as {@link SerializationFeature#WRITE_ENUMS_USING_TO_STRING}.
-     *<p>
-     * Feature is disabled by default.
-     */
-    READ_ENUMS_USING_TO_STRING(false),
-    
-    /*
-    /******************************************************
-     *  Error handling features
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether encountering of unknown
-     * properties (ones that do not map to a property, and there is
-     * no "any setter" or handler that can handle it)
-     * should result in a failure (by throwing a
-     * {@link JsonMappingException}) or not.
-     * This setting only takes effect after all other handling
-     * methods for unknown properties have been tried, and
-     * property remains unhandled.
-     *<p>
-     * Feature is enabled by default (meaning that a
-     * {@link JsonMappingException} will be thrown if an unknown property
-     * is encountered).
-     */
-    FAIL_ON_UNKNOWN_PROPERTIES(false),
-
-    /**
-     * Feature that determines whether encountering of JSON null
-     * is an error when deserializing into Java primitive types
-     * (like 'int' or 'double'). If it is, a JsonProcessingException
-     * is thrown to indicate this; if not, default value is used
-     * (0 for 'int', 0.0 for double, same defaulting as what JVM uses).
-     *<p>
-     * Feature is disabled by default.
-     */
-    FAIL_ON_NULL_FOR_PRIMITIVES(false),
-
-    /**
-     * Feature that determines whether JSON integer numbers are valid
-     * values to be used for deserializing Java enum values.
-     * If set to 'false' numbers are acceptable and are used to map to
-     * ordinal() of matching enumeration value; if 'true', numbers are
-     * not allowed and a {@link JsonMappingException} will be thrown.
-     * Latter behavior makes sense if there is concern that accidental
-     * mapping from integer values to enums might happen (and when enums
-     * are always serialized as JSON Strings)
-     *<p>
-     * Feature is disabled by default.
-     */
-    FAIL_ON_NUMBERS_FOR_ENUMS(false),
-
-    /**
-     * Feature that determines whether Jackson code should catch
-     * and wrap {@link Exception}s (but never {@link Error}s!)
-     * to add additional information about
-     * location (within input) of problem or not. If enabled,
-     * most exceptions will be caught and re-thrown (exception
-     * specifically being that {@link java.io.IOException}s may be passed
-     * as is, since they are declared as throwable); this can be
-     * convenient both in that all exceptions will be checked and
-     * declared, and so there is more contextual information.
-     * However, sometimes calling application may just want "raw"
-     * unchecked exceptions passed as is.
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRAP_EXCEPTIONS(true),
-    
-    /*
-    /******************************************************
-    /* Structural conversion features
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether it is acceptable to coerce non-array
-     * (in JSON) values to work with Java collection (arrays, java.util.Collection)
-     * types. If enabled, collection deserializers will try to handle non-array
-     * values as if they had "implicit" surrounding JSON array.
-     * This feature is meant to be used for compatibility/interoperability reasons,
-     * to work with packages (such as XML-to-JSON converters) that leave out JSON
-     * array in cases where there is just a single element in array.
-     *<p>
-     * Feature is disabled by default.
-     */
-    ACCEPT_SINGLE_VALUE_AS_ARRAY(false),
-    
-    /**
-     * Feature to allow "unwrapping" root-level JSON value, to match setting of
-     * {@link SerializationFeature#WRAP_ROOT_VALUE} used for serialization.
-     * Will verify that the root JSON value is a JSON Object, and that it has
-     * a single property with expected root name. If not, a
-     * {@link JsonMappingException} is thrown; otherwise value of the wrapped property
-     * will be deserialized as if it was the root value.
-     *<p>
-     * Feature is disabled by default.
-     */
-    UNWRAP_ROOT_VALUE(false),
-
-    /*
-    /******************************************************
-    /* Value conversion features
-    /******************************************************
-     */
-    
-    /**
-     * Feature that can be enabled to allow JSON empty String
-     * value ("") to be bound to POJOs as null.
-     * If disabled, standard POJOs can only be bound from JSON null or
-     * JSON Object (standard meaning that no custom deserializers or
-     * constructors are defined; both of which can add support for other
-     * kinds of JSON values); if enable, empty JSON String can be taken
-     * to be equivalent of JSON null.
-     *<p>
-     * Feature is enabled by default.
-     */
-    ACCEPT_EMPTY_STRING_AS_NULL_OBJECT(false),
-    
-    /**
-     * Feature that allows unknown Enum values to be parsed as null values. 
-     * If disabled, unknown Enum values will throw exceptions.
-     *<p>
-     * Note that in some cases this will basically ignore unknown Enum values;
-     * this is the keys for keys of {@link java.util.EnumMap} and values
-     * of {@link java.util.EnumSet} (because nulls are not accepted in these
-     * cases).
-     *<p>
-     * Feature is disabled by default.
-     * 
-     * @since 2.0
-     */
-    READ_UNKNOWN_ENUM_VALUES_AS_NULL(false),
-
-    /*
-    /******************************************************
-    /* Other
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether {@link ObjectReader} should
-     * try to eagerly fetch necessary {@link JsonDeserializer} when
-     * possible. This improves performance in cases where similarly
-     * configured {@link ObjectReader} instance is used multiple
-     * times; and should not significantly affect single-use cases.
-     *<p>
-     * Note that there should not be any need to normally disable this
-     * feature: only consider that if there are actual perceived problems.
-     *<p>
-     * Feature is enabled by default.
-     * 
-     * @since 2.1
-     */
-    EAGER_DESERIALIZER_FETCH(true)
-    
-    ;
-
-    private final boolean _defaultState;
-    
-    private DeserializationFeature(boolean defaultState) {
-        _defaultState = defaultState;
-    }
-
-//  @Override
-    public boolean enabledByDefault() { return _defaultState; }
-
-//  @Override
-    public int getMask() { return (1 << ordinal()); }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/InjectableValues.java b/showkeyHelper/src/com/fasterxml/jackson/databind/InjectableValues.java
deleted file mode 100644
index 64d69de..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/InjectableValues.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.util.*;
-
-/**
- * Abstract class that defines API for objects that provide value to
- * "inject" during deserialization. An instance of this object
- */
-public abstract class InjectableValues
-{
-    /**
-     * Method called to find value identified by id <code>valueId</code> to
-     * inject as value of specified property during deserialization, passing
-     * POJO instance in which value will be injected if it is available
-     * (will be available when injected via field or setter; not available
-     * when injected via constructor or factory method argument).
-     * 
-     * @param valueId Object that identifies value to inject; may be a simple
-     *   name or more complex identifier object, whatever provider needs
-     * @param ctxt Deserialization context
-     * @param forProperty Bean property in which value is to be injected
-     * @param beanInstance Bean instance that contains property to inject,
-     *    if available; null if bean has not yet been constructed.
-     */
-    public abstract Object findInjectableValue(Object valueId,
-            DeserializationContext ctxt, BeanProperty forProperty,
-            Object beanInstance);
-
-    /*
-    /**********************************************************
-    /* Standard implementation
-    /**********************************************************
-     */
-
-    /**
-     * Simple standard implementation which uses a simple Map to
-     * store values to inject, identified by simple String keys.
-     */
-    public static class Std
-        extends InjectableValues
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        protected final Map<String,Object> _values;
-        
-        public Std() {
-            this(new HashMap<String,Object>());
-        }
-
-        public Std(Map<String,Object> values) {
-            _values = values;
-        }
-
-        public Std addValue(String key, Object value)
-        {
-            _values.put(key, value);
-            return this;
-        }
-
-        public Std addValue(Class<?> classKey, Object value)
-        {
-            _values.put(classKey.getName(), value);
-            return this;
-        }
-        
-        @Override
-        public Object findInjectableValue(Object valueId,
-                DeserializationContext ctxt, BeanProperty forProperty,
-                Object beanInstance)
-        {
-            if (!(valueId instanceof String)) {
-                String type = (valueId == null) ? "[null]" : valueId.getClass().getName();
-                throw new IllegalArgumentException("Unrecognized inject value id type ("+type+"), expecting String");
-            }
-            String key = (String) valueId;
-            Object ob = _values.get(key);
-            if (ob == null && !_values.containsKey(key)) {
-                throw new IllegalArgumentException("No injectable id with value '"+key+"' found (for property '"
-                        +forProperty.getName()+"')");
-            }
-            return ob;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JavaType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JavaType.java
deleted file mode 100644
index 2a512b1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JavaType.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.lang.reflect.Modifier;
-
-import com.fasterxml.jackson.core.type.ResolvedType;
-
-/**
- * Base class for type token classes used both to contain information
- * and as keys for deserializers.
- *<p>
- * Instances can (only) be constructed by
- * <code>com.fasterxml.jackson.databind.TypeFactory</code>
- * (included in "jackson-databind")
- */
-public abstract class JavaType
-    extends ResolvedType
-    implements java.io.Serializable
-{
-    // for 2.1.0:
-    private static final long serialVersionUID = -5321897246493723158L;
-
-    /**
-     * This is the nominal type-erased Class that would be close to the
-     * type represented (but not exactly type, due to type erasure: type
-     * instance may have more information on this).
-     * May be an interface or abstract class, so instantiation
-     * may not be possible.
-     */
-    protected final Class<?> _class;
-
-    protected final int _hashCode;
-
-    /**
-     * Optional handler (codec) that can be attached to indicate 
-     * what to use for handling (serializing, deserializing) values of
-     * this specific type.
-     *<p>
-     * Note: untyped (i.e. caller has to cast) because it is used for
-     * different kinds of handlers, with unrelated types.
-     */
-    protected final Object _valueHandler;
-
-    /**
-     * Optional handler that can be attached to indicate how to handle
-     * additional type metadata associated with this type.
-     *<p>
-     * Note: untyped (i.e. caller has to cast) because it is used for
-     * different kinds of handlers, with unrelated types.
-     */
-    protected final Object _typeHandler;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * @param raw "Raw" (type-erased) class for this type
-     * @param additionalHash Additional hash code to use, in addition
-     *   to hash code of the class name 
-     */
-    protected JavaType(Class<?> raw, int additionalHash,
-            Object valueHandler, Object typeHandler)
-    {
-        _class = raw;
-        _hashCode = raw.getName().hashCode() + additionalHash;
-        _valueHandler = valueHandler;
-        _typeHandler = typeHandler;
-    }
-
-    /**
-     * Serialization method called when no additional type information is
-     * to be included in serialization.
-     */
-    
-    /**
-     * "Copy method" that will construct a new instance that is identical to
-     * this instance, except that it will have specified type handler assigned.
-     * 
-     * @return Newly created type instance
-     */
-    public abstract JavaType withTypeHandler(Object h);
-
-    /**
-     * "Copy method" that will construct a new instance that is identical to
-     * this instance, except that its content type will have specified
-     * type handler assigned.
-     * 
-     * @return Newly created type instance
-     */
-    public abstract JavaType withContentTypeHandler(Object h);
-
-    /**
-     * "Copy method" that will construct a new instance that is identical to
-     * this instance, except that it will have specified value handler assigned.
-     * 
-     * @return Newly created type instance
-     */
-    public abstract JavaType withValueHandler(Object h);
-
-    /**
-     * "Copy method" that will construct a new instance that is identical to
-     * this instance, except that it will have specified content value handler assigned.
-     * 
-     * @return Newly created type instance
-     */
-    public abstract JavaType withContentValueHandler(Object h);
-    
-    /*
-    /**********************************************************
-    /* Type coercion fluent factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to do a "narrowing" conversions; that is,
-     * to return a type with a raw class that is assignable to the raw
-     * class of this type. If this is not possible, an
-     * {@link IllegalArgumentException} is thrown.
-     * If class is same as the current raw class, instance itself is
-     * returned.
-     */
-    public JavaType narrowBy(Class<?> subclass)
-    {
-        // First: if same raw class, just return this instance
-        if (subclass == _class) {
-            return this;
-        }
-        // Otherwise, ensure compatibility
-        _assertSubclass(subclass, _class);
-        JavaType result = _narrow(subclass);
-
-        // TODO: these checks should NOT actually be needed; above should suffice:
-        if (_valueHandler != result.<Object>getValueHandler()) {
-            result = result.withValueHandler(_valueHandler);
-        }
-        if (_typeHandler != result.<Object>getTypeHandler()) {
-            result = result.withTypeHandler(_typeHandler);
-        }
-        return result;
-    }
-
-    /**
-     * More efficient version of {@link #narrowBy}, called by
-     * internal framework in cases where compatibility checks
-     * are to be skipped.
-     */
-    public JavaType forcedNarrowBy(Class<?> subclass)
-    {
-        if (subclass == _class) { // can still optimize for simple case
-            return this;
-        }
-        JavaType result = _narrow(subclass);
-        // TODO: these checks should NOT actually be needed; above should suffice:
-        if (_valueHandler != result.<Object>getValueHandler()) {
-            result = result.withValueHandler(_valueHandler);
-        }
-        if (_typeHandler != result.<Object>getTypeHandler()) {
-            result = result.withTypeHandler(_typeHandler);
-        }
-        return result;
-    }
-
-    /**
-     * Method that can be called to do a "widening" conversions; that is,
-     * to return a type with a raw class that could be assigned from this
-     * type.
-     * If such conversion is not possible, an
-     * {@link IllegalArgumentException} is thrown.
-     * If class is same as the current raw class, instance itself is
-     * returned.
-     */
-    public JavaType widenBy(Class<?> superclass)
-    {
-        // First: if same raw class, just return this instance
-        if (superclass == _class) {
-            return this;
-        }
-        // Otherwise, ensure compatibility
-        _assertSubclass(_class, superclass);
-        return _widen(superclass);
-    }
-
-    protected abstract JavaType _narrow(Class<?> subclass);
-
-    /**
-     *<p>
-     * Default implementation is just to call {@link #_narrow}, since
-     * underlying type construction is usually identical
-     */
-    protected JavaType _widen(Class<?> superclass) {
-        return _narrow(superclass);
-    }
-
-    public abstract JavaType narrowContentsBy(Class<?> contentClass);
-
-    public abstract JavaType widenContentsBy(Class<?> contentClass);
-    
-    /*
-    /**********************************************************
-    /* Implementation of ResolvedType API
-    /**********************************************************
-     */
-
-    @Override
-    public final Class<?> getRawClass() { return _class; }
-
-    /**
-     * Method that can be used to check whether this type has
-     * specified Class as its type erasure. Put another way, returns
-     * true if instantiation of this Type is given (type-erased) Class.
-     */
-    @Override
-    public final boolean hasRawClass(Class<?> clz) {
-        return _class == clz;
-    }
-
-    @Override
-    public boolean isAbstract() {
-        return Modifier.isAbstract(_class.getModifiers());
-    }
-
-    /**
-     * Convenience method for checking whether underlying Java type
-     * is a concrete class or not: abstract classes and interfaces
-     * are not.
-     */
-    @Override
-    public boolean isConcrete() {
-        int mod = _class.getModifiers();
-        if ((mod & (Modifier.INTERFACE | Modifier.ABSTRACT)) == 0) {
-            return true;
-        }
-        /* 19-Feb-2010, tatus: Holy mackarel; primitive types
-         *    have 'abstract' flag set...
-         */
-        if (_class.isPrimitive()) {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isThrowable() {
-        return Throwable.class.isAssignableFrom(_class);
-    }
-
-    @Override
-    public boolean isArrayType() { return false; }
-
-    @Override
-    public final boolean isEnumType() { return _class.isEnum(); }
-
-    @Override
-    public final boolean isInterface() { return _class.isInterface(); }
-
-    @Override
-    public final boolean isPrimitive() { return _class.isPrimitive(); }
-
-    @Override
-    public final boolean isFinal() { return Modifier.isFinal(_class.getModifiers()); }
-
-    /**
-     * @return True if type represented is a container type; this includes
-     *    array, Map and Collection types.
-     */
-    @Override
-    public abstract boolean isContainerType();
-
-    /**
-     * @return True if type is either true {@link java.util.Collection} type,
-     *    or something similar (meaning it has at least one type parameter,
-     *    which describes type of contents)
-     */
-    @Override
-    public boolean isCollectionLikeType() { return false; }
-
-    /**
-     * @return True if type is either true {@link java.util.Map} type,
-     *    or something similar (meaning it has at least two type parameter;
-     *    first one describing key type, second value type)
-     */
-    @Override
-    public boolean isMapLikeType() { return false; }
-    
-    /*
-    /**********************************************************
-    /* Public API, type parameter access; pass-through
-    /**********************************************************
-     */
-
-    @Override
-    public boolean hasGenericTypes()
-    {
-        return containedTypeCount() > 0;
-    }
-
-    @Override
-    public JavaType getKeyType() { return null; }
-
-    @Override
-    public JavaType getContentType() { return null; }
-
-    @Override
-    public int containedTypeCount() { return 0; }
-
-    @Override
-    public JavaType containedType(int index) { return null; }
-
-    @Override
-    public String containedTypeName(int index) { return null; }
-
-    /*
-    /**********************************************************
-    /* Semi-public API, accessing handlers
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing value handler associated with this type, if any
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T getValueHandler() { return (T) _valueHandler; }
-
-    /**
-     * Method for accessing type handler associated with this type, if any
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T getTypeHandler() { return (T) _typeHandler; }
-
-    /*
-    /**********************************************************
-    /* Support for producing signatures
-    /**********************************************************
-     */
-    
-    //public abstract String toCanonical();
-
-    /**
-     * Method for accessing signature that contains generic
-     * type information, in form compatible with JVM 1.5
-     * as per JLS. It is a superset of {@link #getErasedSignature},
-     * in that generic information can be automatically removed
-     * if necessary (just remove outermost
-     * angle brackets along with content inside)
-     */
-    public String getGenericSignature() {
-        StringBuilder sb = new StringBuilder(40);
-        getGenericSignature(sb);
-        return sb.toString();        
-    }
-
-    /**
-     * 
-     * @param sb StringBuilder to append signature to
-     * 
-     * @return StringBuilder that was passed in; returned to allow
-     * call chaining
-     */
-    public abstract StringBuilder getGenericSignature(StringBuilder sb);
-    
-    /**
-     * Method for accessing signature without generic
-     * type information, in form compatible with all versions
-     * of JVM, and specifically used for type descriptions
-     * when generating byte code.
-     */
-    public String getErasedSignature() {
-        StringBuilder sb = new StringBuilder(40);
-        getErasedSignature(sb);
-        return sb.toString();
-    }
-
-    /**
-     * Method for accessing signature without generic
-     * type information, in form compatible with all versions
-     * of JVM, and specifically used for type descriptions
-     * when generating byte code.
-     * 
-     * @param sb StringBuilder to append signature to
-     * 
-     * @return StringBuilder that was passed in; returned to allow
-     * call chaining
-     */
-    public abstract StringBuilder getErasedSignature(StringBuilder sb);
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    protected void _assertSubclass(Class<?> subclass, Class<?> superClass)
-    {
-        if (!_class.isAssignableFrom(subclass)) {
-            throw new IllegalArgumentException("Class "+subclass.getName()+" is not assignable to "+_class.getName());
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods; let's make them abstract to force override
-    /**********************************************************
-     */
-
-    @Override
-    public abstract String toString();
-
-    @Override
-    public abstract boolean equals(Object o);
-
-    @Override
-    public final int hashCode() { return _hashCode; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JsonDeserializer.java
deleted file mode 100644
index e566b8d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonDeserializer.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Abstract class that defines API used by {@link ObjectMapper} (and
- * other chained {@link JsonDeserializer}s too) to deserialize Objects of
- * arbitrary types from JSON, using provided {@link JsonParser}.
- *<p>
- * Custom deserializers should usually not directly extend this class,
- * but instead extend {@link com.fasterxml.jackson.databind.deser.std.StdDeserializer}
- * (or its subtypes like {@link com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer}).
- *<p>
- * If deserializer is an aggregate one -- meaning it delegates handling of some
- * of its contents by using other deserializer(s) -- it typically also needs
- * to implement {@link com.fasterxml.jackson.databind.deser.ResolvableDeserializer},
- * which can locate dependant deserializers. This is important to allow dynamic
- * overrides of deserializers; separate call interface is needed to separate
- * resolution of dependant deserializers (which may have cyclic link back
- * to deserializer itself, directly or indirectly).
- *<p>
- * In addition, to support per-property annotations (to configure aspects
- * of deserialization on per-property basis), deserializers may want
- * to implement 
- * {@link com.fasterxml.jackson.databind.deser.ContextualDeserializer},
- * which allows specialization of deserializers: call to
- * {@link com.fasterxml.jackson.databind.deser.ContextualDeserializer#createContextual}
- * is passed information on property, and can create a newly configured
- * deserializer for handling that particular property.
- *<p>
- * If both
- * {@link com.fasterxml.jackson.databind.deser.ResolvableDeserializer} and
- * {@link com.fasterxml.jackson.databind.deser.ContextualDeserializer}
- * are implemented, resolution of deserializers occurs before
- * contextualization.
- */
-public abstract class JsonDeserializer<T>
-{
-    /*
-    /**********************************************************
-    /* Main deserialization methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to ask implementation to deserialize
-     * JSON content into the value type this serializer handles.
-     * Returned instance is to be constructed by method itself.
-     *<p>
-     * Pre-condition for this method is that the parser points to the
-     * first event that is part of value to deserializer (and which 
-     * is never JSON 'null' literal, more on this below): for simple
-     * types it may be the only value; and for structured types the
-     * Object start marker.
-     * Post-condition is that the parser will point to the last
-     * event that is part of deserialized value (or in case deserialization
-     * fails, event that was not recognized or usable, which may be
-     * the same event as the one it pointed to upon call).
-     *<p>
-     * Note that this method is never called for JSON null literal,
-     * and thus deserializers need (and should) not check for it.
-     *
-     * @param jp Parsed used for reading JSON content
-     * @param ctxt Context that can be used to access information about
-     *   this deserialization activity.
-     *
-     * @return Deserializer value
-     */
-    public abstract T deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Alternate deserialization method (compared to the most commonly
-     * used, {@link #deserialize(JsonParser, DeserializationContext)}),
-     * which takes in initialized value instance, to be
-     * configured and/or populated by deserializer.
-     * Method is not necessarily used for all supported types; most commonly
-     * it is used
-     * for Collections and Maps.
-     *<p>
-     * Default implementation just throws
-     * {@link UnsupportedOperationException}, to indicate that types
-     * that do not explicitly add support do not necessarily support
-     * update-existing-value operation (esp. immutable types)
-     */
-    public T deserialize(JsonParser jp, DeserializationContext ctxt,
-                         T intoValue)
-        throws IOException, JsonProcessingException
-    {
-        throw new UnsupportedOperationException("Can not update object of type "+intoValue.getClass().getName());
-    }
-
-    /**
-     * Deserialization called when type being deserialized is defined to
-     * contain additional type identifier, to allow for correctly
-     * instantiating correct subtype. This can be due to annotation on
-     * type (or its supertype), or due to global settings without
-     * annotations.
-     *<p>
-     * Default implementation may work for some types, but ideally subclasses
-     * should not rely on current default implementation.
-     * Implementation is mostly provided to avoid compilation errors with older
-     * code.
-     * 
-     * @param typeDeserializer Deserializer to use for handling type information
-     */
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // We could try calling 
-        return typeDeserializer.deserializeTypedFromAny(jp, ctxt);
-    }
-
-    /*
-    /**********************************************************
-    /* Fluent factory methods for constructing decorated versions
-    /**********************************************************
-     */
-
-    /**
-     * Method that will return deserializer instance that is able
-     * to handle "unwrapped" value instances
-     * If no unwrapped instance can be constructed, will simply
-     * return this object as-is.
-     *<p>
-     * Default implementation just returns 'this'
-     * indicating that no unwrapped variant exists
-     */
-    public JsonDeserializer<T> unwrappingDeserializer(NameTransformer unwrapper) {
-        return this;
-    }
-
-    /**
-     * Method that can be called to try to replace deserializer this deserializer
-     * delegates calls to. If not supported (either this deserializer does not
-     * delegate anything; or it does not want any changes), should either
-     * throw {@link UnsupportedOperationException} (if operation does not
-     * make sense or is not allowed); or return this deserializer as is.
-     * 
-     * @since 2.1
-     */
-    public JsonDeserializer<?> replaceDelegatee(JsonDeserializer<?> delegatee) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /*
-    /**********************************************************
-    /* Other accessors
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to determine value to be used for
-     * representing null values (values deserialized when JSON token
-     * is {@link JsonToken#VALUE_NULL}). Usually this is simply
-     * Java null, but for some types (especially primitives) it may be
-     * necessary to use non-null values.
-     *<p>
-     * Note that deserializers are allowed to call this just once and
-     * then reuse returned value; that is, method is not guaranteed to
-     * be called once for each conversion.
-     *<p>
-     * Default implementation simply returns null.
-     */
-    public T getNullValue() { return null; }
-
-    /**
-     * Method called to determine value to be used for "empty" values
-     * (most commonly when deserializing from empty JSON Strings).
-     * Usually this is same as {@link #getNullValue} (which in turn
-     * is usually simply Java null), but it can be overridden
-     * for types. Or, if type should never be converted from empty
-     * String, method can also throw an exception.
-     *<p>
-     * Default implementation simple calls {@link #getNullValue} and
-     * returns value.
-     */
-    public T getEmptyValue() { return getNullValue(); }
-
-    /**
-     * Method that will
-     * either return null to indicate that type being deserializers
-     * has no concept of properties; or a collection of identifiers
-     * for which <code>toString</code> will give external property
-     * name.
-     * This is only to be used for error reporting and diagnostics
-     * purposes (most commonly, to accompany "unknown property"
-     * exception).
-     * 
-     * @since 2.0
-     */
-    public Collection<Object> getKnownPropertyNames() {
-        return null;
-    }
-    
-    /**
-     * Method called to see if deserializer instance is cachable and
-     * usable for other properties of same type (type for which instance
-     * was created).
-     *<p>
-     * Note that cached instances are still resolved on per-property basis,
-     * if instance implements {@link com.fasterxml.jackson.databind.deser.ResolvableDeserializer}:
-     * cached instance is just as the base. This means that in most cases it is safe to
-     * cache instances; however, it only makes sense to cache instances
-     * if instantiation is expensive, or if instances are heavy-weight.
-     *<p>
-     * Default implementation returns false, to indicate that no caching
-     * is done.
-     */
-    public boolean isCachable() { return false; }
-
-    /**
-     * Accessor that can be used to check whether this deserializer
-     * is expecting to possibly get an Object Identifier value instead of full value
-     * serialization, and if so, should be able to resolve it to actual
-     * Object instance to return as deserialized value.
-     *<p>
-     * Default implementation returns null, as support can not be implemented
-     * generically. Some standard deserializers (most notably
-     * {@link com.fasterxml.jackson.databind.deser.BeanDeserializer})
-     * do implement this feature, and may return reader instance, depending on exact
-     * configuration of instance (which is based on type, and referring property).
-     * 
-     * @return ObjectIdReader used for resolving possible Object Identifier
-     *    value, instead of full value serialization, if deserializer can do that;
-     *    null if no Object Id is expected.
-     * 
-     * @since 2.0
-     */
-    public ObjectIdReader getObjectIdReader() { return null; }
-
-    /**
-     * Accessor that can be used to determine if this deserializer uses
-     * another deserializer for actual deserialization, by delegating
-     * calls. If so, will return immediate delegate (which itself may
-     * delegate to further deserializers); otherwise will return null.
-     * 
-     * @return Deserializer this deserializer delegates calls to, if null;
-     *   null otherwise.
-     * 
-     * @since 2.1
-     */
-    public JsonDeserializer<?> getDelegatee() {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * This marker class is only to be used with annotations, to
-     * indicate that <b>no deserializer is configured</b>.
-     *<p>
-     * Specifically, this class is to be used as the marker for
-     * annotation {@link com.fasterxml.jackson.databind.annotation.JsonDeserialize}
-     */
-    public abstract static class None extends JsonDeserializer<Object> {
-        private None() { } // not to be instantiated
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonMappingException.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JsonMappingException.java
deleted file mode 100644
index 8f935cb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonMappingException.java
+++ /dev/null
@@ -1,367 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Checked exception used to signal fatal problems with mapping of
- * content.
- *<p>
- * One additional feature is the ability to denote relevant path
- * of references (during serialization/deserialization) to help in
- * troubleshooting.
- */
-public class JsonMappingException
-    extends JsonProcessingException
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Let's limit length of reference chain, to limit damage in cases
-     * of infinite recursion.
-     */
-    final static int MAX_REFS_TO_LIST = 1000;
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Simple bean class used to contain references. References
-     * can be added to indicate execution/reference path that
-     * lead to the problem that caused this exception to be
-     * thrown.
-     */
-    public static class Reference implements Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Object through which reference was resolved. Can be either
-         * actual instance (usually the case for serialization), or
-         * Class (usually the case for deserialization).
-         */
-        protected Object _from;
-
-        /**
-         * Name of field (for beans) or key (for Maps) that is part
-         * of the reference. May be null for Collection types (which
-         * generally have {@link #_index} defined), or when resolving
-         * Map classes without (yet) having an instance to operate on.
-         */
-        protected String _fieldName;
-
-        /**
-         * Index within a {@link Collection} instance that contained
-         * the reference; used if index is relevant and available.
-         * If either not applicable, or not available, -1 is used to
-         * denote "not known".
-         */
-        protected int _index = -1;
-
-        /**
-         * Default constructor for deserialization/sub-classing purposes
-         */
-        protected Reference() { }
-
-        public Reference(Object from) { _from = from; }
-
-        public Reference(Object from, String fieldName) {
-            _from = from;
-            if (fieldName == null) {
-                throw new NullPointerException("Can not pass null fieldName");
-            }
-            _fieldName = fieldName;
-        }
-
-        public Reference(Object from, int index) {
-            _from = from;
-            _index = index;
-        }
-
-        public void setFrom(Object o) { _from = o; }
-        public void setFieldName(String n) { _fieldName = n; }
-        public void setIndex(int ix) { _index = ix; }
-
-        public Object getFrom() { return _from; }
-        public String getFieldName() { return _fieldName; }
-        public int getIndex() { return _index; }
-
-        @Override public String toString() {
-            StringBuilder sb = new StringBuilder();
-            Class<?> cls = (_from instanceof Class<?>) ?
-                ((Class<?>)_from) : _from.getClass();
-            /* Hmmh. Although Class.getName() is mostly ok, it does look
-             * butt-ugly for arrays. So let's use getSimpleName() instead;
-             * but have to prepend package name too.
-             */
-            Package pkg = cls.getPackage();
-            if (pkg != null) {
-                sb.append(pkg.getName());
-                sb.append('.');
-            }
-            sb.append(cls.getSimpleName());
-            sb.append('[');
-            if (_fieldName != null) {
-                sb.append('"');
-                sb.append(_fieldName);
-                sb.append('"');
-            } else if (_index >= 0) {
-                sb.append(_index);
-            } else {
-                sb.append('?');
-            }
-            sb.append(']');
-            return sb.toString();
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* State/configuration
-    /**********************************************************
-     */
-
-    /**
-     * Path through which problem that triggering throwing of
-     * this exception was reached.
-     */
-    protected LinkedList<Reference> _path;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public JsonMappingException(String msg)
-    {
-        super(msg);
-    }
-
-    public JsonMappingException(String msg, Throwable rootCause)
-    {
-        super(msg, rootCause);
-    }
-
-    public JsonMappingException(String msg, JsonLocation loc)
-    {
-        super(msg, loc);
-    }
-
-    public JsonMappingException(String msg, JsonLocation loc, Throwable rootCause)
-    {
-        super(msg, loc, rootCause);
-    }
-
-    public static JsonMappingException from(JsonParser jp, String msg)
-    {
-        return new JsonMappingException(msg, jp.getTokenLocation());
-    }
-
-    public static JsonMappingException from(JsonParser jp, String msg,
-            Throwable problem)
-    {
-        return new JsonMappingException(msg, jp.getTokenLocation(), problem);
-    }
-
-    /**
-     * Factory method used when "upgrading" an {@link IOException} into
-     * {@link JsonMappingException}: usually only needed to comply with
-     * a signature.
-     * 
-     * @since 2.1
-     */
-    public static JsonMappingException fromUnexpectedIOE(IOException src)
-    {
-        return new JsonMappingException("Unexpected IOException (of type "
-                +src.getClass().getName()+"): "+src.getMessage(), (JsonLocation)null, src);
-    }
-    
-    /**
-     * Method that can be called to either create a new JsonMappingException
-     * (if underlying exception is not a JsonMappingException), or augment
-     * given exception with given path/reference information.
-     *
-     * This version of method is called when the reference is through a
-     * non-indexed object, such as a Map or POJO/bean.
-     */
-    public static JsonMappingException wrapWithPath(Throwable src, Object refFrom,
-                                                    String refFieldName)
-    {
-        return wrapWithPath(src, new Reference(refFrom, refFieldName));
-    }
-
-    /**
-     * Method that can be called to either create a new JsonMappingException
-     * (if underlying exception is not a JsonMappingException), or augment
-     * given exception with given path/reference information.
-     *
-     * This version of method is called when the reference is through an
-     * index, which happens with arrays and Collections.
-     */
-    public static JsonMappingException wrapWithPath(Throwable src, Object refFrom,
-                                                    int index)
-    {
-        return wrapWithPath(src, new Reference(refFrom, index));
-    }
-
-    /**
-     * Method that can be called to either create a new JsonMappingException
-     * (if underlying exception is not a JsonMappingException), or augment
-     * given exception with given path/reference information.
-     */
-    public static JsonMappingException wrapWithPath(Throwable src, Reference ref)
-    {
-        JsonMappingException jme;
-        if (src instanceof JsonMappingException) {
-            jme = (JsonMappingException) src;
-        } else {
-            String msg = src.getMessage();
-            /* Related to [JACKSON-62], let's use a more meaningful placeholder
-             * if all we have is null
-             */
-            if (msg == null || msg.length() == 0) {
-                msg = "(was "+src.getClass().getName()+")";
-            }
-            jme = new JsonMappingException(msg, null, src);
-        }
-        jme.prependPath(ref);
-        return jme;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors/mutators
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing full structural path within type hierarchy
-     * down to problematic property.
-     */
-    public List<Reference> getPath()
-    {
-        if (_path == null) {
-            return Collections.emptyList();
-        }
-        return Collections.unmodifiableList(_path);
-    }
-
-    /**
-     * Method for accesing description of path that lead to the
-     * problem that triggered this exception
-     */
-    public String getPathReference()
-    {
-        return getPathReference(new StringBuilder()).toString();
-    }
-
-    public StringBuilder getPathReference(StringBuilder sb)
-    {
-        _appendPathDesc(sb);
-        return sb;
-    }
-    
-    /**
-     * Method called to prepend a reference information in front of
-     * current path
-     */
-    public void prependPath(Object referrer, String fieldName)
-    {
-        Reference ref = new Reference(referrer, fieldName);
-        prependPath(ref);
-    }
-    /**
-     * Method called to prepend a reference information in front of
-     * current path
-     */
-    public void prependPath(Object referrer, int index)
-    {
-        Reference ref = new Reference(referrer, index);
-        prependPath(ref);
-    }
-
-    public void prependPath(Reference r)
-    {
-        if (_path == null) {
-            _path = new LinkedList<Reference>();
-        }
-        /* Also: let's not increase without bounds. Could choose either
-         * head or tail; tail is easier (no need to ever remove), as
-         * well as potentially more useful so let's use it:
-         */
-        if (_path.size() < MAX_REFS_TO_LIST) {
-            _path.addFirst(r);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public String getLocalizedMessage() {
-        return _buildMessage();
-    }
-    
-    /**
-     * Method is overridden so that we can properly inject description
-     * of problem path, if such is defined.
-     */
-    @Override
-    public String getMessage() {
-        return _buildMessage();
-    }
-
-    protected String _buildMessage()
-    {
-        /* First: if we have no path info, let's just use parent's
-         * definition as is
-         */
-        String msg = super.getMessage();
-        if (_path == null) {
-            return msg;
-        }
-        StringBuilder sb = (msg == null) ? new StringBuilder() : new StringBuilder(msg);
-        /* 18-Feb-2009, tatu: initially there was a linefeed between
-         *    message and path reference; but unfortunately many systems
-         *   (loggers, junit) seem to assume linefeeds are only added to
-         *   separate stack trace.
-         */
-        sb.append(" (through reference chain: ");
-        sb = getPathReference(sb);
-        sb.append(')');
-        return sb.toString();
-    }
-
-    @Override
-    public String toString()
-    {
-        return getClass().getName()+": "+getMessage();
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected void _appendPathDesc(StringBuilder sb)
-    {
-        Iterator<Reference> it = _path.iterator();
-        while (it.hasNext()) {
-            sb.append(it.next().toString());
-            if (it.hasNext()) {
-                sb.append("->");
-            }
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JsonNode.java
deleted file mode 100644
index ff1762a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonNode.java
+++ /dev/null
@@ -1,793 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.*;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.TreeNode;
-
-/**
- * Base class for all JSON nodes, which form the basis of JSON
- * Tree Model that Jackson implements.
- * One way to think of these nodes is to consider them
- * similar to DOM nodes in XML DOM trees.
- *<p>
- * As a general design rule, most accessors ("getters") are included
- * in this base class, to allow for traversing structure without
- * type casts. Most mutators, however, need to be accessed through
- * specific sub-classes (such as <code>ObjectNode</code>
- * and <code>ArrayNode</code>).
- * This seems sensible because proper type
- * information is generally available when building or modifying
- * trees, but less often when reading a tree (newly built from
- * parsed JSON content).
- *<p>
- * Actual concrete sub-classes can be found from package
- * {@link com.fasterxml.jackson.databind.node}.
- */
-public abstract class JsonNode
-    implements TreeNode, Iterable<JsonNode>
-{
-    protected final static List<JsonNode> NO_NODES = Collections.emptyList();
-    protected final static List<String> NO_STRINGS = Collections.emptyList();
-
-    /*
-    /**********************************************************
-    /* Construction, related
-    /**********************************************************
-     */
-    
-    protected JsonNode() { }
-
-    /**
-     * Method that can be called to get a node that is guaranteed
-     * not to allow changing of this node through mutators on
-     * this node or any of its children.
-     * This means it can either make a copy of this node (and all
-     * mutable children and grand children nodes), or node itself
-     * if it is immutable.
-     *<p>
-     * Note: return type is guaranteed to have same type as the
-     * node method is called on; which is why method is declared
-     * with local generic type.
-     * 
-     * @since 2.0
-     * 
-     * @return Node that is either a copy of this node (and all non-leaf
-     *    children); or, for immutable leaf nodes, node itself.
-     */
-    public abstract <T extends JsonNode> T deepCopy();
-    
-    /*
-    /**********************************************************
-    /* Public API, type introspection
-    /**********************************************************
-     */
-
-    // // First high-level division between values, containers and "missing"
-
-    /**
-     * Method that returns true for all value nodes: ones that 
-     * are not containers, and that do not represent "missing" nodes
-     * in the path. Such value nodes represent String, Number, Boolean
-     * and null values from JSON.
-     *<p>
-     * Note: one and only one of methods {@link #isValueNode},
-     * {@link #isContainerNode} and {@link #isMissingNode} ever
-     * returns true for any given node.
-     */
-    public boolean isValueNode() { return false; }
-
-    /**
-     * Method that returns true for container nodes: Arrays and Objects.
-     *<p>
-     * Note: one and only one of methods {@link #isValueNode},
-     * {@link #isContainerNode} and {@link #isMissingNode} ever
-     * returns true for any given node.
-     */
-    public boolean isContainerNode() { return false; }
-
-    /**
-     * Method that returns true for "virtual" nodes which represent
-     * missing entries constructed by path accessor methods when
-     * there is no actual node matching given criteria.
-     *<p>
-     * Note: one and only one of methods {@link #isValueNode},
-     * {@link #isContainerNode} and {@link #isMissingNode} ever
-     * returns true for any given node.
-     */
-    public boolean isMissingNode() { return false; }
-
-    // // Then more specific type introspection
-    // // (along with defaults to be overridden)
-
-    /**
-     * @return True if this node represents JSON Array
-     */
-    public boolean isArray() { return false; }
-
-    /**
-     * @return True if this node represents JSON Object
-     */
-    public boolean isObject() { return false; }
-
-    /**
-     * Method that can be used to check if the node is a wrapper
-     * for a POJO ("Plain Old Java Object" aka "bean".
-     * Returns true only for
-     * instances of <code>POJONode</code>.
-     *
-     * @return True if this node wraps a POJO
-     */
-    public boolean isPojo() { return false; }
-
-    /**
-     * @return True if this node represents a numeric JSON
-     *   value
-     */
-    public boolean isNumber() { return false; }
-
-    /**
-     * 
-     * @return True if this node represents an integral (integer)
-     *   numeric JSON value
-     */
-    public boolean isIntegralNumber() { return false; }
-
-    /**
-     * @return True if this node represents a non-integral
-     *   numeric JSON value
-     */
-    public boolean isFloatingPointNumber() { return false; }
-
-    /**
-     * Method that can be used to check whether contained value
-     * is a number represented as Java <code>int</code>.
-     * Note, however, that even if this method returns false, it
-     * is possible that conversion would be possible from other numeric
-     * types -- to check if this is possible, use
-     * {@link #canConvertToInt()} instead.
-     * 
-     * @return True if the value contained by this node is stored as Java int
-     */
-    public boolean isInt() { return false; }
-
-    /**
-     * Method that can be used to check whether contained value
-     * is a number represented as Java <code>long</code>.
-     * Note, however, that even if this method returns false, it
-     * is possible that conversion would be possible from other numeric
-     * types -- to check if this is possible, use
-     * {@link #canConvertToInt()} instead.
-     * 
-     * @return True if the value contained by this node is stored as Java <code>long</code>
-     */
-    public boolean isLong() { return false; }
-
-    public boolean isDouble() { return false; }
-    public boolean isBigDecimal() { return false; }
-    public boolean isBigInteger() { return false; }
-
-    public boolean isTextual() { return false; }
-
-    /**
-     * Method that can be used to check if this node was created from
-     * JSON boolean value (literals "true" and "false").
-     */
-    public boolean isBoolean() { return false; }
-
-    /**
-     * Method that can be used to check if this node was created from
-     * JSON literal null value.
-     */
-    public boolean isNull() { return false; }
-
-    /**
-     * Method that can be used to check if this node represents
-     * binary data (Base64 encoded). Although this will be externally
-     * written as JSON String value, {@link #isTextual} will
-     * return false if this method returns true.
-     *
-     * @return True if this node represents base64 encoded binary data
-     */
-    public boolean isBinary() { return false; }
-
-    /**
-     * Method that can be used for efficient type detection
-     * when using stream abstraction for traversing nodes.
-     * Will return the first {@link JsonToken} that equivalent
-     * stream event would produce (for most nodes there is just
-     * one token but for structured/container types multiple)
-     */
-    public abstract JsonToken asToken();
-
-    /**
-     * If this node is a numeric type (as per {@link #isNumber}),
-     * returns native type that node uses to store the numeric value;
-     * otherwise returns null.
-     * 
-     * @return Type of number contained, if any; or null if node does not
-     *  contain numeric value.
-     */
-    public abstract JsonParser.NumberType numberType();
-
-    /**
-     * Method that can be used to check whether this node is a numeric
-     * node ({@link #isNumber} would return true) AND its value fits
-     * within Java's 32-bit signed integer type, <code>int</code>.
-     * Note that floating-point numbers are convertible if the integral
-     * part fits without overflow (as per standard Java coercion rules)
-     * 
-     * @since 2.0
-     */
-    public boolean canConvertToInt() { return false; }
-
-    /**
-     * Method that can be used to check whether this node is a numeric
-     * node ({@link #isNumber} would return true) AND its value fits
-     * within Java's 64-bit signed integer type, <code>long</code>.
-     * Note that floating-point numbers are convertible if the integral
-     * part fits without overflow (as per standard Java coercion rules)
-     * 
-     * @since 2.0
-     */
-    public boolean canConvertToLong() { return false; }
-    
-    /*
-    /**********************************************************
-    /* Public API, straight value access
-    /**********************************************************
-     */
-
-    /**
-     * Method to use for accessing String values.
-     * Does <b>NOT</b> do any conversions for non-String value nodes;
-     * for non-String values (ones for which {@link #isTextual} returns
-     * false) null will be returned.
-     * For String values, null is never returned (but empty Strings may be)
-     *
-     * @return Textual value this node contains, iff it is a textual
-     *   JSON node (comes from JSON String value entry)
-     */
-    public String textValue() { return null; }
-
-    /**
-     * Method to use for accessing binary content of binary nodes (nodes
-     * for which {@link #isBinary} returns true); or for Text Nodes
-     * (ones for which {@link #textValue} returns non-null value),
-     * to read decoded base64 data.
-     * For other types of nodes, returns null.
-     *
-     * @return Binary data this node contains, iff it is a binary
-     *   node; null otherwise
-     */
-    public byte[] binaryValue() throws IOException
-    {
-        return null;
-    }
-
-    /**
-     * Method to use for accessing JSON boolean values (value
-     * literals 'true' and 'false').
-     * For other types, always returns false.
-     *
-     * @return Textual value this node contains, iff it is a textual
-     *   json node (comes from JSON String value entry)
-     */
-    public boolean booleanValue() { return false; }
-
-    /**
-     * Returns numeric value for this node, <b>if and only if</b>
-     * this node is numeric ({@link #isNumber} returns true); otherwise
-     * returns null
-     *
-     * @return Number value this node contains, if any (null for non-number
-     *   nodes).
-     */
-    public Number numberValue() { return null; }
-
-    /**
-     * Returns integer value for this node, <b>if and only if</b>
-     * this node is numeric ({@link #isNumber} returns true). For other
-     * types returns 0.
-     * For floating-point numbers, value is truncated using default
-     * Java coercion, similar to how cast from double to int operates.
-     *
-     * @return Integer value this node contains, if any; 0 for non-number
-     *   nodes.
-     */
-    public int intValue() { return 0; }
-
-    public long longValue() { return 0L; }
-    public double doubleValue() { return 0.0; }
-    public BigDecimal decimalValue() { return BigDecimal.ZERO; }
-    public BigInteger bigIntegerValue() { return BigInteger.ZERO; }
-
-    /**
-     * Method for accessing value of the specified element of
-     * an array node. For other nodes, null is always returned.
-     *<p>
-     * For array nodes, index specifies
-     * exact location within array and allows for efficient iteration
-     * over child elements (underlying storage is guaranteed to
-     * be efficiently indexable, i.e. has random-access to elements).
-     * If index is less than 0, or equal-or-greater than
-     * <code>node.size()</code>, null is returned; no exception is
-     * thrown for any index.
-     *<p>
-     * NOTE: if the element value has been explicitly set as <code>null</code>
-     * (which is different from removal!),
-     * a {@link com.fasterxml.jackson.databind.node.NullNode} will be returned,
-     * not null.
-     *
-     * @return Node that represent value of the specified element,
-     *   if this node is an array and has specified element.
-     *   Null otherwise.
-     */
-    public JsonNode get(int index) { return null; }
-
-    /**
-     * Method for accessing value of the specified field of
-     * an object node. If this node is not an object (or it
-     * does not have a value for specified field name), or
-     * if there is no field with such name, null is returned.
-     *<p>
-     * NOTE: if the property value has been explicitly set as <code>null</code>
-     * (which is different from removal!),
-     * a {@link com.fasterxml.jackson.databind.node.NullNode} will be returned,
-     * not null.
-     *
-     * @return Node that represent value of the specified field,
-     *   if this node is an object and has value for the specified
-     *   field. Null otherwise.
-     */
-    public JsonNode get(String fieldName) { return null; }
-    
-    /*
-    /**********************************************************
-    /* Public API, value access with conversion(s)/coercion(s)
-    /**********************************************************
-     */
-
-    /**
-     * Method that will return a valid String representation of
-     * the container value, if the node is a value node
-     * (method {@link #isValueNode} returns true),
-     * otherwise empty String.
-     */
-    public abstract String asText();
-
-    /**
-     * Method that will try to convert value of this node to a Java <b>int</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * default value of <b>0</b> will be returned; no exceptions are thrown.
-     */
-    public int asInt() {
-        return asInt(0);
-    }
-    
-    /**
-     * Method that will try to convert value of this node to a Java <b>int</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public int asInt(int defaultValue) {
-        return defaultValue;
-    }
-
-    /**
-     * Method that will try to convert value of this node to a Java <b>long</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an long (including structured types
-     * like Objects and Arrays),
-     * default value of <b>0</b> will be returned; no exceptions are thrown.
-     */
-    public long asLong() {
-        return asLong(0L);
-    }
-    
-    /**
-     * Method that will try to convert value of this node to a Java <b>long</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0 (false)
-     * and 1 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an long (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public long asLong(long defaultValue) {
-        return defaultValue;
-    }
-    
-    /**
-     * Method that will try to convert value of this node to a Java <b>double</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0.0 (false)
-     * and 1.0 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * default value of <b>0.0</b> will be returned; no exceptions are thrown.
-     */
-    public double asDouble() {
-        return asDouble(0.0);
-    }
-    
-    /**
-     * Method that will try to convert value of this node to a Java <b>double</b>.
-     * Numbers are coerced using default Java rules; booleans convert to 0.0 (false)
-     * and 1.0 (true), and Strings are parsed using default Java language integer
-     * parsing rules.
-     *<p>
-     * If representation can not be converted to an int (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public double asDouble(double defaultValue) {
-        return defaultValue;
-    }
-
-    /**
-     * Method that will try to convert value of this node to a Java <b>boolean</b>.
-     * JSON booleans map naturally; integer numbers other than 0 map to true, and
-     * 0 maps to false
-     * and Strings 'true' and 'false' map to corresponding values.
-     *<p>
-     * If representation can not be converted to a boolean value (including structured types
-     * like Objects and Arrays),
-     * default value of <b>false</b> will be returned; no exceptions are thrown.
-     */
-    public boolean asBoolean() {
-        return asBoolean(false);
-    }
-    
-    /**
-     * Method that will try to convert value of this node to a Java <b>boolean</b>.
-     * JSON booleans map naturally; integer numbers other than 0 map to true, and
-     * 0 maps to false
-     * and Strings 'true' and 'false' map to corresponding values.
-     *<p>
-     * If representation can not be converted to a boolean value (including structured types
-     * like Objects and Arrays),
-     * specified <b>defaultValue</b> will be returned; no exceptions are thrown.
-     */
-    public boolean asBoolean(boolean defaultValue) {
-        return defaultValue;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, value find / existence check methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method that allows checking whether this node is JSON Object node
-     * and contains value for specified property. If this is the case
-     * (including properties with explicit null values), returns true;
-     * otherwise returns false.
-     *<p>
-     * This method is equivalent to:
-     *<pre>
-     *   node.get(fieldName) != null
-     *</pre>
-     * (since return value of get() is node, not value node contains)
-     *<p>
-     * NOTE: when explicit <code>null</code> values are added, this
-     * method will return <code>true</code> for such properties.
-     *
-     * @param fieldName Name of element to check
-     * 
-     * @return True if this node is a JSON Object node, and has a property
-     *   entry with specified name (with any value, including null value)
-     */
-    public boolean has(String fieldName) {
-        return get(fieldName) != null;
-    }
-
-    /**
-     * Method that allows checking whether this node is JSON Array node
-     * and contains a value for specified index
-     * If this is the case
-     * (including case of specified indexing having null as value), returns true;
-     * otherwise returns false.
-     *<p>
-     * Note: array element indexes are 0-based.
-     *<p>
-     * This method is equivalent to:
-     *<pre>
-     *   node.get(index) != null
-     *</pre>
-     *<p>
-     * NOTE: this method will return <code>true</code> for explicitly added
-     * null values.
-     *
-     * @param index Index to check
-     * 
-     * @return True if this node is a JSON Object node, and has a property
-     *   entry with specified name (with any value, including null value)
-     */
-    public boolean has(int index) {
-        return get(index) != null;
-    }
-
-    /**
-     * Method that is similar to {@link #has(String)}, but that will
-     * return <code>false</code> for explicitly added nulls.
-     *<p>
-     * This method is functionally equivalent to:
-     *<pre>
-     *   node.get(fieldName) != null && !node.get(fieldName).isNull()
-     *</pre>
-     * 
-     * @since 2.1
-     */
-    public boolean hasNonNull(String fieldName) {
-        JsonNode n = get(fieldName);
-        return (n != null) && !n.isNull();
-    }
-
-    /**
-     * Method that is similar to {@link #has(int)}, but that will
-     * return <code>false</code> for explicitly added nulls.
-     *<p>
-     * This method is equivalent to:
-     *<pre>
-     *   node.get(index) != null && !node.get(index).isNull()
-     *</pre>
-     * 
-     * @since 2.1
-     */
-    public boolean hasNonNull(int index) {
-        JsonNode n = get(index);
-        return (n != null) && !n.isNull();
-    }
-    
-    /**
-     * Method for finding a JSON Object field with specified name in this
-     * node or its child nodes, and returning value it has.
-     * If no matching field is found in this node or its descendants, returns null.
-     * 
-     * @param fieldName Name of field to look for
-     * 
-     * @return Value of first matching node found, if any; null if none
-     */
-    public abstract JsonNode findValue(String fieldName);
-
-    /**
-     * Method for finding JSON Object fields with specified name, and returning
-     * found ones as a List. Note that sub-tree search ends if a field is found,
-     * so possible children of result nodes are <b>not</b> included.
-     * If no matching fields are found in this node or its descendants, returns
-     * an empty List.
-     * 
-     * @param fieldName Name of field to look for
-     */
-    public final List<JsonNode> findValues(String fieldName)
-    {
-        List<JsonNode> result = findValues(fieldName, null);
-        if (result == null) {
-            return Collections.emptyList();
-        }
-        return result;
-    }
-
-    /**
-     * Similar to {@link #findValues}, but will additionally convert
-     * values into Strings, calling {@link #asText}.
-     */
-    public final List<String> findValuesAsText(String fieldName)
-    {
-        List<String> result = findValuesAsText(fieldName, null);
-        if (result == null) {
-            return Collections.emptyList();
-        }
-        return result;
-    }
-    
-    /**
-     * Method similar to {@link #findValue}, but that will return a
-     * "missing node" instead of null if no field is found. Missing node
-     * is a specific kind of node for which {@link #isMissingNode}
-     * returns true; and all value access methods return empty or
-     * missing value.
-     * 
-     * @param fieldName Name of field to look for
-     * 
-     * @return Value of first matching node found; or if not found, a
-     *    "missing node" (non-null instance that has no value)
-     */
-    public abstract JsonNode findPath(String fieldName);
-    
-    /**
-     * Method for finding a JSON Object that contains specified field,
-     * within this node or its descendants.
-     * If no matching field is found in this node or its descendants, returns null.
-     * 
-     * @param fieldName Name of field to look for
-     * 
-     * @return Value of first matching node found, if any; null if none
-     */
-    public abstract JsonNode findParent(String fieldName);
-
-    /**
-     * Method for finding a JSON Object that contains specified field,
-     * within this node or its descendants.
-     * If no matching field is found in this node or its descendants, returns null.
-     * 
-     * @param fieldName Name of field to look for
-     * 
-     * @return Value of first matching node found, if any; null if none
-     */
-    public final List<JsonNode> findParents(String fieldName)
-    {
-        List<JsonNode> result = findParents(fieldName, null);
-        if (result == null) {
-            return Collections.emptyList();
-        }
-        return result;
-    }
-
-    public abstract List<JsonNode> findValues(String fieldName, List<JsonNode> foundSoFar);
-    public abstract List<String> findValuesAsText(String fieldName, List<String> foundSoFar);
-    public abstract List<JsonNode> findParents(String fieldName, List<JsonNode> foundSoFar);
-
-    /*
-    /**********************************************************
-    /* Public API, container access
-    /**********************************************************
-     */
-
-    /**
-     * Method that returns number of child nodes this node contains:
-     * for Array nodes, number of child elements, for Object nodes,
-     * number of fields, and for all other nodes 0.
-     *
-     * @return For non-container nodes returns 0; for arrays number of
-     *   contained elements, and for objects number of fields.
-     */
-    public int size() { return 0; }
-
-    /**
-     * Same as calling {@link #elements}; implemented so that
-     * convenience "for-each" loop can be used for looping over elements
-     * of JSON Array constructs.
-     */
-//  @Override
-    public final Iterator<JsonNode> iterator() { return elements(); }
-
-    /**
-     * Method for accessing all value nodes of this Node, iff
-     * this node is a JSON Array or Object node. In case of Object node,
-     * field names (keys) are not included, only values.
-     * For other types of nodes, returns empty iterator.
-     */
-    public Iterator<JsonNode> elements() { return NO_NODES.iterator(); }
-
-    /**
-     * Method for accessing names of all fields for this Node, iff
-     * this node is a JSON Object node.
-     */
-    public Iterator<String> fieldNames() { return NO_STRINGS.iterator(); }
-
-    /**
-     * @return Iterator that can be used to traverse all key/value pairs for
-     *   object nodes; empty iterator (no contents) for other types
-     */
-    public Iterator<Map.Entry<String, JsonNode>> fields() {
-        Collection<Map.Entry<String, JsonNode>> coll = Collections.emptyList();
-        return coll.iterator();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, path handling
-    /**********************************************************
-     */
-
-    /**
-     * This method is similar to {@link #get(String)}, except
-     * that instead of returning null if no such value exists (due
-     * to this node not being an object, or object not having value
-     * for the specified field),
-     * a "missing node" (node that returns true for
-     * {@link #isMissingNode}) will be returned. This allows for
-     * convenient and safe chained access via path calls.
-     */
-    public abstract JsonNode path(String fieldName);
-
-    /**
-     * This method is similar to {@link #get(int)}, except
-     * that instead of returning null if no such element exists (due
-     * to index being out of range, or this node not being an array),
-     * a "missing node" (node that returns true for
-     * {@link #isMissingNode}) will be returned. This allows for
-     * convenient and safe chained access via path calls.
-     */
-    public abstract JsonNode path(int index);
-
-    /**
-     * Method that can be called on Object nodes, to access a property
-     * that has Object value; or if no such property exists, to create,
-     * add and return such Object node.
-     * If the node method is called on is not Object node,
-     * or if property exists and has value that is not Object node,
-     * {@link UnsupportedOperationException} is thrown
-     */
-    public JsonNode with(String propertyName) {
-        throw new UnsupportedOperationException("JsonNode not of type ObjectNode (but "
-                +getClass().getName()+"), can not call with() on it");
-    }
-
-    /**
-     * Method that can be called on Object nodes, to access a property
-     * that has <code>Array</code> value; or if no such property exists, to create,
-     * add and return such Array node.
-     * If the node method is called on is not Object node,
-     * or if property exists and has value that is not Array node,
-     * {@link UnsupportedOperationException} is thrown
-     */
-    public JsonNode withArray(String propertyName) {
-        throw new UnsupportedOperationException("JsonNode not of type ObjectNode (but "
-                +getClass().getName()+"), can not call withArray() on it");
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API: converting to/from Streaming API
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing a {@link JsonParser} instance for
-     * iterating over contents of the tree that this
-     * node is root of.
-     * Functionally equivalent to first serializing tree using
-     * {@link com.fasterxml.jackson.core.ObjectCodec} and then re-parsing but
-     * more efficient.
-     */
-    public abstract JsonParser traverse();
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-    
-    /**
-     *<p>
-     * Note: marked as abstract to ensure all implementation
-     * classes define it properly.
-     */
-    @Override
-    public abstract String toString();
-
-    /**
-     * Equality for node objects is defined as full (deep) value
-     * equality. This means that it is possible to compare complete
-     * JSON trees for equality by comparing equality of root nodes.
-     *<p>
-     * Note: marked as abstract to ensure all implementation
-     * classes define it properly and not rely on definition
-     * from {@link java.lang.Object}.
-     */
-    @Override
-    public abstract boolean equals(Object o);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializable.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializable.java
deleted file mode 100644
index 073a6ea..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Interface that can be implemented by objects that know how to
- * serialize themselves to JSON, using {@link JsonGenerator}
- * (and {@link SerializerProvider} if necessary).
- *<p>
- * Note that implementing this interface binds implementing object
- * closely to Jackson API, and that it is often not necessary to do
- * so -- if class is a bean, it can be serialized without
- * implementing this interface.
- *<p>
- * NOTE: Jackson 2.0 added another method (from former "JsonSerializableWithType"),
- * which is required for proper handling of case where additional type information
- * is needed.
- */
-public interface JsonSerializable
-{
-    /**
-     * Serialization method called when no additional type information is
-     * to be included in serialization.
-     */
-    public void serialize(JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Serialization method called when additional type information is
-     * expected to be included in serialization, for deserialization to use.
-     *<p>
-     * Usually implementation consists of a call to one of methods
-     * in {@link TypeSerializer} (such as {@link TypeSerializer#writeTypePrefixForObject(Object, JsonGenerator)})
-     * followed by serialization of contents,
-     * followed by another call to {@link TypeSerializer}
-     * (such as {@link TypeSerializer#writeTypeSuffixForObject(Object, JsonGenerator)}).
-     * Exact methods to call in {@link TypeSerializer} depend on shape of JSON Object used
-     * (Array, Object or scalar like String/Number/Boolean).
-     *<p>
-     * Note that some types (most notably, "natural" types: String, Integer,
-     * Double and Boolean) never include type information.
-     */
-    public void serializeWithType(JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializer.java
deleted file mode 100644
index 5afc2c8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/JsonSerializer.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Abstract class that defines API used by {@link ObjectMapper} (and
- * other chained {@link JsonSerializer}s too) to serialize Objects of
- * arbitrary types into JSON, using provided {@link JsonGenerator}.
- *<p>
- * NOTE: it is recommended that custom serializers extend
- * {@link com.fasterxml.jackson.databind.ser.std.StdSerializer} instead
- * of this class, since it will implement many of optional
- * methods of this class.
- *<p>
- * If serializer is an aggregate one -- meaning it delegates handling of some
- * of its contents by using other serializer(s) -- it typically also needs
- * to implement {@link com.fasterxml.jackson.databind.ser.ResolvableSerializer},
- * which can locate secondary serializers needed. This is important to allow dynamic
- * overrides of serializers; separate call interface is needed to separate
- * resolution of secondary serializers (which may have cyclic link back
- * to serializer itself, directly or indirectly).
- *<p>
- * In addition, to support per-property annotations (to configure aspects
- * of serialization on per-property basis), serializers may want
- * to implement 
- * {@link com.fasterxml.jackson.databind.ser.ContextualSerializer},
- * which allows specialization of serializers: call to
- * {@link com.fasterxml.jackson.databind.ser.ContextualSerializer#createContextual}
- * is passed information on property, and can create a newly configured
- * serializer for handling that particular property.
- *<p>
- * If both
- * {@link com.fasterxml.jackson.databind.ser.ResolvableSerializer} and
- * {@link com.fasterxml.jackson.databind.ser.ContextualSerializer}
- * are implemented, resolution of serializers occurs before
- * contextualization.
- */
-public abstract class JsonSerializer<T>
-    implements JsonFormatVisitable // since 2.1
-{
-    /*
-    /**********************************************************
-    /* Fluent factory methods for constructing decorated versions
-    /**********************************************************
-     */
-
-    /**
-     * Method that will return serializer instance that produces
-     * "unwrapped" serialization, if applicable for type being
-     * serialized (which is the case for some serializers
-     * that produce JSON Objects as output).
-     * If no unwrapped serializer can be constructed, will simply
-     * return serializer as-is.
-     *<p>
-     * Default implementation just returns serializer as-is,
-     * indicating that no unwrapped variant exists
-     * 
-     * @param unwrapper Name transformation to use to convert between names
-     *   of unwrapper properties
-     */
-    public JsonSerializer<T> unwrappingSerializer(NameTransformer unwrapper) {
-        return this;
-    }
-
-    /**
-     * Method that can be called to try to replace serializer this serializer
-     * delegates calls to. If not supported (either this serializer does not
-     * delegate anything; or it does not want any changes), should either
-     * throw {@link UnsupportedOperationException} (if operation does not
-     * make sense or is not allowed); or return this serializer as is.
-     * 
-     * @since 2.1
-     */
-    public JsonSerializer<T> replaceDelegatee(JsonSerializer<?> delegatee) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to ask implementation to serialize
-     * values of type this serializer handles.
-     *
-     * @param value Value to serialize; can <b>not</b> be null.
-     * @param jgen Generator used to output resulting Json content
-     * @param provider Provider that can be used to get serializers for
-     *   serializing Objects value contains, if any.
-     */
-    public abstract void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method that can be called to ask implementation to serialize
-     * values of type this serializer handles, using specified type serializer
-     * for embedding necessary type information.
-     *<p>
-     * Default implementation will throw {@link UnsupportedOperationException}
-     * to indicate that proper type handling needs to be implemented.
-     *<p>
-     * For simple datatypes written as a single scalar value (JSON String, Number, Boolean),
-     * implementation would look like:
-     *<pre>
-     *  // note: method to call depends on whether this type is serialized as JSON scalar, object or Array!
-     *  typeSer.writeTypePrefixForScalar(value, jgen);
-     *  serialize(value, jgen, provider);
-     *  typeSer.writeTypeSuffixForScalar(value, jgen);
-     *</pre>
-     * and implementations for type serialized as JSON Arrays or Objects would differ slightly,
-     * as <code>START-ARRAY>/<code>END-ARRAY</code> and
-     * <code>START-OBJECT>/<code>END-OBJECT</code> pairs
-     * need to be properly handled with respect to serializing of contents.
-     *
-     * @param value Value to serialize; can <b>not</b> be null.
-     * @param jgen Generator used to output resulting Json content
-     * @param provider Provider that can be used to get serializers for
-     *   serializing Objects value contains, if any.
-     * @param typeSer Type serializer to use for including type information
-     */
-    public void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        Class<?> clz = handledType();
-        if (clz == null) {
-            clz = value.getClass();
-        }
-        throw new UnsupportedOperationException("Type id handling not implemented for type "+clz.getName());
-    }
-    
-    /*
-    /**********************************************************
-    /* Other accessors
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing type of Objects this serializer can handle.
-     * Note that this information is not guaranteed to be exact -- it
-     * may be a more generic (super-type) -- but it should not be
-     * incorrect (return a non-related type).
-     *<p>
-     * Default implementation will return null, which essentially means
-     * same as returning <code>Object.class</code> would; that is, that
-     * nothing is known about handled type.
-     *<p>
-     */
-    public Class<T> handledType() { return null; }
-
-    /**
-     * Method called to check whether given serializable value is
-     * considered "empty" value (for purposes of suppressing serialization
-     * of empty values).
-     *<p>
-     * Default implementation will consider only null values to be empty.
-     * 
-     * @since 2.0
-     */
-    public boolean isEmpty(T value) {
-        return (value == null);
-    }
-
-    /**
-     * Method that can be called to see whether this serializer instance
-     * will use Object Id to handle cyclic references.
-     */
-    public boolean usesObjectId() {
-        return false;
-    }
-
-    /**
-     * Accessor for checking whether this serializer is an
-     * "unwrapping" serializer; this is necessary to know since
-     * it may also require caller to suppress writing of the
-     * leading property name.
-     */
-    public boolean isUnwrappingSerializer() {
-        return false;
-    }
-    
-    /**
-     * Accessor that can be used to determine if this serializer uses
-     * another serializer for actual serialization, by delegating
-     * calls. If so, will return immediate delegate (which itself may
-     * delegate to further serializers); otherwise will return null.
-     * 
-     * @return Serializer this serializer delegates calls to, if null;
-     *   null otherwise.
-     * 
-     * @since 2.1
-     */
-    public JsonSerializer<?> getDelegatee() {
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Default JsonFormatVisitable implementation
-    /**********************************************************
-     */
-
-    /**
-     * Default implementation simply calls {@link JsonFormatVisitorWrapper#expectAnyFormat(JavaType)}.
-     * 
-     * @since 2.1
-     */
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType type)
-        throws JsonMappingException
-    {
-        visitor.expectAnyFormat(type);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper class(es)
-    /**********************************************************
-     */
-
-    /**
-     * This marker class is only to be used with annotations, to
-     * indicate that <b>no serializer is configured</b>.
-     *<p>
-     * Specifically, this class is to be used as the marker for
-     * annotation {@link com.fasterxml.jackson.databind.annotation.JsonSerialize}.
-     */
-    public abstract static class None
-        extends JsonSerializer<Object> { }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/KeyDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/KeyDeserializer.java
deleted file mode 100644
index 90dd56d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/KeyDeserializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Abstract class that defines API used for deserializing JSON content
- * field names into Java Map keys. These deserializers are only used
- * if the Map key class is not <code>String</code> or <code>Object</code>.
- */
-public abstract class KeyDeserializer
-{
-    /**
-     * Method called to deserialize a {@link java.util.Map} key from JSON property name.
-     */
-    public abstract Object deserializeKey(String key, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * This marker class is only to be used with annotations, to
-     * indicate that <b>no deserializer is configured</b>.
-     *<p>
-     * Specifically, this class is to be used as the marker for
-     * annotation {@link com.fasterxml.jackson.databind.annotation.JsonDeserialize}.
-     */
-    public abstract static class None
-        extends KeyDeserializer { }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/MapperFeature.java b/showkeyHelper/src/com/fasterxml/jackson/databind/MapperFeature.java
deleted file mode 100644
index f94212d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/MapperFeature.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.cfg.ConfigFeature;
-
-/**
- * Enumeration that defines simple on/off features to set
- * for {@link ObjectMapper}, and accessible (but not changeable)
- * via {@link ObjectReader} and {@link ObjectWriter} (as well as
- * through various convenience methods through context objects).
- *<p>
- * Note that in addition to being only mutable via {@link ObjectMapper},
- * changes only take effect when done <b>before any serialization or
- * deserialization</b> calls -- that is, caller must follow
- * "configure-then-use" pattern.
- */
-public enum MapperFeature implements ConfigFeature
-{
-    /*
-    /******************************************************
-    /*  Introspection features
-    /******************************************************
-     */
-    
-    /**
-     * Feature that determines whether annotation introspection
-     * is used for configuration; if enabled, configured
-     * {@link AnnotationIntrospector} will be used: if disabled,
-     * no annotations are considered.
-     *<p>
-     * Feature is enabled by default.
-     */
-    USE_ANNOTATIONS(true),
-
-    /**
-     * Feature that determines whether "creator" methods are
-     * automatically detected by consider public constructors,
-     * and static single argument methods with name "valueOf".
-     * If disabled, only methods explicitly annotated are considered
-     * creator methods (except for the no-arg default constructor which
-     * is always considered a factory method).
-     *<p>
-     * Note that this feature has lower precedence than per-class
-     * annotations, and is only used if there isn't more granular
-     * configuration available.
-     *<P>
-     * Feature is enabled by default.
-     */
-    AUTO_DETECT_CREATORS(true),
-    
-    /**
-     * Feature that determines whether non-static fields are recognized as
-     * properties.
-     * If yes, then all public member fields
-     * are considered as properties. If disabled, only fields explicitly
-     * annotated are considered property fields.
-     *<p>
-     * Note that this feature has lower precedence than per-class
-     * annotations, and is only used if there isn't more granular
-     * configuration available.
-     *<p>
-     * Feature is enabled by default.
-     */
-     AUTO_DETECT_FIELDS(true),
-    
-    /**
-     * Feature that determines whether regualr "getter" methods are
-     * automatically detected based on standard Bean naming convention
-     * or not. If yes, then all public zero-argument methods that
-     * start with prefix "get" 
-     * are considered as getters.
-     * If disabled, only methods explicitly  annotated are considered getters.
-     *<p>
-     * Note that since version 1.3, this does <b>NOT</b> include
-     * "is getters" (see {@link #AUTO_DETECT_IS_GETTERS} for details)
-     *<p>
-     * Note that this feature has lower precedence than per-class
-     * annotations, and is only used if there isn't more granular
-     * configuration available.
-     *<p>
-     * Feature is enabled by default.
-     */
-    AUTO_DETECT_GETTERS(true),
-
-    /**
-     * Feature that determines whether "is getter" methods are
-     * automatically detected based on standard Bean naming convention
-     * or not. If yes, then all public zero-argument methods that
-     * start with prefix "is", and whose return type is boolean
-     * are considered as "is getters".
-     * If disabled, only methods explicitly annotated are considered getters.
-     *<p>
-     * Note that this feature has lower precedence than per-class
-     * annotations, and is only used if there isn't more granular
-     * configuration available.
-     *<p>
-     * Feature is enabled by default.
-     */
-    AUTO_DETECT_IS_GETTERS(true),
-
-     /**
-      * Feature that determines whether "setter" methods are
-      * automatically detected based on standard Bean naming convention
-      * or not. If yes, then all public one-argument methods that
-      * start with prefix "set"
-      * are considered setters. If disabled, only methods explicitly
-      * annotated are considered setters.
-      *<p>
-      * Note that this feature has lower precedence than per-class
-      * annotations, and is only used if there isn't more granular
-      * configuration available.
-      *<P>
-      * Feature is enabled by default.
-      */
-     AUTO_DETECT_SETTERS(true),
-     
-     /**
-      * Feature that determines whether getters (getter methods)
-      * can be auto-detected if there is no matching mutator (setter,
-      * constructor parameter or field) or not: if set to true,
-      * only getters that match a mutator are auto-discovered; if
-      * false, all auto-detectable getters can be discovered.
-      *<p>
-      * Feature is disabled by default.
-      */
-     REQUIRE_SETTERS_FOR_GETTERS(false),
-
-     /**
-      * Feature that determines whether otherwise regular "getter"
-      * methods (but only ones that handle Collections and Maps,
-      * not getters of other type)
-      * can be used for purpose of getting a reference to a Collection
-      * and Map to modify the property, without requiring a setter
-      * method.
-      * This is similar to how JAXB framework sets Collections and
-      * Maps: no setter is involved, just setter.
-      *<p>
-      * Note that such getters-as-setters methods have lower
-      * precedence than setters, so they are only used if no
-      * setter is found for the Map/Collection property.
-      *<p>
-      * Feature is enabled by default.
-      */
-     USE_GETTERS_AS_SETTERS(true),
-
-     /**
-     * Feature that determines whether method and field access
-     * modifier settings can be overridden when accessing
-     * properties. If enabled, method
-     * {@link java.lang.reflect.AccessibleObject#setAccessible}
-     * may be called to enable access to otherwise unaccessible
-     * objects.
-     *<p>
-     * Feature is enabled by default.
-     */
-    CAN_OVERRIDE_ACCESS_MODIFIERS(true),
-
-    /*
-    /******************************************************
-    /* Type-handling features
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether the type detection for
-     * serialization should be using actual dynamic runtime type,
-     * or declared static type.
-     * Note that deserialization always uses declared static types
-     * since no runtime types are available (as we are creating
-     * instances after using type information).
-     *<p>
-     * This global default value can be overridden at class, method
-     * or field level by using {@link JsonSerialize#typing} annotation
-     * property.
-     *<p>
-     * Feature is disabled by default which means that dynamic runtime types
-     * are used (instead of declared static types) for serialization.
-     */
-    USE_STATIC_TYPING(false),
-
-    /*
-    /******************************************************
-    /* View-related features
-    /******************************************************
-     */
-    
-    /**
-     * Feature that determines whether properties that have no view
-     * annotations are included in JSON serialization views (see
-     * {@link com.fasterxml.jackson.annotation.JsonView} for more
-     * details on JSON Views).
-     * If enabled, non-annotated properties will be included;
-     * when disabled, they will be excluded. So this feature
-     * changes between "opt-in" (feature disabled) and
-     * "opt-out" (feature enabled) modes.
-     *<p>
-     * Default value is enabled, meaning that non-annotated
-     * properties are included in all views if there is no
-     * {@link com.fasterxml.jackson.annotation.JsonView} annotation.
-     *<p>
-     * Feature is enabled by default.
-     */
-    DEFAULT_VIEW_INCLUSION(true),
-    
-    /*
-    /******************************************************
-    /* Generic output features
-    /******************************************************
-     */
-
-    /**
-     * Feature that defines default property serialization order used
-     * for POJO fields (note: does <b>not</b> apply to {@link java.util.Map}
-     * serialization!):
-     * if enabled, default ordering is alphabetic (similar to
-     * how {@link com.fasterxml.jackson.annotation.JsonPropertyOrder#alphabetic()}
-     * works); if disabled, order is unspecified (based on what JDK gives
-     * us, which may be declaration order, but is not guaranteed).
-     *<p>
-     * Note that this is just the default behavior, and can be overridden by
-     * explicit overrides in classes.
-     *<p>
-     * Feature is disabled by default.
-     */
-    SORT_PROPERTIES_ALPHABETICALLY(false),
-
-    /*
-    /******************************************************
-    /* Name-related features
-    /******************************************************
-     */
-
-    /**
-     * Feature that can be enabled to make property names be
-     * overridden by wrapper name (usually detected with annotations
-     * as defined by {@link AnnotationIntrospector#findWrapperName}.
-     * If enabled, all properties that have associated non-empty Wrapper
-     * name will use that wrapper name instead of property name.
-     * If disabled, wrapper name is only used for wrapping (if anything).
-     *<p>
-     * Feature is disabled by default.
-     * 
-     * @since 2.1
-     */
-    USE_WRAPPER_NAME_AS_PROPERTY_NAME(false)
-    
-    ;
-
-    private final boolean _defaultState;
-    
-    private MapperFeature(boolean defaultState) {
-        _defaultState = defaultState;
-    }
-    
-//  @Override
-    public boolean enabledByDefault() { return _defaultState; }
-
-//  @Override
-    public int getMask() { return (1 << ordinal()); }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/MappingIterator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/MappingIterator.java
deleted file mode 100644
index 3ca16ea..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/MappingIterator.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-/**
- * Iterator exposed by {@link ObjectMapper} when binding sequence of
- * objects. Extension is done to allow more convenient exposing of
- * {@link IOException} (which basic {@link Iterator} does not expose)
- */
-public class MappingIterator<T> implements Iterator<T>, Closeable
-{
-    protected final static MappingIterator<?> EMPTY_ITERATOR =
-        new MappingIterator<Object>(null, null, null, null, false, null);
-    
-    protected final JavaType _type;
-
-    protected final DeserializationContext _context;
-    
-    protected final JsonDeserializer<T> _deserializer;
-
-    protected JsonParser _parser;
-    
-    /**
-     * Flag that indicates whether input {@link JsonParser} should be closed
-     * when we are done or not; generally only called when caller did not
-     * pass JsonParser.
-     */
-    protected final boolean _closeParser;
-
-    /**
-     * Flag that is set when we have determined what {@link #hasNextValue()}
-     * should value; reset when {@link #nextValue} is called
-     */
-    protected boolean _hasNextChecked;
-    
-    /**
-     * If not null, "value to update" instead of creating a new instance
-     * for each call.
-     */
-    protected final T _updatedValue;
-
-    /**
-     * @deprecated Since 2.1, to be removed
-     */
-    @Deprecated
-    protected MappingIterator(JavaType type, JsonParser jp, DeserializationContext ctxt,
-            JsonDeserializer<?> deser)
-    {
-        this(type, jp, ctxt, deser, true, null);
-    }
-
-    /**
-     * @param managedParser Whether we "own" the {@link JsonParser} passed or not:
-     *   if true, it was created by {@link ObjectReader} and code here needs to
-     *   close it; if false, it was passed by calling code and should not be
-     *   closed by iterator.
-     */
-    @SuppressWarnings("unchecked")
-    protected MappingIterator(JavaType type, JsonParser jp, DeserializationContext ctxt,
-            JsonDeserializer<?> deser,
-            boolean managedParser, Object valueToUpdate)
-    {
-        _type = type;
-        _parser = jp;
-        _context = ctxt;
-        _deserializer = (JsonDeserializer<T>) deser;
-        _closeParser = managedParser;
-        if (valueToUpdate == null) {
-            _updatedValue = null;
-        } else {
-            _updatedValue = (T) valueToUpdate;
-        }
-
-        /* Ok: one more thing; we may have to skip START_ARRAY, assuming
-         * "wrapped" sequence; but this is ONLY done for 'managed' parsers
-         * and never if JsonParser was directly passed by caller (if it
-         * was, caller must have either positioned it over first token of
-         * the first element, or cleared the START_ARRAY token explicitly).
-         * Note, however, that we do not try to guess whether this could be
-         * an unwrapped sequence of arrays/Lists: we just assume it is wrapped;
-         * and if not, caller needs to hand us JsonParser instead, pointing to
-         * the first token of the first element.
-         */
-        if (managedParser && jp != null && jp.getCurrentToken() == JsonToken.START_ARRAY) {
-            jp.clearCurrentToken();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    protected static <T> MappingIterator<T> emptyIterator() {
-        return (MappingIterator<T>) EMPTY_ITERATOR;
-    }
-    
-    /*
-    /**********************************************************
-    /* Basic iterator impl
-    /**********************************************************
-     */
-
-//  @Override
-    public boolean hasNext()
-    {
-        try {
-            return hasNextValue();
-        } catch (JsonMappingException e) {
-            throw new RuntimeJsonMappingException(e.getMessage(), e);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-//  @Override
-    public T next()
-    {
-        try {
-            return nextValue();
-        } catch (JsonMappingException e) {
-            throw new RuntimeJsonMappingException(e.getMessage(), e);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-//  @Override
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-    
-    public void close() throws IOException{
-        if(_parser != null) {
-            _parser.close();
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Equivalent of {@link #next} but one that may throw checked
-     * exceptions from Jackson due to invalid input.
-     */
-    public boolean hasNextValue() throws IOException
-    {
-        if (_parser == null) {
-            return false;
-        }
-        if (!_hasNextChecked) {
-            JsonToken t = _parser.getCurrentToken();
-            _hasNextChecked = true;
-            if (t == null) { // un-initialized or cleared; find next
-                t = _parser.nextToken();
-                // If EOF, no more, or if we hit END_ARRAY (although we don't clear the token).
-                if (t == null || t == JsonToken.END_ARRAY) {
-                    JsonParser jp = _parser;
-                    _parser = null;
-                    if (_closeParser) {
-                        jp.close();
-                    }
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-    
-    public T nextValue() throws IOException
-    {
-        // caller should always call 'hasNext[Value]' first; but let's ensure:
-        if (!_hasNextChecked) {
-            if (!hasNextValue()) {
-                throw new NoSuchElementException();
-            }
-        }
-        if (_parser == null) {
-            throw new NoSuchElementException();
-        }
-        _hasNextChecked = false;
-        T result;
-        
-        if (_updatedValue == null) {
-            result = _deserializer.deserialize(_parser, _context);
-        } else{
-            _deserializer.deserialize(_parser, _context, _updatedValue);
-            result = _updatedValue;
-        }
-        // Need to consume the token too
-        _parser.clearCurrentToken();
-        return result;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/MappingJsonFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/MappingJsonFactory.java
deleted file mode 100644
index c4595e2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/MappingJsonFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Jackson JSON-processor.
- *
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
- *
- * Licensed under the License specified in file LICENSE, included with
- * the source code and binary code bundles.
- * You may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.format.InputAccessor;
-import com.fasterxml.jackson.core.format.MatchStrength;
-
-/**
- * Sub-class of {@link JsonFactory} that will create a proper
- * {@link ObjectCodec} to allow seam-less conversions between
- * JSON content and Java objects (POJOs).
- * The only addition to regular {@link JsonFactory} currently
- * is that {@link ObjectMapper} is constructed and passed as
- * the codec to use.
- */
-public class MappingJsonFactory
-    extends JsonFactory
-{
-    // generated for Jackson 2.1.0
-    private static final long serialVersionUID = -6744103724013275513L;
-
-    public MappingJsonFactory()
-    {
-        this(null);
-    }
-
-    public MappingJsonFactory(ObjectMapper mapper)
-    {
-        super(mapper);
-        if (mapper == null) {
-            setCodec(new ObjectMapper(this));
-        }
-    }
-
-    /**
-     * We'll override the method to return more specific type; co-variance
-     * helps here
-     */
-    @Override
-    public final ObjectMapper getCodec() { return (ObjectMapper) _objectCodec; }
-
-    // @since 2.1
-    @Override
-    public JsonFactory copy()
-    {
-        _checkInvalidCopy(MappingJsonFactory.class);
-        // note: as with base class, must NOT copy mapper reference
-        return new MappingJsonFactory(null);
-    }
-    
-    /*
-    /**********************************************************
-    /* Format detection functionality (since 1.8)
-    /**********************************************************
-     */
-    
-    /**
-     * Sub-classes need to override this method (as of 1.8)
-     */
-    @Override
-    public String getFormatName()
-    {
-        /* since non-JSON factories typically should not extend this class,
-         * let's just always return JSON as name.
-         */
-        return FORMAT_NAME_JSON;
-    }
-
-    /**
-     * Sub-classes need to override this method (as of 1.8)
-     */
-    @Override
-    public MatchStrength hasFormat(InputAccessor acc) throws IOException
-    {
-        if (getClass() == MappingJsonFactory.class) {
-            return hasJSONFormat(acc);
-        }
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/Module.java b/showkeyHelper/src/com/fasterxml/jackson/databind/Module.java
deleted file mode 100644
index ad0f986..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/Module.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
-import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
-import com.fasterxml.jackson.databind.deser.Deserializers;
-import com.fasterxml.jackson.databind.deser.KeyDeserializers;
-import com.fasterxml.jackson.databind.deser.ValueInstantiators;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
-import com.fasterxml.jackson.databind.ser.Serializers;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.type.TypeModifier;
-
-/**
- * Simple interface for extensions that can be registered with {@link ObjectMapper}
- * to provide a well-defined set of extensions to default functionality; such as
- * support for new data types.
- */
-public abstract class Module
-    implements Versioned
-{
-    /*
-    /**********************************************************
-    /* Simple accessors
-    /**********************************************************
-     */
-    
-    /**
-     * Method that returns identifier for module; this can be used by Jackson
-     * for informational purposes, as well as in associating extensions with
-     * module that provides them.
-     */
-    public abstract String getModuleName();
-
-    /**
-     * Method that returns version of this module. Can be used by Jackson for
-     * informational purposes.
-     */
-//  @Override
-    public abstract Version version();
-
-    /*
-    /**********************************************************
-    /* Life-cycle: registration
-    /**********************************************************
-     */
-    
-    /**
-     * Method called by {@link ObjectMapper} when module is registered.
-     * It is called to let module register functionality it provides,
-     * using callback methods passed-in context object exposes.
-     */
-    public abstract void setupModule(SetupContext context);
-    
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-
-    /**
-     * Interface Jackson exposes to modules for purpose of registering
-     * extended functionality.
-     * Usually implemented by {@link ObjectMapper}, but modules should
-     * NOT rely on this -- if they do require access to mapper instance,
-     * they need to call {@link SetupContext#getOwner} method.
-     */
-    public static interface SetupContext
-    {
-        /*
-        /**********************************************************
-        /* Simple accessors
-        /**********************************************************
-         */
-        
-        /**
-         * Method that returns version information about {@link ObjectMapper} 
-         * that implements this context. Modules can use this to choose
-         * different settings or initialization order; or even decide to fail
-         * set up completely if version is compatible with module.
-         */
-        public Version getMapperVersion();
-
-        /**
-         * Fallback access method that allows modules to refer to the
-         * {@link ObjectMapper} that provided this context.
-         * It should NOT be needed by most modules; and ideally should
-         * not be used -- however, there may be cases where this may
-         * be necessary due to various design constraints.
-         *<p>
-         * NOTE: use of this method is discouraged, as it allows access to
-         * things Modules typically should not modify. It is included, however,
-         * to allow access to new features in cases where Module API
-         * has not yet been extended, or there are oversights.
-         *<p>
-         * Return value is chosen to not leak dependency to {@link ObjectMapper};
-         * however, instance will always be of that type.
-         * This is why return value is declared generic, to allow caller to
-         * specify context to often avoid casting.
-         * 
-         * @since 2.0
-         */
-        public <C extends ObjectCodec> C getOwner();
-
-        /**
-         * Accessor for finding {@link TypeFactory} that is currently configured
-         * by the context.
-         *<p>
-         * NOTE: since it is possible that other modules might change or replace
-         * TypeFactory, use of this method adds order-dependency for registrations.
-         * 
-         * @since 2.0
-         */
-        public TypeFactory getTypeFactory();
-        
-        public boolean isEnabled(MapperFeature f);
-        
-        public boolean isEnabled(DeserializationFeature f);
-
-        public boolean isEnabled(SerializationFeature f);
-
-        public boolean isEnabled(JsonFactory.Feature f);
-        
-        public boolean isEnabled(JsonParser.Feature f);
-
-        public boolean isEnabled(JsonGenerator.Feature f);
-        
-        /*
-        /**********************************************************
-        /* Handler registration; serializers/deserializers
-        /**********************************************************
-         */
-        
-        /**
-         * Method that module can use to register additional deserializers to use for
-         * handling types.
-         * 
-         * @param d Object that can be called to find deserializer for types supported
-         *   by module (null returned for non-supported types)
-         */
-        public void addDeserializers(Deserializers d);
-
-        /**
-         * Method that module can use to register additional deserializers to use for
-         * handling Map key values (which are separate from value deserializers because
-         * they are always serialized from String values)
-         */
-        public void addKeyDeserializers(KeyDeserializers s);
-        
-        /**
-         * Method that module can use to register additional serializers to use for
-         * handling types.
-         * 
-         * @param s Object that can be called to find serializer for types supported
-         *   by module (null returned for non-supported types)
-         */
-        public void addSerializers(Serializers s);
-
-        /**
-         * Method that module can use to register additional serializers to use for
-         * handling Map key values (which are separate from value serializers because
-         * they must write <code>JsonToken.FIELD_NAME</code> instead of String value).
-         */
-        public void addKeySerializers(Serializers s);
-
-        /*
-        /**********************************************************
-        /* Handler registration; other
-        /**********************************************************
-         */
-        
-        /**
-         * Method that module can use to register additional modifier objects to
-         * customize configuration and construction of bean deserializers.
-         * 
-         * @param mod Modifier to register
-         */
-        public void addBeanDeserializerModifier(BeanDeserializerModifier mod);
-
-        /**
-         * Method that module can use to register additional modifier objects to
-         * customize configuration and construction of bean serializers.
-         * 
-         * @param mod Modifier to register
-         */
-        public void addBeanSerializerModifier(BeanSerializerModifier mod);
-
-        /**
-         * Method that module can use to register additional
-         * {@link AbstractTypeResolver} instance, to handle resolution of
-         * abstract to concrete types (either by defaulting, or by materializing).
-         * 
-         * @param resolver Resolver to add.
-         */
-        public void addAbstractTypeResolver(AbstractTypeResolver resolver);
-
-        /**
-         * Method that module can use to register additional
-         * {@link TypeModifier} instance, which can augment {@link com.fasterxml.jackson.databind.JavaType}
-         * instances constructed by {@link com.fasterxml.jackson.databind.type.TypeFactory}.
-         * 
-         * @param modifier to add
-         */
-        public void addTypeModifier(TypeModifier modifier);
-
-        /**
-         * Method that module can use to register additional {@link com.fasterxml.jackson.databind.deser.ValueInstantiator}s,
-         * by adding {@link ValueInstantiators} object that gets called when 
-         * instantatiator is needed by a deserializer.
-         * 
-         * @param instantiators Object that can provide {@link com.fasterxml.jackson.databind.deser.ValueInstantiator}s for
-         *    constructing POJO values during deserialization
-         */
-        public void addValueInstantiators(ValueInstantiators instantiators);
-        
-        /**
-         * Method for registering specified {@link AnnotationIntrospector} as the highest
-         * priority introspector (will be chained with existing introspector(s) which
-         * will be used as fallbacks for cases this introspector does not handle)
-         * 
-         * @param ai Annotation introspector to register.
-         */
-        public void insertAnnotationIntrospector(AnnotationIntrospector ai);
-
-        /**
-         * Method for registering specified {@link AnnotationIntrospector} as the lowest
-         * priority introspector, chained with existing introspector(s) and called
-         * as fallback for cases not otherwise handled.
-         * 
-         * @param ai Annotation introspector to register.
-         */
-        public void appendAnnotationIntrospector(AnnotationIntrospector ai);
-
-        /**
-         * Method for registering specified classes as subtypes (of supertype(s)
-         * they have)
-         */
-        public void registerSubtypes(Class<?>... subtypes);
-
-        /**
-         * Method for registering specified classes as subtypes (of supertype(s)
-         * they have), using specified type names.
-         */
-        public void registerSubtypes(NamedType... subtypes);
-        
-        /**
-         * Method used for defining mix-in annotations to use for augmenting
-         * specified class or interface.
-         * All annotations from
-         * <code>mixinSource</code> are taken to override annotations
-         * that <code>target</code> (or its supertypes) has.
-         *<p>
-         * Note: mix-ins are registered both for serialization and deserialization
-         * (which can be different internally).
-         *<p>
-         * Note: currently only one set of mix-in annotations can be defined for
-         * a single class; so if multiple modules register mix-ins, highest
-         * priority one (last one registered) will have priority over other modules.
-         *
-         * @param target Class (or interface) whose annotations to effectively override
-         * @param mixinSource Class (or interface) whose annotations are to
-         *   be "added" to target's annotations, overriding as necessary
-         */
-        public void setMixInAnnotations(Class<?> target, Class<?> mixinSource);
-
-        /**
-         * Add a deserialization problem handler
-         *
-         * @param handler The deserialization problem handler
-         */
-        public void addDeserializationProblemHandler(DeserializationProblemHandler handler);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectMapper.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectMapper.java
deleted file mode 100644
index d056ad7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectMapper.java
+++ /dev/null
@@ -1,2905 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.*;
-import java.lang.reflect.Type;
-import java.net.URL;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SegmentedStringWriter;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.core.type.ResolvedType;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.core.util.*;
-import com.fasterxml.jackson.databind.cfg.BaseSettings;
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsontype.*;
-import com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver;
-import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
-import com.fasterxml.jackson.databind.node.*;
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.RootNameLookup;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * This mapper (or, data binder, or codec) provides functionality for
- * converting between Java objects (instances of JDK provided core classes,
- * beans), and matching JSON constructs.
- * It will use instances of {@link JsonParser} and {@link JsonGenerator}
- * for implementing actual reading/writing of JSON.
- *<p>
- * The main conversion API is defined in {@link ObjectCodec}, so that
- * implementation details of this class need not be exposed to
- * streaming parser and generator classes.
- *<p>
- * Note on caching: root-level deserializers are always cached, and accessed
- * using full (generics-aware) type information. This is different from
- * caching of referenced types, which is more limited and is done only
- * for a subset of all deserializer types. The main reason for difference
- * is that at root-level there is no incoming reference (and hence no
- * referencing property, no referral information or annotations to
- * produce differing deserializers), and that the performance impact
- * greatest at root level (since it'll essentially cache the full
- * graph of deserializers involved).
- */
-public class ObjectMapper
-    extends ObjectCodec
-    implements Versioned,
-        java.io.Serializable // as of 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    /*
-    /**********************************************************
-    /* Helper classes, enums
-    /**********************************************************
-     */
-
-    /**
-     * Enumeration used with {@link ObjectMapper#enableDefaultTyping()}
-     * to specify what kind of types (classes) default typing should
-     * be used for. It will only be used if no explicit type information
-     * is found, but this enumeration further limits subset of those types.
-     */
-    public enum DefaultTyping {
-        /**
-         * This value means that only properties that have
-         * {@link java.lang.Object} as declared type (including
-         * generic types without explicit type) will use default
-         * typing.
-         */
-        JAVA_LANG_OBJECT,
-        
-        /**
-         * Value that means that default typing will be used for
-         * properties with declared type of {@link java.lang.Object}
-         * or an abstract type (abstract class or interface).
-         * Note that this does <b>not</b> include array types.
-         */
-        OBJECT_AND_NON_CONCRETE,
-
-        /**
-         * Value that means that default typing will be used for
-         * all types covered by {@link #OBJECT_AND_NON_CONCRETE}
-         * plus all array types for them.
-         */
-        NON_CONCRETE_AND_ARRAYS,
-        
-        /**
-         * Value that means that default typing will be used for
-         * all non-final types, with exception of small number of
-         * "natural" types (String, Boolean, Integer, Double), which
-         * can be correctly inferred from JSON; as well as for
-         * all arrays of non-final types.
-         */
-        NON_FINAL
-    }
-
-    /**
-     * Customized {@link TypeResolverBuilder} that provides type resolver builders
-     * used with so-called "default typing"
-     * (see {@link ObjectMapper#enableDefaultTyping()} for details).
-     *<p>
-     * Type resolver construction is based on configuration: implementation takes care
-     * of only providing builders in cases where type information should be applied.
-     * This is important since build calls may be sent for any and all types, and
-     * type information should NOT be applied to all of them.
-     */
-    public static class DefaultTypeResolverBuilder
-        extends StdTypeResolverBuilder
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Definition of what types is this default typer valid for.
-         */
-        protected final DefaultTyping _appliesFor;
-
-        public DefaultTypeResolverBuilder(DefaultTyping t) {
-            _appliesFor = t;
-        }
-
-        @Override
-        public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
-                JavaType baseType, Collection<NamedType> subtypes)
-        {
-            return useForType(baseType) ? super.buildTypeDeserializer(config, baseType, subtypes) : null;
-        }
-
-        @Override
-        public TypeSerializer buildTypeSerializer(SerializationConfig config,
-                JavaType baseType, Collection<NamedType> subtypes)
-        {
-            return useForType(baseType) ? super.buildTypeSerializer(config, baseType, subtypes) : null;            
-        }
-
-        /**
-         * Method called to check if the default type handler should be
-         * used for given type.
-         * Note: "natural types" (String, Boolean, Integer, Double) will never
-         * use typing; that is both due to them being concrete and final,
-         * and since actual serializers and deserializers will also ignore any
-         * attempts to enforce typing.
-         */
-        public boolean useForType(JavaType t)
-        {
-            switch (_appliesFor) {
-            case NON_CONCRETE_AND_ARRAYS:
-                while (t.isArrayType()) {
-                    t = t.getContentType();
-                }
-                // fall through
-            case OBJECT_AND_NON_CONCRETE:
-                return (t.getRawClass() == Object.class) || !t.isConcrete();
-            case NON_FINAL:
-                while (t.isArrayType()) {
-                    t = t.getContentType();
-                }
-                return !t.isFinal(); // includes Object.class
-            default:
-            //case JAVA_LANG_OBJECT:
-                return (t.getRawClass() == Object.class);
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal constants, singletons
-    /**********************************************************
-     */
-    
-    // Quick little shortcut, to avoid having to use global TypeFactory instance...
-    private final static JavaType JSON_NODE_TYPE = SimpleType.constructUnsafe(JsonNode.class);
-
-    /* !!! 03-Apr-2009, tatu: Should try to avoid direct reference... but not
-     *   sure what'd be simple and elegant way. So until then:
-     */
-    protected final static ClassIntrospector DEFAULT_INTROSPECTOR = BasicClassIntrospector.instance;
-
-    // 16-May-2009, tatu: Ditto ^^^
-    protected final static AnnotationIntrospector DEFAULT_ANNOTATION_INTROSPECTOR = new JacksonAnnotationIntrospector();
-
-    protected final static VisibilityChecker<?> STD_VISIBILITY_CHECKER = VisibilityChecker.Std.defaultInstance();
-
-    protected final static PrettyPrinter _defaultPrettyPrinter = new DefaultPrettyPrinter();
-    
-    /**
-     * Base settings contain defaults used for all {@link ObjectMapper}
-     * instances.
-     */
-    protected final static BaseSettings DEFAULT_BASE = new BaseSettings(DEFAULT_INTROSPECTOR,
-            DEFAULT_ANNOTATION_INTROSPECTOR, STD_VISIBILITY_CHECKER, null, TypeFactory.defaultInstance(),
-            null, StdDateFormat.instance, null,
-            Locale.getDefault(),
-//            TimeZone.getDefault()
-            TimeZone.getTimeZone("GMT"),
-            Base64Variants.getDefaultVariant() // 2.1
-    );
-    
-    /*
-    /**********************************************************
-    /* Configuration settings, shared
-    /**********************************************************
-     */
-
-    /**
-     * Factory used to create {@link JsonParser} and {@link JsonGenerator}
-     * instances as necessary.
-     */
-    protected final JsonFactory _jsonFactory;
-
-    /**
-     * Specific factory used for creating {@link JavaType} instances;
-     * needed to allow modules to add more custom type handling
-     * (mostly to support types of non-Java JVM languages)
-     */
-    protected TypeFactory _typeFactory;
-
-    /**
-     * Provider for values to inject in deserialized POJOs.
-     */
-    protected InjectableValues _injectableValues;
-
-    /**
-     * Thing used for registering sub-types, resolving them to
-     * super/sub-types as needed.
-     */
-    protected SubtypeResolver _subtypeResolver;
-
-    /**
-     * Cache for root names used when root-wrapping is enabled.
-     */
-    protected final RootNameLookup _rootNames;
-    
-    /*
-    /**********************************************************
-    /* Configuration settings: mix-in annotations
-    /**********************************************************
-     */
-    
-    /**
-     * Mapping that defines how to apply mix-in annotations: key is
-     * the type to received additional annotations, and value is the
-     * type that has annotations to "mix in".
-     *<p>
-     * Annotations associated with the value classes will be used to
-     * override annotations of the key class, associated with the
-     * same field or method. They can be further masked by sub-classes:
-     * you can think of it as injecting annotations between the target
-     * class and its sub-classes (or interfaces)
-     */
-    protected final HashMap<ClassKey,Class<?>> _mixInAnnotations
-        = new HashMap<ClassKey,Class<?>>();
-    
-    /*
-    /**********************************************************
-    /* Configuration settings, serialization
-    /**********************************************************
-     */
-
-    /**
-     * Configuration object that defines basic global
-     * settings for the serialization process
-     */
-    protected SerializationConfig _serializationConfig;
-
-    /**
-     * Object that manages access to serializers used for serialization,
-     * including caching.
-     * It is configured with {@link #_serializerFactory} to allow
-     * for constructing custom serializers.
-     *<p>
-     * Note: while serializers are only exposed {@link SerializerProvider},
-     * mappers and readers need to access additional API defined by
-     * {@link DefaultSerializerProvider}
-     */
-    protected DefaultSerializerProvider _serializerProvider;
-
-    /**
-     * Serializer factory used for constructing serializers.
-     */
-    protected SerializerFactory _serializerFactory;
-
-    /*
-    /**********************************************************
-    /* Configuration settings, deserialization
-    /**********************************************************
-     */
-
-    /**
-     * Configuration object that defines basic global
-     * settings for the serialization process
-     */
-    protected DeserializationConfig _deserializationConfig;
-
-    /**
-     * Blueprint context object; stored here to allow custom
-     * sub-classes. Contains references to objects needed for
-     * deserialization construction (cache, factory).
-     */
-    protected DefaultDeserializationContext _deserializationContext;
-
-    /*
-    /**********************************************************
-    /* Caching
-    /**********************************************************
-     */
-
-    /* Note: handling of serializers and deserializers is not symmetric;
-     * and as a result, only root-level deserializers can be cached here.
-     * This is mostly because typing and resolution for deserializers is
-     * fully static; whereas it is quite dynamic for serialization.
-     */
-
-    /**
-     * We will use a separate main-level Map for keeping track
-     * of root-level deserializers. This is where most succesful
-     * cache lookups get resolved.
-     * Map will contain resolvers for all kinds of types, including
-     * container types: this is different from the component cache
-     * which will only cache bean deserializers.
-     *<p>
-     * Given that we don't expect much concurrency for additions
-     * (should very quickly converge to zero after startup), let's
-     * explicitly define a low concurrency setting.
-     *<p>
-     * Since version 1.5, these may are either "raw" deserializers (when
-     * no type information is needed for base type), or type-wrapped
-     * deserializers (if it is needed)
-     */
-    final protected ConcurrentHashMap<JavaType, JsonDeserializer<Object>> _rootDeserializers
-        = new ConcurrentHashMap<JavaType, JsonDeserializer<Object>>(64, 0.6f, 2);
-
-    /*
-    /**********************************************************
-    /* Life-cycle: constructing instance
-    /**********************************************************
-     */
-
-    /**
-     * Default constructor, which will construct the default
-     * {@link JsonFactory} as necessary, use
-     * {@link SerializerProvider} as its
-     * {@link SerializerProvider}, and
-     * {@link BeanSerializerFactory} as its
-     * {@link SerializerFactory}.
-     * This means that it
-     * can serialize all standard JDK types, as well as regular
-     * Java Beans (based on method names and Jackson-specific annotations),
-     * but does not support JAXB annotations.
-     */
-    public ObjectMapper()
-    {
-        this(null, null, null);
-    }
-
-    /**
-     * Constructs instance that uses specified {@link JsonFactory}
-     * for constructing necessary {@link JsonParser}s and/or
-     * {@link JsonGenerator}s.
-     */
-    public ObjectMapper(JsonFactory jf)
-    {
-        this(jf, null, null);
-    }
-
-    /**
-     * Copy-constructor, mostly used to support {@link #copy}.
-     * 
-     * @since 2.1
-     */
-    protected ObjectMapper(ObjectMapper src)
-    {
-        _jsonFactory = src._jsonFactory.copy();
-        _jsonFactory.setCodec(this);
-        _subtypeResolver = src._subtypeResolver;
-        _rootNames = new RootNameLookup();
-        _typeFactory = src._typeFactory;
-        _serializationConfig = src._serializationConfig;
-        _serializationConfig = new SerializationConfig(src._serializationConfig, _mixInAnnotations);
-        _deserializationConfig = new DeserializationConfig(src._deserializationConfig, _mixInAnnotations);
-        _serializerProvider = src._serializerProvider;
-        _deserializationContext = src._deserializationContext;
-
-        // Default serializer factory is stateless, can just assign
-        _serializerFactory = src._serializerFactory;
-    }
-    
-    /**
-     * Constructs instance that uses specified {@link JsonFactory}
-     * for constructing necessary {@link JsonParser}s and/or
-     * {@link JsonGenerator}s, and uses given providers for accessing
-     * serializers and deserializers.
-     * 
-     * @param jf JsonFactory to use: if null, a new {@link MappingJsonFactory} will be constructed
-     * @param sp SerializerProvider to use: if null, a {@link SerializerProvider} will be constructed
-     * @param dc Blueprint deserialization context instance to use for creating
-     *    actual context objects; if null, will construct standard
-     *    {@link DeserializationContext}
-     */
-    public ObjectMapper(JsonFactory jf,
-            DefaultSerializerProvider sp, DefaultDeserializationContext dc)
-    {
-        /* 02-Mar-2009, tatu: Important: we MUST default to using
-         *   the mapping factory, otherwise tree serialization will
-         *   have problems with POJONodes.
-         * 03-Jan-2010, tatu: and obviously we also must pass 'this',
-         *    to create actual linking.
-         */
-        if (jf == null) {
-            _jsonFactory = new MappingJsonFactory(this);
-        } else {
-            _jsonFactory = jf;
-            if (jf.getCodec() == null) { // as per [JACKSON-741]
-                _jsonFactory.setCodec(this);
-            }
-        }
-        _subtypeResolver = new StdSubtypeResolver();
-        _rootNames = new RootNameLookup();
-        // and default type factory is shared one
-        _typeFactory = TypeFactory.defaultInstance();
-        _serializationConfig = new SerializationConfig(DEFAULT_BASE,
-                    _subtypeResolver, _mixInAnnotations);
-        _deserializationConfig = new DeserializationConfig(DEFAULT_BASE,
-                    _subtypeResolver, _mixInAnnotations);
-        _serializerProvider = (sp == null) ? new DefaultSerializerProvider.Impl() : sp;
-        _deserializationContext = (dc == null) ?
-                new DefaultDeserializationContext.Impl(BeanDeserializerFactory.instance) : dc;
-
-        // Default serializer factory is stateless, can just assign
-        _serializerFactory = BeanSerializerFactory.instance;
-    }
-
-    /**
-     * Method for creating a new {@link ObjectMapper} instance that
-     * has same initial configuration as this instance. Note that this
-     * also requires making a copy of the underlying {@link JsonFactory}
-     * instance.
-     *<p>
-     * Method is typically
-     * used when multiple, differently configured mappers are needed.
-     * Although configuration is shared, cached serializers and deserializers
-     * are NOT shared, which means that the new instance may be re-configured
-     * before use; meaning that it behaves the same way as if an instance
-     * was constructed from scratch.
-     * 
-     * @since 2.1
-     */
-    public ObjectMapper copy()
-    {
-        _checkInvalidCopy(ObjectMapper.class);
-        return new ObjectMapper(this);
-    }
-
-    /**
-     * @since 2.1
-     * @param exp
-     */
-    protected void _checkInvalidCopy(Class<?> exp)
-    {
-        if (getClass() != exp) {
-            throw new IllegalStateException("Failed copy(): "+getClass().getName()
-                    +" (version: "+version()+") does not override copy(); it has to");
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Versioned impl
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will return version information stored in and read from jar
-     * that contains this class.
-     */
-//  @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* Module registration
-    /**********************************************************
-     */
-
-    /**
-     * Method for registering a module that can extend functionality
-     * provided by this mapper; for example, by adding providers for
-     * custom serializers and deserializers.
-     * 
-     * @param module Module to register
-     */
-    public ObjectMapper registerModule(Module module)
-    {
-        /* Let's ensure we have access to name and version information, 
-         * even if we do not have immediate use for either. This way we know
-         * that they will be available from beginning
-         */
-        String name = module.getModuleName();
-        if (name == null) {
-            throw new IllegalArgumentException("Module without defined name");
-        }
-        Version version = module.version();
-        if (version == null) {
-            throw new IllegalArgumentException("Module without defined version");
-        }
-
-        final ObjectMapper mapper = this;
-        
-        // And then call registration
-        module.setupModule(new Module.SetupContext()
-        {
-            // // // Accessors
-
-//          @Override
-            public Version getMapperVersion() {
-                return version();
-            }
-
-            @SuppressWarnings("unchecked")
-//          @Override
-            public <C extends ObjectCodec> C getOwner() {
-                // why do we need the cast here?!?
-                return (C) mapper;
-            }
-
-//          @Override
-            public TypeFactory getTypeFactory() {
-                return _typeFactory;
-            }
-            
-//          @Override
-            public boolean isEnabled(MapperFeature f) {
-                return mapper.isEnabled(f);
-            }
-
-//          @Override
-            public boolean isEnabled(DeserializationFeature f) {
-                return mapper.isEnabled(f);
-            }
-            
-//          @Override
-            public boolean isEnabled(SerializationFeature f) {
-                return mapper.isEnabled(f);
-            }
-
-//          @Override
-            public boolean isEnabled(JsonFactory.Feature f) {
-                return mapper.isEnabled(f);
-            }
-
-//          @Override
-            public boolean isEnabled(JsonParser.Feature f) {
-                return mapper.isEnabled(f);
-            }
-            
-//          @Override
-            public boolean isEnabled(JsonGenerator.Feature f) {
-                return mapper.isEnabled(f);
-            }
-            
-            // // // Methods for registering handlers: deserializers
-            
-//          @Override
-            public void addDeserializers(Deserializers d) {
-                DeserializerFactory df = mapper._deserializationContext._factory.withAdditionalDeserializers(d);
-                mapper._deserializationContext = mapper._deserializationContext.with(df);
-            }
-
-//          @Override
-            public void addKeyDeserializers(KeyDeserializers d) {
-                DeserializerFactory df = mapper._deserializationContext._factory.withAdditionalKeyDeserializers(d);
-                mapper._deserializationContext = mapper._deserializationContext.with(df);
-            }
-
-//          @Override
-            public void addBeanDeserializerModifier(BeanDeserializerModifier modifier) {
-                DeserializerFactory df = mapper._deserializationContext._factory.withDeserializerModifier(modifier);
-                mapper._deserializationContext = mapper._deserializationContext.with(df);
-            }
-            
-            // // // Methods for registering handlers: serializers
-            
-//          @Override
-            public void addSerializers(Serializers s) {
-                mapper._serializerFactory = mapper._serializerFactory.withAdditionalSerializers(s);
-            }
-
-//          @Override
-            public void addKeySerializers(Serializers s) {
-                mapper._serializerFactory = mapper._serializerFactory.withAdditionalKeySerializers(s);
-            }
-            
-//          @Override
-            public void addBeanSerializerModifier(BeanSerializerModifier modifier) {
-                mapper._serializerFactory = mapper._serializerFactory.withSerializerModifier(modifier);
-            }
-
-            // // // Methods for registering handlers: other
-            
-//          @Override
-            public void addAbstractTypeResolver(AbstractTypeResolver resolver) {
-                DeserializerFactory df = mapper._deserializationContext._factory.withAbstractTypeResolver(resolver);
-                mapper._deserializationContext = mapper._deserializationContext.with(df);
-            }
-
-//          @Override
-            public void addTypeModifier(TypeModifier modifier) {
-                TypeFactory f = mapper._typeFactory;
-                f = f.withModifier(modifier);
-                mapper.setTypeFactory(f);
-            }
-
-//          @Override
-            public void addValueInstantiators(ValueInstantiators instantiators) {
-                DeserializerFactory df = mapper._deserializationContext._factory.withValueInstantiators(instantiators);
-                mapper._deserializationContext = mapper._deserializationContext.with(df);
-            }
-            
-//          @Override
-            public void insertAnnotationIntrospector(AnnotationIntrospector ai) {
-                mapper._deserializationConfig = mapper._deserializationConfig.withInsertedAnnotationIntrospector(ai);
-                mapper._serializationConfig = mapper._serializationConfig.withInsertedAnnotationIntrospector(ai);
-            }
-            
-//          @Override
-            public void appendAnnotationIntrospector(AnnotationIntrospector ai) {
-                mapper._deserializationConfig = mapper._deserializationConfig.withAppendedAnnotationIntrospector(ai);
-                mapper._serializationConfig = mapper._serializationConfig.withAppendedAnnotationIntrospector(ai);
-            }
-
-//          @Override
-            public void registerSubtypes(Class<?>... subtypes) {
-                mapper.registerSubtypes(subtypes);
-            }
-
-//          @Override
-            public void registerSubtypes(NamedType... subtypes) {
-                mapper.registerSubtypes(subtypes);
-            }
-            
-//          @Override
-            public void setMixInAnnotations(Class<?> target, Class<?> mixinSource) {
-                mapper.addMixInAnnotations(target, mixinSource);
-            }
-            
-//          @Override
-            public void addDeserializationProblemHandler(DeserializationProblemHandler handler) {
-                mapper.addHandler(handler);
-            }
-        });
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration: main config object access
-    /**********************************************************
-     */
-
-    /**
-     * Method that returns the shared default {@link SerializationConfig}
-     * object that defines configuration settings for serialization.
-     *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of config object.
-     */
-    public SerializationConfig getSerializationConfig() {
-        return _serializationConfig;
-    }
-
-    /**
-     * Method that returns
-     * the shared default {@link DeserializationConfig} object
-     * that defines configuration settings for deserialization.
-     *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of config object.
-     */
-    public DeserializationConfig getDeserializationConfig() {
-        return _deserializationConfig;
-    }
-    
-    /**
-     * Method for getting current {@link DeserializationContext}.
-      *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of context object.
-    */
-    public DeserializationContext getDeserializationContext() {
-        return _deserializationContext;
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration: ser/deser factory, provider access
-    /**********************************************************
-     */
-    
-    /**
-     * Method for setting specific {@link SerializerFactory} to use
-     * for constructing (bean) serializers.
-     */
-    public ObjectMapper setSerializerFactory(SerializerFactory f) {
-        _serializerFactory = f;
-        return this;
-    }
-
-    /**
-     * Method for getting current {@link SerializerFactory}.
-      *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of factory object.
-     */
-    public SerializerFactory getSerializerFactory() {
-        return _serializerFactory;
-    }
-
-    /**
-     * Method for setting specific {@link SerializerProvider} to use
-     * for handling caching of {@link JsonSerializer} instances.
-     */
-    public ObjectMapper setSerializerProvider(DefaultSerializerProvider p) {
-        _serializerProvider = p;
-        return this;
-    }
-
-    public SerializerProvider getSerializerProvider() {
-        return _serializerProvider;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration: mix-in annotations
-    /**********************************************************
-     */
-    
-    /**
-     * Method to use for defining mix-in annotations to use for augmenting
-     * annotations that processable (serializable / deserializable)
-     * classes have.
-     * Mixing in is done when introspecting class annotations and properties.
-     * Map passed contains keys that are target classes (ones to augment
-     * with new annotation overrides), and values that are source classes
-     * (have annotations to use for augmentation).
-     * Annotations from source classes (and their supertypes)
-     * will <b>override</b>
-     * annotations that target classes (and their super-types) have.
-     */
-    public final void setMixInAnnotations(Map<Class<?>, Class<?>> sourceMixins)
-    {
-        _mixInAnnotations.clear();
-        if (sourceMixins != null && sourceMixins.size() > 0) {
-            for (Map.Entry<Class<?>,Class<?>> en : sourceMixins.entrySet()) {
-                _mixInAnnotations.put(new ClassKey(en.getKey()), en.getValue());
-            }
-        }
-    }
-
-    /**
-     * Method to use for adding mix-in annotations to use for augmenting
-     * specified class or interface. All annotations from
-     * <code>mixinSource</code> are taken to override annotations
-     * that <code>target</code> (or its supertypes) has.
-     *
-     * @param target Class (or interface) whose annotations to effectively override
-     * @param mixinSource Class (or interface) whose annotations are to
-     *   be "added" to target's annotations, overriding as necessary
-     */
-    public final void addMixInAnnotations(Class<?> target, Class<?> mixinSource)
-    {
-        _mixInAnnotations.put(new ClassKey(target), mixinSource);
-    }
-
-    public final Class<?> findMixInClassFor(Class<?> cls) {
-        return (_mixInAnnotations == null) ? null : _mixInAnnotations.get(new ClassKey(cls));
-    }
-
-    public final int mixInCount() {
-        return (_mixInAnnotations == null) ? 0 : _mixInAnnotations.size();
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, introspection
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing currently configured visibility checker;
-     * object used for determining whether given property element
-     * (method, field, constructor) can be auto-detected or not.
-     */
-    public VisibilityChecker<?> getVisibilityChecker() {
-        return _serializationConfig.getDefaultVisibilityChecker();
-    }
-
-    /**
-     * Method for setting currently configured visibility checker;
-     * object used for determining whether given property element
-     * (method, field, constructor) can be auto-detected or not.
-     * This default checker is used if no per-class overrides
-     * are defined.
-     */    
-    public void setVisibilityChecker(VisibilityChecker<?> vc) {
-        _deserializationConfig = _deserializationConfig.with(vc);
-        _serializationConfig = _serializationConfig.with(vc);
-    }
-
-    /**
-     * Convenience method that allows changing configuration for
-     * underlying {@link VisibilityChecker}s, to change details of what kinds of
-     * properties are auto-detected.
-     * Basically short cut for doing:
-     *<pre>
-     *  mapper.setVisibilityChecker(
-     *     mapper.getVisibilityChecker().withVisibility(forMethod, visibility)
-     *  );
-     *</pre>
-     * one common use case would be to do:
-     *<pre>
-     *  mapper.setVisibility(JsonMethod.FIELD, Visibility.ANY);
-     *</pre>
-     * which would make all member fields serializable without further annotations,
-     * instead of just public fields (default setting).
-     * 
-     * @param forMethod Type of property descriptor affected (field, getter/isGetter,
-     *     setter, creator)
-     * @param visibility Minimum visibility to require for the property descriptors of type
-     * 
-     * @return Modified mapper instance (that is, "this"), to allow chaining
-     *    of configuration calls
-     */
-    public ObjectMapper setVisibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibility)
-    {
-        _deserializationConfig = _deserializationConfig.withVisibility(forMethod, visibility);
-        _serializationConfig = _serializationConfig.withVisibility(forMethod, visibility);
-        return this;
-    }
-    
-    /**
-     * Method for accessing subtype resolver in use.
-     */
-    public SubtypeResolver getSubtypeResolver() {
-        return _subtypeResolver;
-    }
-
-    /**
-     * Method for setting custom subtype resolver to use.
-     */
-    public ObjectMapper setSubtypeResolver(SubtypeResolver str) {
-        _subtypeResolver = str;
-        _deserializationConfig = _deserializationConfig.with(str);
-        _serializationConfig = _serializationConfig.with(str);
-        return this;
-    }
-
-    /**
-     * Method for changing {@link AnnotationIntrospector} used by this
-     * mapper instance for both serialization and deserialization
-     */
-    public ObjectMapper setAnnotationIntrospector(AnnotationIntrospector ai) {
-        _serializationConfig = _serializationConfig.with(ai);
-        _deserializationConfig = _deserializationConfig.with(ai);
-        return this;
-    }
-
-    /**
-     * Method for changing {@link AnnotationIntrospector} instances used
-     * by this mapper instance for serialization and deserialization,
-     * specifying them separately so that different introspection can be
-     * used for different aspects
-     * 
-     * @since 2.1
-     * 
-     * @param serializerAI {@link AnnotationIntrospector} to use for configuring
-     *    serialization
-     * @param deserializerAI {@link AnnotationIntrospector} to use for configuring
-     *    deserialization
-     */
-    public ObjectMapper setAnnotationIntrospectors(AnnotationIntrospector serializerAI,
-            AnnotationIntrospector deserializerAI) {
-        _serializationConfig = _serializationConfig.with(serializerAI);
-        _deserializationConfig = _deserializationConfig.with(deserializerAI);
-        return this;
-    }
-    
-    /**
-     * Method for setting custom property naming strategy to use.
-     */
-    public ObjectMapper setPropertyNamingStrategy(PropertyNamingStrategy s) {
-        _serializationConfig = _serializationConfig.with(s);
-        _deserializationConfig = _deserializationConfig.with(s);
-        return this;
-    }
-
-    /**
-     * Method for setting defalt POJO property inclusion strategy for serialization.
-     */
-    public ObjectMapper setSerializationInclusion(JsonInclude.Include incl) {
-        _serializationConfig = _serializationConfig.withSerializationInclusion(incl);
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Type information configuration (1.5+)
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method that is equivalent to calling
-     *<pre>
-     *  enableObjectTyping(DefaultTyping.OBJECT_AND_NON_CONCRETE);
-     *</pre>
-     */
-    public ObjectMapper enableDefaultTyping() {
-        return enableDefaultTyping(DefaultTyping.OBJECT_AND_NON_CONCRETE);
-    }
-
-    /**
-     * Convenience method that is equivalent to calling
-     *<pre>
-     *  enableObjectTyping(dti, JsonTypeInfo.As.WRAPPER_ARRAY);
-     *</pre>
-     */
-    public ObjectMapper enableDefaultTyping(DefaultTyping dti) {
-        return enableDefaultTyping(dti, JsonTypeInfo.As.WRAPPER_ARRAY);
-    }
-
-    /**
-     * Method for enabling automatic inclusion of type information, needed
-     * for proper deserialization of polymorphic types (unless types
-     * have been annotated with {@link com.fasterxml.jackson.annotation.JsonTypeInfo}).
-     * 
-     * @param applicability Defines kinds of types for which additional type information
-     *    is added; see {@link DefaultTyping} for more information.
-     */
-    public ObjectMapper enableDefaultTyping(DefaultTyping applicability, JsonTypeInfo.As includeAs)
-    {
-        TypeResolverBuilder<?> typer = new DefaultTypeResolverBuilder(applicability);
-        // we'll always use full class name, when using defaulting
-        typer = typer.init(JsonTypeInfo.Id.CLASS, null);
-        typer = typer.inclusion(includeAs);
-        return setDefaultTyping(typer);
-    }
-
-    /**
-     * Method for enabling automatic inclusion of type information -- needed
-     * for proper deserialization of polymorphic types (unless types
-     * have been annotated with {@link com.fasterxml.jackson.annotation.JsonTypeInfo}) --
-     * using "As.PROPERTY" inclusion mechanism and specified property name
-     * to use for inclusion (default being "@class" since default type information
-     * always uses class name as type identifier)
-     */
-    public ObjectMapper enableDefaultTypingAsProperty(DefaultTyping applicability, String propertyName)
-    {
-        TypeResolverBuilder<?> typer = new DefaultTypeResolverBuilder(applicability);
-        // we'll always use full class name, when using defaulting
-        typer = typer.init(JsonTypeInfo.Id.CLASS, null);
-        typer = typer.inclusion(JsonTypeInfo.As.PROPERTY);
-        typer = typer.typeProperty(propertyName);
-        return setDefaultTyping(typer);
-    }
-    
-    /**
-     * Method for disabling automatic inclusion of type information; if so, only
-     * explicitly annotated types (ones with
-     * {@link com.fasterxml.jackson.annotation.JsonTypeInfo}) will have
-     * additional embedded type information.
-     */
-    public ObjectMapper disableDefaultTyping() {
-        return setDefaultTyping(null);
-    }
-
-    /**
-     * Method for enabling automatic inclusion of type information, using
-     * specified handler object for determining which types this affects,
-     * as well as details of how information is embedded.
-     * 
-     * @param typer Type information inclusion handler
-     */
-    public ObjectMapper setDefaultTyping(TypeResolverBuilder<?> typer) {
-        _deserializationConfig = _deserializationConfig.with(typer);
-        _serializationConfig = _serializationConfig.with(typer);
-        return this;
-    }
-
-    /**
-     * Method for registering specified class as a subtype, so that
-     * typename-based resolution can link supertypes to subtypes
-     * (as an alternative to using annotations).
-     * Type for given class is determined from appropriate annotation;
-     * or if missing, default name (unqualified class name)
-     */
-    public void registerSubtypes(Class<?>... classes) {
-        getSubtypeResolver().registerSubtypes(classes);
-    }
-
-    /**
-     * Method for registering specified class as a subtype, so that
-     * typename-based resolution can link supertypes to subtypes
-     * (as an alternative to using annotations).
-     * Name may be provided as part of argument, but if not will
-     * be based on annotations or use default name (unqualified
-     * class name).
-     */
-    public void registerSubtypes(NamedType... types) {
-        getSubtypeResolver().registerSubtypes(types);
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration, basic type handling
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for getting currently configured {@link TypeFactory} instance.
-     */
-    public TypeFactory getTypeFactory() {
-        return _typeFactory;
-    }
-
-    /**
-     * Method that can be used to override {@link TypeFactory} instance
-     * used by this mapper.
-     *<p>
-     * Note: will also set {@link TypeFactory} that deserialization and
-     * serialization config objects use.
-     */
-    public ObjectMapper setTypeFactory(TypeFactory f)
-    {
-        _typeFactory = f;
-        _deserializationConfig = _deserializationConfig.with(f);
-        _serializationConfig = _serializationConfig.with(f);
-        return this;
-    }
-    
-    /**
-     * Convenience method for constructing {@link JavaType} out of given
-     * type (typically <code>java.lang.Class</code>), but without explicit
-     * context.
-     */
-    public JavaType constructType(Type t) {
-        return _typeFactory.constructType(t);
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, deserialization
-    /**********************************************************
-     */
-    
-    /**
-     * Method for specifying {@link JsonNodeFactory} to use for
-     * constructing root level tree nodes (via method
-     * {@link #createObjectNode}
-     */
-    public ObjectMapper setNodeFactory(JsonNodeFactory f) {
-        _deserializationConfig = _deserializationConfig.with(f);
-        return this;
-    }
-
-    /**
-     * Method for adding specified {@link DeserializationProblemHandler}
-     * to be used for handling specific problems during deserialization.
-     */
-    public ObjectMapper addHandler(DeserializationProblemHandler h) {
-        _deserializationConfig = _deserializationConfig.withHandler(h);
-        return this;
-    }
-
-    /**
-     * Method for removing all registered {@link DeserializationProblemHandler}s
-     * instances from this mapper.
-     */
-    public ObjectMapper clearProblemHandlers() {
-        _deserializationConfig = _deserializationConfig.withNoProblemHandlers();
-        return this;
-    }
-    
-    
-    /*
-    /**********************************************************
-    /* Configuration, serialization
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method that is equivalent to:
-     *<pre>
-     *  mapper.setFilters(mapper.getSerializationConfig().withFilters(filterProvider));
-     *</pre>
-     *<p>
-     * Note that usually it is better to use method {@link #writer(FilterProvider)};
-     * however, sometimes
-     * this method is more convenient. For example, some frameworks only allow configuring
-     * of ObjectMapper instances and not ObjectWriters.
-     */
-    public void setFilters(FilterProvider filterProvider) {
-        _serializationConfig = _serializationConfig.withFilters(filterProvider);
-    }
-
-    /**
-     * Method that will configure default {@link Base64Variant} that
-     * <code>byte[]</code> serializers and deserializers will use.
-     * 
-     * @param v Base64 variant to use
-     * 
-     * @returns This mapper, for convenience to allow chaining
-     * 
-     * @since 2.1
-     */
-    public ObjectMapper setBase64Variant(Base64Variant v) {
-        _serializationConfig = _serializationConfig.with(v);
-        _deserializationConfig = _deserializationConfig.with(v);
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, other
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to get hold of {@link JsonFactory} that this
-     * mapper uses if it needs to construct {@link JsonParser}s
-     * and/or {@link JsonGenerator}s.
-     *
-     * @return {@link JsonFactory} that this mapper uses when it needs to
-     *   construct Json parser and generators
-     */
-    @Override
-    public JsonFactory getFactory() { return _jsonFactory; }
-    
-    /**
-     * @deprecated Since 2.1: Use {@link #getFactory} instead
-     */
-    @Deprecated
-    @Override
-    public JsonFactory getJsonFactory() { return _jsonFactory; }
-
-    /**
-     * Method for configuring the default {@link DateFormat} to use when serializing time
-     * values as Strings, and deserializing from JSON Strings.
-     * This is preferably to directly modifying {@link SerializationConfig} and
-     * {@link DeserializationConfig} instances.
-     * If you need per-request configuration, use {@link #writer(DateFormat)} to
-     * create properly configured {@link ObjectWriter} and use that; this because
-     * {@link ObjectWriter}s are thread-safe whereas ObjectMapper itself is only
-     * thread-safe when configuring methods (such as this one) are NOT called.
-     */
-    public ObjectMapper setDateFormat(DateFormat dateFormat)
-    {
-        _deserializationConfig = _deserializationConfig.with(dateFormat);
-        _serializationConfig = _serializationConfig.with(dateFormat);
-        return this;
-    }
-
-    /**
-     * Method for configuring {@link HandlerInstantiator} to use for creating
-     * instances of handlers (such as serializers, deserializers, type and type
-     * id resolvers), given a class.
-     *
-     * @param hi Instantiator to use; if null, use the default implementation
-     */
-    public Object setHandlerInstantiator(HandlerInstantiator hi)
-    {
-        _deserializationConfig = _deserializationConfig.with(hi);
-        _serializationConfig = _serializationConfig.with(hi);
-        return this;
-    }
-    
-    /**
-     * Method for configuring {@link InjectableValues} which used to find
-     * values to inject.
-     */
-    public ObjectMapper setInjectableValues(InjectableValues injectableValues) {
-        _injectableValues = injectableValues;
-        return this;
-    }
-    
-    /**
-     * Method for overriding default locale to use for formatting.
-     * Default value used is {@link Locale#getDefault()}.
-     */
-    public ObjectMapper setLocale(Locale l) {
-        _deserializationConfig = _deserializationConfig.with(l);
-        _serializationConfig = _serializationConfig.with(l);
-        return this;
-    }
-
-    /**
-     * Method for overriding default TimeZone to use for formatting.
-     * Default value used is {@link TimeZone#getDefault()}.
-     */
-    public ObjectMapper setTimeZone(TimeZone tz) {
-        _deserializationConfig = _deserializationConfig.with(tz);
-        _serializationConfig = _serializationConfig.with(tz);
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration, simple features
-    /**********************************************************
-     */
-
-    /**
-     * Method for changing state of an on/off mapper feature for
-     * this mapper instance.
-     */
-    public ObjectMapper configure(MapperFeature f, boolean state) {
-        _serializationConfig = state ?
-                _serializationConfig.with(f) : _serializationConfig.without(f);
-        _deserializationConfig = state ?
-                _deserializationConfig.with(f) : _deserializationConfig.without(f);
-        return this;
-    }
-    
-    /**
-     * Method for changing state of an on/off serialization feature for
-     * this object mapper.
-     */
-    public ObjectMapper configure(SerializationFeature f, boolean state) {
-        _serializationConfig = state ?
-                _serializationConfig.with(f) : _serializationConfig.without(f);
-        return this;
-    }
-
-    /**
-     * Method for changing state of an on/off deserialization feature for
-     * this object mapper.
-     */
-    public ObjectMapper configure(DeserializationFeature f, boolean state) {
-        _deserializationConfig = state ?
-                _deserializationConfig.with(f) : _deserializationConfig.without(f);
-        return this;
-    }
-
-    /**
-     * Method for changing state of an on/off {@link JsonParser} feature for
-     * {@link JsonFactory} instance this object mapper uses.
-     *<p>
-     * This is method is basically a shortcut method for calling
-     * {@link JsonFactory#enable} on the shared
-     * {@link JsonFactory} this mapper uses (which is accessible
-     * using {@link #getJsonFactory}).
-     */
-    public ObjectMapper configure(JsonParser.Feature f, boolean state) {
-        _jsonFactory.configure(f, state);
-        return this;
-    }
-
-    /**
-     * Method for changing state of an on/off {@link JsonGenerator} feature for
-     * {@link JsonFactory} instance this object mapper uses.
-     *<p>
-     * This is method is basically a shortcut method for calling
-     * {@link JsonFactory#enable} on the shared
-     * {@link JsonFactory} this mapper uses (which is accessible
-     * using {@link #getJsonFactory}).
-     */
-    public ObjectMapper configure(JsonGenerator.Feature f, boolean state) {
-        _jsonFactory.configure(f, state);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link MapperConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper enable(MapperFeature... f) {
-        _deserializationConfig = _deserializationConfig.with(f);
-        _serializationConfig = _serializationConfig.with(f);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper disable(MapperFeature... f) {
-        _deserializationConfig = _deserializationConfig.without(f);
-        _serializationConfig = _serializationConfig.without(f);
-        return this;
-    }
-    
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper enable(DeserializationFeature feature) {
-        _deserializationConfig = _deserializationConfig.with(feature);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper enable(DeserializationFeature first,
-            DeserializationFeature... f) {
-        _deserializationConfig = _deserializationConfig.with(first, f);
-        return this;
-    }
-    
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper disable(DeserializationFeature feature) {
-        _deserializationConfig = _deserializationConfig.without(feature);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper disable(DeserializationFeature first,
-            DeserializationFeature... f) {
-        _deserializationConfig = _deserializationConfig.without(first, f);
-        return this;
-    }
-    
-    /**
-     * Method for enabling specified {@link DeserializationConfig} feature.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper enable(SerializationFeature f) {
-        _serializationConfig = _serializationConfig.with(f);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper enable(SerializationFeature first,
-            SerializationFeature... f) {
-        _serializationConfig = _serializationConfig.with(first, f);
-        return this;
-    }
-    
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper disable(SerializationFeature f) {
-        _serializationConfig = _serializationConfig.without(f);
-        return this;
-    }
-
-    /**
-     * Method for enabling specified {@link DeserializationConfig} features.
-     * Modifies and returns this instance; no new object is created.
-     */
-    public ObjectMapper disable(SerializationFeature first,
-            SerializationFeature... f) {
-        _serializationConfig = _serializationConfig.without(first, f);
-        return this;
-    }
-
-    /**
-     * Method for checking whether given Mapper
-     * feature is enabled.
-     */
-    public boolean isEnabled(MapperFeature f) {
-        // ok to use either one, should be kept in sync
-        return _serializationConfig.isEnabled(f);
-    }
-
-    /**
-     * Method for checking whether given serialization-specific
-     * feature is enabled.
-     */
-    public boolean isEnabled(SerializationFeature f) {
-        return _serializationConfig.isEnabled(f);
-    }
-    
-    /**
-     * Method for checking whether given deserialization-specific
-     * feature is enabled.
-     */
-    public boolean isEnabled(DeserializationFeature f) {
-        return _deserializationConfig.isEnabled(f);
-    }
-
-    /**
-     * Convenience method, equivalent to:
-     *<pre>
-     *  getJsonFactory().isEnabled(f);
-     *</pre>
-     */
-    public boolean isEnabled(JsonFactory.Feature f) {
-        return _jsonFactory.isEnabled(f);
-    }
-
-    /**
-     * Convenience method, equivalent to:
-     *<pre>
-     *  getJsonFactory().isEnabled(f);
-     *</pre>
-     */
-    public boolean isEnabled(JsonParser.Feature f) {
-        return _jsonFactory.isEnabled(f);
-    }
-    
-    /**
-     * Convenience method, equivalent to:
-     *<pre>
-     *  getJsonFactory().isEnabled(f);
-     *</pre>
-     */
-    public boolean isEnabled(JsonGenerator.Feature f) {
-        return _jsonFactory.isEnabled(f);
-    }
-    
-    /**
-     * Method that can be used to get hold of {@link JsonNodeFactory}
-     * that this mapper will use when directly constructing
-     * root {@link JsonNode} instances for Trees.
-     *<p>
-     * Note: this is just a shortcut for calling
-     *<pre>
-     *   getDeserializationConfig().getNodeFactory()
-     *</pre>
-     */
-    public JsonNodeFactory getNodeFactory() {
-        return _deserializationConfig.getNodeFactory();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API (from ObjectCodec): deserialization
-    /* (mapping from JSON to Java types);
-    /* main methods
-    /**********************************************************
-     */
-
-    /**
-     * Method to deserialize JSON content into a non-container
-     * type (it can be an array type, however): typically a bean, array
-     * or a wrapper type (like {@link java.lang.Boolean}).
-     *<p>
-     * Note: this method should NOT be used if the result type is a
-     * container ({@link java.util.Collection} or {@link java.util.Map}.
-     * The reason is that due to type erasure, key and value types
-     * can not be introspected when using this method.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readValue(getDeserializationConfig(), jp, _typeFactory.constructType(valueType));
-    } 
-
-    /**
-     * Method to deserialize JSON content into a Java type, reference
-     * to which is passed as argument. Type is passed using so-called
-     * "super type token" (see )
-     * and specifically needs to be used if the root type is a 
-     * parameterized (generic) container type.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readValue(getDeserializationConfig(), jp, _typeFactory.constructType(valueTypeRef));
-    }
-
-    /**
-     * Method to deserialize JSON content into a Java type, reference
-     * to which is passed as argument. Type is passed using 
-     * Jackson specific type; instance of which can be constructed using
-     * {@link TypeFactory}.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <T> T readValue(JsonParser jp, ResolvedType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readValue(getDeserializationConfig(), jp, (JavaType) valueType);
-    }
-
-    /**
-     * Type-safe overloaded method, basically alias for {@link #readValue(JsonParser, ResolvedType)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readValue(getDeserializationConfig(), jp, valueType);
-    }
-    
-    /**
-     * Method to deserialize JSON content as tree expressed
-     * using set of {@link JsonNode} instances. Returns
-     * root of the resulting tree (where root can consist
-     * of just a single node if the current event is a
-     * value event, not container).
-     */
-    @Override
-    public <T extends TreeNode> T readTree(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        /* 02-Mar-2009, tatu: One twist; deserialization provider
-         *   will map JSON null straight into Java null. But what
-         *   we want to return is the "null node" instead.
-         */
-        /* 05-Aug-2011, tatu: Also, must check for EOF here before
-         *   calling readValue(), since that'll choke on it otherwise
-         */
-        DeserializationConfig cfg = getDeserializationConfig();
-        JsonToken t = jp.getCurrentToken();
-        if (t == null) {
-            t = jp.nextToken();
-            if (t == null) {
-                return null;
-            }
-        }
-        JsonNode n = (JsonNode) _readValue(cfg, jp, JSON_NODE_TYPE);
-        if (n == null) {
-            n = getNodeFactory().nullNode();
-        }
-        @SuppressWarnings("unchecked")
-        T result = (T) n;
-        return result;
-    }
-
-    /**
-     * Method for reading sequence of Objects from parser stream.
-     * Sequence can be either root-level "unwrapped" sequence (without surrounding
-     * JSON array), or a sequence contained in a JSON Array.
-     * In either case {@link JsonParser} must point to the first token of
-     * the first element, OR not point to any token (in which case it is advanced
-     * to the next token). This means, specifically, that for wrapped sequences,
-     * parser MUST NOT point to the surrounding <code>START_ARRAY</code> but rather
-     * to the token following it.
-     *<p>
-     * Note that {@link ObjectReader} has more complete set of variants.
-     */
-    @Override
-    public <T> MappingIterator<T> readValues(JsonParser jp, ResolvedType valueType)
-        throws IOException, JsonProcessingException
-    {
-        return readValues(jp, (JavaType) valueType);
-    }
-
-    /**
-     * Type-safe overloaded method, basically alias for {@link #readValues(JsonParser, ResolvedType)}.
-     */
-    public <T> MappingIterator<T> readValues(JsonParser jp, JavaType valueType)
-            throws IOException, JsonProcessingException
-    {
-        DeserializationConfig config = getDeserializationConfig();
-        DeserializationContext ctxt = createDeserializationContext(jp, config);
-        JsonDeserializer<?> deser = _findRootDeserializer(ctxt, valueType);
-        // false -> do NOT close JsonParser (since caller passed it)
-        return new MappingIterator<T>(valueType, jp, ctxt, deser,
-                false, null);
-    }
-
-    /**
-     * Type-safe overloaded method, basically alias for {@link #readValues(JsonParser, ResolvedType)}.
-     */
-    @Override
-    public <T> MappingIterator<T> readValues(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonProcessingException
-    {
-        return readValues(jp, _typeFactory.constructType(valueType));
-    }
-
-    /**
-     * Method for reading sequence of Objects from parser stream.
-     */
-    @Override
-    public <T> MappingIterator<T> readValues(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException
-    {
-        return readValues(jp, _typeFactory.constructType(valueTypeRef));
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API not included in ObjectCodec: deserialization
-    /* (mapping from JSON to Java types)
-    /**********************************************************
-     */
-
-    /**
-     * Method to deserialize JSON content as tree expressed
-     * using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist
-     * of just a single node if the current event is a
-     * value event, not container).
-     *
-     * @param in Input stream used to read JSON content
-     *   for building the JSON tree.
-     */
-    public JsonNode readTree(InputStream in)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(in), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-
-    /**
-     * Method to deserialize JSON content as tree expressed
-     * using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist
-     * of just a single node if the current event is a
-     * value event, not container).
-     *
-     * @param r Reader used to read JSON content
-     *   for building the JSON tree.
-     */
-    public JsonNode readTree(Reader r)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(r), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-
-    /**
-     * Method to deserialize JSON content as tree expressed using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist of just a single node if the current
-     * event is a value event, not container).
-     *
-     * @param content JSON content to parse to build the JSON tree.
-     */
-    public JsonNode readTree(String content)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(content), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-
-    /**
-     * Method to deserialize JSON content as tree expressed using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist of just a single node if the current
-     * event is a value event, not container).
-     *
-     * @param content JSON content to parse to build the JSON tree.
-     */
-    public JsonNode readTree(byte[] content)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(content), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-    
-    /**
-     * Method to deserialize JSON content as tree expressed using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist of just a single node if the current
-     * event is a value event, not container).
-     *
-     * @param file File of which contents to parse as JSON for building a tree instance
-     */
-    public JsonNode readTree(File file)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(file), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-
-    /**
-     * Method to deserialize JSON content as tree expressed using set of {@link JsonNode} instances.
-     * Returns root of the resulting tree (where root can consist of just a single node if the current
-     * event is a value event, not container).
-     *
-     * @param source URL to use for fetching contents to parse as JSON for building a tree instance
-     */
-    public JsonNode readTree(URL source)
-        throws IOException, JsonProcessingException
-    {
-        JsonNode n = (JsonNode) _readMapAndClose(_jsonFactory.createJsonParser(source), JSON_NODE_TYPE);
-        return (n == null) ? NullNode.instance : n;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API (from ObjectCodec): serialization
-    /* (mapping from Java types to Json)
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using provided {@link JsonGenerator}.
-     */
-    @Override
-    public void writeValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        SerializationConfig config = getSerializationConfig();
-        // 10-Aug-2012, tatu: as per [Issue#12], must handle indentation:
-        if (config.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
-            jgen.useDefaultPrettyPrinter();
-        }
-        if (config.isEnabled(SerializationFeature.CLOSE_CLOSEABLE) && (value instanceof Closeable)) {
-            _writeCloseableValue(jgen, value, config);
-        } else {
-            _serializerProvider(config).serializeValue(jgen, value);
-            if (config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) {
-                jgen.flush();
-            }
-        }
-    }
-
-    /**
-     * Method to serialize given JSON Tree, using generator
-     * provided.
-     */
-    public void writeTree(JsonGenerator jgen, JsonNode rootNode)
-        throws IOException, JsonProcessingException
-    {
-        SerializationConfig config = getSerializationConfig();
-        _serializerProvider(config).serializeValue(jgen, rootNode);
-        if (config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) {
-            jgen.flush();
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Public API (from ObjectCodec): Tree Model support
-    /**********************************************************
-     */
-
-    /**
-     *<p>
-     * Note: return type is co-variant, as basic ObjectCodec
-     * abstraction can not refer to concrete node types (as it's
-     * part of core package, whereas impls are part of mapper
-     * package)
-     */
-    @Override    
-    public ObjectNode createObjectNode() {
-        return _deserializationConfig.getNodeFactory().objectNode();
-    }
-
-    /**
-     *<p>
-     * Note: return type is co-variant, as basic ObjectCodec
-     * abstraction can not refer to concrete node types (as it's
-     * part of core package, whereas impls are part of mapper
-     * package)
-     */
-    @Override
-    public ArrayNode createArrayNode() {
-        return _deserializationConfig.getNodeFactory().arrayNode();
-    }
-
-    /**
-     * Method for constructing a {@link JsonParser} out of JSON tree
-     * representation.
-     * 
-     * @param n Root node of the tree that resulting parser will read from
-     */
-    @Override
-    public JsonParser treeAsTokens(TreeNode n)
-    {
-        return new TreeTraversingParser((JsonNode) n, this);
-    }
-
-    /**
-     * Convenience conversion method that will bind data given JSON tree
-     * contains into specific value (usually bean) type.
-     *<p>
-     * Equivalent to:
-     *<pre>
-     *   objectMapper.convertValue(n, valueClass);
-     *</pre>
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T treeToValue(TreeNode n, Class<T> valueType)
-        throws JsonProcessingException
-    {
-        try {
-            // [Issue-11]: Simple cast when we just want to cast to, say, ObjectNode
-            // ... one caveat; while everything is Object.class, let's not take shortcut
-            if (valueType != Object.class && valueType.isAssignableFrom(n.getClass())) {
-                return (T) n;
-            }
-            return readValue(treeAsTokens(n), valueType);
-        } catch (JsonProcessingException e) {
-            throw e;
-        } catch (IOException e) { // should not occur, no real i/o...
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Reverse of {@link #treeToValue}; given a value (usually bean), will
-     * construct equivalent JSON Tree representation. Functionally same
-     * as if serializing value into JSON and parsing JSON as tree, but
-     * more efficient.
-     * 
-     * @param <T> Actual node type; usually either basic {@link JsonNode} or
-     *  {@link com.fasterxml.jackson.databind.node.ObjectNode}
-     * @param fromValue Bean value to convert
-     * @return Root node of the resulting JSON tree
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends JsonNode> T valueToTree(Object fromValue)
-        throws IllegalArgumentException
-    {
-        if (fromValue == null) return null;
-        TokenBuffer buf = new TokenBuffer(this);
-        JsonNode result;
-        try {
-            writeValue(buf, fromValue);
-            JsonParser jp = buf.asParser();
-            result = readTree(jp);
-            jp.close();
-        } catch (IOException e) { // should not occur, no real i/o...
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-        return (T) result;
-    } 
-    
-    /*
-    /**********************************************************
-    /* Extended Public API, accessors
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to check whether mapper thinks
-     * it could serialize an instance of given Class.
-     * Check is done
-     * by checking whether a serializer can be found for the type.
-     *
-     * @return True if mapper can find a serializer for instances of
-     *  given class (potentially serializable), false otherwise (not
-     *  serializable)
-     */
-    public boolean canSerialize(Class<?> type) {
-        return _serializerProvider(getSerializationConfig()).hasSerializerFor(type);
-    }
-
-    /**
-     * Method that can be called to check whether mapper thinks
-     * it could deserialize an Object of given type.
-     * Check is done
-     * by checking whether a deserializer can be found for the type.
-     *
-     * @return True if mapper can find a serializer for instances of
-     *  given class (potentially serializable), false otherwise (not
-     *  serializable)
-     */
-    public boolean canDeserialize(JavaType type)
-    {
-        return createDeserializationContext(null,
-                getDeserializationConfig()).hasValueDeserializerFor(type);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended Public API, deserialization,
-    /* convenience methods
-    /**********************************************************
-     */
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(File src, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(File src, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(File src, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(URL src, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(URL src, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(URL src, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(String content, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(content), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(String content, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(content), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(String content, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(content), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(Reader src, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(Reader src, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(Reader src, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(InputStream src, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(InputStream src, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(InputStream src, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src, Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//      _setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueType));
-    } 
-    
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src, int offset, int len, 
-                               Class<T> valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-     // !!! TODO
-//    	_setupClassLoaderForDeserialization(valueType);
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src, offset, len), _typeFactory.constructType(valueType));
-    } 
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(byte[] src, TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), _typeFactory.constructType(valueTypeRef));
-    } 
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public <T> T readValue(byte[] src, int offset, int len,
-                           TypeReference valueTypeRef)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src, offset, len), _typeFactory.constructType(valueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src), valueType);
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src, int offset, int len,
-                           JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        return (T) _readMapAndClose(_jsonFactory.createJsonParser(src, offset, len), valueType);
-    } 
-    
-    /*
-    /**********************************************************
-    /* Extended Public API: serialization
-    /* (mapping from Java types to JSON)
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, written to File provided.
-     */
-    public void writeValue(File resultFile, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(resultFile, JsonEncoding.UTF8), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using output stream provided (using encoding
-     * {@link JsonEncoding#UTF8}).
-     *<p>
-     * Note: method does not close the underlying stream explicitly
-     * here; however, {@link JsonFactory} this mapper uses may choose
-     * to close the stream depending on its settings (by default,
-     * it will try to close it when {@link JsonGenerator} we construct
-     * is closed).
-     */
-    public void writeValue(OutputStream out, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(out, JsonEncoding.UTF8), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using Writer provided.
-     *<p>
-     * Note: method does not close the underlying stream explicitly
-     * here; however, {@link JsonFactory} this mapper uses may choose
-     * to close the stream depending on its settings (by default,
-     * it will try to close it when {@link JsonGenerator} we construct
-     * is closed).
-     */
-    public void writeValue(Writer w, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(w), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * a String. Functionally equivalent to calling
-     * {@link #writeValue(Writer,Object)} with {@link java.io.StringWriter}
-     * and constructing String, but more efficient.
-     *<p>
-     * Note: prior to version 2.1, throws clause included {@link IOException}; 2.1 removed it.
-     */
-    public String writeValueAsString(Object value)
-        throws JsonProcessingException
-    {        
-        // alas, we have to pull the recycler directly here...
-        SegmentedStringWriter sw = new SegmentedStringWriter(_jsonFactory._getBufferRecycler());
-        try {
-            _configAndWriteValue(_jsonFactory.createJsonGenerator(sw), value);
-        } catch (JsonProcessingException e) { // to support [JACKSON-758]
-            throw e;
-        } catch (IOException e) { // shouldn't really happen, but is declared as possibility so:
-            throw JsonMappingException.fromUnexpectedIOE(e);
-        }
-        return sw.getAndClear();
-    }
-    
-    /**
-     * Method that can be used to serialize any Java value as
-     * a byte array. Functionally equivalent to calling
-     * {@link #writeValue(Writer,Object)} with {@link java.io.ByteArrayOutputStream}
-     * and getting bytes, but more efficient.
-     * Encoding used will be UTF-8.
-     *<p>
-     * Note: prior to version 2.1, throws clause included {@link IOException}; 2.1 removed it.
-     */
-    public byte[] writeValueAsBytes(Object value)
-        throws JsonProcessingException
-    {
-        ByteArrayBuilder bb = new ByteArrayBuilder(_jsonFactory._getBufferRecycler());
-        try {
-            _configAndWriteValue(_jsonFactory.createJsonGenerator(bb, JsonEncoding.UTF8), value);
-        } catch (JsonProcessingException e) { // to support [JACKSON-758]
-            throw e;
-        } catch (IOException e) { // shouldn't really happen, but is declared as possibility so:
-            throw JsonMappingException.fromUnexpectedIOE(e);
-        }
-        byte[] result = bb.toByteArray();
-        bb.release();
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Extended Public API: constructing ObjectWriters
-    /* for more advanced configuration
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method for constructing {@link ObjectWriter}
-     * with default settings.
-     */
-    public ObjectWriter writer() {
-        return new ObjectWriter(this, getSerializationConfig());
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectWriter} with
-     * specified feature enabled (compared to settings that this
-     * mapper instance has).
-     */
-    public ObjectWriter writer(SerializationFeature feature) {
-        return new ObjectWriter(this, getSerializationConfig().with(feature));
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectWriter} with
-     * specified features enabled (compared to settings that this
-     * mapper instance has).
-     */
-    public ObjectWriter writer(SerializationFeature first,
-            SerializationFeature... other) {
-        return new ObjectWriter(this, getSerializationConfig().with(first, other));
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified {@link DateFormat}; or, if
-     * null passed, using timestamp (64-bit number.
-     */
-    public ObjectWriter writer(DateFormat df) {
-        return new ObjectWriter(this,
-                getSerializationConfig().with(df));
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified JSON View (filter).
-     */
-    public ObjectWriter writerWithView(Class<?> serializationView) {
-        return new ObjectWriter(this, getSerializationConfig().withView(serializationView));
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified root type, instead of actual
-     * runtime type of value. Type must be a super-type of runtime
-     * type.
-     */
-    public ObjectWriter writerWithType(Class<?> rootType) {
-        JavaType t = (rootType == null) ? null : _typeFactory.constructType(rootType);
-        return new ObjectWriter(this, getSerializationConfig(), t, /*PrettyPrinter*/null);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified root type, instead of actual
-     * runtime type of value. Type must be a super-type of runtime type.
-     */
-    public ObjectWriter writerWithType(JavaType rootType) {
-        return new ObjectWriter(this, getSerializationConfig(), rootType, /*PrettyPrinter*/null);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified root type, instead of actual
-     * runtime type of value. Type must be a super-type of runtime type.
-     */
-    public ObjectWriter writerWithType(TypeReference<?> rootType) {
-        JavaType t = (rootType == null) ? null : _typeFactory.constructType(rootType);
-        return new ObjectWriter(this, getSerializationConfig(), t, /*PrettyPrinter*/null);
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified pretty printer for indentation
-     * (or if null, no pretty printer)
-     */
-    public ObjectWriter writer(PrettyPrinter pp) {
-        if (pp == null) { // need to use a marker to indicate explicit disabling of pp
-            pp = ObjectWriter.NULL_PRETTY_PRINTER;
-        }
-        return new ObjectWriter(this, getSerializationConfig(), /*root type*/ null, pp);
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using the default pretty printer for indentation
-     */
-    public ObjectWriter writerWithDefaultPrettyPrinter() {
-        return new ObjectWriter(this, getSerializationConfig(),
-                /*root type*/ null, _defaultPrettyPrinter());
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * serialize objects using specified filter provider.
-     */
-    public ObjectWriter writer(FilterProvider filterProvider) {
-        return new ObjectWriter(this,
-                getSerializationConfig().withFilters(filterProvider));
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * pass specific schema object to {@link JsonGenerator} used for
-     * writing content.
-     * 
-     * @param schema Schema to pass to generator
-     */
-    public ObjectWriter writer(FormatSchema schema) {
-        return new ObjectWriter(this, getSerializationConfig(), schema);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectWriter} that will
-     * use specified Base64 encoding variant for Base64-encoded binary data.
-     * 
-     * @since 2.1
-     */
-    public ObjectWriter writer(Base64Variant defaultBase64) {
-        return new ObjectWriter(this, getSerializationConfig().with(defaultBase64));
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended Public API: constructing ObjectReaders
-    /* for more advanced configuration
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for constructing {@link ObjectReader} with
-     * default settings. Note that the resulting instance is NOT usable as is,
-     * without defining expected value type.
-     */
-    public ObjectReader reader() {
-        return new ObjectReader(this, getDeserializationConfig())
-            .with(_injectableValues);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} with
-     * specified feature enabled (compared to settings that this
-     * mapper instance has).
-     * Note that the resulting instance is NOT usable as is,
-     * without defining expected value type.
-     */
-    public ObjectReader reader(DeserializationFeature feature) {
-        return new ObjectReader(this, getDeserializationConfig().with(feature));
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} with
-     * specified features enabled (compared to settings that this
-     * mapper instance has).
-     * Note that the resulting instance is NOT usable as is,
-     * without defining expected value type.
-     */
-    public ObjectReader reader(DeserializationFeature first,
-            DeserializationFeature... other) {
-        return new ObjectReader(this, getDeserializationConfig().with(first, other));
-    }
-    
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * update given Object (usually Bean, but can be a Collection or Map
-     * as well, but NOT an array) with JSON data. Deserialization occurs
-     * normally except that the root-level value in JSON is not used for
-     * instantiating a new object; instead give updateable object is used
-     * as root.
-     * Runtime type of value object is used for locating deserializer,
-     * unless overridden by other factory methods of {@link ObjectReader}
-     */
-    public ObjectReader readerForUpdating(Object valueToUpdate)
-    {
-        JavaType t = _typeFactory.constructType(valueToUpdate.getClass());
-        return new ObjectReader(this, getDeserializationConfig(), t, valueToUpdate,
-                null, _injectableValues);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * read or update instances of specified type
-     */
-    public ObjectReader reader(JavaType type)
-    {
-        return new ObjectReader(this, getDeserializationConfig(), type, null,
-                null, _injectableValues);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * read or update instances of specified type
-     */
-    public ObjectReader reader(Class<?> type)
-    {
-        return reader(_typeFactory.constructType(type));
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * read or update instances of specified type
-     */
-    public ObjectReader reader(TypeReference<?> type)
-    {
-        return reader(_typeFactory.constructType(type));
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * use specified {@link JsonNodeFactory} for constructing JSON trees.
-     */
-    public ObjectReader reader(JsonNodeFactory f)
-    {
-        return new ObjectReader(this, getDeserializationConfig()).with(f);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * pass specific schema object to {@link JsonParser} used for
-     * reading content.
-     * 
-     * @param schema Schema to pass to parser
-     */
-    public ObjectReader reader(FormatSchema schema) {
-        return new ObjectReader(this, getDeserializationConfig(), null, null,
-                schema, _injectableValues);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * use specified injectable values.
-     * 
-     * @param injectableValues Injectable values to use
-     */
-    public ObjectReader reader(InjectableValues injectableValues) {
-        return new ObjectReader(this, getDeserializationConfig(), null, null,
-                null, injectableValues);
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * deserialize objects using specified JSON View (filter).
-     */
-    public ObjectReader readerWithView(Class<?> view) {
-        return new ObjectReader(this, getDeserializationConfig().withView(view));
-    }
-
-    /**
-     * Factory method for constructing {@link ObjectReader} that will
-     * use specified Base64 encoding variant for Base64-encoded binary data.
-     * 
-     * @since 2.1
-     */
-    public ObjectReader reader(Base64Variant defaultBase64) {
-        return new ObjectReader(this, getDeserializationConfig().with(defaultBase64));
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended Public API: convenience type conversion
-    /**********************************************************
-     */
-   
-    /**
-     * Convenience method for doing two-step conversion from given value, into
-     * instance of given value type. This is functionality equivalent to first
-     * serializing given value into JSON, then binding JSON data into value
-     * of given type, but may be executed without fully serializing into
-     * JSON. Same converters (serializers, deserializers) will be used as for
-     * data binding, meaning same object mapper configuration works.
-     *      
-     * @throws IllegalArgumentException If conversion fails due to incompatible type;
-     *    if so, root cause will contain underlying checked exception data binding
-     *    functionality threw
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T convertValue(Object fromValue, Class<T> toValueType)
-        throws IllegalArgumentException
-    {
-        // sanity check for null first:
-        if (fromValue == null) return null;
-        // also, as per [Issue-11], consider case for simple cast
-        // ... one caveat; while everything is Object.class, let's not take shortcut
-        if (toValueType != Object.class && toValueType.isAssignableFrom(fromValue.getClass())) {
-            return (T) fromValue;
-        }
-        return (T) _convert(fromValue, _typeFactory.constructType(toValueType));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T convertValue(Object fromValue, TypeReference<?> toValueTypeRef)
-        throws IllegalArgumentException
-    {
-        return (T) convertValue(fromValue, _typeFactory.constructType(toValueTypeRef));
-    } 
-
-    @SuppressWarnings("unchecked")
-    public <T> T convertValue(Object fromValue, JavaType toValueType)
-        throws IllegalArgumentException
-    {
-        // sanity check for null first:
-        if (fromValue == null) return null;
-        // also, as per [Issue-11], consider case for simple cast
-        /* But with caveats: one is that while everything is Object.class, we don't
-         * want to "optimize" that out; and the other is that we also do not want
-         * to lose conversions of generic types.
-         */
-        Class<?> targetType = toValueType.getRawClass();
-        if (targetType != Object.class
-                && !toValueType.hasGenericTypes()
-                && targetType.isAssignableFrom(fromValue.getClass())) {
-            return (T) fromValue;
-        }
-        return (T) _convert(fromValue, toValueType);
-    } 
-
-    /**
-     * Actual conversion implementation: instead of using existing read
-     * and write methods, much of code is inlined. Reason for this is
-     * that we must avoid wrapping/unwrapping both for efficiency and
-     * for correctness. If wrapping/unwrapping is actually desired,
-     * caller must use explicit <code>writeValue</code> and
-     * <code>readValue</code> methods.
-     */
-    protected Object _convert(Object fromValue, JavaType toValueType)
-        throws IllegalArgumentException
-    {        
-        /* Then use TokenBuffer, which is a JsonGenerator:
-         * (see [JACKSON-175])
-         */
-        TokenBuffer buf = new TokenBuffer(this);
-        try {
-            // inlined 'writeValue' with minor changes:
-            // first: disable wrapping when writing
-            SerializationConfig config = getSerializationConfig().without(SerializationFeature.WRAP_ROOT_VALUE);
-            // no need to check for closing of TokenBuffer
-            _serializerProvider(config).serializeValue(buf, fromValue);
-
-            // then matching read, inlined 'readValue' with minor mods:
-            final JsonParser jp = buf.asParser();
-            Object result;
-            // ok to pass in existing feature flags; unwrapping handled by mapper
-            final DeserializationConfig deserConfig = getDeserializationConfig();
-            JsonToken t = _initForReading(jp);
-            if (t == JsonToken.VALUE_NULL) {
-                DeserializationContext ctxt = createDeserializationContext(jp, deserConfig);
-                result = _findRootDeserializer(ctxt, toValueType).getNullValue();
-            } else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-                result = null;
-            } else { // pointing to event other than null
-                DeserializationContext ctxt = createDeserializationContext(jp, deserConfig);
-                JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, toValueType);
-                // note: no handling of unwarpping
-                result = deser.deserialize(jp, ctxt);
-            }
-            jp.close();
-            return result;
-        } catch (IOException e) { // should not occur, no real i/o...
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Extended Public API: JSON Schema generation
-    /**********************************************************
-     */
-
-    /**
-     * Generate <a href="http://json-schema.org/">Json-schema</a>
-     * instance for specified class.
-     *
-     * @param t The class to generate schema for
-     * @return Constructed JSON schema.
-     */
-    public JsonSchema generateJsonSchema(Class<?> t) throws JsonMappingException {
-        return _serializerProvider(getSerializationConfig()).generateJsonSchema(t);
-    }
-
-    /**
-     * Method for visiting type hierarchy for given type, using specified visitor.
-     *<p>
-     * This method can be used for things like
-     * generating <a href="http://json-schema.org/">Json Schema</a>
-     * instance for specified type.
-     *
-     * @param type Type to generate schema for (possibly with generic signature)
-     * 
-     * @since 2.1
-     */
-    public void acceptJsonFormatVisitor(Class<?> type, JsonFormatVisitorWrapper visitor)
-        throws JsonMappingException
-    {
-        acceptJsonFormatVisitor(_typeFactory.constructType(type), visitor);
-    }
-    
-    /**
-     * Method for visiting type hierarchy for given type, using specified visitor.
-     *<p>
-     * This method can be used for things like
-     * generating <a href="http://json-schema.org/">Json Schema</a>
-     * instance for specified type.
-     *
-     * @param type Type to generate schema for (possibly with generic signature)
-     * 
-     * @since 2.1
-     */
-    public void acceptJsonFormatVisitor(JavaType type, JsonFormatVisitorWrapper visitor)
-        throws JsonMappingException
-    {
-    	if (type == null) {
-    	    throw new IllegalArgumentException("type must be provided");
-    	}
-    	if (visitor == null) {
-    	    return;
-    	}
-    	DefaultSerializerProvider provider = _serializerProvider(getSerializationConfig());
-        visitor.setProvider(provider);
-    	provider.acceptJsonFormatVisitor(type, visitor);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods for serialization, overridable
-    /**********************************************************
-     */
-
-    /**
-     * Overridable helper method used for constructing
-     * {@link SerializerProvider} to use for serialization.
-     */
-    protected DefaultSerializerProvider _serializerProvider(SerializationConfig config) {
-        return _serializerProvider.createInstance(config, _serializerFactory);
-    }
-    
-    /**
-     * Helper method that should return default pretty-printer to
-     * use for generators constructed by this mapper, when instructed
-     * to use default pretty printer.
-     */
-    protected PrettyPrinter _defaultPrettyPrinter() {
-        return _defaultPrettyPrinter;
-    }
-    
-    /**
-     * Method called to configure the generator as necessary and then
-     * call write functionality
-     */
-    protected final void _configAndWriteValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        SerializationConfig cfg = getSerializationConfig();
-        // [JACKSON-96]: allow enabling pretty printing for ObjectMapper directly
-        if (cfg.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
-            jgen.useDefaultPrettyPrinter();
-        }
-        // [JACKSON-282]: consider Closeable
-        if (cfg.isEnabled(SerializationFeature.CLOSE_CLOSEABLE) && (value instanceof Closeable)) {
-            _configAndWriteCloseable(jgen, value, cfg);
-            return;
-        }
-        boolean closed = false;
-        try {
-            _serializerProvider(cfg).serializeValue(jgen, value);
-            closed = true;
-            jgen.close();
-        } finally {
-            /* won't try to close twice; also, must catch exception (so it 
-             * will not mask exception that is pending)
-             */
-            if (!closed) {
-                try {
-                    jgen.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-
-    protected final void _configAndWriteValue(JsonGenerator jgen, Object value, Class<?> viewClass)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        SerializationConfig cfg = getSerializationConfig().withView(viewClass);
-        if (cfg.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
-            jgen.useDefaultPrettyPrinter();
-        }
-        // [JACKSON-282]: consider Closeable
-        if (cfg.isEnabled(SerializationFeature.CLOSE_CLOSEABLE) && (value instanceof Closeable)) {
-            _configAndWriteCloseable(jgen, value, cfg);
-            return;
-        }
-        boolean closed = false;
-        try {
-            _serializerProvider(cfg).serializeValue(jgen, value);
-            closed = true;
-            jgen.close();
-        } finally {
-            if (!closed) {
-                try {
-                    jgen.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-
-    /**
-     * Helper method used when value to serialize is {@link Closeable} and its <code>close()</code>
-     * method is to be called right after serialization has been called
-     */
-    private final void _configAndWriteCloseable(JsonGenerator jgen, Object value, SerializationConfig cfg)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        Closeable toClose = (Closeable) value;
-        try {
-            _serializerProvider(cfg).serializeValue(jgen, value);
-            JsonGenerator tmpJgen = jgen;
-            jgen = null;
-            tmpJgen.close();
-            Closeable tmpToClose = toClose;
-            toClose = null;
-            tmpToClose.close();
-        } finally {
-            /* Need to close both generator and value, as long as they haven't yet
-             * been closed
-             */
-            if (jgen != null) {
-                try {
-                    jgen.close();
-                } catch (IOException ioe) { }
-            }
-            if (toClose != null) {
-                try {
-                    toClose.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-    
-    /**
-     * Helper method used when value to serialize is {@link Closeable} and its <code>close()</code>
-     * method is to be called right after serialization has been called
-     */
-    private final void _writeCloseableValue(JsonGenerator jgen, Object value, SerializationConfig cfg)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        Closeable toClose = (Closeable) value;
-        try {
-            _serializerProvider(cfg).serializeValue(jgen, value);
-            if (cfg.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) {
-                jgen.flush();
-            }
-            Closeable tmpToClose = toClose;
-            toClose = null;
-            tmpToClose.close();
-        } finally {
-            if (toClose != null) {
-                try {
-                    toClose.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods for deserialization, overridable
-    /**********************************************************
-     */
-
-    /**
-     * Internal helper method called to create an instance of {@link DeserializationContext}
-     * for deserializing a single root value.
-     * Can be overridden if a custom context is needed.
-     */
-    protected final DefaultDeserializationContext createDeserializationContext(JsonParser jp,
-            DeserializationConfig cfg)
-    {
-        return _deserializationContext.createInstance(cfg,
-                jp, _injectableValues);
-    }
-    
-    /**
-     * Actual implementation of value reading+binding operation.
-     */
-    protected Object _readValue(DeserializationConfig cfg, JsonParser jp, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        /* First: may need to read the next token, to initialize
-         * state (either before first read from parser, or after
-         * previous token has been cleared)
-         */
-        Object result;
-        JsonToken t = _initForReading(jp);
-        if (t == JsonToken.VALUE_NULL) {
-            // [JACKSON-643]: Ask JsonDeserializer what 'null value' to use:
-            DeserializationContext ctxt = createDeserializationContext(jp, cfg);
-            result = _findRootDeserializer(ctxt, valueType).getNullValue();
-        } else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-            result = null;
-        } else { // pointing to event other than null
-            DeserializationContext ctxt = createDeserializationContext(jp, cfg);
-            JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, valueType);
-            // ok, let's get the value
-            if (cfg.useRootWrapping()) {
-                result = _unwrapAndDeserialize(jp, ctxt, cfg, valueType, deser);
-            } else {
-                result = deser.deserialize(jp, ctxt);
-            }
-        }
-        // Need to consume the token too
-        jp.clearCurrentToken();
-        return result;
-    }
-    
-    protected Object _readMapAndClose(JsonParser jp, JavaType valueType)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        try {
-            Object result;
-            JsonToken t = _initForReading(jp);
-            if (t == JsonToken.VALUE_NULL) {
-                // [JACKSON-643]: Ask JsonDeserializer what 'null value' to use:
-                DeserializationContext ctxt = createDeserializationContext(jp,
-                        getDeserializationConfig());
-                result = _findRootDeserializer(ctxt, valueType).getNullValue();
-            } else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-                result = null;
-            } else {
-                DeserializationConfig cfg = getDeserializationConfig();
-                DeserializationContext ctxt = createDeserializationContext(jp, cfg);
-                JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, valueType);
-                if (cfg.useRootWrapping()) {
-                    result = _unwrapAndDeserialize(jp, ctxt, cfg, valueType, deser);
-                } else {
-                    result = deser.deserialize(jp, ctxt);
-                }
-            }
-            // Need to consume the token too
-            jp.clearCurrentToken();
-            return result;
-        } finally {
-            try {
-                jp.close();
-            } catch (IOException ioe) { }
-        }
-    }
-    
-    /**
-     * Method called to ensure that given parser is ready for reading
-     * content for data binding.
-     *
-     * @return First token to be used for data binding after this call:
-     *  can never be null as exception will be thrown if parser can not
-     *  provide more tokens.
-     *
-     * @throws IOException if the underlying input source has problems during
-     *   parsing
-     * @throws JsonParseException if parser has problems parsing content
-     * @throws JsonMappingException if the parser does not have any more
-     *   content to map (note: Json "null" value is considered content;
-     *   enf-of-stream not)
-     */
-    protected JsonToken _initForReading(JsonParser jp)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        /* First: must point to a token; if not pointing to one, advance.
-         * This occurs before first read from JsonParser, as well as
-         * after clearing of current token.
-         */
-        JsonToken t = jp.getCurrentToken();
-        if (t == null) {
-            // and then we must get something...
-            t = jp.nextToken();
-            if (t == null) {
-                /* [JACKSON-546] Throw mapping exception, since it's failure to map,
-                 *   not an actual parsing problem
-                 */
-                throw JsonMappingException.from(jp, "No content to map due to end-of-input");
-            }
-        }
-        return t;
-    }
-
-    protected Object _unwrapAndDeserialize(JsonParser jp, DeserializationContext ctxt, 
-            DeserializationConfig config,
-            JavaType rootType, JsonDeserializer<Object> deser)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        String expName = config.getRootName();
-        if (expName == null) {
-            SerializedString sstr = _rootNames.findRootName(rootType, config);
-            expName = sstr.getValue();
-        }
-        if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
-            throw JsonMappingException.from(jp, "Current token not START_OBJECT (needed to unwrap root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        if (jp.nextToken() != JsonToken.FIELD_NAME) {
-            throw JsonMappingException.from(jp, "Current token not FIELD_NAME (to contain expected root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        String actualName = jp.getCurrentName();
-        if (!expName.equals(actualName)) {
-            throw JsonMappingException.from(jp, "Root name '"+actualName+"' does not match expected ('"
-                    +expName+"') for type "+rootType);
-        }
-        // ok, then move to value itself....
-        jp.nextToken();
-        Object result = deser.deserialize(jp, ctxt);
-        // and last, verify that we now get matching END_OBJECT
-        if (jp.nextToken() != JsonToken.END_OBJECT) {
-            throw JsonMappingException.from(jp, "Current token not END_OBJECT (to match wrapper object with root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        return result;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, other
-    /**********************************************************
-     */
-
-    /**
-     * Method called to locate deserializer for the passed root-level value.
-     */
-    protected JsonDeserializer<Object> _findRootDeserializer(DeserializationContext ctxt,
-            JavaType valueType)
-        throws JsonMappingException
-    {
-        // First: have we already seen it?
-        JsonDeserializer<Object> deser = _rootDeserializers.get(valueType);
-        if (deser != null) {
-            return deser;
-        }
-        // Nope: need to ask provider to resolve it
-        deser = ctxt.findRootValueDeserializer(valueType);
-        if (deser == null) { // can this happen?
-            throw new JsonMappingException("Can not find a deserializer for type "+valueType);
-        }
-        _rootDeserializers.put(valueType, deser);
-        return deser;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectReader.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectReader.java
deleted file mode 100644
index 8dd541e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectReader.java
+++ /dev/null
@@ -1,1505 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.core.type.ResolvedType;
-import com.fasterxml.jackson.core.type.TypeReference;
-
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-import com.fasterxml.jackson.databind.deser.DataFormatReaders;
-import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
-import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.TreeTraversingParser;
-import com.fasterxml.jackson.databind.type.SimpleType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.RootNameLookup;
-
-/**
- * Builder object that can be used for per-serialization configuration of
- * deserialization parameters, such as root type to use or object
- * to update (instead of constructing new instance).
- *<p>
- * Uses "fluent" (or, kind of, builder) pattern so that instances are immutable
- * (and thus fully thread-safe with no external synchronization);
- * new instances are constructed for different configurations.
- * Instances are initially constructed by {@link ObjectMapper} and can be
- * reused, shared, cached; both because of thread-safety and because
- * instances are relatively light-weight.
- */
-public class ObjectReader
-    extends ObjectCodec
-    implements Versioned, java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = -4251443320039569153L;
-
-    private final static JavaType JSON_NODE_TYPE = SimpleType.constructUnsafe(JsonNode.class);
-
-    /*
-    /**********************************************************
-    /* Immutable configuration from ObjectMapper
-    /**********************************************************
-     */
-
-    /**
-     * General serialization configuration settings; while immutable,
-     * can use copy-constructor to create modified instances as necessary.
-     */
-    protected final DeserializationConfig _config;
-
-    /**
-     * Blueprint instance of deserialization context; used for creating
-     * actual instance when needed.
-     */
-    protected final DefaultDeserializationContext _context;
-
-    /**
-     * Factory used for constructing {@link JsonGenerator}s
-     */
-    protected final JsonFactory _jsonFactory;
-    
-    /**
-     * Flag that indicates whether root values are expected to be unwrapped or not
-     */
-    protected final boolean _unwrapRoot;
-    
-    /*
-    /**********************************************************
-    /* Configuration that can be changed during building
-    /**********************************************************
-     */   
-
-    /**
-     * Declared type of value to instantiate during deserialization.
-     * Defines which deserializer to use; as well as base type of instance
-     * to construct if an updatable value is not configured to be used
-     * (subject to changes by embedded type information, for polymorphic
-     * types). If {@link #_valueToUpdate} is non-null, only used for
-     * locating deserializer.
-     */
-    protected final JavaType _valueType;
-
-    /**
-     * We may pre-fetch deserializer as soon as {@link #_valueType}
-     * is known, and if so, reuse it afterwards.
-     * This allows avoiding further deserializer lookups and increases
-     * performance a bit on cases where readers are reused.
-     * 
-     * @since 2.1
-     */
-    protected final JsonDeserializer<Object> _rootDeserializer;
-    
-    /**
-     * Instance to update with data binding; if any. If null,
-     * a new instance is created, if non-null, properties of
-     * this value object will be updated instead.
-     * Note that value can be of almost any type, except not
-     * {@link com.fasterxml.jackson.databind.type.ArrayType}; array
-     * types can not be modified because array size is immutable.
-     */
-    protected final Object _valueToUpdate;
-
-    /**
-     * When using data format that uses a schema, schema is passed
-     * to parser.
-     */
-    protected final FormatSchema _schema;
-
-    /**
-     * Values that can be injected during deserialization, if any.
-     */
-    protected final InjectableValues _injectableValues;
-
-    /**
-     * Optional detector used for auto-detecting data format that byte-based
-     * input uses.
-     *<p>
-     * NOTE: If defined non-null, <code>readValue()</code> methods that take
-     * {@link Reader} or {@link String} input <b>will fail with exception</b>,
-     * because format-detection only works on byte-sources. Also, if format
-     * can not be detect reliably (as per detector settings),
-     * a {@link JsonParseException} will be thrown).
-     * 
-     * @since 2.1
-     */
-    protected final DataFormatReaders _dataFormatReaders;
-    
-    /*
-    /**********************************************************
-    /* Caching
-    /**********************************************************
-     */
-    
-    /**
-     * Root-level cached deserializers
-     */
-    final protected ConcurrentHashMap<JavaType, JsonDeserializer<Object>> _rootDeserializers;
-
-    /**
-     * Cache for root names used when root-wrapping is enabled.
-     */
-    protected final RootNameLookup _rootNames;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, construction
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by {@link ObjectMapper} for initial instantiation
-     */
-    protected ObjectReader(ObjectMapper mapper, DeserializationConfig config)
-    {
-        this(mapper, config, null, null, null, null);
-    }
-
-    /**
-     * Constructor called when a root deserializer should be fetched based
-     * on other configuration.
-     */
-    protected ObjectReader(ObjectMapper mapper, DeserializationConfig config,
-            JavaType valueType, Object valueToUpdate,
-            FormatSchema schema, InjectableValues injectableValues)
-    {
-        _config = config;
-        _context = mapper._deserializationContext;
-        _rootDeserializers = mapper._rootDeserializers;
-        _jsonFactory = mapper._jsonFactory;
-        _rootNames = mapper._rootNames;
-        _valueType = valueType;
-        _valueToUpdate = valueToUpdate;
-        if (valueToUpdate != null && valueType.isArrayType()) {
-            throw new IllegalArgumentException("Can not update an array value");
-        }
-        _schema = schema;
-        _injectableValues = injectableValues;
-        _unwrapRoot = config.useRootWrapping();
-
-        _rootDeserializer = _prefetchRootDeserializer(config, valueType);
-        _dataFormatReaders = null;        
-    }
-    
-    /**
-     * Copy constructor used for building variations.
-     */
-    protected ObjectReader(ObjectReader base, DeserializationConfig config,
-            JavaType valueType, JsonDeserializer<Object> rootDeser, Object valueToUpdate,
-            FormatSchema schema, InjectableValues injectableValues,
-            DataFormatReaders dataFormatReaders)
-    {
-        _config = config;
-        _context = base._context;
-
-        _rootDeserializers = base._rootDeserializers;
-        _jsonFactory = base._jsonFactory;
-        _rootNames = base._rootNames;
-
-        _valueType = valueType;
-        _rootDeserializer = rootDeser;
-        _valueToUpdate = valueToUpdate;
-        if (valueToUpdate != null && valueType.isArrayType()) {
-            throw new IllegalArgumentException("Can not update an array value");
-        }
-        _schema = schema;
-        _injectableValues = injectableValues;
-        _unwrapRoot = config.useRootWrapping();
-        _dataFormatReaders = dataFormatReaders;
-    }
-
-    /**
-     * Copy constructor used when modifying simple feature flags
-     */
-    protected ObjectReader(ObjectReader base, DeserializationConfig config)
-    {
-        _config = config;
-        _context = base._context;
-
-        _rootDeserializers = base._rootDeserializers;
-        _jsonFactory = base._jsonFactory;
-        _rootNames = base._rootNames;
-
-        _valueType = base._valueType;
-        _rootDeserializer = base._rootDeserializer;
-        _valueToUpdate = base._valueToUpdate;
-        _schema = base._schema;
-        _injectableValues = base._injectableValues;
-        _unwrapRoot = config.useRootWrapping();
-        _dataFormatReaders = base._dataFormatReaders;
-    }
-
-    protected ObjectReader(ObjectReader base, JsonFactory f)
-    {
-        _config = base._config;
-        _context = base._context;
-
-        _rootDeserializers = base._rootDeserializers;
-        _jsonFactory = f;
-        _rootNames = base._rootNames;
-
-        _valueType = base._valueType;
-        _rootDeserializer = base._rootDeserializer;
-        _valueToUpdate = base._valueToUpdate;
-        _schema = base._schema;
-        _injectableValues = base._injectableValues;
-        _unwrapRoot = base._unwrapRoot;
-        _dataFormatReaders = base._dataFormatReaders;
-    }
-    
-    /**
-     * Method that will return version information stored in and read from jar
-     * that contains this class.
-     */
-//  @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-
-    /*
-    /**********************************************************
-    /* Life-cycle, fluent factory methods
-    /**********************************************************
-     */
-
-    public ObjectReader with(DeserializationConfig config) {
-        return _with(config);
-    }    
-    
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified feature enabled.
-     */
-    public ObjectReader with(DeserializationFeature feature) {
-        return _with(_config.with(feature));
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectReader with(DeserializationFeature first,
-            DeserializationFeature... other)
-    {
-        return _with(_config.with(first, other));
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectReader withFeatures(DeserializationFeature... features) {
-        return _with(_config.withFeatures(features));
-    }    
-    
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified feature disabled.
-     */
-    public ObjectReader without(DeserializationFeature feature) {
-        return _with(_config.without(feature)); 
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified features disabled.
-     */
-    public ObjectReader without(DeserializationFeature first,
-            DeserializationFeature... other)
-    {
-        return _with(_config.without(first, other));
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * with specified features disabled.
-     */
-    public ObjectReader withoutFeatures(DeserializationFeature... features) {
-        return _with(_config.withoutFeatures(features));
-    }    
-    
-    /**
-     * Method for constructing a new instance with configuration that uses
-     * passed {@link InjectableValues} to provide injectable values.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader with(InjectableValues injectableValues)
-    {
-        if (_injectableValues == injectableValues) {
-            return this;
-        }
-        return new ObjectReader(this, _config,
-                _valueType, _rootDeserializer, _valueToUpdate,
-                _schema, injectableValues, _dataFormatReaders);
-    }
-
-    /**
-     * Method for constructing a new reader instance with configuration that uses
-     * passed {@link JsonNodeFactory} for constructing {@link JsonNode}
-     * instances.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader with(JsonNodeFactory f) {
-        return _with(_config.with(f));
-    }
-
-    /**
-     * Method for constructing a new reader instance with configuration that uses
-     * passed {@link JsonFactory} for constructing underlying Readers.
-     *<p>
-     * NOTE: only factories that <b>DO NOT REQUIRE SPECIAL MAPPERS</b>
-     * (that is, ones that return <code>false</code> for
-     * {@link JsonFactory#requiresCustomCodec()}) can be used: trying
-     * to use one that requires custom codec will throw exception
-     * 
-     * @since 2.1
-     */
-    public ObjectReader with(JsonFactory f) {
-        if (f == _jsonFactory) {
-            return this;
-        }
-        ObjectReader r = new ObjectReader(this, f);
-        // Also, try re-linking, if possible...
-        if (f.getCodec() == null) {
-            f.setCodec(r);
-        }
-        return r;
-    }
-    
-    /**
-     * Method for constructing a new instance with configuration that
-     * specifies what root name to expect for "root name unwrapping".
-     * See {@link DeserializationConfig#withRootName(String)} for
-     * details.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withRootName(String rootName) {
-        return _with(_config.withRootName(rootName));
-    }
-    
-    /**
-     * Method for constructing a new instance with configuration that
-     * passes specified {@link FormatSchema} to {@link JsonParser} that
-     * is constructed for parsing content.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader with(FormatSchema schema)
-    {
-        if (_schema == schema) {
-            return this;
-        }
-        return new ObjectReader(this, _config, _valueType, _rootDeserializer, _valueToUpdate,
-                schema, _injectableValues, _dataFormatReaders);
-    }
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * to data bind into specified type.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withType(JavaType valueType)
-    {
-        if (valueType != null && valueType.equals(_valueType)) {
-            return this;
-        }
-        JsonDeserializer<Object> rootDeser = _prefetchRootDeserializer(_config, valueType);
-        // type is stored here, no need to make a copy of config
-        DataFormatReaders det = _dataFormatReaders;
-        if (det != null) {
-            det = det.withType(valueType);
-        }
-        return new ObjectReader(this, _config, valueType, rootDeser,
-                _valueToUpdate, _schema, _injectableValues, det);
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * to data bind into specified type.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withType(Class<?> valueType) {
-        return withType(_config.constructType(valueType));
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * to data bind into specified type.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withType(java.lang.reflect.Type valueType) {
-        return withType(_config.getTypeFactory().constructType(valueType));
-    }    
-
-    /**
-     * Method for constructing a new reader instance that is configured
-     * to data bind into specified type.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withType(TypeReference<?> valueTypeRef) {
-        return withType(_config.getTypeFactory().constructType(valueTypeRef.getType()));
-    }    
-
-    /**
-     * Method for constructing a new instance with configuration that
-     * updates passed Object (as root value), instead of constructing 
-     * a new value.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withValueToUpdate(Object value)
-    {
-        if (value == _valueToUpdate) return this;
-        if (value == null) {
-            throw new IllegalArgumentException("cat not update null value");
-        }
-        JavaType t;
-        
-        /* no real benefit from pre-fetching, as updating readers are much
-         * less likely to be reused, and value type may also be forced
-         * with a later chained call...
-         */
-        if (_valueType == null) {
-            t = _config.constructType(value.getClass());
-        } else {
-            t = _valueType;
-        }
-        return new ObjectReader(this, _config, t, _rootDeserializer, value,
-                _schema, _injectableValues, _dataFormatReaders);
-    }
-
-    /**
-     * Method for constructing a new instance with configuration that
-     * uses specified View for filtering.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectReader withView(Class<?> activeView) {
-        return _with(_config.withView(activeView));
-    }
-
-    public ObjectReader with(Locale l) {
-        return _with(_config.with(l));
-    }
-
-    public ObjectReader with(TimeZone tz) {
-        return _with(_config.with(tz));
-    }
-
-    public ObjectReader withHandler(DeserializationProblemHandler h) {
-        return _with(_config.withHandler(h));
-    }
-
-    public ObjectReader with(Base64Variant defaultBase64) {
-        return _with(_config.with(defaultBase64));
-    }
-
-    /**
-     * Fluent factory method for constructing a reader that will try to
-     * auto-detect underlying data format, using specified list of
-     * {@link JsonFactory} instances, and default {@link DataFormatReaders} settings
-     * (for customized {@link DataFormatReaders}, you can construct instance yourself).
-     * to construct appropriate {@link JsonParser} for actual parsing.
-     *<p>
-     * Note: since format detection only works with byte sources, it is possible to
-     * get a failure from some 'readValue()' methods. Also, if input can not be reliably
-     * (enough) detected as one of specified types, an exception will be thrown.
-     *<p>
-     * Note: not all {@link JsonFactory} types can be passed: specifically, ones that
-     * require "custom codec" (like XML factory) will not work. Instead, use
-     * method that takes {@link ObjectReader} instances instead of factories.
-     * 
-     * @param readers Data formats accepted, in decreasing order of priority (that is,
-     *   matches checked in listed order, first match wins)
-     * 
-     * @return Newly configured writer instance
-     * 
-     * @since 2.1
-     */
-    public ObjectReader withFormatDetection(ObjectReader... readers)
-    {
-        return withFormatDetection(new DataFormatReaders(readers));
-    }
-
-    /**
-     * Fluent factory method for constructing a reader that will try to
-     * auto-detect underlying data format, using specified
-     * {@link DataFormatReaders}.
-     *<p>
-     * NOTE: since format detection only works with byte sources, it is possible to
-     * get a failure from some 'readValue()' methods. Also, if input can not be reliably
-     * (enough) detected as one of specified types, an exception will be thrown.
-     * 
-     * @param readers DataFormatReaders to use for detecting underlying format.
-     * 
-     * @return Newly configured writer instance
-     * 
-     * @since 2.1
-     */
-    public ObjectReader withFormatDetection(DataFormatReaders readers)
-    {
-        return new ObjectReader(this, _config, _valueType, _rootDeserializer, _valueToUpdate,
-                _schema, _injectableValues, readers);
-    }
-    
-    /*
-    /**********************************************************
-    /* Simple accessors
-    /**********************************************************
-     */
-    
-    public boolean isEnabled(DeserializationFeature f) {
-        return _config.isEnabled(f);
-    }
-
-    public boolean isEnabled(MapperFeature f) {
-        return _config.isEnabled(f);
-    }
-
-    public boolean isEnabled(JsonParser.Feature f) {
-        return _jsonFactory.isEnabled(f);
-    }
-
-    @Override
-    public JsonFactory getFactory() {
-        return _jsonFactory;
-    }
-    
-    /**
-     * @deprecated Since 2.1: Use {@link #getFactory} instead
-     */
-    @Deprecated
-    @Override
-    public JsonFactory getJsonFactory() {
-        return _jsonFactory;
-    }
-
-    public TypeFactory getTypeFactory() {
-        return _config.getTypeFactory();
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserialization methods; basic ones to support ObjectCodec first
-    /* (ones that take JsonParser)
-    /**********************************************************
-     */
-
-    /**
-     * Method that binds content read using given parser, using
-     * configuration of this reader, including expected result type.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        return (T) _bind(jp, _valueToUpdate);
-    }
-
-    /**
-     * Convenience method that binds content read using given parser, using
-     * configuration of this reader, except that expected value type
-     * is specified with the call (instead of currently configured root type).
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T readValue(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonProcessingException
-    {
-        return (T) withType(valueType).readValue(jp);
-    }
-
-    /**
-     * Convenience method that binds content read using given parser, using
-     * configuration of this reader, except that expected value type
-     * is specified with the call (instead of currently configured root type).
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T readValue(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException
-    {
-        return (T) withType(valueTypeRef).readValue(jp);
-    }
-
-    /**
-     * Convenience method that binds content read using given parser, using
-     * configuration of this reader, except that expected value type
-     * is specified with the call (instead of currently configured root type).
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp, ResolvedType valueType) throws IOException, JsonProcessingException {
-        return (T) withType((JavaType)valueType).readValue(jp);
-    }
-
-    /**
-     * Type-safe overloaded method, basically alias for {@link #readValue(JsonParser, ResolvedType)}.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonParser jp, JavaType valueType) throws IOException, JsonProcessingException {
-        return (T) withType(valueType).readValue(jp);
-    }
-    
-    /**
-     * Convenience method that binds content read using given parser, using
-     * configuration of this reader, except that content is bound as
-     * JSON tree instead of configured root value type.
-     *<p>
-     * Note: if an object was specified with {@link #withValueToUpdate}, it
-     * will be ignored.
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T extends TreeNode> T readTree(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        return (T) _bindAsTree(jp);
-    }
-
-    /**
-     * Convenience method that is equivalent to:
-     *<pre>
-     *   withType(valueType).readValues(jp);
-     *</pre>
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @Override
-    public <T> Iterator<T> readValues(JsonParser jp, Class<T> valueType)
-        throws IOException, JsonProcessingException {
-        return withType(valueType).readValues(jp);
-    }
-
-    /**
-     * Convenience method that is equivalent to:
-     *<pre>
-     *   withType(valueTypeRef).readValues(jp);
-     *</pre>
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @Override
-    public <T> Iterator<T> readValues(JsonParser jp, TypeReference<?> valueTypeRef)
-        throws IOException, JsonProcessingException {
-        return withType(valueTypeRef).readValues(jp);
-    }
-    
-    /**
-     * Convenience method that is equivalent to:
-     *<pre>
-     *   withType(valueType).readValues(jp);
-     *</pre>
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    @Override
-    public <T> Iterator<T> readValues(JsonParser jp, ResolvedType valueType)
-        throws IOException, JsonProcessingException {
-        return readValues(jp, (JavaType) valueType);
-    }
-
-    /**
-     * Convenience method that is equivalent to:
-     *<pre>
-     *   withType(valueType).readValues(jp);
-     *</pre>
-     *<p>
-     * NOTE: this method never tries to auto-detect format, since actual
-     * (data-format specific) parser is given.
-     */
-    public <T> Iterator<T> readValues(JsonParser jp, JavaType valueType)
-        throws IOException, JsonProcessingException {
-        return withType(valueType).readValues(jp);
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserialization methods; others similar to what ObjectMapper has
-    /**********************************************************
-     */
-    
-    /**
-     * Method that binds content read from given input source,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(InputStream src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return (T) _detectBindAndClose(_dataFormatReaders.findFormat(src), false);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Method that binds content read from given input source,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(Reader src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(src);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-    
-    /**
-     * Method that binds content read from given JSON string,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(String src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(src);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Method that binds content read from given byte array,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return (T) _detectBindAndClose(src, 0, src.length);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Method that binds content read from given byte array,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(byte[] src, int offset, int length)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return (T) _detectBindAndClose(src, offset, length);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src, offset, length), _valueToUpdate);
-    }
-    
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(File src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return (T) _detectBindAndClose(_dataFormatReaders.findFormat(_inputStream(src)), true);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Method that binds content read from given input source,
-     * using configuration of this reader.
-     * Value return is either newly constructed, or root value that
-     * was specified with {@link #withValueToUpdate(Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(URL src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return (T) _detectBindAndClose(_dataFormatReaders.findFormat(_inputStream(src)), true);
-        }
-        return (T) _bindAndClose(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Convenience method for converting results from given JSON tree into given
-     * value type. Basically short-cut for:
-     *<pre>
-     *   objectReader.readValue(src.traverse())
-     *</pre>
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T readValue(JsonNode src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(src);
-        }
-        return (T) _bindAndClose(treeAsTokens(src), _valueToUpdate);
-    }
-    
-    /**
-     * Method that reads content from given input source,
-     * using configuration of this reader, and binds it as JSON Tree.
-     *<p>
-     * Note that if an object was specified with a call to
-     * {@link #withValueToUpdate(Object)}
-     * it will just be ignored; result is always a newly constructed
-     * {@link JsonNode} instance.
-     */
-    public JsonNode readTree(InputStream in)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return _detectBindAndCloseAsTree(in);
-        }
-        return _bindAndCloseAsTree(_jsonFactory.createJsonParser(in));
-    }
-    
-    /**
-     * Method that reads content from given input source,
-     * using configuration of this reader, and binds it as JSON Tree.
-     *<p>
-     * Note that if an object was specified with a call to
-     * {@link #withValueToUpdate(Object)}
-     * it will just be ignored; result is always a newly constructed
-     * {@link JsonNode} instance.
-     */
-    public JsonNode readTree(Reader r)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(r);
-        }
-        return _bindAndCloseAsTree(_jsonFactory.createJsonParser(r));
-    }
-
-    /**
-     * Method that reads content from given JSON input String,
-     * using configuration of this reader, and binds it as JSON Tree.
-     *<p>
-     * Note that if an object was specified with a call to
-     * {@link #withValueToUpdate(Object)}
-     * it will just be ignored; result is always a newly constructed
-     * {@link JsonNode} instance.
-     */
-    public JsonNode readTree(String json)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(json);
-        }
-        return _bindAndCloseAsTree(_jsonFactory.createJsonParser(json));
-    }
-
-    /*
-    /**********************************************************
-    /* Deserialization methods; reading sequence of values
-    /**********************************************************
-     */
-    
-    /**
-     * Method for reading sequence of Objects from parser stream.
-     *<p>
-     * Sequence can be either root-level "unwrapped" sequence (without surrounding
-     * JSON array), or a sequence contained in a JSON Array.
-     * In either case {@link JsonParser} must point to the first token of
-     * the first element, OR not point to any token (in which case it is advanced
-     * to the next token). This means, specifically, that for wrapped sequences,
-     * parser MUST NOT point to the surrounding <code>START_ARRAY</code> but rather
-     * to the token following it.
-     */
-    public <T> MappingIterator<T> readValues(JsonParser jp)
-        throws IOException, JsonProcessingException
-    {
-        DeserializationContext ctxt = createDeserializationContext(jp, _config);
-        // false -> do not close as caller gave parser instance
-        return new MappingIterator<T>(_valueType, jp, ctxt,
-                _findRootDeserializer(ctxt, _valueType),
-                false, _valueToUpdate);
-    }
-    
-    /**
-     * Method for reading sequence of Objects from parser stream.
-     *<p>
-     * Sequence can be either wrapped or unwrapped root-level sequence:
-     * wrapped means that the elements are enclosed in JSON Array;
-     * and unwrapped that elements are directly accessed at main level.
-     * Assumption is that iff the first token of the document is
-     * <code>START_ARRAY</code>, we have a wrapped sequence; otherwise
-     * unwrapped. For wrapped sequences, leading <code>START_ARRAY</code>
-     * is skipped, so that for both cases, underlying {@link JsonParser}
-     * will point to what is expected to be the first token of the first
-     * element.
-     *<p>
-     * Note that the wrapped vs unwrapped logic means that it is NOT
-     * possible to use this method for reading an unwrapped sequence
-     * of elements written as JSON Arrays: to read such sequences, one
-     * has to use {@link #readValues(JsonParser)}, making sure parser
-     * points to the first token of the first element (i.e. the second
-     * <code>START_ARRAY</code> which is part of the first element).
-     */
-    public <T> MappingIterator<T> readValues(InputStream src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return _detectBindAndReadValues(_dataFormatReaders.findFormat(src), false);
-        }
-        return _bindAndReadValues(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-    
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     */
-    public <T> MappingIterator<T> readValues(Reader src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(src);
-        }
-        JsonParser jp = _jsonFactory.createJsonParser(src);
-        if (_schema != null) {
-            jp.setSchema(_schema);
-        }
-        jp.nextToken();
-        DeserializationContext ctxt = createDeserializationContext(jp, _config);
-        return new MappingIterator<T>(_valueType, jp, ctxt,
-                _findRootDeserializer(ctxt, _valueType), true, _valueToUpdate);
-    }
-    
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     * 
-     * @param json String that contains JSON content to parse
-     */
-    public <T> MappingIterator<T> readValues(String json)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            _reportUndetectableSource(json);
-        }
-        JsonParser jp = _jsonFactory.createJsonParser(json);
-        if (_schema != null) {
-            jp.setSchema(_schema);
-        }
-        jp.nextToken();
-        DeserializationContext ctxt = createDeserializationContext(jp, _config);
-        return new MappingIterator<T>(_valueType, jp, ctxt,
-                _findRootDeserializer(ctxt, _valueType), true, _valueToUpdate);
-    }
-
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     */
-    public <T> MappingIterator<T> readValues(byte[] src, int offset, int length)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return _detectBindAndReadValues(_dataFormatReaders.findFormat(src, offset, length), false);
-        }
-        return _bindAndReadValues(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     */
-    public final <T> MappingIterator<T> readValues(byte[] src)
-            throws IOException, JsonProcessingException {
-        return readValues(src, 0, src.length);
-    }
-    
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     */
-    public <T> MappingIterator<T> readValues(File src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return _detectBindAndReadValues(
-                    _dataFormatReaders.findFormat(_inputStream(src)), false);
-        }
-        return _bindAndReadValues(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /**
-     * Overloaded version of {@link #readValue(InputStream)}.
-     * 
-     * @param src URL to read to access JSON content to parse.
-     */
-    public <T> MappingIterator<T> readValues(URL src)
-        throws IOException, JsonProcessingException
-    {
-        if (_dataFormatReaders != null) {
-            return _detectBindAndReadValues(
-                    _dataFormatReaders.findFormat(_inputStream(src)), true);
-        }
-        return _bindAndReadValues(_jsonFactory.createJsonParser(src), _valueToUpdate);
-    }
-
-    /*
-    /**********************************************************
-    /* Implementation of rest of ObjectCodec methods
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonNode createArrayNode() {
-        return _config.getNodeFactory().arrayNode();
-    }
-
-    @Override
-    public JsonNode createObjectNode() {
-        return _config.getNodeFactory().objectNode();
-    }
-
-    @Override
-    public JsonParser treeAsTokens(TreeNode n) {
-        return new TreeTraversingParser((JsonNode) n, this);
-    }
-
-    @Override
-    public <T> T treeToValue(TreeNode n, Class<T> valueType)
-        throws JsonProcessingException
-    {
-        try {
-            return readValue(treeAsTokens(n), valueType);
-        } catch (JsonProcessingException e) {
-            throw e;
-        } catch (IOException e) { // should not occur, no real i/o...
-            throw new IllegalArgumentException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void writeValue(JsonGenerator jgen, Object value) throws IOException, JsonProcessingException
-    {
-        throw new UnsupportedOperationException("Not implemented for ObjectReader");
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, data-binding
-    /**********************************************************
-     */
-    
-    /**
-     * Actual implementation of value reading+binding operation.
-     */
-    protected Object _bind(JsonParser jp, Object valueToUpdate)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        /* First: may need to read the next token, to initialize state (either
-         * before first read from parser, or after previous token has been cleared)
-         */
-        Object result;
-        JsonToken t = _initForReading(jp);
-        if (t == JsonToken.VALUE_NULL) {
-            if (valueToUpdate == null) {
-                DeserializationContext ctxt = createDeserializationContext(jp, _config);
-                result = _findRootDeserializer(ctxt, _valueType).getNullValue();
-            } else {
-                result = valueToUpdate;
-            }
-        } else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-            result = valueToUpdate;
-        } else { // pointing to event other than null
-            DeserializationContext ctxt = createDeserializationContext(jp, _config);
-            JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, _valueType);
-            if (_unwrapRoot) {
-                result = _unwrapAndDeserialize(jp, ctxt, _valueType, deser);
-            } else {
-                if (valueToUpdate == null) {
-                    result = deser.deserialize(jp, ctxt);
-                } else {
-                    deser.deserialize(jp, ctxt, valueToUpdate);
-                    result = valueToUpdate;
-                }
-            }
-        }
-        // Need to consume the token too
-        jp.clearCurrentToken();
-        return result;
-    }
-    
-    protected Object _bindAndClose(JsonParser jp, Object valueToUpdate)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        if (_schema != null) {
-            jp.setSchema(_schema);
-        }
-        try {
-            Object result;
-            JsonToken t = _initForReading(jp);
-            if (t == JsonToken.VALUE_NULL) {
-                if (valueToUpdate == null) {
-                    DeserializationContext ctxt = createDeserializationContext(jp, _config);
-                    result = _findRootDeserializer(ctxt, _valueType).getNullValue();
-                } else {
-                    result = valueToUpdate;
-                }
-            } else if (t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-                result = valueToUpdate;
-            } else {
-                DeserializationContext ctxt = createDeserializationContext(jp, _config);
-                JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, _valueType);
-                if (_unwrapRoot) {
-                    result = _unwrapAndDeserialize(jp, ctxt, _valueType, deser);
-                } else {
-                    if (valueToUpdate == null) {
-                        result = deser.deserialize(jp, ctxt);
-                    } else {
-                        deser.deserialize(jp, ctxt, valueToUpdate);
-                        result = valueToUpdate;                    
-                    }
-                }
-            }
-            return result;
-        } finally {
-            try {
-                jp.close();
-            } catch (IOException ioe) { }
-        }
-    }
-
-    protected JsonNode _bindAsTree(JsonParser jp)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        JsonNode result;
-        JsonToken t = _initForReading(jp);
-        if (t == JsonToken.VALUE_NULL || t == JsonToken.END_ARRAY || t == JsonToken.END_OBJECT) {
-            result = NullNode.instance;
-        } else {
-            DeserializationContext ctxt = createDeserializationContext(jp, _config);
-            JsonDeserializer<Object> deser = _findRootDeserializer(ctxt, JSON_NODE_TYPE);
-            if (_unwrapRoot) {
-                result = (JsonNode) _unwrapAndDeserialize(jp, ctxt, JSON_NODE_TYPE, deser);
-            } else {
-                result = (JsonNode) deser.deserialize(jp, ctxt);
-            }
-        }
-        // Need to consume the token too
-        jp.clearCurrentToken();
-        return result;
-    }
-    
-    protected JsonNode _bindAndCloseAsTree(JsonParser jp)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        if (_schema != null) {
-            jp.setSchema(_schema);
-        }
-        try {
-            return _bindAsTree(jp);
-        } finally {
-            try {
-                jp.close();
-            } catch (IOException ioe) { }
-        }
-    }
-    
-    /**
-     * @since 2.1
-     */
-    protected <T> MappingIterator<T> _bindAndReadValues(JsonParser p,
-            Object valueToUpdate)
-        throws IOException, JsonProcessingException
-    {
-        if (_schema != null) {
-            p.setSchema(_schema);
-        }
-        p.nextToken();
-        DeserializationContext ctxt = createDeserializationContext(p, _config);
-        return new MappingIterator<T>(_valueType, p, ctxt, 
-                _findRootDeserializer(ctxt, _valueType),
-                true, _valueToUpdate);
-    }
-    
-    protected static JsonToken _initForReading(JsonParser jp)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        /* First: must point to a token; if not pointing to one, advance.
-         * This occurs before first read from JsonParser, as well as
-         * after clearing of current token.
-         */
-        JsonToken t = jp.getCurrentToken();
-        if (t == null) { // and then we must get something...
-            t = jp.nextToken();
-            if (t == null) {
-                /* [JACKSON-546] Throw mapping exception, since it's failure to map,
-                 *   not an actual parsing problem
-                 */
-                throw JsonMappingException.from(jp, "No content to map due to end-of-input");
-            }
-        }
-        return t;
-    }
-
-    /**
-     * Method called to locate deserializer for the passed root-level value.
-     */
-    protected final JsonDeserializer<Object> _findRootDeserializer(DeserializationContext ctxt,
-            JavaType valueType)
-        throws JsonMappingException
-    {
-        if (_rootDeserializer != null) {
-            return _rootDeserializer;
-        }
-
-        // Sanity check: must have actual type...
-        if (valueType == null) {
-            throw new JsonMappingException("No value type configured for ObjectReader");
-        }
-        
-        // First: have we already seen it?
-        JsonDeserializer<Object> deser = _rootDeserializers.get(valueType);
-        if (deser != null) {
-            return deser;
-        }
-        // Nope: need to ask provider to resolve it
-        deser = ctxt.findRootValueDeserializer(valueType);
-        if (deser == null) { // can this happen?
-            throw new JsonMappingException("Can not find a deserializer for type "+valueType);
-        }
-        _rootDeserializers.put(valueType, deser);
-        return deser;
-    }
-
-    /**
-     * Method called to locate deserializer ahead of time, if permitted
-     * by configuration. Method also is NOT to throw an exception if
-     * access fails.
-     */
-    protected final JsonDeserializer<Object> _prefetchRootDeserializer(
-            DeserializationConfig config, JavaType valueType)
-    {
-        if (valueType == null || !_config.isEnabled(DeserializationFeature.EAGER_DESERIALIZER_FETCH)) {
-            return null;
-        }
-        // already cached?
-        JsonDeserializer<Object> deser = _rootDeserializers.get(valueType);
-        if (deser == null) {
-            try {
-                // If not, need to resolve; for which we need a temporary context as well:
-                DeserializationContext ctxt = createDeserializationContext(null, _config);
-                deser = ctxt.findRootValueDeserializer(valueType);
-                if (deser != null) {
-                    _rootDeserializers.put(valueType, deser);
-                }
-                return deser;
-                
-            } catch (JsonProcessingException e) {
-                // need to swallow?
-            }
-        }
-        return deser;
-    }
-    
-    protected Object _unwrapAndDeserialize(JsonParser jp, DeserializationContext ctxt,
-            JavaType rootType, JsonDeserializer<Object> deser)
-        throws IOException, JsonParseException, JsonMappingException
-    {
-        String expName = _config.getRootName();
-        if (expName == null) {
-            SerializedString sstr = _rootNames.findRootName(rootType, _config);
-            expName = sstr.getValue();
-        }
-        if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
-            throw JsonMappingException.from(jp, "Current token not START_OBJECT (needed to unwrap root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        if (jp.nextToken() != JsonToken.FIELD_NAME) {
-            throw JsonMappingException.from(jp, "Current token not FIELD_NAME (to contain expected root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        String actualName = jp.getCurrentName();
-        if (!expName.equals(actualName)) {
-            throw JsonMappingException.from(jp, "Root name '"+actualName+"' does not match expected ('"
-                    +expName+"') for type "+rootType);
-        }
-        // ok, then move to value itself....
-        jp.nextToken();
-        Object result;
-        if (_valueToUpdate == null) {
-            result = deser.deserialize(jp, ctxt);
-        } else {
-            deser.deserialize(jp, ctxt, _valueToUpdate);
-            result = _valueToUpdate;                    
-        }
-        // and last, verify that we now get matching END_OBJECT
-        if (jp.nextToken() != JsonToken.END_OBJECT) {
-            throw JsonMappingException.from(jp, "Current token not END_OBJECT (to match wrapper object with root name '"
-                    +expName+"'), but "+jp.getCurrentToken());
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods, format auto-detection (since 2.1)
-    /**********************************************************
-     */
-    
-    protected Object _detectBindAndClose(byte[] src, int offset, int length) throws IOException
-    {
-        DataFormatReaders.Match match = _dataFormatReaders.findFormat(src, offset, length);
-        if (!match.hasMatch()) {
-            _reportUnkownFormat(_dataFormatReaders, match);
-        }
-        JsonParser jp = match.createParserWithMatch();
-        return match.getReader()._bindAndClose(jp, _valueToUpdate);
-    }
-
-    protected Object _detectBindAndClose(DataFormatReaders.Match match, boolean forceClosing)
-        throws IOException
-    {
-        if (!match.hasMatch()) {
-            _reportUnkownFormat(_dataFormatReaders, match);
-        }
-        JsonParser p = match.createParserWithMatch();
-        // One more thing: we Own the input stream now; and while it's 
-        // not super clean way to do it, we must ensure closure so:
-        if (forceClosing) {
-            p.enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
-        }
-        // important: use matching ObjectReader (may not be 'this')
-        return match.getReader()._bindAndClose(p, _valueToUpdate);
-    }
-
-    protected <T> MappingIterator<T> _detectBindAndReadValues(DataFormatReaders.Match match, boolean forceClosing)
-        throws IOException, JsonProcessingException
-    {
-        if (!match.hasMatch()) {
-            _reportUnkownFormat(_dataFormatReaders, match);
-        }
-        JsonParser p = match.createParserWithMatch();
-        // One more thing: we Own the input stream now; and while it's 
-        // not super clean way to do it, we must ensure closure so:
-        if (forceClosing) {
-            p.enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
-        }
-        // important: use matching ObjectReader (may not be 'this')
-        return match.getReader()._bindAndReadValues(p, _valueToUpdate);
-    }
-    
-    protected JsonNode _detectBindAndCloseAsTree(InputStream in) throws IOException
-    {
-        DataFormatReaders.Match match = _dataFormatReaders.findFormat(in);
-        if (!match.hasMatch()) {
-            _reportUnkownFormat(_dataFormatReaders, match);
-        }
-        JsonParser p = match.createParserWithMatch();
-        p.enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
-        return match.getReader()._bindAndCloseAsTree(p);
-    }
-    
-    /**
-     * Method called to indicate that format detection failed to detect format
-     * of given input
-     */
-    protected void _reportUnkownFormat(DataFormatReaders detector, DataFormatReaders.Match match) throws JsonProcessingException
-    {
-        throw new JsonParseException("Can not detect format from input, does not look like any of detectable formats "
-                +detector.toString(),
-                JsonLocation.NA);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods, other
-    /**********************************************************
-     */
-
-    /**
-     * Internal helper method called to create an instance of {@link DeserializationContext}
-     * for deserializing a single root value.
-     * Can be overridden if a custom context is needed.
-     */
-    protected final DefaultDeserializationContext createDeserializationContext(JsonParser jp,
-            DeserializationConfig cfg) {
-        // 04-Jan-2010, tatu: we do actually need the provider too... (for polymorphic deser)
-        return _context.createInstance(cfg, jp, _injectableValues);
-    }
-    
-    protected ObjectReader _with(DeserializationConfig newConfig) {
-        if (newConfig == _config) {
-            return this;
-        }
-        if (_dataFormatReaders != null) {
-            return new ObjectReader(this, newConfig)
-                .withFormatDetection(_dataFormatReaders.with(newConfig));
-        }
-        return new ObjectReader(this, newConfig);
-    }
-
-    protected void _reportUndetectableSource(Object src) throws JsonProcessingException
-    {
-        throw new JsonParseException("Can not use source of type "
-                +src.getClass().getName()+" with format auto-detection: must be byte- not char-based",
-                JsonLocation.NA);
-    }
-
-    protected InputStream _inputStream(URL src) throws IOException {
-        return src.openStream();
-    }
-
-    protected InputStream _inputStream(File f) throws IOException {
-        return new FileInputStream(f);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectWriter.java
deleted file mode 100644
index 76ddfc2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ObjectWriter.java
+++ /dev/null
@@ -1,742 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.*;
-import java.text.DateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SegmentedStringWriter;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.core.util.Instantiatable;
-import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
-import com.fasterxml.jackson.databind.ser.FilterProvider;
-import com.fasterxml.jackson.databind.ser.SerializerFactory;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Builder object that can be used for per-serialization configuration of
- * serialization parameters, such as JSON View and root type to use.
- * (and thus fully thread-safe with no external synchronization);
- * new instances are constructed for different configurations.
- * Instances are initially constructed by {@link ObjectMapper} and can be
- * reused in completely thread-safe manner with no explicit synchronization
- */
-public class ObjectWriter
-    implements Versioned,
-        java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = -7024829992408267532L;
-
-    /**
-     * We need to keep track of explicit disabling of pretty printing;
-     * easiest to do by a token value.
-     */
-    protected final static PrettyPrinter NULL_PRETTY_PRINTER = new MinimalPrettyPrinter();
-    
-    /*
-    /**********************************************************
-    /* Immutable configuration from ObjectMapper
-    /**********************************************************
-     */
-
-    /**
-     * General serialization configuration settings
-     */
-    protected final SerializationConfig _config;
-   
-    protected final DefaultSerializerProvider _serializerProvider;
-
-    protected final SerializerFactory _serializerFactory;
-
-    /**
-     * Factory used for constructing {@link JsonGenerator}s
-     */
-    protected final JsonFactory _jsonFactory;
-    
-    /*
-    /**********************************************************
-    /* Configuration that can be changed during building
-    /**********************************************************
-     */
-
-    /**
-     * Specified root serialization type to use; can be same
-     * as runtime type, but usually one of its super types
-     */
-    protected final JavaType _rootType;
-
-    /**
-     * We may pre-fetch serializer if {@link #_rootType}
-     * is known, and if so, reuse it afterwards.
-     * This allows avoiding further serializer lookups and increases
-     * performance a bit on cases where readers are reused.
-     * 
-     * @since 2.1
-     */
-    protected final JsonSerializer<Object> _rootSerializer;
-    
-    /**
-     * To allow for dynamic enabling/disabling of pretty printing,
-     * pretty printer can be optionally configured for writer
-     * as well
-     */
-    protected final PrettyPrinter _prettyPrinter;
-    
-    /**
-     * When using data format that uses a schema, schema is passed
-     * to generator.
-     */
-    protected final FormatSchema _schema;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by {@link ObjectMapper} for initial instantiation
-     */
-    protected ObjectWriter(ObjectMapper mapper, SerializationConfig config,
-            JavaType rootType, PrettyPrinter pp)
-    {
-        _config = config;
-
-        _serializerProvider = mapper._serializerProvider;
-        _serializerFactory = mapper._serializerFactory;
-        _jsonFactory = mapper._jsonFactory;
-
-        _rootType = rootType;
-        _prettyPrinter = pp;
-        _schema = null;
-
-        _rootSerializer = _prefetchRootSerializer(config, rootType);
-    }
-
-    /**
-     * Alternative constructor for initial instantiation by {@link ObjectMapper}
-     */
-    protected ObjectWriter(ObjectMapper mapper, SerializationConfig config)
-    {
-        _config = config;
-
-        _serializerProvider = mapper._serializerProvider;
-        _serializerFactory = mapper._serializerFactory;
-        _jsonFactory = mapper._jsonFactory;
-
-        _rootType = null;
-        _rootSerializer = null;
-        _prettyPrinter = null;
-        _schema = null;
-    }
-
-    /**
-     * Alternative constructor for initial instantiation by {@link ObjectMapper}
-     */
-    protected ObjectWriter(ObjectMapper mapper, SerializationConfig config,
-            FormatSchema s)
-    {
-        _config = config;
-
-        _serializerProvider = mapper._serializerProvider;
-        _serializerFactory = mapper._serializerFactory;
-        _jsonFactory = mapper._jsonFactory;
-
-        _rootType = null;
-        _rootSerializer = null;
-        _prettyPrinter = null;
-        _schema = s;
-    }
-    
-    /**
-     * Copy constructor used for building variations.
-     */
-    protected ObjectWriter(ObjectWriter base, SerializationConfig config,
-            JavaType rootType, JsonSerializer<Object> rootSer,
-            PrettyPrinter pp, FormatSchema s)
-    {
-        _config = config;
-
-        _serializerProvider = base._serializerProvider;
-        _serializerFactory = base._serializerFactory;
-        _jsonFactory = base._jsonFactory;
-        
-        _rootType = rootType;
-        _rootSerializer = rootSer;
-        _prettyPrinter = pp;
-        _schema = s;
-    }
-
-    /**
-     * Copy constructor used for building variations.
-     */
-    protected ObjectWriter(ObjectWriter base, SerializationConfig config)
-    {
-        _config = config;
-
-        _serializerProvider = base._serializerProvider;
-        _serializerFactory = base._serializerFactory;
-        _jsonFactory = base._jsonFactory;
-        _schema = base._schema;
-        
-        _rootType = base._rootType;
-        _rootSerializer = base._rootSerializer;
-        _prettyPrinter = base._prettyPrinter;
-    }
-    
-    /**
-     * Method that will return version information stored in and read from jar
-     * that contains this class.
-     */
-//  @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, fluent factories
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified feature enabled.
-     */
-    public ObjectWriter with(SerializationFeature feature) 
-    {
-        SerializationConfig newConfig = _config.with(feature);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }
-
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectWriter with(SerializationFeature first,
-            SerializationFeature... other)
-    {
-        SerializationConfig newConfig = _config.with(first, other);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }    
-
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectWriter withFeatures(SerializationFeature... features)
-    {
-        SerializationConfig newConfig = _config.withFeatures(features);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }    
-    
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified feature enabled.
-     */
-    public ObjectWriter without(SerializationFeature feature) 
-    {
-        SerializationConfig newConfig = _config.without(feature);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }    
-
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectWriter without(SerializationFeature first,
-            SerializationFeature... other)
-    {
-        SerializationConfig newConfig = _config.without(first, other);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }    
-
-    /**
-     * Method for constructing a new instance that is configured
-     * with specified features enabled.
-     */
-    public ObjectWriter withoutFeatures(SerializationFeature... features)
-    {
-        SerializationConfig newConfig = _config.withoutFeatures(features);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }    
-    
-    /**
-     * Fluent factory method that will construct a new writer instance that will
-     * use specified date format for serializing dates; or if null passed, one
-     * that will serialize dates as numeric timestamps.
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectWriter with(DateFormat df)
-    {
-        SerializationConfig newConfig = _config.with(df);
-        return (newConfig == _config) ? this : new ObjectWriter(this, newConfig);
-    }
-
-    /**
-     * Method that will construct a new instance that will use the default
-     * pretty printer for serialization.
-     */
-    public ObjectWriter withDefaultPrettyPrinter()
-    {
-        return with(new DefaultPrettyPrinter());
-    }
-
-    /**
-     * Method that will construct a new instance that uses specified
-     * provider for resolving filter instances by id.
-     */
-    public ObjectWriter with(FilterProvider filterProvider)
-    {
-        if (filterProvider == _config.getFilterProvider()) { // no change?
-            return this;
-        }
-        return new ObjectWriter(this, _config.withFilters(filterProvider));
-    }
-
-    /**
-     * Method that will construct a new instance that will use specified pretty
-     * printer (or, if null, will not do any pretty-printing)
-     */
-    public ObjectWriter with(PrettyPrinter pp)
-    {
-        if (pp == _prettyPrinter) {
-            return this;
-        }
-        // since null would mean "don't care", need to use placeholder to indicate "disable"
-        if (pp == null) {
-            pp = NULL_PRETTY_PRINTER;
-        }
-        return new ObjectWriter(this, _config, _rootType, _rootSerializer, pp, _schema);
-    }
-
-    /**
-     * Method for constructing a new instance with configuration that
-     * specifies what root name to use for "root element wrapping".
-     * See {@link SerializationConfig#withRootName(String)} for details.
-     *<p>
-     * Note that method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectWriter withRootName(String rootName)
-    {
-        SerializationConfig newConfig = _config.withRootName(rootName);
-        return (newConfig == _config) ? this :  new ObjectWriter(this, newConfig);
-    }
-
-    /**
-     * Method that will construct a new instance that uses specific format schema
-     * for serialization.
-     *<p>
-     * Note that method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    
-    public ObjectWriter withSchema(FormatSchema schema)
-    {
-        return (_schema == schema) ? this :
-            new ObjectWriter(this, _config, _rootType, _rootSerializer, _prettyPrinter, schema);
-    }
-    
-    /**
-     * Method that will construct a new instance that uses specific type
-     * as the root type for serialization, instead of runtime dynamic
-     * type of the root object itself.
-     *<p>
-     * Note that method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectWriter withType(JavaType rootType)
-    {
-        JsonSerializer<Object> rootSer = _prefetchRootSerializer(_config, rootType);
-        return (rootType == _rootType) ? this
-        // type is stored here, no need to make a copy of config
-            : new ObjectWriter(this, _config, rootType, rootSer, _prettyPrinter, _schema);
-    }    
-
-    /**
-     * Method that will construct a new instance that uses specific type
-     * as the root type for serialization, instead of runtime dynamic
-     * type of the root object itself.
-     */
-    public ObjectWriter withType(Class<?> rootType) {
-        return withType(_config.constructType(rootType));
-    }
-
-    public ObjectWriter withType(TypeReference<?> rootType) {
-        return withType(_config.getTypeFactory().constructType(rootType.getType()));
-    }
-
-    /**
-     * Method that will construct a new instance that uses specified
-     * serialization view for serialization (with null basically disables
-     * view processing)
-     *<p>
-     * Note that the method does NOT change state of this reader, but
-     * rather construct and returns a newly configured instance.
-     */
-    public ObjectWriter withView(Class<?> view) {
-        SerializationConfig newConfig = _config.withView(view);
-        return (newConfig == _config) ? this :  new ObjectWriter(this, newConfig);
-    }    
-
-    public ObjectWriter with(Locale l) {
-        SerializationConfig newConfig = _config.with(l);
-        return (newConfig == _config) ? this :  new ObjectWriter(this, newConfig);
-    }
-
-    public ObjectWriter with(TimeZone tz) {
-        SerializationConfig newConfig = _config.with(tz);
-        return (newConfig == _config) ? this :  new ObjectWriter(this, newConfig);
-    }
-
-    /**
-     * Method that will construct a new instance that uses specified default
-     * {@link Base64Variant} for base64 encoding
-     * 
-     * @since 2.1
-     */
-    public ObjectWriter with(Base64Variant b64variant) {
-        SerializationConfig newConfig = _config.with(b64variant);
-        return (newConfig == _config) ? this :  new ObjectWriter(this, newConfig);
-    }
-    
-    /*
-    /**********************************************************
-    /* Simple accessors
-    /**********************************************************
-     */
-
-    public boolean isEnabled(SerializationFeature f) {
-        return _config.isEnabled(f);
-    }
-
-    public boolean isEnabled(MapperFeature f) {
-        return _config.isEnabled(f);
-    }
-
-    public boolean isEnabled(JsonParser.Feature f) {
-        return _jsonFactory.isEnabled(f);
-    }
-
-    public JsonFactory getJsonFactory() {
-        return _jsonFactory;
-    }
-    
-    public TypeFactory getTypeFactory() {
-        return _config.getTypeFactory();
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization methods; ones from ObjectCodec first
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using provided {@link JsonGenerator}.
-     */
-    public void writeValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        // 10-Aug-2012, tatu: As per [Issue#12], may need to force PrettyPrinter settings, so:
-        _configureJsonGenerator(jgen);
-        if (_config.isEnabled(SerializationFeature.CLOSE_CLOSEABLE)
-                && (value instanceof Closeable)) {
-            _writeCloseableValue(jgen, value, _config);
-        } else {
-            if (_rootType == null) {
-                _serializerProvider(_config).serializeValue(jgen, value);
-            } else {
-                _serializerProvider(_config).serializeValue(jgen, value, _rootType, _rootSerializer);
-            }
-            if (_config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) {
-                jgen.flush();
-            }
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization methods, others
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, written to File provided.
-     */
-    public void writeValue(File resultFile, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(resultFile, JsonEncoding.UTF8), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using output stream provided (using encoding
-     * {@link JsonEncoding#UTF8}).
-     *<p>
-     * Note: method does not close the underlying stream explicitly
-     * here; however, {@link JsonFactory} this mapper uses may choose
-     * to close the stream depending on its settings (by default,
-     * it will try to close it when {@link JsonGenerator} we construct
-     * is closed).
-     */
-    public void writeValue(OutputStream out, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(out, JsonEncoding.UTF8), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * JSON output, using Writer provided.
-     *<p>
-     * Note: method does not close the underlying stream explicitly
-     * here; however, {@link JsonFactory} this mapper uses may choose
-     * to close the stream depending on its settings (by default,
-     * it will try to close it when {@link JsonGenerator} we construct
-     * is closed).
-     */
-    public void writeValue(Writer w, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configAndWriteValue(_jsonFactory.createJsonGenerator(w), value);
-    }
-
-    /**
-     * Method that can be used to serialize any Java value as
-     * a String. Functionally equivalent to calling
-     * {@link #writeValue(Writer,Object)} with {@link java.io.StringWriter}
-     * and constructing String, but more efficient.
-     *<p>
-     * Note: prior to version 2.1, throws clause included {@link IOException}; 2.1 removed it.
-     */
-    public String writeValueAsString(Object value)
-        throws JsonProcessingException
-    {        
-        // alas, we have to pull the recycler directly here...
-        SegmentedStringWriter sw = new SegmentedStringWriter(_jsonFactory._getBufferRecycler());
-        try {
-            _configAndWriteValue(_jsonFactory.createJsonGenerator(sw), value);
-        } catch (JsonProcessingException e) { // to support [JACKSON-758]
-            throw e;
-        } catch (IOException e) { // shouldn't really happen, but is declared as possibility so:
-            throw JsonMappingException.fromUnexpectedIOE(e);
-        }
-        return sw.getAndClear();
-    }
-    
-    /**
-     * Method that can be used to serialize any Java value as
-     * a byte array. Functionally equivalent to calling
-     * {@link #writeValue(Writer,Object)} with {@link java.io.ByteArrayOutputStream}
-     * and getting bytes, but more efficient.
-     * Encoding used will be UTF-8.
-     *<p>
-     * Note: prior to version 2.1, throws clause included {@link IOException}; 2.1 removed it.
-     */
-    public byte[] writeValueAsBytes(Object value)
-        throws JsonProcessingException
-    {
-        ByteArrayBuilder bb = new ByteArrayBuilder(_jsonFactory._getBufferRecycler());
-        try {
-            _configAndWriteValue(_jsonFactory.createJsonGenerator(bb, JsonEncoding.UTF8), value);
-        } catch (JsonProcessingException e) { // to support [JACKSON-758]
-            throw e;
-        } catch (IOException e) { // shouldn't really happen, but is declared as possibility so:
-            throw JsonMappingException.fromUnexpectedIOE(e);
-        }
-        byte[] result = bb.toByteArray();
-        bb.release();
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Other public methods
-    /**********************************************************
-     */
-
-    public boolean canSerialize(Class<?> type) {
-        return _serializerProvider(_config).hasSerializerFor(type);
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable helper methods
-    /**********************************************************
-     */
-    
-    /**
-     * Overridable helper method used for constructing
-     * {@link SerializerProvider} to use for serialization.
-     */
-    protected DefaultSerializerProvider _serializerProvider(SerializationConfig config) {
-        return _serializerProvider.createInstance(config, _serializerFactory);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to configure the generator as necessary and then
-     * call write functionality
-     */
-    protected final void _configAndWriteValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        _configureJsonGenerator(jgen);
-        // [JACKSON-282]: consider Closeable
-        if (_config.isEnabled(SerializationFeature.CLOSE_CLOSEABLE) && (value instanceof Closeable)) {
-            _writeCloseable(jgen, value, _config);
-            return;
-        }
-        boolean closed = false;
-        try {
-            if (_rootType == null) {
-                _serializerProvider(_config).serializeValue(jgen, value);
-            } else {
-                _serializerProvider(_config).serializeValue(jgen, value, _rootType, _rootSerializer);
-            }
-            closed = true;
-            jgen.close();
-        } finally {
-            /* won't try to close twice; also, must catch exception (so it 
-             * will not mask exception that is pending)
-             */
-            if (!closed) {
-                try {
-                    jgen.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-
-    /**
-     * Helper method used when value to serialize is {@link Closeable} and its <code>close()</code>
-     * method is to be called right after serialization has been called
-     */
-    private final void _writeCloseable(JsonGenerator jgen, Object value, SerializationConfig cfg)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        Closeable toClose = (Closeable) value;
-        try {
-            if (_rootType == null) {
-                _serializerProvider(cfg).serializeValue(jgen, value);
-            } else {
-                _serializerProvider(cfg).serializeValue(jgen, value, _rootType, _rootSerializer);
-            }
-            JsonGenerator tmpJgen = jgen;
-            jgen = null;
-            tmpJgen.close();
-            Closeable tmpToClose = toClose;
-            toClose = null;
-            tmpToClose.close();
-        } finally {
-            /* Need to close both generator and value, as long as they haven't yet
-             * been closed
-             */
-            if (jgen != null) {
-                try {
-                    jgen.close();
-                } catch (IOException ioe) { }
-            }
-            if (toClose != null) {
-                try {
-                    toClose.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-    
-    /**
-     * Helper method used when value to serialize is {@link Closeable} and its <code>close()</code>
-     * method is to be called right after serialization has been called
-     */
-    private final void _writeCloseableValue(JsonGenerator jgen, Object value, SerializationConfig cfg)
-        throws IOException, JsonGenerationException, JsonMappingException
-    {
-        Closeable toClose = (Closeable) value;
-        try {
-            if (_rootType == null) {
-                _serializerProvider(cfg).serializeValue(jgen, value);
-            } else {
-                _serializerProvider(cfg).serializeValue(jgen, value, _rootType, _rootSerializer);
-            }
-            if (_config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) {
-                jgen.flush();
-            }
-            Closeable tmpToClose = toClose;
-            toClose = null;
-            tmpToClose.close();
-        } finally {
-            if (toClose != null) {
-                try {
-                    toClose.close();
-                } catch (IOException ioe) { }
-            }
-        }
-    }
-
-    /**
-     * Method called to locate (root) serializer ahead of time, if permitted
-     * by configuration. Method also is NOT to throw an exception if
-     * access fails.
-     */
-    protected final JsonSerializer<Object> _prefetchRootSerializer(
-            SerializationConfig config, JavaType valueType)
-    {
-        if (valueType == null || !_config.isEnabled(SerializationFeature.EAGER_SERIALIZER_FETCH)) {
-            return null;
-        }
-        try {
-            return _serializerProvider(config).findTypedValueSerializer(valueType, true, null);
-        } catch (JsonProcessingException e) {
-            // need to swallow?
-            return null;
-        }
-    }
-    
-    /**
-     * Helper method called to set or override settings of passed-in
-     * {@link JsonGenerator}
-     * 
-     * @since 2.1
-     */
-    private final void _configureJsonGenerator(JsonGenerator jgen)
-    {
-        if (_prettyPrinter != null) {
-            PrettyPrinter pp = _prettyPrinter;
-            if (pp == NULL_PRETTY_PRINTER) {
-                jgen.setPrettyPrinter(null);
-            } else {
-                /* [JACKSON-851]: Better take care of stateful PrettyPrinters...
-                 *   like the DefaultPrettyPrinter.
-                 */
-                if (pp instanceof Instantiatable<?>) {
-                    pp = (PrettyPrinter) ((Instantiatable<?>) pp).createInstance();
-                }
-                jgen.setPrettyPrinter(pp);
-            }
-        } else if (_config.isEnabled(SerializationFeature.INDENT_OUTPUT)) {
-            jgen.useDefaultPrettyPrinter();
-        }
-        // [JACKSON-520]: add support for pass-through schema:
-        if (_schema != null) {
-            jgen.setSchema(_schema);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyName.java b/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyName.java
deleted file mode 100644
index 5e12afa..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyName.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-/**
- * Simple value class used for containing names of properties as defined
- * by annotations (and possibly other configuration sources).
- * 
- * @since 2.1
- */
-public class PropertyName
-{
-    /**
-     * Special placeholder value that indicates that name to use should be
-     * based on the standard heuristics. This can be different from returning
-     * null, as null means "no information available, whereas this value
-     * indicates explicit defaulting.
-     */
-    public final static PropertyName USE_DEFAULT = new PropertyName("", null);
-
-    /**
-     * Special placeholder value that indicates that there is no name associated.
-     * Exact semantics to use (if any) depend on actual annotation in use, but
-     * commonly this value disables behavior for which name would be needed.
-     */
-    public final static PropertyName NO_NAME = new PropertyName(new String("#disabled"), null);
-    
-    /**
-     * Basic name of the property.
-     */
-    protected final String _simpleName;
-
-    /**
-     * Additional namespace, for formats that have such concept (JSON
-     * does not, XML does, for example).
-     */
-    protected final String _namespace;
-
-    public PropertyName(String simpleName) {
-        this(simpleName, null);
-    }
-
-    public PropertyName(String simpleName, String namespace)
-    {
-        _simpleName = (simpleName == null) ? "" : simpleName;
-        _namespace = namespace;
-    }
-
-    public static PropertyName construct(String simpleName, String ns)
-    {
-        if (simpleName == null) {
-            simpleName = "";
-        }
-        if (ns == null && simpleName.length() == 0) {
-            return USE_DEFAULT;
-        }
-        return new PropertyName(simpleName, ns);
-    }
-    
-    /**
-     * Fluent factory method for constructing an instance with different
-     * simple name.
-     */
-    public PropertyName withSimpleName(String simpleName)
-    {
-        if (simpleName == null) {
-            simpleName = "";
-        }
-        if (simpleName.equals(_simpleName)) {
-            return this;
-        }
-        return new PropertyName(simpleName, _namespace);
-    }
-    
-    /**
-     * Fluent factory method for constructing an instance with different
-     * namespace.
-     */
-    public PropertyName withNamespace(String ns) {
-        if (ns == null) {
-            if (_namespace == null) {
-                return this;
-            }
-        } else if (ns.equals(_namespace)) {
-            return this;
-        }
-        return new PropertyName(_simpleName, ns);
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    public String getSimpleName() {
-        return _simpleName;
-    }
-
-    public String getNamespace() {
-        return _namespace;
-    }
-
-    public boolean hasSimpleName() {
-        return _simpleName.length() > 0;
-    }
-
-    public boolean hasNamespace() {
-        return _namespace != null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Std method overrides
-    /**********************************************************
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != PropertyName.class) return false;
-        if (USE_DEFAULT == o) {
-            return this == USE_DEFAULT;
-        }
-        PropertyName other = (PropertyName) this;
-        if (_simpleName == null) {
-            if (other._simpleName != null) return false;
-        } else if (!_simpleName.equals(other._simpleName)) {
-            return false;
-        }
-        if (_namespace == null) {
-            return (null == other._namespace);
-        }
-        return _namespace.equals(other._namespace);
-    }
-    
-    @Override
-    public int hashCode() {
-        if (_namespace == null) {
-            return _simpleName.hashCode();
-        }
-        return _namespace.hashCode() ^  _simpleName.hashCode();
-    }
-    
-    @Override
-    public String toString() {
-        if (_namespace == null) {
-            return _simpleName;
-        }
-        return "{"+_namespace + "}" + _simpleName;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyNamingStrategy.java b/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyNamingStrategy.java
deleted file mode 100644
index 48ae816..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/PropertyNamingStrategy.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
-
-/**
- * Class that defines how names of JSON properties ("external names")
- * are derived from names of POJO methods and fields ("internal names"),
- * in cases where they are not
- * auto-detected and no explicit annotations exist for naming.
- * Methods are passed information about POJO member for which name is needed,
- * as well as default name that would be used if no custom strategy was used.
- *<p>
- * Default implementation returns suggested ("default") name unmodified.
- *<p>
- * Note that the strategy is guaranteed to be called once per logical property
- * (which may be represented by multiple members; such as pair of a getter and
- * a setter), but may be called for each: implementations should not count on
- * exact number of times, and should work for any member that represent a
- * property.
- *<p>
- * In absence of a registered custom strategy, default Java property naming strategy
- * is used, which leaves field names as is, and removes set/get/is prefix
- * from methods (as well as lower-cases initial sequence of capitalized
- * characters).
- */
-public abstract class PropertyNamingStrategy
-{
-    /*
-    /**********************************************************
-    /* API
-    /**********************************************************
-     */
-
-    /**
-     * Method called to find external name (name used in JSON) for given logical
-     * POJO property,
-     * as defined by given field.
-     * 
-     * @param config Configuration in used: either <code>SerializationConfig</code>
-     *   or <code>DeserializationConfig</code>, depending on whether method is called
-     *   during serialization or deserialization
-     * @param field Field used to access property
-     * @param defaultName Default name that would be used for property in absence of custom strategy
-     * 
-     * @return Logical name to use for property that the field represents
-     */
-    public String nameForField(MapperConfig<?> config, AnnotatedField field,
-            String defaultName)
-    {
-        return defaultName;
-    }
-
-    /**
-     * Method called to find external name (name used in JSON) for given logical
-     * POJO property,
-     * as defined by given getter method; typically called when building a serializer.
-     * (but not always -- when using "getter-as-setter", may be called during
-     * deserialization)
-     * 
-     * @param config Configuration in used: either <code>SerializationConfig</code>
-     *   or <code>DeserializationConfig</code>, depending on whether method is called
-     *   during serialization or deserialization
-     * @param method Method used to access property.
-     * @param defaultName Default name that would be used for property in absence of custom strategy
-     * 
-     * @return Logical name to use for property that the method represents
-     */
-    public String nameForGetterMethod(MapperConfig<?> config, AnnotatedMethod method,
-            String defaultName)
-    {
-        return defaultName;
-    }
-
-    /**
-     * Method called to find external name (name used in JSON) for given logical
-     * POJO property,
-     * as defined by given setter method; typically called when building a deserializer
-     * (but not necessarily only then).
-     * 
-     * @param config Configuration in used: either <code>SerializationConfig</code>
-     *   or <code>DeserializationConfig</code>, depending on whether method is called
-     *   during serialization or deserialization
-     * @param method Method used to access property.
-     * @param defaultName Default name that would be used for property in absence of custom strategy
-     * 
-     * @return Logical name to use for property that the method represents
-     */
-    public String nameForSetterMethod(MapperConfig<?> config, AnnotatedMethod method,
-            String defaultName)
-    {
-        return defaultName;
-    }
-
-    /**
-     * Method called to find external name (name used in JSON) for given logical
-     * POJO property,
-     * as defined by given constructor parameter; typically called when building a deserializer
-     * (but not necessarily only then).
-     * 
-     * @param config Configuration in used: either <code>SerializationConfig</code>
-     *   or <code>DeserializationConfig</code>, depending on whether method is called
-     *   during serialization or deserialization
-     * @param ctorParam Constructor parameter used to pass property.
-     * @param defaultName Default name that would be used for property in absence of custom strategy
-     */
-    public String nameForConstructorParameter(MapperConfig<?> config, AnnotatedParameter ctorParam,
-            String defaultName)
-    {
-        return defaultName;
-    }
-
-    /*
-    /**********************************************************
-    /* Standard implementations 
-    /**********************************************************
-     */
-    
-    public static abstract class PropertyNamingStrategyBase extends PropertyNamingStrategy
-    {
-        @Override
-        public String nameForField(MapperConfig<?> config, AnnotatedField field, String defaultName)
-        {
-            return translate(defaultName);
-        }
-
-        @Override
-        public String nameForGetterMethod(MapperConfig<?> config, AnnotatedMethod method, String defaultName)
-        {
-            return translate(defaultName);
-        }
-
-        @Override
-        public String nameForSetterMethod(MapperConfig<?> config, AnnotatedMethod method, String defaultName)
-        {
-            return translate(defaultName);
-        }
-
-        @Override
-        public String nameForConstructorParameter(MapperConfig<?> config, AnnotatedParameter ctorParam,
-                String defaultName)
-        {
-            return translate(defaultName);
-        }
-        
-        public abstract String translate(String propertyName);
-    }
-        
-    
-    /*
-    /**********************************************************
-    /* Standard implementations 
-    /**********************************************************
-     */
-
-    /**
-     * See {@link LowerCaseWithUnderscoresStrategy} for details.
-     */
-    public static final PropertyNamingStrategy CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES =
-        new LowerCaseWithUnderscoresStrategy();
-    
-    /**
-     * A {@link PropertyNamingStrategy} that translates typical camel case Java 
-     * property names to lower case JSON element names, separated by 
-     * underscores.  This implementation is somewhat lenient, in that it 
-     * provides some additional translations beyond strictly translating from 
-     * camel case only.  In particular, the following translations are applied 
-     * by this PropertyNamingStrategy.
-     * 
-     * <ul><li>Every upper case letter in the Java property name is translated 
-     * into two characters, an underscore and the lower case equivalent of the 
-     * target character, with three exceptions.
-     * <ol><li>For contiguous sequences of upper case letters, characters after
-     * the first character are replaced only by their lower case equivalent, 
-     * and are not preceded by an underscore.
-     * <ul><li>This provides for reasonable translations of upper case acronyms, 
-     * e.g., &quot;theWWW&quot; is translated to &quot;the_www&quot;.</li></ul></li>
-     * <li>An upper case character in the first position of the Java property 
-     * name is not preceded by an underscore character, and is translated only 
-     * to its lower case equivalent.
-     * <ul><li>For example, &quot;Results&quot; is translated to &quot;results&quot;, 
-     * and not to &quot;_results&quot;.</li></ul></li>
-     * <li>An upper case character in the Java property name that is already 
-     * preceded by an underscore character is translated only to its lower case 
-     * equivalent, and is not preceded by an additional underscore.
-     * <ul><li>For example, &quot;user_Name&quot; is translated to 
-     * &quot;user_name&quot;, and not to &quot;user__name&quot; (with two 
-     * underscore characters).</li></ul></li></ol></li>
-     * <li>If the Java property name starts with an underscore, then that 
-     * underscore is not included in the translated name, unless the Java 
-     * property name is just one character in length, i.e., it is the 
-     * underscore character.  This applies only to the first character of the 
-     * Java property name.</li></ul>
-     * 
-     * These rules result in the following additional example translations from 
-     * Java property names to JSON element names.
-     * <ul><li>&quot;userName&quot; is translated to &quot;user_name&quot;</li>
-     * <li>&quot;UserName&quot; is translated to &quot;user_name&quot;</li>
-     * <li>&quot;USER_NAME&quot; is translated to &quot;user_name&quot;</li>
-     * <li>&quot;user_name&quot; is translated to &quot;user_name&quot; (unchanged)</li>
-     * <li>&quot;user&quot; is translated to &quot;user&quot; (unchanged)</li>
-     * <li>&quot;User&quot; is translated to &quot;user&quot;</li>
-     * <li>&quot;USER&quot; is translated to &quot;user&quot;</li>
-     * <li>&quot;_user&quot; is translated to &quot;user&quot;</li>
-     * <li>&quot;_User&quot; is translated to &quot;user&quot;</li>
-     * <li>&quot;__user&quot; is translated to &quot;_user&quot; 
-     * (the first of two underscores was removed)</li>
-     * <li>&quot;user__name&quot; is translated to &quot;user__name&quot;
-     * (unchanged, with two underscores)</li></ul>
-     */
-    public static class LowerCaseWithUnderscoresStrategy extends PropertyNamingStrategyBase
-    {
-        @Override
-        public String translate(String input)
-        {
-            if (input == null) return input; // garbage in, garbage out
-            int length = input.length();
-            StringBuilder result = new StringBuilder(length * 2);
-            int resultLength = 0;
-            boolean wasPrevTranslated = false;
-            for (int i = 0; i < length; i++)
-            {
-                char c = input.charAt(i);
-                if (i > 0 || c != '_') // skip first starting underscore
-                {
-                    if (Character.isUpperCase(c))
-                    {
-                        if (!wasPrevTranslated && resultLength > 0 && result.charAt(resultLength - 1) != '_')
-                        {
-                            result.append('_');
-                            resultLength++;
-                        }
-                        c = Character.toLowerCase(c);
-                        wasPrevTranslated = true;
-                    }
-                    else
-                    {
-                        wasPrevTranslated = false;
-                    }
-                    result.append(c);
-                    resultLength++;
-                }
-            }
-            return resultLength > 0 ? result.toString() : input;
-        }
-    }
-    
-    /**
-     * See {@link PascalCaseStrategy} for details.
-     * 
-     * @since 2.1
-     */
-    public static final PropertyNamingStrategy PASCAL_CASE_TO_CAMEL_CASE =
-        new PascalCaseStrategy();
-    
-    /**
-     * A {@link PropertyNamingStrategy} that translates typical camelCase Java 
-     * property names to PascalCase JSON element names (i.e., with a capital
-     * first letter).  In particular, the following translations are applied by 
-     * this PropertyNamingStrategy.
-     * 
-     * <ul><li>The first lower-case letter in the Java property name is translated 
-     * into its equivalent upper-case representation.</li></ul>
-     * 
-     * This rules result in the following example translation from 
-     * Java property names to JSON element names.
-     * <ul><li>&quot;userName&quot; is translated to &quot;UserName&quot;</li></ul>
-     * 
-     * @since 2.1
-     */
-    public static class PascalCaseStrategy extends PropertyNamingStrategyBase
-    {
-    	/**
-    	 * Converts camelCase to PascalCase
-    	 * 
-    	 * For example, "userName" would be converted to
-    	 * "UserName".
-      	 * 
-    	 * @param input formatted as camelCase string
-    	 * @return input converted to PascalCase format
-    	 */
-    	@Override
-    	public String translate(String input) {
-    	    if (input == null || input.length() == 0){
-    	        return input; // garbage in, garbage out
-    	    }
-    	    // Replace first lower-case letter with upper-case equivalent
-    	    char c = input.charAt(0);
-    	    if (Character.isUpperCase(c)) {
-    	        return input;
-    	    }
-    	    StringBuilder sb = new StringBuilder(input);
-    	    sb.setCharAt(0, Character.toUpperCase(c));
-    	    return sb.toString();
-    	}	
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/RuntimeJsonMappingException.java b/showkeyHelper/src/com/fasterxml/jackson/databind/RuntimeJsonMappingException.java
deleted file mode 100644
index 22508ac..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/RuntimeJsonMappingException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-/**
- * Wrapper used when interface does not allow throwing a checked
- * {@link JsonMappingException}
- */
-@SuppressWarnings("serial")
-public class RuntimeJsonMappingException extends RuntimeException
-{
-    public RuntimeJsonMappingException(JsonMappingException cause) {
-        super(cause);
-    }
-
-    public RuntimeJsonMappingException(String message) {
-        super(message);
-    }
-
-    public RuntimeJsonMappingException(String message, JsonMappingException cause) {
-        super(message, cause);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationConfig.java b/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationConfig.java
deleted file mode 100644
index a6caf5b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationConfig.java
+++ /dev/null
@@ -1,503 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.text.DateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.core.Base64Variant;
-import com.fasterxml.jackson.databind.cfg.BaseSettings;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.cfg.MapperConfigBase;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.ser.FilterProvider;
-import com.fasterxml.jackson.databind.ser.SerializerFactory;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Object that contains baseline configuration for serialization
- * process. An instance is owned by {@link ObjectMapper}, which
- * passes an immutable instance for serialization process to
- * {@link SerializerProvider} and {@link SerializerFactory}
- * (either directly, or through {@link ObjectWriter}.
- *<p>
- * Note that instances are considered immutable and as such no copies
- * should need to be created for sharing; all copying is done with
- * "fluent factory" methods.
- * Note also that unlike with Jackson 1, these instances can not be
- * assigned to {@link ObjectMapper}; in fact, application code should
- * rarely interact directly with these instance (unlike core Jackson code)
- */
-public final class SerializationConfig
-    extends MapperConfigBase<SerializationFeature, SerializationConfig>
-    implements java.io.Serializable // since 2.1
-{
-    // for 2.1.0:
-    private static final long serialVersionUID = 8849092838541724233L;
-
-    /**
-     * Set of features enabled; actual type (kind of features)
-     * depends on sub-classes.
-     */
-    protected final int _serFeatures;
-    
-    /**
-     * Which Bean/Map properties are to be included in serialization?
-     * Default settings is to include all regardless of value; can be
-     * changed to only include non-null properties, or properties
-     * with non-default values.
-     */
-    protected JsonInclude.Include _serializationInclusion = null;
-    
-    /**
-     * Object used for resolving filter ids to filter instances.
-     * Non-null if explicitly defined; null by default.
-     */
-    protected final FilterProvider _filterProvider;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by ObjectMapper to create default configuration object instance.
-     */
-    public SerializationConfig(BaseSettings base,
-            SubtypeResolver str, Map<ClassKey,Class<?>> mixins)
-    {
-        super(base, str, mixins);
-        _serFeatures = collectFeatureDefaults(SerializationFeature.class);
-        _filterProvider = null;
-    }
-    
-    private SerializationConfig(SerializationConfig src, SubtypeResolver str)
-    {
-        super(src, str);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-
-    private SerializationConfig(SerializationConfig src,
-            int mapperFeatures, int serFeatures)
-    {
-        super(src, mapperFeatures);
-        _serFeatures = serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-    
-    private SerializationConfig(SerializationConfig src, BaseSettings base)
-    {
-        super(src, base);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-
-    private SerializationConfig(SerializationConfig src, FilterProvider filters)
-    {
-        super(src);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = filters;
-    }
-
-    private SerializationConfig(SerializationConfig src, Class<?> view)
-    {
-        super(src, view);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-
-    private SerializationConfig(SerializationConfig src, JsonInclude.Include incl)
-    {
-        super(src);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = incl;
-        _filterProvider = src._filterProvider;
-    }
-
-    private SerializationConfig(SerializationConfig src, String rootName)
-    {
-        super(src, rootName);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-
-    /**
-     * @since 2.1
-     */
-    protected SerializationConfig(SerializationConfig src, Map<ClassKey,Class<?>> mixins)
-    {
-        super(src, mixins);
-        _serFeatures = src._serFeatures;
-        _serializationInclusion = src._serializationInclusion;
-        _filterProvider = src._filterProvider;
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, factory methods from MapperConfig
-    /**********************************************************
-     */
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    @Override
-    public SerializationConfig with(MapperFeature... features)
-    {
-        int newMapperFlags = _mapperFeatures;
-        for (MapperFeature f : features) {
-            newMapperFlags |= f.getMask();
-        }
-        return (newMapperFlags == _mapperFeatures) ? this
-                : new SerializationConfig(this, newMapperFlags, _serFeatures);
-    }
-    
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features disabled.
-     */
-    @Override
-    public SerializationConfig without(MapperFeature... features)
-    {
-        int newMapperFlags = _mapperFeatures;
-        for (MapperFeature f : features) {
-             newMapperFlags &= ~f.getMask();
-        }
-        return (newMapperFlags == _mapperFeatures) ? this
-                : new SerializationConfig(this, newMapperFlags, _serFeatures);
-    }
-
-    @Override
-    public SerializationConfig with(AnnotationIntrospector ai) {
-        return _withBase(_base.withAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public SerializationConfig withAppendedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return _withBase(_base.withAppendedAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public SerializationConfig withInsertedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return _withBase(_base.withInsertedAnnotationIntrospector(ai));
-    }
-
-    @Override
-    public SerializationConfig with(ClassIntrospector ci) {
-        return _withBase(_base.withClassIntrospector(ci));
-    }
-    
-    /**
-     * In addition to constructing instance with specified date format,
-     * will enable or disable <code>SerializationFeature.WRITE_DATES_AS_TIMESTAMPS</code>
-     * (enable if format set as null; disable if non-null)
-     */
-    @Override
-    public SerializationConfig with(DateFormat df) {
-        SerializationConfig cfg =  new SerializationConfig(this, _base.withDateFormat(df));
-        // Also need to toggle this feature based on existence of date format:
-        if (df == null) {
-            cfg = cfg.with(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        } else {
-            cfg = cfg.without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        }
-        return cfg;
-    }
-    
-    @Override
-    public SerializationConfig with(HandlerInstantiator hi) {
-        return _withBase(_base.withHandlerInstantiator(hi));
-    }
-    
-    @Override
-    public SerializationConfig with(PropertyNamingStrategy pns) {
-        return _withBase(_base.withPropertyNamingStrategy(pns));
-    }
-
-    @Override
-    public SerializationConfig withRootName(String rootName) {
-        if (rootName == null) {
-            if (_rootName == null) {
-                return this;
-            }
-        } else if (rootName.equals(_rootName)) {
-            return this;
-        }
-        return new SerializationConfig(this, rootName);
-    }
-
-    @Override
-    public SerializationConfig with(SubtypeResolver str) {
-        return (str == _subtypeResolver)? this : new SerializationConfig(this, str);
-    }
-
-    @Override
-    public SerializationConfig with(TypeFactory tf) {
-        return _withBase(_base.withTypeFactory(tf));
-    }
-
-    @Override
-    public SerializationConfig with(TypeResolverBuilder<?> trb) {
-        return _withBase(_base.withTypeResolverBuilder(trb));
-    }
-    
-    @Override
-    public SerializationConfig withView(Class<?> view) {
-        return (_view == view) ? this : new SerializationConfig(this, view);
-    }
-
-    @Override
-    public SerializationConfig with(VisibilityChecker<?> vc) {
-        return _withBase(_base.withVisibilityChecker(vc));
-    }
-
-    @Override
-    public SerializationConfig withVisibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibility) {
-        return _withBase(_base.withVisibility(forMethod, visibility));
-    }
-
-    @Override
-    public SerializationConfig with(Locale l) {
-        return _withBase(_base.with(l));
-    }
-
-    @Override
-    public SerializationConfig with(TimeZone tz) {
-        return _withBase(_base.with(tz));
-    }
-
-    @Override
-    public SerializationConfig with(Base64Variant base64) {
-        return _withBase(_base.with(base64));
-    }
-    
-    private final SerializationConfig _withBase(BaseSettings newBase) {
-        return (_base == newBase) ? this : new SerializationConfig(this, newBase);
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, SerializationConfig specific factory methods
-    /**********************************************************
-     */
-        
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified feature enabled.
-     */
-    public SerializationConfig with(SerializationFeature feature)
-    {
-        int newSerFeatures = _serFeatures | feature.getMask();
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    public SerializationConfig with(SerializationFeature first, SerializationFeature... features)
-    {
-        int newSerFeatures = _serFeatures | first.getMask();
-        for (SerializationFeature f : features) {
-            newSerFeatures |= f.getMask();
-        }
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-    
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features enabled.
-     */
-    public SerializationConfig withFeatures(SerializationFeature... features)
-    {
-        int newSerFeatures = _serFeatures;
-        for (SerializationFeature f : features) {
-            newSerFeatures |= f.getMask();
-        }
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified feature disabled.
-     */
-    public SerializationConfig without(SerializationFeature feature)
-    {
-        int newSerFeatures = _serFeatures & ~feature.getMask();
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features disabled.
-     */
-    public SerializationConfig without(SerializationFeature first, SerializationFeature... features)
-    {
-        int newSerFeatures = _serFeatures & ~first.getMask();
-        for (SerializationFeature f : features) {
-            newSerFeatures &= ~f.getMask();
-        }
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-
-    /**
-     * Fluent factory method that will construct and return a new configuration
-     * object instance with specified features disabled.
-     */
-    public SerializationConfig withoutFeatures(SerializationFeature... features)
-    {
-        int newSerFeatures = _serFeatures;
-        for (SerializationFeature f : features) {
-            newSerFeatures &= ~f.getMask();
-        }
-        return (newSerFeatures == _serFeatures) ? this
-                : new SerializationConfig(this, _mapperFeatures, newSerFeatures);
-    }
-    
-    public SerializationConfig withFilters(FilterProvider filterProvider) {
-        return (filterProvider == _filterProvider) ? this : new SerializationConfig(this, filterProvider);
-    }
-
-    public SerializationConfig withSerializationInclusion(JsonInclude.Include incl) {
-        return (_serializationInclusion == incl) ? this:  new SerializationConfig(this, incl);
-    }
-    
-    /*
-    /**********************************************************
-    /* MapperConfig implementation/overrides
-    /**********************************************************
-     */
-    
-    @Override
-    public boolean useRootWrapping()
-    {
-        if (_rootName != null) { // empty String disables wrapping; non-empty enables
-            return (_rootName.length() > 0);
-        }
-        return isEnabled(SerializationFeature.WRAP_ROOT_VALUE);
-    }
-    
-    @Override
-    public AnnotationIntrospector getAnnotationIntrospector()
-    {
-        /* 29-Jul-2009, tatu: it's now possible to disable use of
-         *   annotations; can be done using "no-op" introspector
-         */
-        if (isEnabled(MapperFeature.USE_ANNOTATIONS)) {
-            return super.getAnnotationIntrospector();
-        }
-        return AnnotationIntrospector.nopInstance();
-    }
-
-    /**
-     * Accessor for getting bean description that only contains class
-     * annotations: useful if no getter/setter/creator information is needed.
-     */
-    @Override
-    public BeanDescription introspectClassAnnotations(JavaType type) {
-        return getClassIntrospector().forClassAnnotations(this, type, this);
-    }
-
-    /**
-     * Accessor for getting bean description that only contains immediate class
-     * annotations: ones from the class, and its direct mix-in, if any, but
-     * not from super types.
-     */
-    @Override
-    public BeanDescription introspectDirectClassAnnotations(JavaType type) {
-        return getClassIntrospector().forDirectClassAnnotations(this, type, this);
-    }
-    
-    @Override
-    public VisibilityChecker<?> getDefaultVisibilityChecker()
-    {
-        VisibilityChecker<?> vchecker = super.getDefaultVisibilityChecker();
-        if (!isEnabled(MapperFeature.AUTO_DETECT_GETTERS)) {
-            vchecker = vchecker.withGetterVisibility(Visibility.NONE);
-        }
-        // then global overrides (disabling)
-        if (!isEnabled(MapperFeature.AUTO_DETECT_IS_GETTERS)) {
-            vchecker = vchecker.withIsGetterVisibility(Visibility.NONE);
-        }
-        if (!isEnabled(MapperFeature.AUTO_DETECT_FIELDS)) {
-            vchecker = vchecker.withFieldVisibility(Visibility.NONE);
-        }
-        return vchecker;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration: other
-    /**********************************************************
-     */
-
-    public final boolean isEnabled(SerializationFeature f) {
-        return (_serFeatures & f.getMask()) != 0;
-    }
-    
-    public final int getSerializationFeatures() {
-        return _serFeatures;
-    }
-    
-    public JsonInclude.Include getSerializationInclusion()
-    {
-        if (_serializationInclusion != null) {
-            return _serializationInclusion;
-        }
-        return JsonInclude.Include.ALWAYS;
-    }
-    
-    /**
-     * Method for getting provider used for locating filters given
-     * id (which is usually provided with filter annotations).
-     * Will be null if no provided was set for {@link ObjectWriter}
-     * (or if serialization directly called from {@link ObjectMapper})
-     */
-    public FilterProvider getFilterProvider() {
-        return _filterProvider;
-    }
-
-    /*
-    /**********************************************************
-    /* Introspection methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that will introspect full bean properties for the purpose
-     * of building a bean serializer
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends BeanDescription> T introspect(JavaType type) {
-        return (T) getClassIntrospector().forSerialization(this, type, this);
-    }
-    
-    /*
-    /**********************************************************
-    /* Debug support
-    /**********************************************************
-     */
-    
-    @Override public String toString()
-    {
-        return "[SerializationConfig: flags=0x"+Integer.toHexString(_serFeatures)+"]";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationFeature.java b/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationFeature.java
deleted file mode 100644
index 0c68913..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializationFeature.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import com.fasterxml.jackson.databind.cfg.ConfigFeature;
-
-/**
- * Enumeration that defines simple on/off features that affect
- * the way Java objects are serialized.
- *<p>
- * Note that features can be set both through
- * {@link ObjectMapper} (as sort of defaults) and through
- * {@link ObjectWriter}.
- * In first case these defaults must follow "config-then-use" patterns
- * (i.e. defined once, not changed afterwards); all per-call
- * changes must be done using {@link ObjectWriter}.
- */
-public enum SerializationFeature implements ConfigFeature
-{
-    /*
-    /******************************************************
-    /* Generic output features
-    /******************************************************
-     */
-    
-    /**
-     * Feature that can be enabled to make root value (usually JSON
-     * Object but can be any type) wrapped within a single property
-     * JSON object, where key as the "root name", as determined by
-     * annotation introspector (esp. for JAXB that uses
-     * <code>@XmlRootElement.name</code>) or fallback (non-qualified
-     * class name).
-     * Feature is mostly intended for JAXB compatibility.
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRAP_ROOT_VALUE(false),
-
-    /**
-     * Feature that allows enabling (or disabling) indentation
-     * for the underlying generator, using the default pretty
-     * printer (see
-     * {@link com.fasterxml.jackson.core.JsonGenerator#useDefaultPrettyPrinter}
-     * for details).
-     *<p>
-     * Note that this only affects cases where
-     * {@link com.fasterxml.jackson.core.JsonGenerator}
-     * is constructed implicitly by ObjectMapper: if explicit
-     * generator is passed, its configuration is not changed.
-     *<p>
-     * Also note that if you want to configure details of indentation,
-     * you need to directly configure the generator: there is a
-     * method to use any <code>PrettyPrinter</code> instance.
-     * This feature will only allow using the default implementation.
-     *<p>
-     * Feature is enabled by default.
-     */
-    INDENT_OUTPUT(false),
-    
-    /*
-    /******************************************************
-    /*  Error handling features
-    /******************************************************
-     */
-    
-    /**
-     * Feature that determines what happens when no accessors are
-     * found for a type (and there are no annotations to indicate
-     * it is meant to be serialized). If enabled (default), an
-     * exception is thrown to indicate these as non-serializable
-     * types; if disabled, they are serialized as empty Objects,
-     * i.e. without any properties.
-     *<p>
-     * Note that empty types that this feature has only effect on
-     * those "empty" beans that do not have any recognized annotations
-     * (like <code>@JsonSerialize</code>): ones that do have annotations
-     * do not result in an exception being thrown.
-     *<p>
-     * Feature is enabled by default.
-     */
-    FAIL_ON_EMPTY_BEANS(true),
-
-    /**
-     * Feature that determines whether Jackson code should catch
-     * and wrap {@link Exception}s (but never {@link Error}s!)
-     * to add additional information about
-     * location (within input) of problem or not. If enabled,
-     * most exceptions will be caught and re-thrown (exception
-     * specifically being that {@link java.io.IOException}s may be passed
-     * as is, since they are declared as throwable); this can be
-     * convenient both in that all exceptions will be checked and
-     * declared, and so there is more contextual information.
-     * However, sometimes calling application may just want "raw"
-     * unchecked exceptions passed as is.
-     *<p>
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRAP_EXCEPTIONS(true),
-
-    /*
-    /******************************************************
-    /* Output life cycle features
-    /******************************************************
-     */
-    
-     /**
-      * Feature that determines whether <code>close</code> method of
-      * serialized <b>root level</b> objects (ones for which <code>ObjectMapper</code>'s
-      * writeValue() (or equivalent) method is called)
-      * that implement {@link java.io.Closeable} 
-      * is called after serialization or not. If enabled, <b>close()</b> will
-      * be called after serialization completes (whether succesfully, or
-      * due to an error manifested by an exception being thrown). You can
-      * think of this as sort of "finally" processing.
-      *<p>
-      * NOTE: only affects behavior with <b>root</b> objects, and not other
-      * objects reachable from the root object. Put another way, only one
-      * call will be made for each 'writeValue' call.
-     *<p>
-     * Feature is disabled by default.
-      */
-    CLOSE_CLOSEABLE(false),
-
-    /**
-     * Feature that determines whether <code>JsonGenerator.flush()</code> is
-     * called after <code>writeValue()</code> method <b>that takes JsonGenerator
-     * as an argument</b> completes (i.e. does NOT affect methods
-     * that use other destinations); same for methods in {@link ObjectWriter}.
-     * This usually makes sense; but there are cases where flushing
-     * should not be forced: for example when underlying stream is
-     * compressing and flush() causes compression state to be flushed
-     * (which occurs with some compression codecs).
-     *<p>
-     * Feature is enabled by default.
-     */
-    FLUSH_AFTER_WRITE_VALUE(true),
-     
-    /*
-    /******************************************************
-    /* Datatype-specific serialization configuration
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether {@link java.util.Date} values
-     * (and Date-based things like {@link java.util.Calendar}s) are to be
-     * serialized as numeric timestamps (true; the default),
-     * or as something else (usually textual representation).
-     * If textual representation is used, the actual format is
-     * one returned by a call to
-     * {@link com.fasterxml.jackson.databind.SerializationConfig#getDateFormat}.
-     *<p>
-     * Note: whether this feature affects handling of other date-related
-     * types depend on handlers of those types, although ideally they
-     * should use this feature
-     *<p>
-     * Note: whether {@link java.util.Map} keys are serialized as Strings
-     * or not is controlled using {@link #WRITE_DATE_KEYS_AS_TIMESTAMPS}.
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRITE_DATES_AS_TIMESTAMPS(true),
-
-    /**
-     * Feature that determines whether {@link java.util.Date}s
-     * (and sub-types) used as {@link java.util.Map} keys are serialized
-     * as timestamps or not (if not, will be serialized as textual
-     * values).
-     *<p>
-     * Default value is 'false', meaning that Date-valued Map keys are serialized
-     * as textual (ISO-8601) values.
-     *<p>
-     * Feature is disabled by default.
-     */
-    WRITE_DATE_KEYS_AS_TIMESTAMPS(false),
-
-    /**
-     * Feature that determines how type <code>char[]</code> is serialized:
-     * when enabled, will be serialized as an explict JSON array (with
-     * single-character Strings as values); when disabled, defaults to
-     * serializing them as Strings (which is more compact).
-     *<p>
-     * Feature is disabled by default.
-     */
-    WRITE_CHAR_ARRAYS_AS_JSON_ARRAYS(false),
-
-    /**
-     * Feature that determines standard serialization mechanism used for
-     * Enum values: if enabled, return value of <code>Enum.toString()</code>
-     * is used; if disabled, return value of <code>Enum.name()</code> is used.
-     *<p>
-     * Note: this feature should usually have same value
-     * as {@link DeserializationFeature#READ_ENUMS_USING_TO_STRING}.
-     *<p>
-     * Feature is disabled by default.
-     */
-    WRITE_ENUMS_USING_TO_STRING(false),
-
-    /**
-     * Feature that determines whethere Java Enum values are serialized
-     * as numbers (true), or textual values (false). If textual values are
-     * used, other settings are also considered.
-     * If this feature is enabled,
-     *  return value of <code>Enum.ordinal()</code>
-     * (an integer) will be used as the serialization.
-     *<p>
-     * Note that this feature has precedence over {@link #WRITE_ENUMS_USING_TO_STRING},
-     * which is only considered if this feature is set to false.
-     *<p>
-     * Feature is disabled by default.
-     */
-    WRITE_ENUMS_USING_INDEX(false),
-    
-    /**
-     * Feature that determines whether Map entries with null values are
-     * to be serialized (true) or not (false).
-     *<p>
-     * For further details, check out [JACKSON-314]
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRITE_NULL_MAP_VALUES(true),
-
-    /**
-     * Feature that determines whether Container properties (POJO properties
-     * with declared value of Collection or array; i.e. things that produce JSON
-     * arrays) that are empty (have no elements)
-     * will be serialized as empty JSON arrays (true), or suppressed from output (false).
-     *<p>
-     * Note that this does not change behavior of {@link java.util.Map}s, or
-     * "Collection-like" types.
-     *<p>
-     * Feature is enabled by default.
-     */
-    WRITE_EMPTY_JSON_ARRAYS(true),
-    
-    /**
-     * Feature added for interoperability, to work with oddities of
-     * so-called "BadgerFish" convention.
-     * Feature determines handling of single element {@link java.util.Collection}s
-     * and arrays: if enabled, {@link java.util.Collection}s and arrays that contain exactly
-     * one element will be serialized as if that element itself was serialized.
-     *<p>
-     * When enabled, a POJO with array that normally looks like this:
-     *<pre>
-     *  { "arrayProperty" : [ 1 ] }
-     *</pre>
-     * will instead be serialized as
-     *<pre>
-     *  { "arrayProperty" : 1 }
-     *</pre>
-     *<p>
-     * Note that this feature is counterpart to {@link DeserializationFeature#ACCEPT_SINGLE_VALUE_AS_ARRAY}
-     * (that is, usually both are enabled, or neither is).
-     *<p>
-     * Feature is disabled by default, so that no special handling is done.
-     */
-    WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED(false),
-    
-    /**
-     * Feature that determines whether {@link java.util.Map} entries are first
-     * sorted by key before serialization or not: if enabled, additional sorting
-     * step is performed if necessary (not necessary for {@link java.util.SortedMap}s),
-     * if disabled, no additional sorting is needed.
-     *<p>
-     * Feature is disabled by default.
-     */
-    ORDER_MAP_ENTRIES_BY_KEYS(false),
-
-    /*
-    /******************************************************
-    /* Other
-    /******************************************************
-     */
-
-    /**
-     * Feature that determines whether {@link ObjectWriter} should
-     * try to eagerly fetch necessary {@link JsonSerializer} when
-     * possible. This improves performance in cases where similarly
-     * configured {@link ObjectWriter} instance is used multiple
-     * times; and should not significantly affect single-use cases.
-     *<p>
-     * Note that there should not be any need to normally disable this
-     * feature: only consider that if there are actual perceived problems.
-     *<p>
-     * Feature is enabled by default.
-     * 
-     * @since 2.1
-     */
-    EAGER_SERIALIZER_FETCH(true)    
-    ;
-
-    private final boolean _defaultState;
-    
-    private SerializationFeature(boolean defaultState) {
-        _defaultState = defaultState;
-    }
-
-//    @Override
-    public boolean enabledByDefault() { return _defaultState; }
-
-//    @Override
-    public int getMask() { return (1 << ordinal()); }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializerProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/SerializerProvider.java
deleted file mode 100644
index a6a2607..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/SerializerProvider.java
+++ /dev/null
@@ -1,993 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.ser.impl.*;
-import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import com.fasterxml.jackson.databind.ser.std.StdKeySerializers;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.RootNameLookup;
-
-/**
- * Class that defines API used by {@link ObjectMapper} and
- * {@link JsonSerializer}s to obtain serializers capable of serializing
- * instances of specific types; as well as the default implementation
- * of the functionality.
- *<p>
- * Provider handles caching aspects of serializer handling; all construction
- * details are delegated to {@link SerializerFactory} instance.
- *<p>
- * Object life-cycle is such that an initial instance ("blueprint") is created
- * and referenced by {@link ObjectMapper} and {@link ObjectWriter} intances;
- * but for actual usage, a configured instance is created by using
- * a create method in sub-class
- * {@link com.fasterxml.jackson.databind.ser.DefaultSerializerProvider}.
- * Only this instance can be used for actual serialization calls; blueprint
- * object is only to be used for creating instances.
- */
-public abstract class SerializerProvider
-{
-    protected final static JavaType TYPE_OBJECT = TypeFactory.defaultInstance().uncheckedSimpleType(Object.class);
-
-    /**
-     * Setting for determining whether mappings for "unknown classes" should be
-     * cached for faster resolution. Usually this isn't needed, but maybe it
-     * is in some cases?
-     */
-    protected final static boolean CACHE_UNKNOWN_MAPPINGS = false;
-
-    public final static JsonSerializer<Object> DEFAULT_NULL_KEY_SERIALIZER =
-        new FailingSerializer("Null key for a Map not allowed in JSON (use a converting NullKeySerializer?)");
-
-    public final static JsonSerializer<Object> DEFAULT_UNKNOWN_SERIALIZER = new UnknownSerializer();
-
-    /*
-    /**********************************************************
-    /* Configuration, general
-    /**********************************************************
-     */
-    
-    /**
-     * Serialization configuration to use for serialization processing.
-     */
-    final protected SerializationConfig _config;
-
-    /**
-     * View used for currently active serialization, if any.
-     */
-    final protected Class<?> _serializationView;
-    
-    /*
-    /**********************************************************
-    /* Configuration, factories
-    /**********************************************************
-     */
-
-    /**
-     * Factory used for constructing actual serializer instances.
-     */
-    final protected SerializerFactory _serializerFactory;
-
-    /*
-    /**********************************************************
-    /* Helper objects for caching
-    /**********************************************************
-     */
-    
-    /**
-     * Cache for doing type-to-value-serializer lookups.
-     */
-    final protected SerializerCache _serializerCache;
-
-    /**
-     * Helper object for keeping track of introspected root names
-     */
-    final protected RootNameLookup _rootNames;
-    
-    /*
-    /**********************************************************
-    /* Configuration, specialized serializers
-    /**********************************************************
-     */
-
-    /**
-     * Serializer that gets called for values of types for which no
-     * serializers can be constructed.
-     *<p>
-     * The default serializer will simply thrown an exception.
-     */
-    protected JsonSerializer<Object> _unknownTypeSerializer = DEFAULT_UNKNOWN_SERIALIZER;
-
-    /**
-     * Serializer used to output non-null keys of Maps (which will get
-     * output as JSON Objects), if not null; if null, us the standard
-     * default key serializer.
-     */
-    protected JsonSerializer<Object> _keySerializer;
-
-    /**
-     * Serializer used to output a null value. Default implementation
-     * writes nulls using {@link JsonGenerator#writeNull}.
-     */
-    protected JsonSerializer<Object> _nullValueSerializer = NullSerializer.instance;
-
-    /**
-     * Serializer used to (try to) output a null key, due to an entry of
-     * {@link java.util.Map} having null key.
-     * The default implementation will throw an exception if this happens;
-     * alternative implementation (like one that would write an Empty String)
-     * can be defined.
-     */
-    protected JsonSerializer<Object> _nullKeySerializer = DEFAULT_NULL_KEY_SERIALIZER;
-
-    /*
-    /**********************************************************
-    /* State, for non-blueprint instances: generic
-    /**********************************************************
-     */
-    
-    /**
-     * For fast lookups, we will have a local non-shared read-only
-     * map that contains serializers previously fetched.
-     */
-    protected final ReadOnlyClassToSerializerMap _knownSerializers;
-
-    /**
-     * Lazily acquired and instantiated formatter object: initialized
-     * first time it is needed, reused afterwards. Used via instances
-     * (not blueprints), so that access need not be thread-safe.
-     */
-    protected DateFormat _dateFormat;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * Constructor for creating master (or "blue-print") provider object,
-     * which is only used as the template for constructing per-binding
-     * instances.
-     */
-    public SerializerProvider()
-    {
-        _config = null;
-        _serializerFactory = null;
-        _serializerCache = new SerializerCache();
-        // Blueprints doesn't have access to any serializers...
-        _knownSerializers = null;
-        _rootNames = new RootNameLookup();
-
-        _serializationView = null;
-    }
-
-    /**
-     * "Copy-constructor", used by sub-classes.
-     *
-     * @param src Blueprint object used as the baseline for this instance
-     */
-    protected SerializerProvider(SerializerProvider src,
-            SerializationConfig config, SerializerFactory f)
-    {
-        if (config == null) {
-            throw new NullPointerException();
-        }
-        _serializerFactory = f;
-        _config = config;
-
-        _serializerCache = src._serializerCache;
-        _unknownTypeSerializer = src._unknownTypeSerializer;
-        _keySerializer = src._keySerializer;
-        _nullValueSerializer = src._nullValueSerializer;
-        _nullKeySerializer = src._nullKeySerializer;
-        _rootNames = src._rootNames;
-
-        /* Non-blueprint instances do have a read-only map; one that doesn't
-         * need synchronization for lookups.
-         */
-        _knownSerializers = _serializerCache.getReadOnlyLookupMap();
-
-        _serializationView = config.getActiveView();
-    }
-    
-    /*
-    /**********************************************************
-    /* Methods for configuring default settings
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to specify serializer that will be
-     * used to write JSON property names matching null keys for Java
-     * Maps (which will throw an exception if try write such property
-     * name)
-     */
-    public void setDefaultKeySerializer(JsonSerializer<Object> ks)
-    {
-        if (ks == null) {
-            throw new IllegalArgumentException("Can not pass null JsonSerializer");
-        }
-        _keySerializer = ks;
-    }
-
-    /**
-     * Method that can be used to specify serializer that will be
-     * used to write JSON values matching Java null values
-     * instead of default one (which simply writes JSON null)
-     */
-    public void setNullValueSerializer(JsonSerializer<Object> nvs)
-    {
-        if (nvs == null) {
-            throw new IllegalArgumentException("Can not pass null JsonSerializer");
-        }
-        _nullValueSerializer = nvs;
-    }
-
-    /**
-     * Method that can be used to specify serializer to use for serializing
-     * all non-null JSON property names, unless more specific key serializer
-     * is found (i.e. if not custom key serializer has been registered for
-     * Java type).
-     *<p>
-     * Note that key serializer registration are different from value serializer
-     * registrations.
-     */
-    public void setNullKeySerializer(JsonSerializer<Object> nks)
-    {
-        if (nks == null) {
-            throw new IllegalArgumentException("Can not pass null JsonSerializer");
-        }
-        _nullKeySerializer = nks;
-    }
-        
-    /*
-    /**********************************************************
-    /* Access to general configuration
-    /**********************************************************
-     */
-
-    /**
-     * Method for accessing configuration for the serialization processing.
-     */
-    public final SerializationConfig getConfig() { return _config; }
-
-    /**
-     * Convenience method for checking whether specified serialization
-     * feature is enabled or not.
-     * Shortcut for:
-     *<pre>
-     *  getConfig().isEnabled(feature);
-     *</pre>
-     */
-    public final boolean isEnabled(MapperFeature feature) {
-        return _config.isEnabled(feature);
-    }
-
-    /**
-     * Convenience method for checking whether specified serialization
-     * feature is enabled or not.
-     * Shortcut for:
-     *<pre>
-     *  getConfig().isEnabled(feature);
-     *</pre>
-     */
-    public final boolean isEnabled(SerializationFeature feature) {
-        return _config.isEnabled(feature);
-    }
-
-    /**
-     * Convenience method for accessing serialization view in use (if any); equivalent to:
-     *<pre>
-     *   getConfig().canOverrideAccessModifiers();
-     *</pre>
-     */
-    public final boolean canOverrideAccessModifiers() {
-        return _config.canOverrideAccessModifiers();
-    }
-    
-    /**
-     * Convenience method for accessing serialization view in use (if any); equivalent to:
-     *<pre>
-     *   getConfig().getAnnotationIntrospector();
-     *</pre>
-     */
-    public final AnnotationIntrospector getAnnotationIntrospector() {
-        return _config.getAnnotationIntrospector();
-    }
-    
-    /**
-     * Convenience method for accessing serialization view in use (if any); equivalent to:
-     *<pre>
-     *   getConfig().getSerializationView();
-     *</pre>
-     */
-    public final Class<?> getSerializationView() { return _serializationView; }
-
-    /**
-     * Convenience method for accessing provider to find serialization filters used,
-     * equivalent to calling:
-     *<pre>
-     *   getConfig().getFilterProvider();
-     *</pre>
-     */
-    public final FilterProvider getFilterProvider() {
-        return _config.getFilterProvider();
-    }
-
-    /**
-     * Method for accessing default Locale to use: convenience method for
-     *<pre>
-     *   getConfig().getLocale();
-     *</pre>
-     */
-    public Locale getLocale() {
-        return _config.getLocale();
-    }
-
-    /**
-     * Method for accessing default TimeZone to use: convenience method for
-     *<pre>
-     *   getConfig().getTimeZone();
-     *</pre>
-     */
-    public TimeZone getTimeZone() {
-        return _config.getTimeZone();
-    }
-    
-    /*
-    /**********************************************************
-    /* Access to type handling
-    /**********************************************************
-     */
-    
-    /**
-     * Convenience method for constructing {@link JavaType} for given JDK
-     * type (usually {@link java.lang.Class})
-     */
-    public JavaType constructType(Type type) {
-         return _config.getTypeFactory().constructType(type);
-    }
-
-    /**
-     * Convenience method for constructing subtypes, retaining generic
-     * type parameter (if any)
-     */
-    public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass) {
-        return _config.constructSpecializedType(baseType, subclass);
-    }
-
-    public TypeFactory getTypeFactory() {
-        return _config.getTypeFactory();
-    }
-
-    /*
-    /**********************************************************
-    /* Access to Object Id aspects
-    /**********************************************************
-     */
-
-    /**
-     * Method called to find the Object Id for given POJO, if one
-     * has been generated. Will always return a non-null Object;
-     * contents vary depending on whether an Object Id already
-     * exists or not.
-     */
-    public abstract WritableObjectId findObjectId(Object forPojo,
-            ObjectIdGenerator<?> generatorType);
-    
-    /*
-    /**********************************************************
-    /* General serializer locating functionality
-    /**********************************************************
-     */
-
-    /**
-     * Method called to get hold of a serializer for a value of given type;
-     * or if no such serializer can be found, a default handler (which
-     * may do a best-effort generic serialization or just simply
-     * throw an exception when invoked).
-     *<p>
-     * Note: this method is only called for non-null values; not for keys
-     * or null values. For these, check out other accessor methods.
-     *<p>
-     * Note that starting with version 1.5, serializers should also be type-aware
-     * if they handle polymorphic types. That means that it may be necessary
-     * to also use a {@link TypeSerializer} based on declared (static) type
-     * being serializer (whereas actual data may be serialized using dynamic
-     * type)
-     *
-     * @throws JsonMappingException if there are fatal problems with
-     *   accessing suitable serializer; including that of not
-     *   finding any serializer
-     */
-    public JsonSerializer<Object> findValueSerializer(Class<?> valueType,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        // Fast lookup from local lookup thingy works?
-        JsonSerializer<Object> ser = _knownSerializers.untypedValueSerializer(valueType);
-        if (ser == null) {
-            // If not, maybe shared map already has it?
-            ser = _serializerCache.untypedValueSerializer(valueType);
-            if (ser == null) {
-                // ... possibly as fully typed?
-                ser = _serializerCache.untypedValueSerializer(_config.constructType(valueType));
-                if (ser == null) {
-                    // If neither, must create
-                    ser = _createAndCacheUntypedSerializer(valueType);
-                    // Not found? Must use the unknown type serializer
-                    /* Couldn't create? Need to return the fallback serializer, which
-                     * most likely will report an error: but one question is whether
-                     * we should cache it?
-                     */
-                    if (ser == null) {
-                        ser = getUnknownTypeSerializer(valueType);
-                        // Should this be added to lookups?
-                        if (CACHE_UNKNOWN_MAPPINGS) {
-                            _serializerCache.addAndResolveNonTypedSerializer(valueType, ser, this);
-                        }
-                        return ser;
-                    }
-                }
-            }
-        }
-        // at this point, resolution has occured, but not contextualization
-        return _handleContextual(ser, property);
-    }
-
-    /**
-     * Similar to {@link #findValueSerializer(Class,BeanProperty)}, but takes
-     * full generics-aware type instead of raw class.
-     * This is necessary for accurate handling of external type information,
-     * to handle polymorphic types.
-     * 
-     * @param property When creating secondary serializers, property for which
-     *   serializer is needed: annotations of the property (or bean that contains it)
-     *   may be checked to create contextual serializers.
-     */
-    public JsonSerializer<Object> findValueSerializer(JavaType valueType, BeanProperty property)
-        throws JsonMappingException
-    {
-        // Fast lookup from local lookup thingy works?
-        JsonSerializer<Object> ser = _knownSerializers.untypedValueSerializer(valueType);
-        if (ser == null) {
-            // If not, maybe shared map already has it?
-            ser = _serializerCache.untypedValueSerializer(valueType);
-            if (ser == null) {
-                // If neither, must create
-                ser = _createAndCacheUntypedSerializer(valueType);
-                // Not found? Must use the unknown type serializer
-                /* Couldn't create? Need to return the fallback serializer, which
-                 * most likely will report an error: but one question is whether
-                 * we should cache it?
-                 */
-                if (ser == null) {
-                    ser = getUnknownTypeSerializer(valueType.getRawClass());
-                    // Should this be added to lookups?
-                    if (CACHE_UNKNOWN_MAPPINGS) {
-                        _serializerCache.addAndResolveNonTypedSerializer(valueType, ser, this);
-                    }
-                    return ser;
-                }
-            }
-        }
-        return _handleContextual(ser, property);
-    }
-    
-    /**
-     * Method called to locate regular serializer, matching type serializer,
-     * and if both found, wrap them in a serializer that calls both in correct
-     * sequence. This method is currently only used for root-level serializer
-     * handling to allow for simpler caching. A call can always be replaced
-     * by equivalent calls to access serializer and type serializer separately.
-     * 
-     * @param valueType Type for purpose of locating a serializer; usually dynamic
-     *   runtime type, but can also be static declared type, depending on configuration
-     * @param cache Whether resulting value serializer should be cached or not; this is just
-     *    a hint
-     * @param property When creating secondary serializers, property for which
-     *   serializer is needed: annotations of the property (or bean that contains it)
-     *   may be checked to create contextual serializers.
-     */
-    public JsonSerializer<Object> findTypedValueSerializer(Class<?> valueType,
-            boolean cache, BeanProperty property)
-        throws JsonMappingException
-    {
-        // Two-phase lookups; local non-shared cache, then shared:
-        JsonSerializer<Object> ser = _knownSerializers.typedValueSerializer(valueType);
-        if (ser != null) {
-            return ser;
-        }
-        // If not, maybe shared map already has it?
-        ser = _serializerCache.typedValueSerializer(valueType);
-        if (ser != null) {
-            return ser;
-        }
-
-        // Well, let's just compose from pieces:
-        ser = findValueSerializer(valueType, property);
-        TypeSerializer typeSer = _serializerFactory.createTypeSerializer(_config,
-                _config.constructType(valueType));
-        if (typeSer != null) {
-            typeSer = typeSer.forProperty(property);
-            ser = new TypeWrappedSerializer(typeSer, ser);
-        }
-        if (cache) {
-            _serializerCache.addTypedSerializer(valueType, ser);
-        }
-        return ser;
-    }
-
-    /**
-     * Method called to locate regular serializer, matching type serializer,
-     * and if both found, wrap them in a serializer that calls both in correct
-     * sequence. This method is currently only used for root-level serializer
-     * handling to allow for simpler caching. A call can always be replaced
-     * by equivalent calls to access serializer and type serializer separately.
-     * 
-     * @param valueType Declared type of value being serialized (which may not
-     *    be actual runtime type); used for finding both value serializer and
-     *    type serializer to use for adding polymorphic type (if any)
-     * @param cache Whether resulting value serializer should be cached or not; this is just
-     *    a hint 
-     * @param property When creating secondary serializers, property for which
-     *   serializer is needed: annotations of the property (or bean that contains it)
-     *   may be checked to create contextual serializers.
-     */
-    public JsonSerializer<Object> findTypedValueSerializer(JavaType valueType, boolean cache,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        // Two-phase lookups; local non-shared cache, then shared:
-        JsonSerializer<Object> ser = _knownSerializers.typedValueSerializer(valueType);
-        if (ser != null) {
-            return ser;
-        }
-        // If not, maybe shared map already has it?
-        ser = _serializerCache.typedValueSerializer(valueType);
-        if (ser != null) {
-            return ser;
-        }
-
-        // Well, let's just compose from pieces:
-        ser = findValueSerializer(valueType, property);
-        TypeSerializer typeSer = _serializerFactory.createTypeSerializer(_config, valueType);
-        if (typeSer != null) {
-            typeSer = typeSer.forProperty(property);
-            ser = new TypeWrappedSerializer(typeSer, ser);
-        }
-        if (cache) {
-            _serializerCache.addTypedSerializer(valueType, ser);
-        }
-        return ser;
-    }
-
-    /**
-     * Method called to get the serializer to use for serializing
-     * non-null Map keys. Separation from regular
-     * {@link #findValueSerializer} method is because actual write
-     * method must be different (@link JsonGenerator#writeFieldName};
-     * but also since behavior for some key types may differ.
-     *<p>
-     * Note that the serializer itself can be called with instances
-     * of any Java object, but not nulls.
-     */
-    public JsonSerializer<Object> findKeySerializer(JavaType keyType,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        JsonSerializer<Object> ser = _serializerFactory.createKeySerializer(_config, keyType);
-    
-        // First things first: maybe there are registered custom implementations
-        // if not, use default one:
-        if (ser == null) {
-            if (_keySerializer == null) {
-                ser = StdKeySerializers.getStdKeySerializer(keyType);
-            } else {
-                ser = _keySerializer;
-            }
-        }
-        // 25-Feb-2011, tatu: As per [JACKSON-519], need to ensure contextuality works here, too
-        return _handleContextualResolvable(ser, property);
-    }
-    
-    /*
-    /********************************************************
-    /* Accessors for specialized serializers
-    /********************************************************
-     */
-
-    /**
-     * @since 2.0
-     */
-    public JsonSerializer<Object> getDefaultNullKeySerializer() {
-        return _nullKeySerializer;
-    }
-
-    /**
-     * @since 2.0
-     */
-    public JsonSerializer<Object> getDefaultNullValueSerializer() {
-        return _nullValueSerializer;
-    }
-    
-    /**
-     * Method called to get the serializer to use for serializing
-     * Map keys that are nulls: this is needed since JSON does not allow
-     * any non-String value as key, including null.
-     *<p>
-     * Typically, returned serializer
-     * will either throw an exception, or use an empty String; but
-     * other behaviors are possible.
-     */
-    /**
-     * Method called to find a serializer to use for null values for given
-     * declared type. Note that type is completely based on declared type,
-     * since nulls in Java have no type and thus runtime type can not be
-     * determined.
-     * 
-     * @since 2.0
-     */
-    public JsonSerializer<Object> findNullKeySerializer(JavaType serializationType,
-            BeanProperty property)
-        throws JsonMappingException {
-        return getDefaultNullKeySerializer();
-    }
-
-    /**
-     * Method called to get the serializer to use for serializing null
-     * property values.
-     *<p>
-     * Default implementation simply calls {@link #getDefaultNullValueSerializer()};
-     * can be overridden to add custom null serialization for properties
-     * of certain type or name.
-     * 
-     * @since 2.0
-     */
-    public JsonSerializer<Object> findNullValueSerializer(BeanProperty property)
-        throws JsonMappingException {
-        return getDefaultNullValueSerializer();
-    }
-
-    /**
-     * Method called to get the serializer to use if provider
-     * can not determine an actual type-specific serializer
-     * to use; typically when none of {@link SerializerFactory}
-     * instances are able to construct a serializer.
-     *<p>
-     * Typically, returned serializer will throw an exception,
-     * although alternatively {@link com.fasterxml.jackson.databind.ser.std.ToStringSerializer}
-     * could be returned as well.
-     *
-     * @param unknownType Type for which no serializer is found
-     */
-    public JsonSerializer<Object> getUnknownTypeSerializer(Class<?> unknownType) {
-        return _unknownTypeSerializer;
-    }
-
-    /*
-    /**********************************************************
-    /* Methods for creating instances based on annotations
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to construct and configure serializer instance,
-     * either given a {@link Class} to instantiate (with default constructor),
-     * or an uninitialized serializer instance.
-     * Either way, serialize will be properly resolved
-     * (via {@link com.fasterxml.jackson.databind.ser.ResolvableSerializer}) and/or contextualized
-     * (via {@link com.fasterxml.jackson.databind.ser.ContextualSerializer}) as necessary.
-     * 
-     * @param annotated Annotated entity that contained definition
-     * @param serDef Serializer definition: either an instance or class
-     */
-    public abstract JsonSerializer<Object> serializerInstance(Annotated annotated,
-            Object serDef)
-        throws JsonMappingException;
-
-    public abstract ObjectIdGenerator<?> objectIdGeneratorInstance(Annotated annotated,
-            ObjectIdInfo objectIdInfo)
-        throws JsonMappingException;
-    
-    /*
-    /********************************************************
-    /* Convenience methods
-    /********************************************************
-     */
-
-    /**
-     * Convenience method that will serialize given value (which can be
-     * null) using standard serializer locating functionality. It can
-     * be called for all values including field and Map values, but usually
-     * field values are best handled calling
-     * {@link #defaultSerializeField} instead.
-     */
-    public final void defaultSerializeValue(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        if (value == null) {
-            getDefaultNullValueSerializer().serialize(null, jgen, this);
-        } else {
-            Class<?> cls = value.getClass();
-            findTypedValueSerializer(cls, true, null).serialize(value, jgen, this);
-        }
-    }
-    
-    /**
-     * Convenience method that will serialize given field with specified
-     * value. Value may be null. Serializer is done using the usual
-     * null) using standard serializer locating functionality.
-     */
-    public final void defaultSerializeField(String fieldName, Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeFieldName(fieldName);
-        if (value == null) {
-            /* Note: can't easily check for suppression at this point
-             * any more; caller must check it.
-             */
-            getDefaultNullValueSerializer().serialize(null, jgen, this);
-        } else {
-            Class<?> cls = value.getClass();
-            findTypedValueSerializer(cls, true, null).serialize(value, jgen, this);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Convenience methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that will handle serialization of Date(-like) values, using
-     * {@link SerializationConfig} settings to determine expected serialization
-     * behavior.
-     * Note: date here means "full" date, that is, date AND time, as per
-     * Java convention (and not date-only values like in SQL)
-     */
-    public final void defaultSerializeDateValue(long timestamp, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // [JACKSON-87]: Support both numeric timestamps and textual
-        if (isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)) {
-            jgen.writeNumber(timestamp);
-        } else {
-            jgen.writeString(_dateFormat().format(new Date(timestamp)));
-        }
-    }
-
-    /**
-     * Method that will handle serialization of Date(-like) values, using
-     * {@link SerializationConfig} settings to determine expected serialization
-     * behavior.
-     * Note: date here means "full" date, that is, date AND time, as per
-     * Java convention (and not date-only values like in SQL)
-     */
-    public final void defaultSerializeDateValue(Date date, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // [JACKSON-87]: Support both numeric timestamps and textual
-        if (isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)) {
-            jgen.writeNumber(date.getTime());
-        } else {
-            jgen.writeString(_dateFormat().format(date));
-        }
-    }
-
-    /**
-     * Method that will handle serialization of Dates used as {@link java.util.Map} keys,
-     * based on {@link SerializationFeature#WRITE_DATE_KEYS_AS_TIMESTAMPS}
-     * value (and if using textual representation, configured date format)
-     */
-    public void defaultSerializeDateKey(long timestamp, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        if (isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)) {
-            jgen.writeFieldName(String.valueOf(timestamp));
-        } else {
-            jgen.writeFieldName(_dateFormat().format(new Date(timestamp)));
-        }
-    }
-
-    /**
-     * Method that will handle serialization of Dates used as {@link java.util.Map} keys,
-     * based on {@link SerializationFeature#WRITE_DATE_KEYS_AS_TIMESTAMPS}
-     * value (and if using textual representation, configured date format)
-     */
-    public void defaultSerializeDateKey(Date date, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        if (isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)) {
-            jgen.writeFieldName(String.valueOf(date.getTime()));
-        } else {
-            jgen.writeFieldName(_dateFormat().format(date));
-        }
-    }
-    
-    public final void defaultSerializeNull(JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        getDefaultNullValueSerializer().serialize(null, jgen, this);
-    }
-
-    /*
-    /********************************************************
-    /* Helper methods
-    /********************************************************
-     */
-    
-    protected void _reportIncompatibleRootType(Object value, JavaType rootType)
-        throws IOException, JsonProcessingException
-    {
-        /* 07-Jan-2010, tatu: As per [JACKSON-456] better handle distinction between wrapper types,
-         *    primitives
-         */
-        if (rootType.isPrimitive()) {
-            Class<?> wrapperType = ClassUtil.wrapperType(rootType.getRawClass());
-            // If it's just difference between wrapper, primitive, let it slide
-            if (wrapperType.isAssignableFrom(value.getClass())) {
-                return;
-            }
-        }
-        throw new JsonMappingException("Incompatible types: declared root type ("+rootType+") vs "
-                +value.getClass().getName());
-    }
-    
-    /**
-     * Method that will try to find a serializer, either from cache
-     * or by constructing one; but will not return an "unknown" serializer
-     * if this can not be done but rather returns null.
-     *
-     * @return Serializer if one can be found, null if not.
-     */
-    protected JsonSerializer<Object> _findExplicitUntypedSerializer(Class<?> runtimeType)
-    {        
-        // Fast lookup from local lookup thingy works?
-        JsonSerializer<Object> ser = _knownSerializers.untypedValueSerializer(runtimeType);
-        if (ser != null) {
-            return ser;
-        }
-        // If not, maybe shared map already has it?
-        ser = _serializerCache.untypedValueSerializer(runtimeType);
-        if (ser != null) {
-            return ser;
-        }
-        try {
-            return _createAndCacheUntypedSerializer(runtimeType);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Low-level methods for actually constructing and initializing
-    /* serializers
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will try to construct a value serializer; and if
-     * one is successfully created, cache it for reuse.
-     */
-    protected JsonSerializer<Object> _createAndCacheUntypedSerializer(Class<?> type)
-        throws JsonMappingException
-    {        
-        JsonSerializer<Object> ser;
-        try {
-            ser = _createUntypedSerializer(_config.constructType(type));
-        } catch (IllegalArgumentException iae) {
-            /* We better only expose checked exceptions, since those
-             * are what caller is expected to handle
-             */
-            throw new JsonMappingException(iae.getMessage(), null, iae);
-        }
-
-        if (ser != null) {
-            _serializerCache.addAndResolveNonTypedSerializer(type, ser, this);
-        }
-        return ser;
-    }
-
-    protected JsonSerializer<Object> _createAndCacheUntypedSerializer(JavaType type)
-        throws JsonMappingException
-    {        
-        JsonSerializer<Object> ser;
-        try {
-            ser = _createUntypedSerializer(type);
-        } catch (IllegalArgumentException iae) {
-            /* We better only expose checked exceptions, since those
-             * are what caller is expected to handle
-             */
-            throw new JsonMappingException(iae.getMessage(), null, iae);
-        }
-    
-        if (ser != null) {
-            _serializerCache.addAndResolveNonTypedSerializer(type, ser, this);
-        }
-        return ser;
-    }
-
-    /**
-     * @since 2.1
-     */
-    @SuppressWarnings("deprecation")
-    protected JsonSerializer<Object> _createUntypedSerializer(JavaType type)
-        throws JsonMappingException
-    {
-        /* 30-Sep-2012, tatu: For now need to call the deprecated method; for 2.2,
-         *   convert to using new one. But note that we do NOT pass 'property' along.
-         */
-        return (JsonSerializer<Object>)_serializerFactory.createSerializer(this, type, null);
-    }
-
-    /**
-     * Helper method called to resolve and contextualize given
-     * serializer, if and as necessary.
-     */
-    protected JsonSerializer<Object> _handleContextualResolvable(JsonSerializer<?> ser,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        if (ser instanceof ResolvableSerializer) {
-            ((ResolvableSerializer) ser).resolve(this);
-        }
-        return _handleContextual(ser, property);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected JsonSerializer<Object> _handleResolvable(JsonSerializer<?> ser)
-        throws JsonMappingException
-    {
-        if (ser instanceof ResolvableSerializer) {
-            ((ResolvableSerializer) ser).resolve(this);
-        }
-        return (JsonSerializer<Object>) ser;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected JsonSerializer<Object> _handleContextual(JsonSerializer<?> ser,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(this, property);
-        }
-        return (JsonSerializer<Object>) ser;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected final DateFormat _dateFormat()
-    {
-        if (_dateFormat != null) {
-            return _dateFormat;
-        }
-        /* 24-Feb-2012, tatu: At this point, all timezone configuration
-         *    should have occured, with respect to default dateformat
-         *    and timezone configuration. But we still better clone
-         *    an instance as formatters may be stateful.
-         */
-        DateFormat df = _config.getDateFormat();
-        _dateFormat = df = (DateFormat) df.clone();
-        return df;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JacksonStdImpl.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JacksonStdImpl.java
deleted file mode 100644
index 5ed3dbd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JacksonStdImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.annotation.JacksonAnnotation;
-
-/**
- * Marker interface used to indicate implementation classes
- * (serializers, deserializers etc) that are standard ones Jackson
- * uses; not custom ones that application has added. It can be
- * added in cases where certain optimizations can be made if
- * default instances are uses; for example when handling conversions
- * of "natural" JSON types like Strings, booleans and numbers.
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JacksonStdImpl {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonDeserialize.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonDeserialize.java
deleted file mode 100644
index 5983811..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonDeserialize.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.KeyDeserializer;
-
-/**
- * Annotation use for configuring deserialization aspects, by attaching
- * to "setter" methods or fields, or to value classes.
- * When annotating value classes, configuration is used for instances
- * of the value class but can be overridden by more specific annotations
- * (ones that attach to methods or fields).
- *<p>
- * An example annotation would be:
- *<pre>
- *  &#64;JsonDeserialize(using=MySerializer.class,
- *    as=MyHashMap.class,
- *    keyAs=MyHashKey.class,
- *    contentAs=MyHashValue.class
- *  )
- *</pre>
- *<p>
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonDeserialize
-{
-    // // // Annotations for explicitly specifying deserialize/builder
-
-    /**
-     * Deserializer class to use for deserializing associated value.
-     * Depending on what is annotated,
-     * value is either an instance of annotated class (used globablly
-     * anywhere where class deserializer is needed); or only used for
-     * deserializing property access via a setter method.
-     */
-    public Class<? extends JsonDeserializer<?>> using()
-        default JsonDeserializer.None.class;
-
-    /**
-     * Deserializer class to use for deserializing contents (elements
-     * of a Collection/array, values of Maps) of annotated property.
-     * Can only be used on instances (methods, fields, constructors),
-     * and not value classes themselves.
-     */
-    public Class<? extends JsonDeserializer<?>> contentUsing()
-        default JsonDeserializer.None.class;
-
-    /**
-     * Deserializer class to use for deserializing Map keys
-     * of annotated property.
-     * Can only be used on instances (methods, fields, constructors),
-     * and not value classes themselves.
-     */
-    public Class<? extends KeyDeserializer> keyUsing()
-        default KeyDeserializer.None.class;
-
-    /**
-     * Annotation for specifying if an external Builder class is to
-     * be used for building up deserialized instances of annotated
-     * class. If so, an instance of referenced class is first constructed
-     * (possibly using a Creator method; or if none defined, using default
-     * constructor), and its "with-methods" are used for populating fields;
-     * and finally "build-method" is invoked to complete deserialization.
-     */
-    public Class<?> builder()
-        default NoClass.class;
-    
-    // // // Annotations for explicitly specifying deserialization type
-    // // // (which is used for choosing deserializer, if not explicitly
-    // // // specified
-
-    /**
-     * Concrete type to deserialize values as, instead of type otherwise
-     * declared. Must be a subtype of declared type; otherwise an
-     * exception may be thrown by deserializer.
-     *<p>
-     * Bogus type {@link NoClass} can be used to indicate that declared
-     * type is used as is (i.e. this annotation property has no setting);
-     * this since annotation properties are not allowed to have null value.
-     *<p>
-     * Note: if {@link #using} is also used it has precedence
-     * (since it directly specified
-     * deserializer, whereas this would only be used to locate the
-     * deserializer)
-     * and value of this annotation property is ignored.
-     */
-    public Class<?> as() default NoClass.class;
-
-    /**
-     * Concrete type to deserialize keys of {@link java.util.Map} as,
-     * instead of type otherwise declared.
-     * Must be a subtype of declared type; otherwise an exception may be
-     * thrown by deserializer.
-     */
-    public Class<?> keyAs() default NoClass.class;
-
-    /**
-     * Concrete type to deserialize content (elements
-     * of a Collection/array, values of Maps) values as,
-     * instead of type otherwise declared.
-     * Must be a subtype of declared type; otherwise an exception may be
-     * thrown by deserializer.
-     */
-    public Class<?> contentAs() default NoClass.class;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonNaming.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonNaming.java
deleted file mode 100644
index c5fb85c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonNaming.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.*;
-
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-
-/**
- * Annotation that can be used to indicate a {@link PropertyNamingStrategy}
- * to use for annotated class. Overrides the global (default) strategy.
- * 
- * @since 2.1
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonNaming
-{
-    public Class<? extends PropertyNamingStrategy> value();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder.java
deleted file mode 100644
index 9e8d46f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonPOJOBuilder.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Annotation used to configure details of a Builder class:
- * instances of which are used as Builders for deserialized
- * POJO values, instead of POJOs being instantiated using
- * constructors or factory methods.
- * Note that this annotation is NOT used to define what is
- * the Builder class for a POJO: rather, this is determined
- * by {@link JsonDeserialize#builder} property of {@link JsonDeserialize}.
- *<p>
- * Annotation is typically used if the naming convention
- * of a Builder class is different from defaults:
- *<ul>
- * </ul>
- * 
- * @since 2.0
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonPOJOBuilder
-{
-	/**
-	 * Property to use for re-defining which zero-argument method
-	 * is considered the actual "build-method": method called after
-	 * all data has been bound, and the actual instance needs to
-	 * be instantiated.
-	 *<p>
-	 * Default value is "build".
-	 */
-	public String buildMethodName() default "build";
-
-	/**
-	 * Property used for (re)defining name prefix to use for
-	 * auto-detecting "with-methods": methods that are similar to
-	 * "set-methods" (in that they take an argument), but that
-	 * may also return the new builder instance to use
-	 * (which may be 'this', or a new modified builder instance).
-	 * Note that in addition to this prefix, it is also possible
-	 * to use {@link com.fasterxml.jackson.annotation.JsonProperty}
-	 * annotation to indicate "with-methods" (as well as
-	 * {@link com.fasterxml.jackson.annotation.JsonSetter}).
-	 *<p>
-	 * Default value is "with", so that method named "withValue()"
-	 * would be used for binding JSON property "value" (using type
-	 * indicated by the argument; or one defined with annotations.
-	 */
-	public String withPrefix() default "with";
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-	
-	/**
-	 * Simple value container for containing values read from
-	 * {@link JsonPOJOBuilder} annotation instance.
-	 */
-	public class Value
-	{
-        public final String buildMethodName;
-	    public final String withPrefix;
-
-	    public Value(JsonPOJOBuilder ann)
-	    {
-	        buildMethodName = ann.buildMethodName();
-	        withPrefix = ann.withPrefix();
-	    }
-	}
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonSerialize.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonSerialize.java
deleted file mode 100644
index 6be7f8c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonSerialize.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Annotation used for configuring serialization aspects, by attaching
- * to "getter" methods or fields, or to value classes.
- * When annotating value classes, configuration is used for instances
- * of the value class but can be overridden by more specific annotations
- * (ones that attach to methods or fields).
- *<p>
- * An example annotation would be:
- *<pre>
- *  &#64;JsonSerialize(using=MySerializer.class,
- *    as=MySubClass.class,
- *    typing=JsonSerialize.Typing.STATIC
- *  )
- *</pre>
- * (which would be redundant, since some properties block others:
- * specifically, 'using' has precedence over 'as', which has precedence
- * over 'typing' setting)
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonSerialize
-{
-    // // // Annotations for explicitly specifying deserializer
-
-    /**
-     * Serializer class to use for
-     * serializing associated value. Depending on what is annotated,
-     * value is either an instance of annotated class (used globablly
-     * anywhere where class serializer is needed); or only used for
-     * serializing property access via a getter method.
-     */
-    public Class<? extends JsonSerializer<?>> using() default JsonSerializer.None.class;
-
-    /**
-     * Serializer class to use for serializing contents (elements
-     * of a Collection/array, values of Maps) of annotated property.
-     * Can only be used on properties (methods, fields, constructors),
-     * and not value classes themselves (as they are typically generic)
-     */
-    public Class<? extends JsonSerializer<?>> contentUsing()
-        default JsonSerializer.None.class;
-
-    /**
-     * Serializer class to use for serializing Map keys
-     * of annotated property.
-     * Can only be used on properties (methods, fields, constructors),
-     * and not value classes themselves.
-     */
-    public Class<? extends JsonSerializer<?>> keyUsing()
-        default JsonSerializer.None.class;
-    
-    // // // Annotations for type handling, explicit declaration
-    // // // (type used for choosing deserializer, if not explicitly
-    // // // specified)
-
-    /**
-     * Supertype (of declared type, which itself is supertype of runtime type)
-     * to use as type when locating serializer to use.
-     *<p>
-     * Bogus type {@link NoClass} can be used to indicate that declared
-     * type is used as is (i.e. this annotation property has no setting);
-     * this since annotation properties are not allowed to have null value.
-     *<p>
-     * Note: if {@link #using} is also used it has precedence
-     * (since it directly specifies
-     * serializer, whereas this would only be used to locate the
-     * serializer)
-     * and value of this annotation property is ignored.
-     */
-    public Class<?> as() default NoClass.class;
-
-    /**
-     * Concrete type to serialize keys of {@link java.util.Map} as,
-     * instead of type otherwise declared.
-     * Must be a supertype of declared type; otherwise an exception may be
-     * thrown by serializer.
-     */
-    public Class<?> keyAs() default NoClass.class;
-
-    /**
-     * Concrete type to serialize content value (elements
-     * of a Collection/array, values of Maps) as,
-     * instead of type otherwise declared.
-     * Must be a supertype of declared type; otherwise an exception may be
-     * thrown by serializer.
-     */
-    public Class<?> contentAs() default NoClass.class;
-    
-    /**
-     * Whether type detection used is dynamic or static: that is,
-     * whether actual runtime type is used (dynamic), or just the
-     * declared type (static).
-     */
-    public Typing typing() default Typing.DYNAMIC;
-
-    // // // Annotation(s) for inclusion criteria
-
-    /**
-     * Which properties of annotated Bean are
-     * to be included in serialization (has no effect on other types
-     * like enums, primitives or collections).
-     * Choices are "all", "properties that have value other than null"
-     * and "properties that have non-default value" (i.e. default value
-     * being property setting for a Bean constructed with default no-arg
-     * constructor, often null).
-     *
-     * @deprecated As of Jackson 2.0, this annotation has been replaced
-     *    by {@link com.fasterxml.jackson.annotation.JsonInclude}
-     */
-    @Deprecated
-    public Inclusion include() default Inclusion.ALWAYS;
-    
-    /*
-    /**********************************************************
-    /* Value enumerations needed
-    /**********************************************************
-     */
-
-    /**
-     * Enumeration used with {@link JsonSerialize#include} property
-     * to define which properties
-     * of Java Beans are to be included in serialization
-     */
-    public enum Inclusion
-    {
-        /**
-         * Value that indicates that properties are to be always included,
-         * independent of value
-         */
-        ALWAYS,
-
-        /**
-         * Value that indicates that only properties with non-null
-         * values are to be included.
-         */
-        NON_NULL,
-
-        /**
-         * Value that indicates that only properties that have values
-         * that differ from default settings (meaning values they have
-         * when Bean is constructed with its no-arguments constructor)
-         * are to be included. Value is generally not useful with
-         * {@link java.util.Map}s, since they have no default values;
-         * and if used, works same as {@link #ALWAYS}.
-         */
-        NON_DEFAULT,
-
-        /**
-         * Value that indicates that only properties that have values
-         * that values that are null or what is considered empty are
-         * not to be included.
-         * Emptiness is defined for following type:
-         *<ul>
-         * <li>For {@link java.util.Collection}s and {@link java.util.Map}s,
-         *    method <code>isEmpty()</code> is called;
-         *   </li>
-         * <li>For Java arrays, empty arrays are ones with length of 0
-         *   </li>
-         * <li>For Java {@link java.lang.String}s, <code>length()</code> is called,
-         *   and return value of 0 indicates empty String (note that <code>String.isEmpty()</code>
-         *   was added in Java 1.6 and as such can not be used by Jackson
-         *   </li>
-         * <ul>
-         *  For other types, non-null values are to be included.
-         */
-        NON_EMPTY
-        ;
-    }
-
-    /**
-     * Enumeration used with {@link JsonSerialize#typing} property
-     * to define whether type detection is based on dynamic runtime
-     * type (DYNAMIC) or declared type (STATIC).
-     */
-    public enum Typing
-    {
-        /**
-         * Value that indicates that the actual dynamic runtime type is to
-         * be used.
-         */
-        DYNAMIC,
-
-        /**
-         * Value that indicates that the static declared type is to
-         * be used.
-         */
-        STATIC
-        ;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java
deleted file mode 100644
index c8d0f4f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-import com.fasterxml.jackson.annotation.JacksonAnnotation;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Annotation that can be used to plug a custom type identifier handler
- * ({@link TypeIdResolver})
- * to be used by
- * {@link com.fasterxml.jackson.databind.jsontype.TypeSerializer}s
- * and {@link com.fasterxml.jackson.databind.jsontype.TypeDeserializer}s
- * for converting between java types and type id included in JSON content.
- * In simplest cases this can be a simple class with static mapping between
- * type names and matching classes.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonTypeIdResolver
-{
-    /**
-     * Defines implementation class of {@link TypeIdResolver} to use for
-     * converting between external type id (type name) and actual
-     * type of object.
-     */
-    public Class<? extends TypeIdResolver> value();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeResolver.java
deleted file mode 100644
index 53156d2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonTypeResolver.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.*;
-
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-
-/**
- * Annotation that can be used to explicitly define custom resolver
- * used for handling serialization and deserialization of type information,
- * needed for handling of polymorphic types (or sometimes just for linking
- * abstract types to concrete types)
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonTypeResolver
-{
-    /**
-     * Defines implementation class of {@link TypeResolverBuilder} which is used to construct
-     * actual {@link com.fasterxml.jackson.databind.jsontype.TypeDeserializer} and {@link com.fasterxml.jackson.databind.jsontype.TypeDeserializer}
-     * instances that handle reading and writing addition type information needed to support polymorphic
-     * deserialization.
-     */
-    public Class<? extends TypeResolverBuilder<?>> value();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonValueInstantiator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonValueInstantiator.java
deleted file mode 100644
index be9ff03..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/JsonValueInstantiator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-
-/**
- * Annotation that can be used to indicate a {@link ValueInstantiator} to use
- * for creating instances of specified type.
- */
-@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@com.fasterxml.jackson.annotation.JacksonAnnotation
-public @interface JsonValueInstantiator
-{
-    /**
-     * @return  {@link ValueInstantiator} to use for annotated type
-     */
-    public Class<? extends ValueInstantiator> value();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/NoClass.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/NoClass.java
deleted file mode 100644
index f957f71..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/NoClass.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.fasterxml.jackson.databind.annotation;
-
-/**
- * Marker class used with annotations to indicate "no class". This is
- * a silly but necessary work-around -- annotations can not take nulls
- * as either default or explicit values. Hence for class values we must
- * explicitly use a bogus placeholder to denote equivalent of
- * "no class" (for which 'null' is usually the natural choice).
- */
-public final class NoClass
-{
-    private NoClass() { }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/package-info.java
deleted file mode 100644
index 3a73fd8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/annotation/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Annotations that directly depend on classes in databinding bundle
- * (not just Jackson core) and can not be included
- * in Jackson core annotations package (because it can not have any
- * external dependencies).
- */
-package com.fasterxml.jackson.databind.annotation;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/BaseSettings.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/BaseSettings.java
deleted file mode 100644
index 830e898..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/BaseSettings.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import java.text.DateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.Base64Variant;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-
-/**
- * Immutable container class used to store simple configuration
- * settings. Since instances are fully immutable, instances can
- * be freely shared and used without synchronization.
- */
-public final class BaseSettings
-    implements java.io.Serializable // since 2.1
-{
-    // for 2.1.0:
-    private static final long serialVersionUID = 4939673998947122190L;
-
-    /*
-    /**********************************************************
-    /* Configuration settings; introspection, related
-    /**********************************************************
-     */
-    
-    /**
-     * Introspector used to figure out Bean properties needed for bean serialization
-     * and deserialization. Overridable so that it is possible to change low-level
-     * details of introspection, like adding new annotation types.
-     */
-    protected final ClassIntrospector _classIntrospector;
-
-    /**
-     * Introspector used for accessing annotation value based configuration.
-     */
-    protected final AnnotationIntrospector _annotationIntrospector;
-
-    /**
-     * Object used for determining whether specific property elements
-     * (method, constructors, fields) can be auto-detected based on
-     * their visibility (access modifiers). Can be changed to allow
-     * different minimum visibility levels for auto-detection. Note
-     * that this is the global handler; individual types (classes)
-     * can further override active checker used (using
-     * {@link JsonAutoDetect} annotation)
-     */
-    protected final VisibilityChecker<?> _visibilityChecker;
-
-    /**
-     * Custom property naming strategy in use, if any.
-     */
-    protected final PropertyNamingStrategy _propertyNamingStrategy;
-
-    /**
-     * Specific factory used for creating {@link JavaType} instances;
-     * needed to allow modules to add more custom type handling
-     * (mostly to support types of non-Java JVM languages)
-     */
-    protected final TypeFactory _typeFactory;
-
-    /*
-    /**********************************************************
-    /* Configuration settings; type resolution
-    /**********************************************************
-     */
-
-    /**
-     * Type information handler used for "untyped" values (ones declared
-     * to have type <code>Object.class</code>)
-     */
-    protected final TypeResolverBuilder<?> _typeResolverBuilder;
-    
-    /*
-    /**********************************************************
-    /* Configuration settings; other
-    /**********************************************************
-     */
-    
-    /**
-     * Custom date format to use for de-serialization. If specified, will be
-     * used instead of {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
-     *<p>
-     * Note that the configured format object will be cloned once per
-     * deserialization process (first time it is needed)
-     */
-    protected final DateFormat _dateFormat;
-
-    /**
-     * Object used for creating instances of handlers (serializers, deserializers,
-     * type and type id resolvers), given class to instantiate. This is typically
-     * used to do additional configuration (with dependency injection, for example)
-     * beyond simply construction of instances; or to use alternative constructors.
-     */
-    protected final HandlerInstantiator _handlerInstantiator;
-
-    /**
-     * Default {@link java.util.Locale} used with serialization formats.
-     * Default value is {@link Locale#getDefault()}.
-     */
-    protected final Locale _locale;
-
-    /**
-     * Default {@link java.util.TimeZone} used with serialization formats.
-     * Default value is {@link TimeZone#getDefault()}, which is typically the
-     * local time zone (unless overridden for JVM).
-     *<p>
-     * Note that if a new value is set, time zone is also assigned to
-     * {@link #_dateFormat} of this object.
-     */
-    protected final TimeZone _timeZone;
-
-    /**
-     * Explicitly default {@link Base64Variant} to use for handling
-     * binary data (<code>byte[]</code>), used with data formats
-     * that use base64 encoding (like JSON, CSV).
-     * 
-     * @since 2.1
-     */
-    protected final Base64Variant _defaultBase64;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    public BaseSettings(ClassIntrospector ci, AnnotationIntrospector ai,
-            VisibilityChecker<?> vc, PropertyNamingStrategy pns, TypeFactory tf,
-            TypeResolverBuilder<?> typer, DateFormat dateFormat, HandlerInstantiator hi,
-            Locale locale, TimeZone tz, Base64Variant defaultBase64)
-    {
-        _classIntrospector = ci;
-        _annotationIntrospector = ai;
-        _visibilityChecker = vc;
-        _propertyNamingStrategy = pns;
-        _typeFactory = tf;
-        _typeResolverBuilder = typer;
-        _dateFormat = dateFormat;
-        _handlerInstantiator = hi;
-        _locale = locale;
-        _timeZone = tz;
-        _defaultBase64 = defaultBase64;
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods
-    /**********************************************************
-     */
-    
-    public BaseSettings withClassIntrospector(ClassIntrospector ci) {
-        if (_classIntrospector == ci) {
-            return this;
-        }
-        return new BaseSettings(ci, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-    
-    public BaseSettings withAnnotationIntrospector(AnnotationIntrospector ai) {
-        if (_annotationIntrospector == ai) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, ai, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings withInsertedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return withAnnotationIntrospector(AnnotationIntrospectorPair.create(ai, _annotationIntrospector));
-    }
-
-    public BaseSettings withAppendedAnnotationIntrospector(AnnotationIntrospector ai) {
-        return withAnnotationIntrospector(AnnotationIntrospectorPair.create(_annotationIntrospector, ai));
-    }
-    
-    public BaseSettings withVisibilityChecker(VisibilityChecker<?> vc) {
-        if (_visibilityChecker == vc) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, vc, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings withVisibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibility) {
-        return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _visibilityChecker.withVisibility(forMethod, visibility),
-                _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-    
-    public BaseSettings withPropertyNamingStrategy(PropertyNamingStrategy pns) {
-        if (_propertyNamingStrategy == pns) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, pns, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings withTypeFactory(TypeFactory tf) {
-        if (_typeFactory == tf) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, tf,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings withTypeResolverBuilder(TypeResolverBuilder<?> typer) {
-        if (_typeResolverBuilder == typer) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                typer, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-    
-    public BaseSettings withDateFormat(DateFormat df) {
-        if (_dateFormat == df) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, df, _handlerInstantiator, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings withHandlerInstantiator(HandlerInstantiator hi) {
-        if (_handlerInstantiator == hi) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, hi, _locale,
-                _timeZone, _defaultBase64);
-    }
-
-    public BaseSettings with(Locale l) {
-        if (_locale == l) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector, _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, l,
-                _timeZone, _defaultBase64);
-    }
-
-    /**
-     * Fluent factory for constructing a new instance that uses specified TimeZone.
-     * Note that timezone used with also be assigned to configured {@link DateFormat},
-     * changing time formatting defaults.
-     */
-    public BaseSettings with(TimeZone tz)
-    {
-        if (tz == null) {
-            throw new IllegalArgumentException();
-        }
-        DateFormat df = _dateFormat;
-        if (df instanceof StdDateFormat) {
-            df = ((StdDateFormat) df).withTimeZone(tz);
-        } else {
-            // we don't know if original format might be shared; better create a clone:
-            df = (DateFormat) df.clone();
-            df.setTimeZone(tz);
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, df, _handlerInstantiator, _locale,
-                tz, _defaultBase64);
-    }
-
-    /**
-     * @since 2.1
-     */
-    public BaseSettings with(Base64Variant base64) {
-        if (base64 == _defaultBase64) {
-            return this;
-        }
-        return new BaseSettings(_classIntrospector, _annotationIntrospector,
-                _visibilityChecker, _propertyNamingStrategy, _typeFactory,
-                _typeResolverBuilder, _dateFormat, _handlerInstantiator, _locale,
-                _timeZone, base64);
-    }
-    
-    /*
-    /**********************************************************
-    /* API
-    /**********************************************************
-     */
-
-    public ClassIntrospector getClassIntrospector() {
-        return _classIntrospector;
-    }
-    
-    public AnnotationIntrospector getAnnotationIntrospector() {
-        return _annotationIntrospector;
-    }
-
-    public VisibilityChecker<?> getVisibilityChecker() {
-        return _visibilityChecker;
-    }
-
-    public PropertyNamingStrategy getPropertyNamingStrategy() {
-        return _propertyNamingStrategy;
-    }
-
-    public TypeFactory getTypeFactory() {
-        return _typeFactory;
-    }
-
-    public TypeResolverBuilder<?> getTypeResolverBuilder() {
-        return _typeResolverBuilder;
-    }
-    
-    public DateFormat getDateFormat() {
-        return _dateFormat;
-    }
-
-    public HandlerInstantiator getHandlerInstantiator() {
-        return _handlerInstantiator;
-    }
-
-    public Locale getLocale() {
-        return _locale;
-    }
-
-    public TimeZone getTimeZone() {
-        return _timeZone;
-    }
-
-    public Base64Variant getBase64Variant() {
-        return _defaultBase64;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/ConfigFeature.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/ConfigFeature.java
deleted file mode 100644
index d38d321..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/ConfigFeature.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-/**
- * Interface that actual SerializationFeature enumerations used by
- * {@link MapperConfig} implementations must implement.
- * Necessary since enums can not be extended using normal
- * inheritance, but can implement interfaces
- */
-public interface ConfigFeature
-{
-    /**
-     * Accessor for checking whether this feature is enabled by default.
-     */
-    public boolean enabledByDefault();
-    
-    /**
-     * Returns bit mask for this feature instance
-     */
-    public int getMask();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DatabindVersion.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DatabindVersion.java
deleted file mode 100644
index 0b565d4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DatabindVersion.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import com.fasterxml.jackson.core.util.VersionUtil;
-
-/**
- * Helper class used for finding and caching version information
- * for the databind bundle.
- * NOTE: although defined as public, should NOT be accessed directly
- * from outside databind bundle itself.
- */
-public class DatabindVersion extends VersionUtil
-{
-    public final static DatabindVersion instance = new DatabindVersion();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.java
deleted file mode 100644
index 2c67252..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import com.fasterxml.jackson.databind.AbstractTypeResolver;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-
-/**
- * Configuration settings container class for {@link DeserializerFactory}.
- */
-public class DeserializerFactoryConfig
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 3683541151102256824L;
-
-    protected final static Deserializers[] NO_DESERIALIZERS = new Deserializers[0];
-    protected final static KeyDeserializers[] NO_KEY_DESERIALIZERS = new KeyDeserializers[0];
-    protected final static BeanDeserializerModifier[] NO_MODIFIERS = new BeanDeserializerModifier[0];
-    protected final static AbstractTypeResolver[] NO_ABSTRACT_TYPE_RESOLVERS = new AbstractTypeResolver[0];
-    protected final static ValueInstantiators[] NO_VALUE_INSTANTIATORS = new ValueInstantiators[0];
-    
-    /**
-     * List of providers for additional deserializers, checked before considering default
-     * basic or bean deserializers.
-     */
-    protected final Deserializers[] _additionalDeserializers;
-
-    /**
-     * List of providers for additional key deserializers, checked before considering
-     * standard key deserializers.
-     */
-    protected final KeyDeserializers[] _additionalKeyDeserializers;
-    
-    /**
-     * List of modifiers that can change the way {@link BeanDeserializer} instances
-     * are configured and constructed.
-     */
-    protected final BeanDeserializerModifier[] _modifiers;
-
-
-    /**
-     * List of objects that may be able to resolve abstract types to
-     * concrete types. Used by functionality like "mr Bean" to materialize
-     * types as needed.
-     */
-    protected final AbstractTypeResolver[] _abstractTypeResolvers;
-
-    /**
-     * List of objects that know how to create instances of POJO types;
-     * possibly using custom construction (non-annoted constructors; factory
-     * methods external to value type etc).
-     * Used to support objects that are created using non-standard methods;
-     * or to support post-constructor functionality.
-     */
-    protected final ValueInstantiators[] _valueInstantiators;
-    
-    /**
-     * Constructor for creating basic configuration with no additional
-     * handlers.
-     */
-    public DeserializerFactoryConfig() {
-        this(null, null, null, null, null);
-    }
-
-    /**
-     * Copy-constructor that will create an instance that contains defined
-     * set of additional deserializer providers.
-     */
-    protected DeserializerFactoryConfig(Deserializers[] allAdditionalDeserializers,
-            KeyDeserializers[] allAdditionalKeyDeserializers,
-            BeanDeserializerModifier[] modifiers,
-            AbstractTypeResolver[] atr,
-            ValueInstantiators[] vi)
-    {
-        _additionalDeserializers = (allAdditionalDeserializers == null) ?
-                NO_DESERIALIZERS : allAdditionalDeserializers;
-        _additionalKeyDeserializers = (allAdditionalKeyDeserializers == null) ?
-                NO_KEY_DESERIALIZERS : allAdditionalKeyDeserializers;
-        _modifiers = (modifiers == null) ? NO_MODIFIERS : modifiers;
-        _abstractTypeResolvers = (atr == null) ? NO_ABSTRACT_TYPE_RESOLVERS : atr;
-        _valueInstantiators = (vi == null) ? NO_VALUE_INSTANTIATORS : vi;
-    }
-
-    /**
-     * Fluent/factory method used to construct a configuration object that
-     * has same deserializer providers as this instance, plus one specified
-     * as argument. Additional provider will be added before existing ones,
-     * meaning it has priority over existing definitions.
-     */
-    public DeserializerFactoryConfig withAdditionalDeserializers(Deserializers additional)
-    {
-        if (additional == null) {
-            throw new IllegalArgumentException("Can not pass null Deserializers");
-        }
-        Deserializers[] all = ArrayBuilders.insertInListNoDup(_additionalDeserializers, additional);
-        return new DeserializerFactoryConfig(all, _additionalKeyDeserializers, _modifiers,
-                _abstractTypeResolvers, _valueInstantiators);
-    }
-    /**
-     * Fluent/factory method used to construct a configuration object that
-     * has same key deserializer providers as this instance, plus one specified
-     * as argument. Additional provider will be added before existing ones,
-     * meaning it has priority over existing definitions.
-     */
-    public DeserializerFactoryConfig withAdditionalKeyDeserializers(KeyDeserializers additional)
-    {
-        if (additional == null) {
-            throw new IllegalArgumentException("Can not pass null KeyDeserializers");
-        }
-        KeyDeserializers[] all = ArrayBuilders.insertInListNoDup(_additionalKeyDeserializers, additional);
-        return new DeserializerFactoryConfig(_additionalDeserializers, all, _modifiers,
-                _abstractTypeResolvers, _valueInstantiators);
-    }
-
-    /**
-     * Fluent/factory method used to construct a configuration object that
-     * has same configuration as this instance plus one additional
-     * deserialiazer modifier. Added modifier has the highest priority (that is, it
-     * gets called before any already registered modifier).
-     */
-    public DeserializerFactoryConfig withDeserializerModifier(BeanDeserializerModifier modifier)
-    {
-        if (modifier == null) {
-            throw new IllegalArgumentException("Can not pass null modifier");
-        }
-        BeanDeserializerModifier[] all = ArrayBuilders.insertInListNoDup(_modifiers, modifier);
-        return new DeserializerFactoryConfig(_additionalDeserializers, _additionalKeyDeserializers, all,
-                _abstractTypeResolvers, _valueInstantiators);
-    }
-
-    /**
-     * Fluent/factory method used to construct a configuration object that
-     * has same configuration as this instance plus one additional
-     * abstract type resolver.
-     * Added resolver has the highest priority (that is, it
-     * gets called before any already registered resolver).
-     */
-    public DeserializerFactoryConfig withAbstractTypeResolver(AbstractTypeResolver resolver)
-    {
-        if (resolver == null) {
-            throw new IllegalArgumentException("Can not pass null resolver");
-        }
-        AbstractTypeResolver[] all = ArrayBuilders.insertInListNoDup(_abstractTypeResolvers, resolver);
-        return new DeserializerFactoryConfig(_additionalDeserializers, _additionalKeyDeserializers, _modifiers,
-                all, _valueInstantiators);
-    }
-
-    /**
-     * Fluent/factory method used to construct a configuration object that
-     * has same configuration as this instance plus specified additional
-     * value instantiator provider object.
-     * Added instantiator provider has the highest priority (that is, it
-     * gets called before any already registered resolver).
-     * 
-     * @param instantiators Object that can provide {@link com.fasterxml.jackson.databind.deser.ValueInstantiator}s for
-     *    constructing POJO values during deserialization
-     */
-    public DeserializerFactoryConfig withValueInstantiators(ValueInstantiators instantiators) 
-    {
-        if (instantiators == null) {
-            throw new IllegalArgumentException("Can not pass null resolver");
-        }
-        ValueInstantiators[] all = ArrayBuilders.insertInListNoDup(_valueInstantiators, instantiators);
-        return new DeserializerFactoryConfig(_additionalDeserializers, _additionalKeyDeserializers, _modifiers,
-                _abstractTypeResolvers, all);
-    }
-    
-    public boolean hasDeserializers() { return _additionalDeserializers.length > 0; }
-
-    public boolean hasKeyDeserializers() { return _additionalKeyDeserializers.length > 0; }
-    
-    public boolean hasDeserializerModifiers() { return _modifiers.length > 0; }
-
-    public boolean hasAbstractTypeResolvers() { return _abstractTypeResolvers.length > 0; }
-
-    public boolean hasValueInstantiators() { return _valueInstantiators.length > 0; }
-    
-    public Iterable<Deserializers> deserializers() {
-        return ArrayBuilders.arrayAsIterable(_additionalDeserializers);
-    }
-
-    public Iterable<KeyDeserializers> keyDeserializers() {
-        return ArrayBuilders.arrayAsIterable(_additionalKeyDeserializers);
-    }
-    
-    public Iterable<BeanDeserializerModifier> deserializerModifiers() {
-        return ArrayBuilders.arrayAsIterable(_modifiers);
-    }
-
-    public Iterable<AbstractTypeResolver> abstractTypeResolvers() {
-        return ArrayBuilders.arrayAsIterable(_abstractTypeResolvers);
-    }
-
-    public Iterable<ValueInstantiators> valueInstantiators() {
-        return ArrayBuilders.arrayAsIterable(_valueInstantiators);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.java
deleted file mode 100644
index 5a006e4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-
-/**
- * Helper class used for handling details of creating handler instances (things
- * like {@link JsonSerializer}s, {@link JsonDeserializer}s, various type
- * handlers) of specific types. Actual handler type has been resolved at this
- * point, so instantiator is strictly responsible for providing a configured
- * instance by constructing and configuring a new instance, or possibly by
- * recycling a shared instance. One use case is that of allowing
- * dependency injection, which would otherwise be difficult to do.
- *<p>
- * Custom instances are allowed to return null to indicate that caller should
- * use the default instantiation handling (which just means calling no-argument
- * constructor via reflection).
- *<p>
- * Care has to be taken to ensure that if instance returned is shared, it will
- * be thread-safe; caller will not synchronize access to returned instances.
- */
-public abstract class HandlerInstantiator
-{
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method called to get an instance of deserializer of specified type.
-     * 
-     * @param config Deserialization configuration in effect
-     * @param annotated Element (Class, Method, Field, constructor parameter) that
-     *    had annotation defining class of deserializer to construct (to allow
-     *    implementation use information from other annotations)
-     * @param deserClass Class of deserializer instance to return
-     * 
-     * @return Deserializer instance to use
-     */
-    public abstract JsonDeserializer<?> deserializerInstance(DeserializationConfig config,
-            Annotated annotated, Class<?> deserClass);
-
-    /**
-     * Method called to get an instance of key deserializer of specified type.
-     * 
-     * @param config Deserialization configuration in effect
-     * @param annotated Element (Class, Method, Field, constructor parameter) that
-     *    had annotation defining class of key deserializer to construct (to allow
-     *    implementation use information from other annotations)
-     * @param keyDeserClass Class of key deserializer instance to return
-     * 
-     * @return Key deserializer instance to use
-     */
-    public abstract KeyDeserializer keyDeserializerInstance(DeserializationConfig config,
-            Annotated annotated, Class<?> keyDeserClass);
-    
-    /**
-     * Method called to get an instance of serializer of specified type.
-     * 
-     * @param config Serialization configuration in effect
-     * @param annotated Element (Class, Method, Field) that
-     *    had annotation defining class of serializer to construct (to allow
-     *    implementation use information from other annotations)
-     * @param serClass Class of serializer instance to return
-     * 
-     * @return Serializer instance to use
-     */
-    public abstract JsonSerializer<?> serializerInstance(SerializationConfig config,
-            Annotated annotated, Class<?> serClass);
-
-    /**
-     * Method called to get an instance of TypeResolverBuilder of specified type.
-     * 
-     * @param config Mapper configuration in effect (either SerializationConfig or
-     *   DeserializationConfig, depending on when instance is being constructed)
-     * @param annotated annotated Element (Class, Method, Field) that
-     *    had annotation defining class of builder to construct (to allow
-     *    implementation use information from other annotations)
-     * @param builderClass Class of builder instance to return
-     * 
-     * @return TypeResolverBuilder instance to use
-     */
-    public abstract TypeResolverBuilder<?> typeResolverBuilderInstance(MapperConfig<?> config,
-            Annotated annotated, Class<?> builderClass);
-
-    /**
-     * Method called to get an instance of TypeIdResolver of specified type.
-     * 
-     * @param config Mapper configuration in effect (either SerializationConfig or
-     *   DeserializationConfig, depending on when instance is being constructed)
-     * @param annotated annotated Element (Class, Method, Field) that
-     *    had annotation defining class of resolver to construct (to allow
-     *    implementation use information from other annotations)
-     * @param resolverClass Class of resolver instance to return
-     * 
-     * @return TypeResolverBuilder instance to use
-     */
-    public abstract TypeIdResolver typeIdResolverInstance(MapperConfig<?> config,
-            Annotated annotated, Class<?> resolverClass);
-
-    /**
-     * Method called to construct an instance of ValueInstantiator of specified type.
-     */
-    public ValueInstantiator valueInstantiatorInstance(MapperConfig<?> config,
-            Annotated annotated, Class<?> resolverClass) {
-        return null;
-    }
-
-    
-    /**
-     * Method called to construct a ObjectIdHandler instance of specified type.
-     * 
-     * @since 2.0
-     */
-    public ObjectIdGenerator<?> objectIdGeneratorInstance(MapperConfig<?> config,
-            Annotated annotated, Class<?> implClass) {
-        return null;
-    }
-
-    /**
-     * Method called to construct a NamingStrategy instance used for specified
-     * class.
-     * 
-     * @since 2.1
-     */
-    public PropertyNamingStrategy namingStrategyInstance(MapperConfig<?> config,
-            Annotated annotated, Class<?> implClass) {
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfig.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfig.java
deleted file mode 100644
index b1b7dc8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfig.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import java.text.DateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.core.Base64Variant;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Interface that defines functionality accessible through both
- * serialization and deserialization configuration objects;
- * accessors to mode-independent configuration settings
- * and such.
- * In addition, shared features are defined
- * in {@link MapperFeature}.
- *<p>
- * Small part of implementation is included here by aggregating
- * {@link BaseSettings} instance that contains configuration
- * that is shared between different types of instances.
- */
-public abstract class MapperConfig<T extends MapperConfig<T>>
-    implements ClassIntrospector.MixInResolver,
-        java.io.Serializable
-{
-    private static final long serialVersionUID = 8891625428805876137L;
-
-    /**
-     * Set of shared mapper features enabled.
-     */
-    protected final int _mapperFeatures;
-    
-    /**
-     * Immutable container object for simple configuration settings.
-     */
-    protected final BaseSettings _base;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-    protected MapperConfig(BaseSettings base, int mapperFeatures)
-    {
-        _base = base;
-        _mapperFeatures = mapperFeatures;
-    }
-
-    protected MapperConfig(MapperConfig<T> src)
-    {
-        _base = src._base;
-        _mapperFeatures = src._mapperFeatures;
-    }
-    
-    /**
-     * Method that calculates bit set (flags) of all features that
-     * are enabled by default.
-     */
-    public static <F extends Enum<F> & ConfigFeature> int collectFeatureDefaults(Class<F> enumClass)
-    {
-        int flags = 0;
-        for (F value : enumClass.getEnumConstants()) {
-            if (value.enabledByDefault()) {
-                flags |= value.getMask();
-            }
-        }
-        return flags;
-    }
-    /*
-    /**********************************************************
-    /* Life-cycle: factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method for constructing and returning a new instance with specified
-     * mapper features enabled.
-     */
-    public abstract T with(MapperFeature... features);
-
-    /**
-     * Method for constructing and returning a new instance with specified
-     * mapper features disabled.
-     */
-    public abstract T without(MapperFeature... features);
-    
-    /*
-    /**********************************************************
-    /* Configuration: simple features
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for simple mapper features (which are shared for
-     * serialization, deserialization)
-     */
-    public final boolean isEnabled(MapperFeature f) {
-        return (_mapperFeatures & f.getMask()) != 0;
-    }
-    
-    /**
-     * Method for determining whether annotation processing is enabled or not
-     * (default settings are typically that it is enabled; must explicitly disable).
-     * 
-     * @return True if annotation processing is enabled; false if not
-     */
-    public final boolean isAnnotationProcessingEnabled() {
-        return isEnabled(MapperFeature.USE_ANNOTATIONS);
-    }
-
-    /**
-     * Accessor for determining whether it is ok to try to force override of access
-     * modifiers to be able to get or set values of non-public Methods, Fields;
-     * to invoke non-public Constructors, Methods; or to instantiate non-public
-     * Classes. By default this is enabled, but on some platforms it needs to be
-     * prevented since if this would violate security constraints and cause failures.
-     * 
-     * @return True if access modifier overriding is allowed (and may be done for
-     *   any Field, Method, Constructor or Class); false to prevent any attempts
-     *   to override.
-     */
-    public final boolean canOverrideAccessModifiers() {
-        return isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
-    }
-
-    /**
-     * Accessor for checking whether default settings for property handling
-     * indicate that properties should be alphabetically ordered or not.
-     */
-    public final boolean shouldSortPropertiesAlphabetically() {
-        return isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY);
-    }
-
-    /**
-     * Accessor for checking whether configuration indicates that
-     * "root wrapping" (use of an extra property/name pair at root level)
-     * is expected or not.
-     */
-    public abstract boolean useRootWrapping();
-    
-    /*
-    /**********************************************************
-    /* Configuration: introspectors, mix-ins
-    /**********************************************************
-     */
-    
-    public ClassIntrospector getClassIntrospector() {
-        return _base.getClassIntrospector();
-    }
-
-    /**
-     * Method for getting {@link AnnotationIntrospector} configured
-     * to introspect annotation values used for configuration.
-     *<p>
-     * Non-final since it is actually overridden by sub-classes (for now?)
-     */
-    public AnnotationIntrospector getAnnotationIntrospector() {
-        return _base.getAnnotationIntrospector();
-    }
-
-    /**
-     * Accessor for object used for determining whether specific property elements
-     * (method, constructors, fields) can be auto-detected based on
-     * their visibility (access modifiers). Can be changed to allow
-     * different minimum visibility levels for auto-detection. Note
-     * that this is the global handler; individual types (classes)
-     * can further override active checker used (using
-     * {@link JsonAutoDetect} annotation)
-     */
-    public VisibilityChecker<?> getDefaultVisibilityChecker() {
-        return _base.getVisibilityChecker();
-    }
-    
-    public final PropertyNamingStrategy getPropertyNamingStrategy() {
-        return _base.getPropertyNamingStrategy();
-    }
-
-    public final HandlerInstantiator getHandlerInstantiator() {
-        return _base.getHandlerInstantiator();
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration: type and subtype handling
-    /**********************************************************
-     */
-
-    /**
-     * Method called to locate a type info handler for types that do not have
-     * one explicitly declared via annotations (or other configuration).
-     * If such default handler is configured, it is returned; otherwise
-     * null is returned.
-     */
-    public final TypeResolverBuilder<?> getDefaultTyper(JavaType baseType) {
-        return _base.getTypeResolverBuilder();
-    }
-    
-    public abstract SubtypeResolver getSubtypeResolver();
-
-    public final TypeFactory getTypeFactory() {
-        return _base.getTypeFactory();
-    }
-
-    /**
-     * Helper method that will construct {@link JavaType} for given
-     * raw class.
-     * This is a simple short-cut for:
-     *<pre>
-     *    getTypeFactory().constructType(cls);
-     *</pre>
-     */
-    public final JavaType constructType(Class<?> cls) {
-        return getTypeFactory().constructType(cls, (TypeBindings) null);
-    }
-
-    /**
-     * Helper method that will construct {@link JavaType} for given
-     * type reference
-     * This is a simple short-cut for:
-     *<pre>
-     *    getTypeFactory().constructType(valueTypeRef);
-     *</pre>
-     */
-    public final JavaType constructType(TypeReference<?> valueTypeRef) {
-        return getTypeFactory().constructType(valueTypeRef.getType(), (TypeBindings) null);
-    }
-
-    public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass) {
-        return getTypeFactory().constructSpecializedType(baseType, subclass);
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration: introspection support
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for getting bean description that only contains class
-     * annotations: useful if no getter/setter/creator information is needed.
-     */
-    public BeanDescription introspectClassAnnotations(Class<?> cls) {
-        return introspectClassAnnotations(constructType(cls));
-    }
-    
-    /**
-     * Accessor for getting bean description that only contains class
-     * annotations: useful if no getter/setter/creator information is needed.
-     */
-    public abstract BeanDescription introspectClassAnnotations(JavaType type);
-
-    /**
-     * Accessor for getting bean description that only contains immediate class
-     * annotations: ones from the class, and its direct mix-in, if any, but
-     * not from super types.
-     */
-    public BeanDescription introspectDirectClassAnnotations(Class<?> cls) {
-        return introspectDirectClassAnnotations(constructType(cls));
-    }
-    /**
-     * Accessor for getting bean description that only contains immediate class
-     * annotations: ones from the class, and its direct mix-in, if any, but
-     * not from super types.
-     */
-    public abstract BeanDescription introspectDirectClassAnnotations(JavaType type);
-
-    /*
-    /**********************************************************
-    /* Configuration: other
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing currently configured (textual) date format
-     * that will be used for reading or writing date values (in case
-     * of writing, only if textual output is configured; not if dates
-     * are to be serialized as time stamps).
-     *<p>
-     * Note that typically {@link DateFormat} instances are <b>not thread-safe</b>
-     * (at least ones provided by JDK):
-     * this means that calling code should clone format instance before
-     * using it.
-     *<p>
-     * This method is usually only called by framework itself, since there
-     * are convenience methods available via
-     * {@link DeserializationContext} and {@link SerializerProvider} that
-     * take care of cloning and thread-safe reuse.
-     */
-    public final DateFormat getDateFormat() { return _base.getDateFormat(); }
-
-    /**
-     * Method for accessing the default {@link java.util.Locale} to use
-     * for formatting, unless overridden by local annotations.
-     * Initially set to {@link Locale#getDefault()}.
-     */
-    public final Locale getLocale() { return _base.getLocale(); }
-    
-    /**
-     * Method for accessing the default {@link java.util.TimeZone} to use
-     * for formatting, unless overridden by local annotations.
-     * Initially set to {@link TimeZone#getDefault()}.
-     */
-    public final TimeZone getTimeZone() { return _base.getTimeZone(); }
-    
-    /**
-     * Accessor for finding currently active view, if any (null if none)
-     */
-    public abstract Class<?> getActiveView();
-
-    /**
-     * Method called during deserialization if Base64 encoded content
-     * needs to be decoded. Default version just returns default Jackson
-     * uses, which is modified-mime which does not add linefeeds (because
-     * those would have to be escaped in JSON strings); but this can
-     * be configured on {@link ObjectWriter}.
-     */
-    public Base64Variant getBase64Variant() {
-        return _base.getBase64Variant();
-    }
-    
-    /*
-    /**********************************************************
-    /* Methods for instantiating handlers
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to obtain an instance of <code>TypeIdResolver</code> of
-     * specified type.
-     */
-    public TypeResolverBuilder<?> typeResolverBuilderInstance(Annotated annotated,
-            Class<? extends TypeResolverBuilder<?>> builderClass)
-    {
-        HandlerInstantiator hi = getHandlerInstantiator();
-        if (hi != null) {
-            TypeResolverBuilder<?> builder = hi.typeResolverBuilderInstance(this, annotated, builderClass);
-            if (builder != null) {
-                return builder;
-            }
-        }
-        return (TypeResolverBuilder<?>) ClassUtil.createInstance(builderClass, canOverrideAccessModifiers());
-    }
-
-    /**
-     * Method that can be called to obtain an instance of <code>TypeIdResolver</code> of
-     * specified type.
-     */
-    public TypeIdResolver typeIdResolverInstance(Annotated annotated,
-            Class<? extends TypeIdResolver> resolverClass)
-    {
-        HandlerInstantiator hi = getHandlerInstantiator();
-        if (hi != null) {
-            TypeIdResolver builder = hi.typeIdResolverInstance(this, annotated, resolverClass);
-            if (builder != null) {
-                return builder;
-            }
-        }
-        return (TypeIdResolver) ClassUtil.createInstance(resolverClass, canOverrideAccessModifiers());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
deleted file mode 100644
index cfbf4c0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import java.text.DateFormat;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.Base64Variant;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-public abstract class MapperConfigBase<CFG extends ConfigFeature,
-    T extends MapperConfigBase<CFG,T>>
-    extends MapperConfig<T>
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = -8378230381628000111L;
-
-    private final static int DEFAULT_MAPPER_FEATURES = collectFeatureDefaults(MapperFeature.class);
-
-    /*
-    /**********************************************************
-    /* Immutable config
-    /**********************************************************
-     */
-
-    /**
-     * Mix-in annotation mappings to use, if any: immutable,
-     * can not be changed once defined.
-     */
-    protected final Map<ClassKey,Class<?>> _mixInAnnotations;
-
-    /**
-     * Registered concrete subtypes that can be used instead of (or
-     * in addition to) ones declared using annotations.
-     */
-    protected final SubtypeResolver _subtypeResolver;
-
-    /**
-     * Explicitly defined root name to use, if any; if empty
-     * String, will disable root-name wrapping; if null, will
-     * use defaults
-     */
-    protected final String _rootName;
-
-    /**
-     * View to use for filtering out properties to serialize
-     * or deserialize.
-     * Null if none (will also be assigned null if <code>Object.class</code>
-     * is defined), meaning that all properties are to be included.
-     */
-    protected final Class<?> _view;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used when creating a new instance (compared to
-     * that of creating fluent copies)
-     */
-    protected MapperConfigBase(BaseSettings base,
-            SubtypeResolver str, Map<ClassKey,Class<?>> mixins)
-    {
-        super(base, DEFAULT_MAPPER_FEATURES);
-        _mixInAnnotations = mixins;
-        _subtypeResolver = str;
-        _rootName = null;
-        _view = null;
-    }
-    
-    /**
-     * Pass-through constructor used when no changes are needed to the
-     * base class.
-     */
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src)
-    {
-        super(src);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = src._rootName;
-        _view = src._view;
-    }
-
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, BaseSettings base)
-    {
-        super(base, src._mapperFeatures);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = src._rootName;
-        _view = src._view;
-    }
-    
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, int mapperFeatures)
-    {
-        super(src._base, mapperFeatures);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = src._rootName;
-        _view = src._view;
-    }
-
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, SubtypeResolver str) {
-        super(src);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = str;
-        _rootName = src._rootName;
-        _view = src._view;
-    }
-
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, String rootName) {
-        super(src);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = rootName;
-        _view = src._view;
-    }
-
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, Class<?> view)
-    {
-        super(src);
-        _mixInAnnotations = src._mixInAnnotations;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = src._rootName;
-        _view = view;
-    }
-
-    /**
-     * @since 2.1
-     */
-    protected MapperConfigBase(MapperConfigBase<CFG,T> src, Map<ClassKey,Class<?>> mixins)
-    {
-        super(src);
-        _mixInAnnotations = mixins;
-        _subtypeResolver = src._subtypeResolver;
-        _rootName = src._rootName;
-        _view = src._view;
-    }
-    
-    /*
-    /**********************************************************
-    /* Addition fluent factory methods, common to all sub-types
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link AnnotationIntrospector} to use (replacing old one).
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(AnnotationIntrospector ai);
-
-    /**
-     * Method for constructing and returning a new instance with additional
-     * {@link AnnotationIntrospector} appended (as the lowest priority one)
-     */
-    public abstract T withAppendedAnnotationIntrospector(AnnotationIntrospector introspector);
-
-    /**
-     * Method for constructing and returning a new instance with additional
-     * {@link AnnotationIntrospector} inserted (as the highest priority one)
-     */
-    public abstract T withInsertedAnnotationIntrospector(AnnotationIntrospector introspector);
-    
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link ClassIntrospector}
-     * to use.
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(ClassIntrospector ci);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link DateFormat}
-     * to use.
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(DateFormat df);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link HandlerInstantiator}
-     * to use.
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(HandlerInstantiator hi);
-    
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link PropertyNamingStrategy}
-     * to use.
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(PropertyNamingStrategy strategy);
-    
-    /**
-     * Method for constructing and returning a new instance with different
-     * root name to use (none, if null).
-     *<p>
-     * Note that when a root name is set to a non-Empty String, this will automatically force use
-     * of root element wrapping with given name. If empty String passed, will
-     * disable root name wrapping; and if null used, will instead use
-     * <code>SerializationFeature</code> to determine if to use wrapping, and annotation
-     * (or default name) for actual root name to use.
-     * 
-     * @param rootName to use: if null, means "use default" (clear setting);
-     *   if empty String ("") means that no root name wrapping is used;
-     *   otherwise defines root name to use.
-     */
-    public abstract T withRootName(String rootName);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link SubtypeResolver}
-     * to use.
-     *<p>
-     * NOTE: make sure to register new instance with <code>ObjectMapper</code>
-     * if directly calling this method.
-     */
-    public abstract T with(SubtypeResolver str);
-    
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link TypeFactory}
-     * to use.
-     */
-    public abstract T with(TypeFactory typeFactory);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link TypeResolverBuilder} to use.
-     */
-    public abstract T with(TypeResolverBuilder<?> trb);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * view to use.
-     */
-    public abstract T withView(Class<?> view);
-    
-    /**
-     * Method for constructing and returning a new instance with different
-     * {@link VisibilityChecker}
-     * to use.
-     */
-    public abstract T with(VisibilityChecker<?> vc);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * minimal visibility level for specified property type
-     */
-    public abstract T withVisibility(PropertyAccessor forMethod, JsonAutoDetect.Visibility visibility);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * default {@link java.util.Locale} to use for formatting.
-     */
-    public abstract T with(Locale l);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * default {@link java.util.TimeZone} to use for formatting of date values.
-     */
-    public abstract T with(TimeZone tz);
-
-    /**
-     * Method for constructing and returning a new instance with different
-     * default {@link Base64Variant} to use with base64-encoded binary values.
-     */
-    public abstract T with(Base64Variant base64);
-    
-    /*
-    /**********************************************************
-    /* Simple accessors
-    /**********************************************************
-     */
-    
-    /**
-     * Accessor for object used for finding out all reachable subtypes
-     * for supertypes; needed when a logical type name is used instead
-     * of class name (or custom scheme).
-     */
-    @Override
-    public final SubtypeResolver getSubtypeResolver() {
-        return _subtypeResolver;
-    }
-
-    public final String getRootName() {
-        return _rootName;
-    }
-
-    @Override
-    public final Class<?> getActiveView() {
-        return _view;
-    }
-    
-    /*
-    /**********************************************************
-    /* ClassIntrospector.MixInResolver impl:
-    /**********************************************************
-     */
-
-    /**
-     * Method that will check if there are "mix-in" classes (with mix-in
-     * annotations) for given class
-     */
-//  @Override
-    public final Class<?> findMixInClassFor(Class<?> cls) {
-        return (_mixInAnnotations == null) ? null : _mixInAnnotations.get(new ClassKey(cls));
-    }
-
-    public final int mixInCount() {
-        return (_mixInAnnotations == null) ? 0 : _mixInAnnotations.size();
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.java
deleted file mode 100644
index 57f8518..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/SerializerFactoryConfig.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.fasterxml.jackson.databind.cfg;
-
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-
-/**
- * Configuration settings container class for
- * {@link SerializerFactory} implementations.
- */
-public final class SerializerFactoryConfig
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-    /**
-     * Constant for empty <code>Serializers</code> array (which by definition
-     * is stateless and reusable)
-     */
-    protected final static Serializers[] NO_SERIALIZERS = new Serializers[0];
-
-    protected final static BeanSerializerModifier[] NO_MODIFIERS = new BeanSerializerModifier[0];
-    
-    /**
-     * List of providers for additional serializers, checked before considering default
-     * basic or bean serialializers.
-     */
-    protected final Serializers[] _additionalSerializers;
-
-    /**
-     * List of providers for additional key serializers, checked before considering default
-     * key serialializers.
-     */
-    protected final Serializers[] _additionalKeySerializers;
-    
-    /**
-     * List of modifiers that can change the way {@link BeanSerializer} instances
-     * are configured and constructed.
-     */
-    protected final BeanSerializerModifier[] _modifiers;
-    
-    public SerializerFactoryConfig() {
-        this(null, null, null);
-    }
-
-    protected SerializerFactoryConfig(Serializers[] allAdditionalSerializers,
-            Serializers[] allAdditionalKeySerializers,
-            BeanSerializerModifier[] modifiers)
-    {
-        _additionalSerializers = (allAdditionalSerializers == null) ?
-                NO_SERIALIZERS : allAdditionalSerializers;
-        _additionalKeySerializers = (allAdditionalKeySerializers == null) ?
-                NO_SERIALIZERS : allAdditionalKeySerializers;
-        _modifiers = (modifiers == null) ? NO_MODIFIERS : modifiers;
-    }
-
-    public SerializerFactoryConfig withAdditionalSerializers(Serializers additional)
-    {
-        if (additional == null) {
-            throw new IllegalArgumentException("Can not pass null Serializers");
-        }
-        Serializers[] all = ArrayBuilders.insertInListNoDup(_additionalSerializers, additional);
-        return new SerializerFactoryConfig(all, _additionalKeySerializers, _modifiers);
-    }
-
-    public SerializerFactoryConfig withAdditionalKeySerializers(Serializers additional)
-    {
-        if (additional == null) {
-            throw new IllegalArgumentException("Can not pass null Serializers");
-        }
-        Serializers[] all = ArrayBuilders.insertInListNoDup(_additionalKeySerializers, additional);
-        return new SerializerFactoryConfig(_additionalSerializers, all, _modifiers);
-    }
-    
-    public SerializerFactoryConfig withSerializerModifier(BeanSerializerModifier modifier)
-    {
-        if (modifier == null) {
-            throw new IllegalArgumentException("Can not pass null modifier");
-        }
-        BeanSerializerModifier[] modifiers = ArrayBuilders.insertInListNoDup(_modifiers, modifier);
-        return new SerializerFactoryConfig(_additionalSerializers, _additionalKeySerializers, modifiers);
-    }
-
-    public boolean hasSerializers() { return _additionalSerializers.length > 0; }
-
-    public boolean hasKeySerializers() { return _additionalKeySerializers.length > 0; }
-    
-    public boolean hasSerializerModifiers() { return _modifiers.length > 0; }
-    
-    public Iterable<Serializers> serializers() {
-        return ArrayBuilders.arrayAsIterable(_additionalSerializers);
-    }
-
-    public Iterable<Serializers> keySerializers() {
-        return ArrayBuilders.arrayAsIterable(_additionalKeySerializers);
-    }
-    
-    public Iterable<BeanSerializerModifier> serializerModifiers() {
-        return ArrayBuilders.arrayAsIterable(_modifiers);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/package-info.java
deleted file mode 100644
index 5afd53a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/cfg/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
-Package that contains most of configuration-related classes;
-exception being couple of most-commonly used configuration
-things (like Feature enumerations) that are at the
-main level (<code>com.fasterxml.jackson.databind</code>).
-*/
-
-package com.fasterxml.jackson.databind.cfg;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java
deleted file mode 100644
index b663b80..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Deserializer only used for abstract types used as placeholders during polymorphic
- * type handling deserialization. If so, there is no real deserializer associated
- * with nominal type, just {@link TypeDeserializer}; and any calls that do not
- * pass such resolver will result in an error.
- * 
- * @author tatu
- */
-public class AbstractDeserializer
-    extends JsonDeserializer<Object>
-{
-    protected final JavaType _baseType;
-
-    protected final ObjectIdReader _objectIdReader;
-
-    protected final Map<String, SettableBeanProperty> _backRefProperties;
-    
-    // support for "native" types, which require special care:
-    
-    protected final boolean _acceptString;
-    protected final boolean _acceptBoolean;
-    protected final boolean _acceptInt;
-    protected final boolean _acceptDouble;
-    
-    public AbstractDeserializer(BeanDeserializerBuilder builder,
-            BeanDescription beanDesc, Map<String, SettableBeanProperty> backRefProps)
-    {
-        _baseType = beanDesc.getType();
-        _objectIdReader = builder.getObjectIdReader();
-        _backRefProperties = backRefProps;
-        Class<?> cls = _baseType.getRawClass();
-        _acceptString = cls.isAssignableFrom(String.class);
-        _acceptBoolean = (cls == Boolean.TYPE) || cls.isAssignableFrom(Boolean.class);
-        _acceptInt = (cls == Integer.TYPE) || cls.isAssignableFrom(Integer.class);
-        _acceptDouble = (cls == Double.TYPE) || cls.isAssignableFrom(Double.class);
-    }
-
-    /*
-    /**********************************************************
-    /* Public accessors
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isCachable() { return true; }
-    
-    /**
-     * Overridden to return true for those instances that are
-     * handling value for which Object Identity handling is enabled
-     * (either via value type or referring property).
-     */
-    @Override
-    public ObjectIdReader getObjectIdReader() {
-        return _objectIdReader;
-    }
-
-    /**
-     * Method called by <code>BeanDeserializer</code> to resolve back reference
-     * part of managed references.
-     */
-    public SettableBeanProperty findBackReference(String logicalName)
-    {
-        return (_backRefProperties == null) ? null : _backRefProperties.get(logicalName);
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializer implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // Hmmh. One tricky question; for scalar, is it an Object Id, or "Natural" type?
-
-        // for now, prefer Object Id:
-        if (_objectIdReader != null) {
-            JsonToken t = jp.getCurrentToken();
-            // should be good enough check; we only care about Strings, integral numbers:
-            if (t != null && t.isScalarValue()) {
-                return _deserializeFromObjectId(jp, ctxt);
-            }
-        }
-        
-        // First: support "natural" values (which are always serialized without type info!)
-        Object result = _deserializeIfNatural(jp, ctxt);
-        if (result != null) {
-            return result;
-        }
-        return typeDeserializer.deserializeTypedFromObject(jp, ctxt);
-    }
-
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        // This method should never be called...
-        throw ctxt.instantiationException(_baseType.getRawClass(),
-                "abstract types either need to be mapped to concrete types, have custom deserializer, or be instantiated with additional type information");
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    protected Object _deserializeIfNatural(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        /* As per [JACKSON-417], there is a chance we might be "natural" types
-         * (String, Boolean, Integer, Double), which do not include any type information...
-         * Care must be taken to only return this if return type matches, however.
-         * Finally, we may have to consider possibility of custom handlers for
-         * these values: but for now this should work ok.
-         */
-        switch (jp.getCurrentToken()) {
-        case VALUE_STRING:
-            if (_acceptString) {
-                return jp.getText();
-            }
-            break;
-        case VALUE_NUMBER_INT:
-            if (_acceptInt) {
-                return jp.getIntValue();
-            }
-            break;
-
-        case VALUE_NUMBER_FLOAT:
-            if (_acceptDouble) {
-                return Double.valueOf(jp.getDoubleValue());
-            }
-            break;
-        case VALUE_TRUE:
-            if (_acceptBoolean) {
-                return Boolean.TRUE;
-            }
-            break;
-        case VALUE_FALSE:
-            if (_acceptBoolean) {
-                return Boolean.FALSE;
-            }
-            break;
-        }
-        return null;
-    }
-
-    /**
-     * Method called in cases where it looks like we got an Object Id
-     * to parse and use as a reference.
-     */
-    protected Object _deserializeFromObjectId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        Object id = _objectIdReader.deserializer.deserialize(jp, ctxt);
-        ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator);
-        // do we have it resolved?
-        Object pojo = roid.item;
-        if (pojo == null) { // not yet; should wait...
-            throw new IllegalStateException("Could not resolve Object Id ["+id+"] -- unresolved forward-reference?");
-        }
-        return pojo;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
deleted file mode 100644
index 0770b1a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
+++ /dev/null
@@ -1,1464 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.deser.impl.CreatorCollector;
-import com.fasterxml.jackson.databind.deser.std.*;
-import com.fasterxml.jackson.databind.ext.OptionalHandlerFactory;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.EnumResolver;
-
-/**
- * Abstract factory base class that can provide deserializers for standard
- * JDK classes, including collection classes and simple heuristics for
- * "upcasting" commmon collection interface types
- * (such as {@link java.util.Collection}).
- *<p>
- * Since all simple deserializers are eagerly instantiated, and there is
- * no additional introspection or customizability of these types,
- * this factory is stateless.
- */
-public abstract class BasicDeserializerFactory
-    extends DeserializerFactory
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1;
-
-    /**
-     * We will pre-create serializers for common non-structured
-     * (that is things other than Collection, Map or array)
-     * types. These need not go through factory.
-     */
-    final protected static HashMap<ClassKey, JsonDeserializer<Object>> _simpleDeserializers
-        = new HashMap<ClassKey, JsonDeserializer<Object>>();
-
-    /**
-     * Also special array deserializers for primitive array types.
-     */
-    final protected static HashMap<JavaType,JsonDeserializer<Object>> _arrayDeserializers
-        = PrimitiveArrayDeserializers.getAll();
-
-    /**
-     * Set of available key deserializers is currently limited
-     * to standard types; and all known instances are storing in this map.
-     */
-    final protected static HashMap<JavaType, KeyDeserializer> _keyDeserializers = StdKeyDeserializers.constructAll();
-
-    static {
-        // First, add the fall-back "untyped" deserializer:
-        _add(_simpleDeserializers, Object.class, new UntypedObjectDeserializer());
-    
-        // Then String and String-like converters:
-        StdDeserializer<?> strDeser = new StringDeserializer();
-        _add(_simpleDeserializers, String.class, strDeser);
-        _add(_simpleDeserializers, CharSequence.class, strDeser);
-    
-        // Primitives/wrappers, other Numbers:
-        _add(_simpleDeserializers, NumberDeserializers.all());
-        // Date/time types
-        _add(_simpleDeserializers, DateDeserializers.all());
-        // other JDK types
-        _add(_simpleDeserializers, JdkDeserializers.all());
-        // and a few Jackson types as well:
-        _add(_simpleDeserializers, JacksonDeserializers.all());
-    }
-
-    private static void _add(Map<ClassKey, JsonDeserializer<Object>> desers,
-            StdDeserializer<?>[] serializers) {
-        for (StdDeserializer<?> ser : serializers) {
-            _add(desers, ser.getValueClass(), ser);
-        }
-    }
-
-    private static void _add(Map<ClassKey, JsonDeserializer<Object>> desers,
-            Class<?> valueClass, StdDeserializer<?> stdDeser)
-    {
-        @SuppressWarnings("unchecked")
-        JsonDeserializer<Object> deser = (JsonDeserializer<Object>) stdDeser;
-        desers.put(new ClassKey(valueClass), deser);
-    }
-    
-    /* We do some defaulting for abstract Map classes and
-     * interfaces, to avoid having to use exact types or annotations in
-     * cases where the most common concrete Maps will do.
-     */
-    @SuppressWarnings("rawtypes")
-    final static HashMap<String, Class<? extends Map>> _mapFallbacks =
-        new HashMap<String, Class<? extends Map>>();
-    static {
-        _mapFallbacks.put(Map.class.getName(), LinkedHashMap.class);
-        _mapFallbacks.put(ConcurrentMap.class.getName(), ConcurrentHashMap.class);
-        _mapFallbacks.put(SortedMap.class.getName(), TreeMap.class);
-
-        /* 11-Jan-2009, tatu: Let's see if we can still add support for
-         *    JDK 1.6 interfaces, even if we run on 1.5. Just need to be
-         *    more careful with typos, since compiler won't notice any
-         *    problems...
-         */
-        _mapFallbacks.put("java.util.NavigableMap", TreeMap.class);
-        try {
-            Class<?> key = Class.forName("java.util.concurrent.ConcurrentNavigableMap");
-            Class<?> value = Class.forName("java.util.concurrent.ConcurrentSkipListMap");
-            @SuppressWarnings("unchecked")
-                Class<? extends Map<?,?>> mapValue = (Class<? extends Map<?,?>>) value;
-            _mapFallbacks.put(key.getName(), mapValue);
-        } catch (ClassNotFoundException cnfe) { // occurs on 1.5
-        } catch (SecurityException se) { // might occur in applets, see stackoverflow.com/questions/12345068
-        }
-    }
-
-    /* We do some defaulting for abstract Collection classes and
-     * interfaces, to avoid having to use exact types or annotations in
-     * cases where the most common concrete Collection will do.
-     */
-    @SuppressWarnings("rawtypes")
-    final static HashMap<String, Class<? extends Collection>> _collectionFallbacks =
-        new HashMap<String, Class<? extends Collection>>();
-    static {
-        _collectionFallbacks.put(Collection.class.getName(), ArrayList.class);
-        _collectionFallbacks.put(List.class.getName(), ArrayList.class);
-        _collectionFallbacks.put(Set.class.getName(), HashSet.class);
-        _collectionFallbacks.put(SortedSet.class.getName(), TreeSet.class);
-        _collectionFallbacks.put(Queue.class.getName(), LinkedList.class);
-
-        /* 11-Jan-2009, tatu: Let's see if we can still add support for
-         *    JDK 1.6 interfaces, even if we run on 1.5. Just need to be
-         *    more careful with typos, since compiler won't notice any
-         *    problems...
-         */
-        _collectionFallbacks.put("java.util.Deque", LinkedList.class);
-        _collectionFallbacks.put("java.util.NavigableSet", TreeSet.class);
-    }
-
-    /**
-     * To support external/optional deserializers, we'll use a helper class
-     */
-    protected OptionalHandlerFactory optionalHandlers = OptionalHandlerFactory.instance;
-    
-    /*
-    /**********************************************************
-    /* Config
-    /**********************************************************
-     */
-    
-    /**
-     * Configuration settings for this factory; immutable instance (just like this
-     * factory), new version created via copy-constructor (fluent-style)
-     */
-    protected final DeserializerFactoryConfig _factoryConfig;
-    
-    /*
-    /**********************************************************
-    /* Life cycle
-    /**********************************************************
-     */
-
-    protected BasicDeserializerFactory(DeserializerFactoryConfig config) {
-        _factoryConfig = config;
-    }
-
-    /**
-     * Method for getting current {@link DeserializerFactoryConfig}.
-      *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of config object.
-     */
-    public DeserializerFactoryConfig getFactoryConfig() {
-        return _factoryConfig;
-    }
-
-    protected abstract DeserializerFactory withConfig(DeserializerFactoryConfig config);
-    
-    /*
-    /********************************************************
-    /* Configuration handling: fluent factories
-    /********************************************************
-     */
-
-    /**
-     * Convenience method for creating a new factory instance with additional deserializer
-     * provider.
-     */
-    @Override
-    public final DeserializerFactory withAdditionalDeserializers(Deserializers additional) {
-        return withConfig(_factoryConfig.withAdditionalDeserializers(additional));
-    }
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link KeyDeserializers}.
-     */
-    @Override
-    public final DeserializerFactory withAdditionalKeyDeserializers(KeyDeserializers additional) {
-        return withConfig(_factoryConfig.withAdditionalKeyDeserializers(additional));
-    }
-    
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link BeanDeserializerModifier}.
-     */
-    @Override
-    public final DeserializerFactory withDeserializerModifier(BeanDeserializerModifier modifier) {
-        return withConfig(_factoryConfig.withDeserializerModifier(modifier));
-    }
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link AbstractTypeResolver}.
-     */
-    @Override
-    public final DeserializerFactory withAbstractTypeResolver(AbstractTypeResolver resolver) {
-        return withConfig(_factoryConfig.withAbstractTypeResolver(resolver));
-    }
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link ValueInstantiators}.
-     */
-    @Override
-    public final DeserializerFactory withValueInstantiators(ValueInstantiators instantiators) {
-        return withConfig(_factoryConfig.withValueInstantiators(instantiators));
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl (partial): type mappings
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType mapAbstractType(DeserializationConfig config, JavaType type)
-        throws JsonMappingException
-    {
-        // first, general mappings
-        while (true) {
-            JavaType next = _mapAbstractType2(config, type);
-            if (next == null) {
-                return type;
-            }
-            /* Should not have to worry about cycles; but better verify since they will invariably
-             * occur... :-)
-             * (also: guard against invalid resolution to a non-related type)
-             */
-            Class<?> prevCls = type.getRawClass();
-            Class<?> nextCls = next.getRawClass();
-            if ((prevCls == nextCls) || !prevCls.isAssignableFrom(nextCls)) {
-                throw new IllegalArgumentException("Invalid abstract type resolution from "+type+" to "+next+": latter is not a subtype of former");
-            }
-            type = next;
-        }
-    }
-
-    /**
-     * Method that will find abstract type mapping for specified type, doing a single
-     * lookup through registered abstract type resolvers; will not do recursive lookups.
-     */
-    private JavaType _mapAbstractType2(DeserializationConfig config, JavaType type)
-        throws JsonMappingException
-    {
-        Class<?> currClass = type.getRawClass();
-        if (_factoryConfig.hasAbstractTypeResolvers()) {
-            for (AbstractTypeResolver resolver : _factoryConfig.abstractTypeResolvers()) {
-                JavaType concrete = resolver.findTypeMapping(config, type);
-                if (concrete != null && concrete.getRawClass() != currClass) {
-                    return concrete;
-                }
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl (partial): ValueInstantiators
-    /**********************************************************
-     */
-
-    /**
-     * Value instantiator is created both based on creator annotations,
-     * and on optional externally provided instantiators (registered through
-     * module interface).
-     */
-    @Override
-    public ValueInstantiator findValueInstantiator(DeserializationContext ctxt,
-            BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-
-        ValueInstantiator instantiator = null;
-        // [JACKSON-633] Check @JsonValueInstantiator before anything else
-        AnnotatedClass ac = beanDesc.getClassInfo();
-        Object instDef = ctxt.getAnnotationIntrospector().findValueInstantiator(ac);
-        if (instDef != null) {
-            instantiator = _valueInstantiatorInstance(config, ac, instDef);
-        }
-        if (instantiator == null) {
-            /* Second: see if some of standard Jackson/JDK types might provide value
-             * instantiators.
-             */
-            instantiator = _findStdValueInstantiator(config, beanDesc);
-            if (instantiator == null) {
-                instantiator = _constructDefaultValueInstantiator(ctxt, beanDesc);
-            }
-        }
-        
-        // finally: anyone want to modify ValueInstantiator?
-        if (_factoryConfig.hasValueInstantiators()) {
-            for (ValueInstantiators insts : _factoryConfig.valueInstantiators()) {
-                instantiator = insts.findValueInstantiator(config, beanDesc, instantiator);
-                // let's do sanity check; easier to spot buggy handlers
-                if (instantiator == null) {
-                    throw new JsonMappingException("Broken registered ValueInstantiators (of type "
-                            +insts.getClass().getName()+"): returned null ValueInstantiator");
-                }
-            }
-        }
-        
-        return instantiator;
-    }
-
-    private ValueInstantiator _findStdValueInstantiator(DeserializationConfig config,
-            BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        return JacksonDeserializers.findValueInstantiator(config, beanDesc);
-    }
-
-    /**
-     * Method that will construct standard default {@link ValueInstantiator}
-     * using annotations (like @JsonCreator) and visibility rules
-     */
-    protected ValueInstantiator _constructDefaultValueInstantiator(DeserializationContext ctxt,
-            BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        boolean fixAccess = ctxt.canOverrideAccessModifiers();
-        CreatorCollector creators =  new CreatorCollector(beanDesc, fixAccess);
-        AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        
-        // need to construct suitable visibility checker:
-        final DeserializationConfig config = ctxt.getConfig();
-        VisibilityChecker<?> vchecker = config.getDefaultVisibilityChecker();
-        vchecker = intr.findAutoDetectVisibility(beanDesc.getClassInfo(), vchecker);
-
-        /* Important: first add factory methods; then constructors, so
-         * latter can override former!
-         */
-        _addDeserializerFactoryMethods(ctxt, beanDesc, vchecker, intr, creators);
-        // constructors only usable on concrete types:
-        if (beanDesc.getType().isConcrete()) {
-            _addDeserializerConstructors(ctxt, beanDesc, vchecker, intr, creators);
-        }
-        return creators.constructValueInstantiator(config);
-    }
-
-    public ValueInstantiator _valueInstantiatorInstance(DeserializationConfig config,
-            Annotated annotated, Object instDef)
-        throws JsonMappingException
-    {
-        if (instDef == null) {
-            return null;
-        }
-
-        ValueInstantiator inst;
-        
-        if (instDef instanceof ValueInstantiator) {
-            inst = (ValueInstantiator) instDef;
-        } else {
-            if (!(instDef instanceof Class)) {
-                throw new IllegalStateException("AnnotationIntrospector returned key deserializer definition of type "
-                        +instDef.getClass().getName()
-                        +"; expected type KeyDeserializer or Class<KeyDeserializer> instead");
-            }
-            Class<?> instClass = (Class<?>)instDef;
-            if (instClass == NoClass.class) {
-                return null;
-            }
-            if (!ValueInstantiator.class.isAssignableFrom(instClass)) {
-                throw new IllegalStateException("AnnotationIntrospector returned Class "+instClass.getName()
-                        +"; expected Class<ValueInstantiator>");
-            }
-            HandlerInstantiator hi = config.getHandlerInstantiator();
-            if (hi != null) {
-                inst = hi.valueInstantiatorInstance(config, annotated, instClass);
-            } else {
-                inst = (ValueInstantiator) ClassUtil.createInstance(instClass,
-                        config.canOverrideAccessModifiers());
-            }
-        }
-        // not resolvable or contextual, just return:
-        return inst;
-    }
-    
-    protected void _addDeserializerConstructors
-        (DeserializationContext ctxt, BeanDescription beanDesc, VisibilityChecker<?> vchecker,
-         AnnotationIntrospector intr, CreatorCollector creators)
-        throws JsonMappingException
-    {
-        /* First things first: the "default constructor" (zero-arg
-         * constructor; whether implicit or explicit) is NOT included
-         * in list of constructors, so needs to be handled separately.
-         */
-        AnnotatedConstructor defaultCtor = beanDesc.findDefaultConstructor();
-        if (defaultCtor != null) {
-            if (!creators.hasDefaultCreator() || intr.hasCreatorAnnotation(defaultCtor)) {
-                creators.setDefaultCreator(defaultCtor);
-            }
-        }
-        
-        for (AnnotatedConstructor ctor : beanDesc.getConstructors()) {
-            int argCount = ctor.getParameterCount();
-            boolean isCreator = intr.hasCreatorAnnotation(ctor);
-            boolean isVisible =  vchecker.isCreatorVisible(ctor);
-            // some single-arg constructors (String, number) are auto-detected
-            if (argCount == 1) {
-                _handleSingleArgumentConstructor(ctxt, beanDesc, vchecker, intr, creators,
-                        ctor, isCreator, isVisible);
-                continue;
-            }
-            if (!isCreator && !isVisible) {
-                continue;
-            }
-            // [JACKSON-541] improved handling a bit so:
-            // 2 or more args; all params must have name annotations
-            // ... or @JacksonInject (or equivalent)
-            /* [JACKSON-711] One more possibility; can have 1 or more injectables, and
-             * exactly one non-annotated parameter: if so, it's still delegating.
-             */
-            AnnotatedParameter nonAnnotatedParam = null;
-            int namedCount = 0;
-            int injectCount = 0;
-            CreatorProperty[] properties = new CreatorProperty[argCount];
-            for (int i = 0; i < argCount; ++i) {
-                AnnotatedParameter param = ctor.getParameter(i);
-                PropertyName pn = (param == null) ? null : intr.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
-                Object injectId = intr.findInjectableValueId(param);
-                if (name != null && name.length() > 0) {
-                    ++namedCount;
-                    properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
-                } else if (injectId != null) {
-                    ++injectCount;
-                    properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
-                } else if (nonAnnotatedParam == null) {
-                    nonAnnotatedParam = param;
-                }
-            }
-
-            // Ok: if named or injectable, we have more work to do
-            if (isCreator || namedCount > 0 || injectCount > 0) {
-                // simple case; everything covered:
-                if ((namedCount + injectCount) == argCount) {
-                    creators.addPropertyCreator(ctor, properties);
-                } else if ((namedCount == 0) && ((injectCount + 1) == argCount)) {
-                    // [712] secondary: all but one injectable, one un-annotated (un-named)
-                    creators.addDelegatingCreator(ctor, properties);
-                } else { // otherwise, epic fail
-                    throw new IllegalArgumentException("Argument #"+nonAnnotatedParam.getIndex()+" of constructor "+ctor+" has no property name annotation; must have name when multiple-paramater constructor annotated as Creator");
-                }
-            }
-        }
-    }
-
-    protected boolean _handleSingleArgumentConstructor(DeserializationContext ctxt,
-            BeanDescription beanDesc, VisibilityChecker<?> vchecker,
-            AnnotationIntrospector intr, CreatorCollector creators,
-            AnnotatedConstructor ctor, boolean isCreator, boolean isVisible)
-        throws JsonMappingException
-    {
-        // note: if we do have parameter name, it'll be "property constructor":
-        AnnotatedParameter param = ctor.getParameter(0);
-        PropertyName pn = (param == null) ? null : intr.findNameForDeserialization(param);
-        String name = (pn == null) ? null : pn.getSimpleName();
-        Object injectId = intr.findInjectableValueId(param);
-    
-        if ((injectId != null) || (name != null && name.length() > 0)) { // property-based
-            // We know there's a name and it's only 1 parameter.
-            CreatorProperty[] properties = new CreatorProperty[1];
-            properties[0] = constructCreatorProperty(ctxt, beanDesc, name, 0, param, injectId);
-            creators.addPropertyCreator(ctor, properties);
-            return true;
-        }
-    
-        // otherwise either 'simple' number, String, or general delegate:
-        Class<?> type = ctor.getRawParameterType(0);
-        if (type == String.class) {
-            if (isCreator || isVisible) {
-                creators.addStringCreator(ctor);
-            }
-            return true;
-        }
-        if (type == int.class || type == Integer.class) {
-            if (isCreator || isVisible) {
-                creators.addIntCreator(ctor);
-            }
-            return true;
-        }
-        if (type == long.class || type == Long.class) {
-            if (isCreator || isVisible) {
-                creators.addLongCreator(ctor);
-            }
-            return true;
-        }
-        if (type == double.class || type == Double.class) {
-            if (isCreator || isVisible) {
-                creators.addDoubleCreator(ctor);
-            }
-            return true;
-        }
-    
-        // Delegating Creator ok iff it has @JsonCreator (etc)
-        if (isCreator) {
-            creators.addDelegatingCreator(ctor, null);
-            return true;
-        }
-        return false;
-    }
-    
-    protected void _addDeserializerFactoryMethods
-        (DeserializationContext ctxt, BeanDescription beanDesc, VisibilityChecker<?> vchecker,
-         AnnotationIntrospector intr, CreatorCollector creators)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        for (AnnotatedMethod factory : beanDesc.getFactoryMethods()) {
-            boolean isCreator = intr.hasCreatorAnnotation(factory);
-            int argCount = factory.getParameterCount();
-            // zero-arg methods must be annotated; if so, are "default creators" [JACKSON-850]
-            if (argCount == 0) {
-                if (isCreator) {
-                    creators.setDefaultCreator(factory);
-                }
-                continue;
-            }
-            // some single-arg factory methods (String, number) are auto-detected
-            if (argCount == 1) {
-                AnnotatedParameter param = factory.getParameter(0);
-                PropertyName pn = (param == null) ? null : intr.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
-                Object injectId = intr.findInjectableValueId(param);
-
-                if ((injectId == null) && (name == null || name.length() == 0)) { // not property based
-                    _handleSingleArgumentFactory(config, beanDesc, vchecker, intr, creators,
-                            factory, isCreator);
-                    // otherwise just ignored
-                    continue;
-                }
-                // fall through if there's name
-            } else {
-                // more than 2 args, must be @JsonCreator
-                if (!intr.hasCreatorAnnotation(factory)) {
-                    continue;
-                }
-            }
-            // 1 or more args; all params must have name annotations
-            AnnotatedParameter nonAnnotatedParam = null;            
-            CreatorProperty[] properties = new CreatorProperty[argCount];
-            int namedCount = 0;
-            int injectCount = 0;            
-            for (int i = 0; i < argCount; ++i) {
-                AnnotatedParameter param = factory.getParameter(i);
-                PropertyName pn = (param == null) ? null : intr.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
-                Object injectId = intr.findInjectableValueId(param);
-                if (name != null && name.length() > 0) {
-                    ++namedCount;
-                    properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
-                } else if (injectId != null) {
-                    ++injectCount;
-                    properties[i] = constructCreatorProperty(ctxt, beanDesc, name, i, param, injectId);
-                } else if (nonAnnotatedParam == null) {
-                    nonAnnotatedParam = param;
-                }
-            }
-
-            // Ok: if named or injectable, we have more work to do
-            if (isCreator || namedCount > 0 || injectCount > 0) {
-                // simple case; everything covered:
-                if ((namedCount + injectCount) == argCount) {
-                    creators.addPropertyCreator(factory, properties);
-                } else if ((namedCount == 0) && ((injectCount + 1) == argCount)) {
-                    // [712] secondary: all but one injectable, one un-annotated (un-named)
-                    creators.addDelegatingCreator(factory, properties);
-                } else { // otherwise, epic fail
-                    throw new IllegalArgumentException("Argument #"+nonAnnotatedParam.getIndex()
-                            +" of factory method "+factory+" has no property name annotation; must have name when multiple-paramater constructor annotated as Creator");
-                }
-            }
-        }
-    }
-
-    protected boolean _handleSingleArgumentFactory(DeserializationConfig config,
-            BeanDescription beanDesc, VisibilityChecker<?> vchecker,
-            AnnotationIntrospector intr, CreatorCollector creators,
-            AnnotatedMethod factory, boolean isCreator)
-        throws JsonMappingException
-    {
-        Class<?> type = factory.getRawParameterType(0);
-        
-        if (type == String.class) {
-            if (isCreator || vchecker.isCreatorVisible(factory)) {
-                creators.addStringCreator(factory);
-            }
-            return true;
-        }
-        if (type == int.class || type == Integer.class) {
-            if (isCreator || vchecker.isCreatorVisible(factory)) {
-                creators.addIntCreator(factory);
-            }
-            return true;
-        }
-        if (type == long.class || type == Long.class) {
-            if (isCreator || vchecker.isCreatorVisible(factory)) {
-                creators.addLongCreator(factory);
-            }
-            return true;
-        }
-        if (type == double.class || type == Double.class) {
-            if (isCreator || vchecker.isCreatorVisible(factory)) {
-                creators.addDoubleCreator(factory);
-            }
-            return true;
-        }
-        if (type == boolean.class || type == Boolean.class) {
-            if (isCreator || vchecker.isCreatorVisible(factory)) {
-                creators.addBooleanCreator(factory);
-            }
-            return true;
-        }
-        if (intr.hasCreatorAnnotation(factory)) {
-            creators.addDelegatingCreator(factory, null);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Method that will construct a property object that represents
-     * a logical property passed via Creator (constructor or static
-     * factory method)
-     */
-    protected CreatorProperty constructCreatorProperty(DeserializationContext ctxt,
-            BeanDescription beanDesc, String name, int index,
-            AnnotatedParameter param,
-            Object injectableValueId)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        JavaType t0 = config.getTypeFactory().constructType(param.getParameterType(), beanDesc.bindingsForBeanType());
-        BeanProperty.Std property = new BeanProperty.Std(name, t0, beanDesc.getClassAnnotations(), param);
-        JavaType type = resolveType(ctxt, beanDesc, t0, param);
-        if (type != t0) {
-            property = property.withType(type);
-        }
-        // Is there an annotation that specifies exact deserializer?
-        JsonDeserializer<Object> deser = findDeserializerFromAnnotation(ctxt, param);
-        // If yes, we are mostly done:
-        type = modifyTypeByAnnotation(ctxt, param, type);
-
-        // Type deserializer: either comes from property (and already resolved)
-        TypeDeserializer typeDeser = (TypeDeserializer) type.getTypeHandler();
-        // or if not, based on type being referenced:
-        if (typeDeser == null) {
-            typeDeser = findTypeDeserializer(config, type);
-        }
-        CreatorProperty prop = new CreatorProperty(name, type, typeDeser,
-                beanDesc.getClassAnnotations(), param, index, injectableValueId);
-        if (deser != null) {
-            prop = prop.withValueDeserializer(deser);
-        }
-        return prop;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl: array deserializers
-    /**********************************************************
-     */
-        
-    @Override
-    public JsonDeserializer<?> createArrayDeserializer(DeserializationContext ctxt,
-            ArrayType type, final BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        JavaType elemType = type.getContentType();
-        
-        // Very first thing: is deserializer hard-coded for elements?
-        JsonDeserializer<Object> contentDeser = elemType.getValueHandler();
-        if (contentDeser == null) {
-            // Maybe special array type, such as "primitive" arrays (int[] etc)
-            JsonDeserializer<?> deser = _arrayDeserializers.get(elemType);
-            if (deser != null) {
-                /* 23-Nov-2010, tatu: Although not commonly needed, ability to override
-                 *   deserializers for all types (including primitive arrays) is useful
-                 *   so let's allow this
-                 */
-                JsonDeserializer<?> custom = _findCustomArrayDeserializer(type,
-                        ctxt.getConfig(), beanDesc, null, contentDeser);
-                if (custom != null) {
-                    return custom;
-                }
-                return deser;
-            }
-            // If not, generic one:
-            if (elemType.isPrimitive()) { // sanity check
-                throw new IllegalArgumentException("Internal error: primitive type ("+type+") passed, no array deserializer found");
-            }
-        }
-        // Then optional type info (1.5): if type has been resolved, we may already know type deserializer:
-        TypeDeserializer elemTypeDeser = elemType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (elemTypeDeser == null) {
-            elemTypeDeser = findTypeDeserializer(ctxt.getConfig(), elemType);
-        }
-        // 23-Nov-2010, tatu: Custom array deserializer?
-        JsonDeserializer<?> custom = _findCustomArrayDeserializer(type,
-                ctxt.getConfig(), beanDesc, elemTypeDeser, contentDeser);
-        if (custom != null) {
-            return custom;
-        }
-        return new ObjectArrayDeserializer(type, contentDeser, elemTypeDeser);
-    }
-
-    protected JsonDeserializer<?> _findCustomArrayDeserializer(ArrayType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findArrayDeserializer(type, config,
-                    beanDesc, elementTypeDeserializer, elementDeserializer);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl: Collection(-like) deserializers
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonDeserializer<?> createCollectionDeserializer(DeserializationContext ctxt,
-            CollectionType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        JavaType contentType = type.getContentType();
-        // Very first thing: is deserializer hard-coded for elements?
-        JsonDeserializer<Object> contentDeser = contentType.getValueHandler();
-
-        // Then optional type info (1.5): if type has been resolved, we may already know type deserializer:
-        TypeDeserializer contentTypeDeser = contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = findTypeDeserializer(ctxt.getConfig(), contentType);
-        }
-
-        // 23-Nov-2010, tatu: Custom deserializer?
-        JsonDeserializer<?> custom = _findCustomCollectionDeserializer(type,
-                ctxt.getConfig(), beanDesc, contentTypeDeser, contentDeser);
-        if (custom != null) {
-            return custom;
-        }
-        
-        Class<?> collectionClass = type.getRawClass();
-        if (contentDeser == null) { // not defined by annotation
-            // One special type: EnumSet:
-            if (EnumSet.class.isAssignableFrom(collectionClass)) {
-                return new EnumSetDeserializer(contentType, null);
-            }
-        }
-        
-        /* One twist: if we are being asked to instantiate an interface or
-         * abstract Collection, we need to either find something that implements
-         * the thing, or give up.
-         *
-         * Note that we do NOT try to guess based on secondary interfaces
-         * here; that would probably not work correctly since casts would
-         * fail later on (as the primary type is not the interface we'd
-         * be implementing)
-         */
-        if (type.isInterface() || type.isAbstract()) {
-            @SuppressWarnings({ "rawtypes" })
-            Class<? extends Collection> fallback = _collectionFallbacks.get(collectionClass.getName());
-            if (fallback == null) {
-                throw new IllegalArgumentException("Can not find a deserializer for non-concrete Collection type "+type);
-            }
-            collectionClass = fallback;
-            type = (CollectionType) ctxt.getConfig().constructSpecializedType(type, collectionClass);
-            // But if so, also need to re-check creators...
-            beanDesc = ctxt.getConfig().introspectForCreation(type);
-        }
-        ValueInstantiator inst = findValueInstantiator(ctxt, beanDesc);
-        // 13-Dec-2010, tatu: Can use more optimal deserializer if content type is String, so:
-        if (contentType.getRawClass() == String.class) {
-            // no value type deserializer because Strings are one of natural/native types:
-            return new StringCollectionDeserializer(type, contentDeser, inst);
-        }
-        return new CollectionDeserializer(type, contentDeser, contentTypeDeser, inst);
-    }
-
-    // Copied almost verbatim from "createCollectionDeserializer" -- should try to share more code
-    @Override
-    public JsonDeserializer<?> createCollectionLikeDeserializer(DeserializationContext ctxt,
-            CollectionLikeType type, final BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        JavaType contentType = type.getContentType();
-        // Very first thing: is deserializer hard-coded for elements?
-        JsonDeserializer<Object> contentDeser = contentType.getValueHandler();
-
-        // Then optional type info (1.5): if type has been resolved, we may already know type deserializer:
-        TypeDeserializer contentTypeDeser = contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = findTypeDeserializer(ctxt.getConfig(), contentType);
-        }
-        return _findCustomCollectionLikeDeserializer(type, ctxt.getConfig(), beanDesc,
-                contentTypeDeser, contentDeser);
-    }
-  
-    protected JsonDeserializer<?> _findCustomCollectionDeserializer(CollectionType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findCollectionDeserializer(type, config, beanDesc,
-                    elementTypeDeserializer, elementDeserializer);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-
-    protected JsonDeserializer<?> _findCustomCollectionLikeDeserializer(CollectionLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findCollectionLikeDeserializer(type, config, beanDesc,
-                    elementTypeDeserializer, elementDeserializer);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl: Map(-like) deserializers
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
-            MapType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        JavaType keyType = type.getKeyType();
-        JavaType contentType = type.getContentType();
-        
-        // First: is there annotation-specified deserializer for values?
-        @SuppressWarnings("unchecked")
-        JsonDeserializer<Object> contentDeser = (JsonDeserializer<Object>) contentType.getValueHandler();
-        
-        // Ok: need a key deserializer (null indicates 'default' here)
-        KeyDeserializer keyDes = (KeyDeserializer) keyType.getValueHandler();
-        // Then optional type info (1.5); either attached to type, or resolved separately:
-        TypeDeserializer contentTypeDeser = contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = findTypeDeserializer(config, contentType);
-        }
-
-        // 23-Nov-2010, tatu: Custom deserializer?
-        JsonDeserializer<?> custom = _findCustomMapDeserializer(type, config, beanDesc,
-                keyDes, contentTypeDeser, contentDeser);
-
-        if (custom != null) {
-            return custom;
-        }
-        // Value handling is identical for all, but EnumMap requires special handling for keys
-        Class<?> mapClass = type.getRawClass();
-        if (EnumMap.class.isAssignableFrom(mapClass)) {
-            Class<?> kt = keyType.getRawClass();
-            if (kt == null || !kt.isEnum()) {
-                throw new IllegalArgumentException("Can not construct EnumMap; generic (key) type not available");
-            }
-            return new EnumMapDeserializer(type, null, contentDeser);
-        }
-
-        // Otherwise, generic handler works ok.
-
-        /* But there is one more twist: if we are being asked to instantiate
-         * an interface or abstract Map, we need to either find something
-         * that implements the thing, or give up.
-         *
-         * Note that we do NOT try to guess based on secondary interfaces
-         * here; that would probably not work correctly since casts would
-         * fail later on (as the primary type is not the interface we'd
-         * be implementing)
-         */
-        if (type.isInterface() || type.isAbstract()) {
-            @SuppressWarnings("rawtypes")
-            Class<? extends Map> fallback = _mapFallbacks.get(mapClass.getName());
-            if (fallback == null) {
-                throw new IllegalArgumentException("Can not find a deserializer for non-concrete Map type "+type);
-            }
-            mapClass = fallback;
-            type = (MapType) config.constructSpecializedType(type, mapClass);
-            // But if so, also need to re-check creators...
-            beanDesc = config.introspectForCreation(type);
-        }
-        ValueInstantiator inst = findValueInstantiator(ctxt, beanDesc);
-        MapDeserializer md = new MapDeserializer(type, inst, keyDes, contentDeser, contentTypeDeser);
-        md.setIgnorableProperties(config.getAnnotationIntrospector().findPropertiesToIgnore(beanDesc.getClassInfo()));
-        return md;
-    }
-
-    // Copied almost verbatim from "createMapDeserializer" -- should try to share more code
-    @Override
-    public JsonDeserializer<?> createMapLikeDeserializer(DeserializationContext ctxt,
-            MapLikeType type, final BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        JavaType keyType = type.getKeyType();
-        JavaType contentType = type.getContentType();
-        
-        // First: is there annotation-specified deserializer for values?
-        @SuppressWarnings("unchecked")
-        JsonDeserializer<Object> contentDeser = (JsonDeserializer<Object>) contentType.getValueHandler();
-        
-        // Ok: need a key deserializer (null indicates 'default' here)
-        KeyDeserializer keyDes = (KeyDeserializer) keyType.getValueHandler();
-        /* !!! 24-Jan-2012, tatu: NOTE: impls MUST use resolve() to find key deserializer!
-        if (keyDes == null) {
-            keyDes = p.findKeyDeserializer(config, keyType, property);
-        }
-        */
-        // Then optional type info (1.5); either attached to type, or resolve separately:
-        TypeDeserializer contentTypeDeser = contentType.getTypeHandler();
-        // but if not, may still be possible to find:
-        if (contentTypeDeser == null) {
-            contentTypeDeser = findTypeDeserializer(ctxt.getConfig(), contentType);
-        }
-        return _findCustomMapLikeDeserializer(type, ctxt.getConfig(),
-                beanDesc, keyDes, contentTypeDeser, contentDeser);
-    }
-
-    protected JsonDeserializer<?> _findCustomMapDeserializer(MapType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findMapDeserializer(type, config, beanDesc,
-                    keyDeserializer, elementTypeDeserializer, elementDeserializer);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-
-    protected JsonDeserializer<?> _findCustomMapLikeDeserializer(MapLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findMapLikeDeserializer(type, config, beanDesc,
-                    keyDeserializer, elementTypeDeserializer, elementDeserializer);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl: Enum deserializers
-    /**********************************************************
-     */
-    
-    /**
-     * Factory method for constructing serializers of {@link Enum} types.
-     */
-    @Override
-    public JsonDeserializer<?> createEnumDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        Class<?> enumClass = type.getRawClass();
-        // 23-Nov-2010, tatu: Custom deserializer?
-        JsonDeserializer<?> custom = _findCustomEnumDeserializer(enumClass,
-                ctxt.getConfig(), beanDesc);
-        if (custom != null) {
-            return custom;
-        }
-
-        // [JACKSON-193] May have @JsonCreator for static factory method:
-        for (AnnotatedMethod factory : beanDesc.getFactoryMethods()) {
-            if (ctxt.getAnnotationIntrospector().hasCreatorAnnotation(factory)) {
-                int argCount = factory.getParameterCount();
-                if (argCount == 1) {
-                    Class<?> returnType = factory.getRawReturnType();
-                    // usually should be class, but may be just plain Enum<?> (for Enum.valueOf()?)
-                    if (returnType.isAssignableFrom(enumClass)) {
-                        return EnumDeserializer.deserializerForCreator(ctxt.getConfig(), enumClass, factory);
-                    }
-                }
-                throw new IllegalArgumentException("Unsuitable method ("+factory+") decorated with @JsonCreator (for Enum type "
-                        +enumClass.getName()+")");
-            }
-        }
-        // [JACKSON-749] Also, need to consider @JsonValue, if one found
-        return new EnumDeserializer(constructEnumResolver(enumClass, ctxt.getConfig(), beanDesc.findJsonValueMethod()));
-    }
-
-    protected JsonDeserializer<?> _findCustomEnumDeserializer(Class<?> type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findEnumDeserializer(type, config, beanDesc);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl: Tree deserializers
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonDeserializer<?> createTreeDeserializer(DeserializationConfig config,
-            JavaType nodeType, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        @SuppressWarnings("unchecked")
-        Class<? extends JsonNode> nodeClass = (Class<? extends JsonNode>) nodeType.getRawClass();
-        // 23-Nov-2010, tatu: Custom deserializer?
-        JsonDeserializer<?> custom = _findCustomTreeNodeDeserializer(nodeClass, config,
-                beanDesc);
-        if (custom != null) {
-            return custom;
-        }
-        return JsonNodeDeserializer.getDeserializer(nodeClass);
-    }
-
-    protected JsonDeserializer<?> _findCustomTreeNodeDeserializer(Class<? extends JsonNode> type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findTreeNodeDeserializer(type, config, beanDesc);
-            if (deser != null) {
-                return deser;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl (partial): type deserializers
-    /**********************************************************
-     */
-
-    @Override
-    public TypeDeserializer findTypeDeserializer(DeserializationConfig config,
-            JavaType baseType)
-        throws JsonMappingException
-    {
-        Class<?> cls = baseType.getRawClass();
-        BeanDescription bean = config.introspectClassAnnotations(cls);
-        AnnotatedClass ac = bean.getClassInfo();
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findTypeResolver(config, ac, baseType);
-
-        /* Ok: if there is no explicit type info handler, we may want to
-         * use a default. If so, config object knows what to use.
-         */
-        Collection<NamedType> subtypes = null;
-        if (b == null) {
-            b = config.getDefaultTyper(baseType);
-            if (b == null) {
-                return null;
-            }
-        } else {
-            subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(ac, config, ai);
-        }
-        // [JACKSON-505]: May need to figure out default implementation, if none found yet
-        // (note: check for abstract type is not 100% mandatory, more of an optimization)
-        if ((b.getDefaultImpl() == null) && baseType.isAbstract()) {
-            JavaType defaultType = mapAbstractType(config, baseType);
-            if (defaultType != null && defaultType.getRawClass() != baseType.getRawClass()) {
-                b = b.defaultImpl(defaultType.getRawClass());
-            }
-        }
-        return b.buildTypeDeserializer(config, baseType, subtypes);
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializerFactory impl (partial): key deserializers
-    /**********************************************************
-     */
-    
-    @Override
-    public KeyDeserializer createKeyDeserializer(DeserializationContext ctxt,
-            JavaType type)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        if (_factoryConfig.hasKeyDeserializers()) {
-            BeanDescription beanDesc = config.introspectClassAnnotations(type.getRawClass());
-            for (KeyDeserializers d  : _factoryConfig.keyDeserializers()) {
-                KeyDeserializer deser = d.findKeyDeserializer(type, config, beanDesc);
-                if (deser != null) {
-                    return deser;
-                }
-            }
-        }
-        // and if none found, standard ones:
-        Class<?> raw = type.getRawClass();
-        if (raw == String.class || raw == Object.class) {
-            return StdKeyDeserializers.constructStringKeyDeserializer(config, type);
-        }
-        // Most other keys are for limited number of static types
-        KeyDeserializer kdes = _keyDeserializers.get(type);
-        if (kdes != null) {
-            return kdes;
-        }
-        // And then other one-offs; first, Enum:
-        if (type.isEnumType()) {
-            return _createEnumKeyDeserializer(ctxt, type);
-        }
-        // One more thing: can we find ctor(String) or valueOf(String)?
-        kdes = StdKeyDeserializers.findStringBasedKeyDeserializer(config, type);
-        return kdes;
-    }
-
-    private KeyDeserializer _createEnumKeyDeserializer(DeserializationContext ctxt,
-            JavaType type)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        BeanDescription beanDesc = config.introspect(type);
-        JsonDeserializer<?> des = findDeserializerFromAnnotation(ctxt, beanDesc.getClassInfo());
-        if (des != null) {
-            return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, des);
-        }
-        Class<?> enumClass = type.getRawClass();
-        // 23-Nov-2010, tatu: Custom deserializer?
-        JsonDeserializer<?> custom = _findCustomEnumDeserializer(enumClass, config, beanDesc);
-        if (custom != null) {
-            return StdKeyDeserializers.constructDelegatingKeyDeserializer(config, type, des);
-        }
-
-        EnumResolver<?> enumRes = constructEnumResolver(enumClass, config, beanDesc.findJsonValueMethod());
-        // [JACKSON-193] May have @JsonCreator for static factory method:
-        for (AnnotatedMethod factory : beanDesc.getFactoryMethods()) {
-            if (config.getAnnotationIntrospector().hasCreatorAnnotation(factory)) {
-                int argCount = factory.getParameterCount();
-                if (argCount == 1) {
-                    Class<?> returnType = factory.getRawReturnType();
-                    // usually should be class, but may be just plain Enum<?> (for Enum.valueOf()?)
-                    if (returnType.isAssignableFrom(enumClass)) {
-                        // note: mostly copied from 'EnumDeserializer.deserializerForCreator(...)'
-                        if (factory.getGenericParameterType(0) != String.class) {
-                            throw new IllegalArgumentException("Parameter #0 type for factory method ("+factory+") not suitable, must be java.lang.String");
-                        }
-                        if (config.canOverrideAccessModifiers()) {
-                            ClassUtil.checkAndFixAccess(factory.getMember());
-                        }
-                        return StdKeyDeserializers.constructEnumKeyDeserializer(enumRes, factory);
-                    }
-                }
-                throw new IllegalArgumentException("Unsuitable method ("+factory+") decorated with @JsonCreator (for Enum type "
-                        +enumClass.getName()+")");
-            }
-        }
-        // [JACKSON-749] Also, need to consider @JsonValue, if one found
-        return StdKeyDeserializers.constructEnumKeyDeserializer(enumRes);
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Method called to create a type information deserializer for values of
-     * given non-container property, if one is needed.
-     * If not needed (no polymorphic handling configured for property), should return null.
-     *<p>
-     * Note that this method is only called for non-container bean properties,
-     * and not for values in container types or root values (or container properties)
-     *
-     * @param baseType Declared base type of the value to deserializer (actual
-     *    deserializer type will be this type or its subtype)
-     * 
-     * @return Type deserializer to use for given base type, if one is needed; null if not.
-     */
-    public TypeDeserializer findPropertyTypeDeserializer(DeserializationConfig config,
-            JavaType baseType, AnnotatedMember annotated)
-        throws JsonMappingException
-    {
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyTypeResolver(config, annotated, baseType);        
-        // Defaulting: if no annotations on member, check value class
-        if (b == null) {
-            return findTypeDeserializer(config, baseType);
-        }
-        // but if annotations found, may need to resolve subtypes:
-        Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(
-                annotated, config, ai, baseType);
-        return b.buildTypeDeserializer(config, baseType, subtypes);
-    }
-    
-    /**
-     * Method called to find and create a type information deserializer for values of
-     * given container (list, array, map) property, if one is needed.
-     * If not needed (no polymorphic handling configured for property), should return null.
-     *<p>
-     * Note that this method is only called for container bean properties,
-     * and not for values in container types or root values (or non-container properties)
-     * 
-     * @param containerType Type of property; must be a container type
-     * @param propertyEntity Field or method that contains container property
-     */    
-    public TypeDeserializer findPropertyContentTypeDeserializer(DeserializationConfig config,
-            JavaType containerType, AnnotatedMember propertyEntity)
-        throws JsonMappingException
-    {
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyContentTypeResolver(config, propertyEntity, containerType);        
-        JavaType contentType = containerType.getContentType();
-        // Defaulting: if no annotations on member, check class
-        if (b == null) {
-            return findTypeDeserializer(config, contentType);
-        }
-        // but if annotations found, may need to resolve subtypes:
-        Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(
-                propertyEntity, config, ai, contentType);
-        return b.buildTypeDeserializer(config, contentType, subtypes);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, value/content/key type introspection
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method called to check if a class or method
-     * has annotation that tells which class to use for deserialization.
-     * Returns null if no such annotation found.
-     */
-    protected JsonDeserializer<Object> findDeserializerFromAnnotation(DeserializationContext ctxt,
-            Annotated ann)
-        throws JsonMappingException
-    {
-        Object deserDef = ctxt.getAnnotationIntrospector().findDeserializer(ann);
-        if (deserDef == null) {
-            return null;
-        }
-        return ctxt.deserializerInstance(ann, deserDef);
-    }
-
-    /**
-     * Method called to see if given method has annotations that indicate
-     * a more specific type than what the argument specifies.
-     * If annotations are present, they must specify compatible Class;
-     * instance of which can be assigned using the method. This means
-     * that the Class has to be raw class of type, or its sub-class
-     * (or, implementing class if original Class instance is an interface).
-     *
-     * @param a Method or field that the type is associated with
-     * @param type Type of field, or the setter argument
-     *
-     * @return Original type if no annotations are present; or a more
-     *   specific type derived from it if type annotation(s) was found
-     *
-     * @throws JsonMappingException if invalid annotation is found
-     */
-    @SuppressWarnings({ "unchecked" })
-    protected <T extends JavaType> T modifyTypeByAnnotation(DeserializationContext ctxt,
-            Annotated a, T type)
-        throws JsonMappingException
-    {
-        // first: let's check class for the instance itself:
-        AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        Class<?> subclass = intr.findDeserializationType(a, type);
-        if (subclass != null) {
-            try {
-                type = (T) type.narrowBy(subclass);
-            } catch (IllegalArgumentException iae) {
-                throw new JsonMappingException("Failed to narrow type "+type+" with concrete-type annotation (value "+subclass.getName()+"), method '"+a.getName()+"': "+iae.getMessage(), null, iae);
-            }
-        }
-
-        // then key class
-        if (type.isContainerType()) {
-            Class<?> keyClass = intr.findDeserializationKeyType(a, type.getKeyType());
-            if (keyClass != null) {
-                // illegal to use on non-Maps
-                if (!(type instanceof MapLikeType)) {
-                    throw new JsonMappingException("Illegal key-type annotation: type "+type+" is not a Map(-like) type");
-                }
-                try {
-                    type = (T) ((MapLikeType) type).narrowKey(keyClass);
-                } catch (IllegalArgumentException iae) {
-                    throw new JsonMappingException("Failed to narrow key type "+type+" with key-type annotation ("+keyClass.getName()+"): "+iae.getMessage(), null, iae);
-                }
-            }
-            JavaType keyType = type.getKeyType();
-            /* 21-Mar-2011, tatu: ... and associated deserializer too (unless already assigned)
-             *   (not 100% why or how, but this does seem to get called more than once, which
-             *   is not good: for now, let's just avoid errors)
-             */
-            if (keyType != null && keyType.getValueHandler() == null) {
-                Object kdDef = intr.findKeyDeserializer(a);
-                KeyDeserializer kd = ctxt.keyDeserializerInstance(a, kdDef);
-                if (kd != null) {
-                    type = (T) ((MapLikeType) type).withKeyValueHandler(kd);
-                    keyType = type.getKeyType(); // just in case it's used below
-                }
-            }            
-           
-           // and finally content class; only applicable to structured types
-           Class<?> cc = intr.findDeserializationContentType(a, type.getContentType());
-           if (cc != null) {
-               try {
-                   type = (T) type.narrowContentsBy(cc);
-               } catch (IllegalArgumentException iae) {
-                   throw new JsonMappingException("Failed to narrow content type "+type+" with content-type annotation ("+cc.getName()+"): "+iae.getMessage(), null, iae);
-               }
-           }
-           // ... as well as deserializer for contents:
-           JavaType contentType = type.getContentType();
-           if (contentType.getValueHandler() == null) { // as with above, avoid resetting (which would trigger exception)
-               Object cdDef = intr.findContentDeserializer(a);
-                JsonDeserializer<?> cd = ctxt.deserializerInstance(a, cdDef);
-                if (cd != null) {
-                    type = (T) type.withContentValueHandler(cd);
-                }
-            }
-        }
-        return type;
-    }
-    
-    /**
-     * Helper method used to resolve method return types and field
-     * types. The main trick here is that the containing bean may
-     * have type variable binding information (when deserializing
-     * using generic type passed as type reference), which is
-     * needed in some cases.
-     */
-    protected JavaType resolveType(DeserializationContext ctxt,
-            BeanDescription beanDesc, JavaType type, AnnotatedMember member)
-        throws JsonMappingException
-    {
-        // [JACKSON-154]: Also need to handle keyUsing, contentUsing
-        if (type.isContainerType()) {
-            AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-            JavaType keyType = type.getKeyType();
-            if (keyType != null) {
-                Object kdDef = intr.findKeyDeserializer(member);
-                KeyDeserializer kd = ctxt.keyDeserializerInstance(member, kdDef);
-                if (kd != null) {
-                    type = ((MapLikeType) type).withKeyValueHandler(kd);
-                    keyType = type.getKeyType(); // just in case it's used below
-                }
-            }
-            // and all container types have content types...
-            Object cdDef = intr.findContentDeserializer(member);
-            JsonDeserializer<?> cd = ctxt.deserializerInstance(member, cdDef);
-            if (cd != null) {
-                type = type.withContentValueHandler(cd);
-            }
-            /* 04-Feb-2010, tatu: Need to figure out JAXB annotations that indicate type
-             *    information to use for polymorphic members; and specifically types for
-             *    collection values (contents).
-             *    ... but only applies to members (fields, methods), not classes
-             */
-            if (member instanceof AnnotatedMember) {
-            	TypeDeserializer contentTypeDeser = findPropertyContentTypeDeserializer(
-            	        ctxt.getConfig(), type, (AnnotatedMember) member);            	
-            	if (contentTypeDeser != null) {
-            	    type = type.withContentTypeHandler(contentTypeDeser);
-            	}
-            }
-        }
-    	TypeDeserializer valueTypeDeser;
-
-        if (member instanceof AnnotatedMember) { // JAXB allows per-property annotations
-            valueTypeDeser = findPropertyTypeDeserializer(ctxt.getConfig(),
-                    type, (AnnotatedMember) member);
-        } else { // classes just have Jackson annotations
-            // probably only occurs if 'property' is null anyway
-            valueTypeDeser = findTypeDeserializer(ctxt.getConfig(), type);
-        }
-    	if (valueTypeDeser != null) {
-            type = type.withTypeHandler(valueTypeDeser);
-    	}
-    	return type;
-    }
-    
-    protected EnumResolver<?> constructEnumResolver(Class<?> enumClass,
-            DeserializationConfig config, AnnotatedMethod jsonValueMethod)
-    {
-        if (jsonValueMethod != null) {
-            Method accessor = jsonValueMethod.getAnnotated();
-            if (config.canOverrideAccessModifiers()) {
-                ClassUtil.checkAndFixAccess(accessor);
-            }
-            return EnumResolver.constructUnsafeUsingMethod(enumClass, accessor);
-        }
-        // [JACKSON-212]: may need to use Enum.toString()
-        if (config.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)) {
-            return EnumResolver.constructUnsafeUsingToString(enumClass);
-        }
-        return EnumResolver.constructUnsafe(enumClass, config.getAnnotationIntrospector());
-    }
-
-    protected AnnotatedMethod _findJsonValueFor(DeserializationConfig config, JavaType enumType)
-    {
-        if (enumType == null) {
-            return null;
-        }
-        BeanDescription beanDesc = config.introspect(enumType);
-        return beanDesc.findJsonValueMethod();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
deleted file mode 100644
index b6bf430..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
+++ /dev/null
@@ -1,1059 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.impl.*;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Deserializer class that can deserialize instances of
- * arbitrary bean objects, usually from JSON Object structs,
- * but possibly also from simple types like String values.
- */
-public class BeanDeserializer
-    extends BeanDeserializerBase
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, initialization
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by {@link BeanDeserializerBuilder}.
-     */
-    public BeanDeserializer(BeanDeserializerBuilder builder,
-            BeanDescription beanDesc,
-            BeanPropertyMap properties, Map<String, SettableBeanProperty> backRefs,
-            HashSet<String> ignorableProps, boolean ignoreAllUnknown,
-            boolean hasViews)
-    {
-        super(builder, beanDesc, properties, backRefs,
-                ignorableProps, ignoreAllUnknown, hasViews);
-    }
-
-    /**
-     * Copy-constructor that can be used by sub-classes to allow
-     * copy-on-write style copying of settings of an existing instance.
-     */
-    protected BeanDeserializer(BeanDeserializerBase src) {
-    	super(src, src._ignoreAllUnknown);
-    }
-
-    protected BeanDeserializer(BeanDeserializerBase src, boolean ignoreAllUnknown) {
-        super(src, ignoreAllUnknown);
-    }
-    
-    protected BeanDeserializer(BeanDeserializerBase src, NameTransformer unwrapper) {
-    	super(src, unwrapper);
-    }
-
-    public BeanDeserializer(BeanDeserializerBase src, ObjectIdReader oir) {
-    	super(src, oir);
-    }
-
-    public BeanDeserializer(BeanDeserializerBase src, HashSet<String> ignorableProps) {
-        super(src, ignorableProps);
-    }
-    
-    @Override
-    public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
-    {
-        /* bit kludgy but we don't want to accidentally change type; sub-classes
-         * MUST override this method to support unwrapped properties...
-         */
-        if (getClass() != BeanDeserializer.class) {
-            return this;
-        }
-        /* main thing really is to just enforce ignoring of unknown
-         * properties; since there may be multiple unwrapped values
-         * and properties for all may be interleaved...
-         */
-        return new BeanDeserializer(this, unwrapper);
-    }
-
-    @Override
-    public BeanDeserializer withObjectIdReader(ObjectIdReader oir) {
-        return new BeanDeserializer(this, oir);
-    }
-
-    @Override
-    public BeanDeserializer withIgnorableProperties(HashSet<String> ignorableProps) {
-        return new BeanDeserializer(this, ignorableProps);
-    }
-
-    @Override
-    protected BeanDeserializerBase asArrayDeserializer() {
-        SettableBeanProperty[] props = _beanProperties.getPropertiesInInsertionOrder();
-        return new BeanAsArrayDeserializer(this, props);
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer implementation
-    /**********************************************************
-     */
-
-    /**
-     * Main deserialization method for bean-based objects (POJOs).
-     */
-    @Override
-    public final Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        // common case first:
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-            if (_vanillaProcessing) {
-                return vanillaDeserialize(jp, ctxt, t);
-            }
-            if (_objectIdReader != null) {
-                return deserializeWithObjectId(jp, ctxt);
-            }
-            return deserializeFromObject(jp, ctxt);
-        }
-        if (t == null) {
-            return _missingToken(jp, ctxt);
-        }
-        // and then others, generally requiring use of @JsonCreator
-        switch (t) {
-        case VALUE_STRING:
-            return deserializeFromString(jp, ctxt);
-        case VALUE_NUMBER_INT:
-            return deserializeFromNumber(jp, ctxt);
-        case VALUE_NUMBER_FLOAT:
-	    return deserializeFromDouble(jp, ctxt);
-        case VALUE_EMBEDDED_OBJECT:
-            return jp.getEmbeddedObject();
-        case VALUE_TRUE:
-        case VALUE_FALSE:
-            return deserializeFromBoolean(jp, ctxt);
-        case START_ARRAY:
-            // these only work if there's a (delegating) creator...
-            return deserializeFromArray(jp, ctxt);
-        case FIELD_NAME:
-        case END_OBJECT: // added to resolve [JACKSON-319], possible related issues
-            if (_vanillaProcessing) {
-                return vanillaDeserialize(jp, ctxt, t);
-            }
-            if (_objectIdReader != null) {
-                return deserializeWithObjectId(jp, ctxt);
-            }
-            return deserializeFromObject(jp, ctxt);
-	}
-        throw ctxt.mappingException(getBeanClass());
-    }
-
-    private Object _missingToken(JsonParser jp, DeserializationContext ctxt)
-        throws JsonProcessingException
-    {
-        throw ctxt.endOfInputException(getBeanClass());
-    }
-    
-    /**
-     * Secondary deserialization method, called in cases where POJO
-     * instance is created as part of deserialization, potentially
-     * after collecting some or all of the properties to set.
-     */
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-        if (_unwrappedPropertyHandler != null) {
-            return deserializeWithUnwrapped(jp, ctxt, bean);
-        }
-        if (_externalTypeIdHandler != null) {
-            return deserializeWithExternalTypeId(jp, ctxt, bean);
-        }
-        JsonToken t = jp.getCurrentToken();
-        // 23-Mar-2010, tatu: In some cases, we start with full JSON object too...
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        if (_needViewProcesing) {
-            Class<?> view = ctxt.getActiveView();
-            if (view != null) {
-                return deserializeWithView(jp, ctxt, bean, view);
-            }
-        }
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            
-            if (prop != null) { // normal case
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);
-            }
-        }
-        return bean;
-    }
-    
-    /*
-    /**********************************************************
-    /* Concrete deserialization methods
-    /**********************************************************
-     */
-
-    /**
-     * Streamlined version that is only used when no "special"
-     * features are enabled.
-     */
-    private final Object vanillaDeserialize(JsonParser jp,
-    		DeserializationContext ctxt, JsonToken t)
-        throws IOException, JsonProcessingException
-    {
-        final Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-            } else {
-                _vanillaDeserializeHandleUnknown(jp, ctxt, bean, propName);
-            }
-        }
-        return bean;
-    }
-
-    /**
-     * Helper method called for an unknown property, when using "vanilla"
-     * processing.
-     */
-    private final void _vanillaDeserializeHandleUnknown(JsonParser jp, DeserializationContext ctxt,
-            Object bean, String propName)
-        throws IOException, JsonProcessingException
-    {
-        if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-            jp.skipChildren();
-        } else if (_anySetter != null) {
-            try {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-            } catch (Exception e) {
-                wrapAndThrow(e, bean, propName, ctxt);
-            }
-        } else {
-            // Unknown: let's call handler method
-            handleUnknownProperty(jp, ctxt, bean, propName);         
-        }
-    }
-
-    /**
-     * General version used when handling needs more advanced
-     * features.
-     */
-    public Object deserializeFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_nonStandardCreation) {
-            if (_unwrappedPropertyHandler != null) {
-                return deserializeWithUnwrapped(jp, ctxt);
-            }
-            if (_externalTypeIdHandler != null) {
-                return deserializeWithExternalTypeId(jp, ctxt);
-            }
-            return deserializeFromObjectUsingNonDefault(jp, ctxt);
-        }
-        final Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-        if (_needViewProcesing) {
-            Class<?> view = ctxt.getActiveView();
-            if (view != null) {
-                return deserializeWithView(jp, ctxt, bean, view);
-            }
-        }
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);         
-            }
-        }
-        return bean;
-    }
-
-    /**
-     * Alternative deserialization method used when we expect to see Object Id;
-     * if so, we will need to ensure that the Id is seen before anything
-     * else, to ensure that it is available for solving references,
-     * even if JSON itself is not ordered that way. This may require
-     * buffering in some cases, but usually just a simple lookup to ensure
-     * that ordering is correct.
-     */
-    @SuppressWarnings("resource")
-    protected Object deserializeWithObjectId(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        final String idPropName = _objectIdReader.propertyName;
-        // First, the simple case: we point to the Object Id property
-        if (idPropName.equals(jp.getCurrentName())) {
-            return deserializeFromObject(jp, ctxt);
-        }
-        // otherwise need to reorder things
-        TokenBuffer tmpBuffer = new TokenBuffer(jp.getCodec());
-        TokenBuffer mergedBuffer = null;
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // when we match the id property, can start merging
-            if (mergedBuffer == null) {
-                if (idPropName.equals(propName)) {
-                    mergedBuffer = new TokenBuffer(jp.getCodec());
-                    mergedBuffer.writeFieldName(propName);
-                    jp.nextToken();
-                    mergedBuffer.copyCurrentStructure(jp);
-                    mergedBuffer.append(tmpBuffer);
-                    tmpBuffer = null;
-                } else {
-                    tmpBuffer.writeFieldName(propName);
-                    jp.nextToken();
-                    tmpBuffer.copyCurrentStructure(jp);
-                }
-            } else {
-                mergedBuffer.writeFieldName(propName);
-                jp.nextToken();
-                mergedBuffer.copyCurrentStructure(jp);
-            }
-        }
-        // note: we really should get merged buffer (and if not, that is likely error), but
-        // for now let's allow missing case as well. Will be caught be a later stage...
-        TokenBuffer buffer = (mergedBuffer == null) ? tmpBuffer : mergedBuffer;
-        buffer.writeEndObject();
-        // important: need to advance to point to first FIELD_NAME:
-        JsonParser mergedParser = buffer.asParser();
-        mergedParser.nextToken();
-        return deserializeFromObject(mergedParser, ctxt);
-    }
-
-    protected Object deserializeFromObjectUsingNonDefault(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {        
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return _deserializeUsingPropertyBased(jp, ctxt);
-        }
-        // should only occur for abstract types...
-        if (_beanType.isAbstract()) {
-            throw JsonMappingException.from(jp, "Can not instantiate abstract type "+_beanType
-                    +" (need to add/enable type information?)");
-        }
-        throw JsonMappingException.from(jp, "No suitable constructor found for type "
-                +_beanType+": can not instantiate from JSON object (need to add/enable type information?)");
-    }
-    
-    public Object deserializeFromString(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // First things first: id Object Id is used, most likely that's it
-        if (_objectIdReader != null) {
-            return deserializeFromObjectId(jp, ctxt);
-        }
-        
-        /* Bit complicated if we have delegating creator; may need to use it,
-         * or might not...
-         */
-        if (_delegateDeserializer != null) {
-            if (!_valueInstantiator.canCreateFromString()) {
-                Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                if (_injectables != null) {
-                    injectValues(ctxt, bean);
-                }
-                return bean;
-            }
-        }
-        return _valueInstantiator.createFromString(ctxt, jp.getText());
-    }
-
-    public Object deserializeFromNumber(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // First things first: id Object Id is used, most likely that's it
-        if (_objectIdReader != null) {
-            return deserializeFromObjectId(jp, ctxt);
-        }
-
-        switch (jp.getNumberType()) {
-        case INT:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromInt()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromInt(ctxt, jp.getIntValue());
-        case LONG:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromInt()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromLong(ctxt, jp.getLongValue());
-    	}
-        // actually, could also be BigInteger, so:
-        if (_delegateDeserializer != null) {
-            Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-            if (_injectables != null) {
-                injectValues(ctxt, bean);
-            }
-            return bean;
-        }
-        throw ctxt.instantiationException(getBeanClass(), "no suitable creator method found to deserialize from JSON integer number");
-    }
-
-    /**
-     * Method called to deserialize POJO value from a JSON floating-point
-     * number.
-     */
-    public Object deserializeFromDouble(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getNumberType()) {
-        case FLOAT: // no separate methods for taking float...
-        case DOUBLE:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromDouble()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromDouble(ctxt, jp.getDoubleValue());
-        }
-        // actually, could also be BigDecimal, so:
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        throw ctxt.instantiationException(getBeanClass(), "no suitable creator method found to deserialize from JSON floating-point number");
-    }
-
-    /**
-     * Method called to deserialize POJO value from a JSON boolean value (true, false)
-     */
-    public Object deserializeFromBoolean(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            if (!_valueInstantiator.canCreateFromBoolean()) {
-                Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                if (_injectables != null) {
-                    injectValues(ctxt, bean);
-                }
-                return bean;
-            }
-        }
-        boolean value = (jp.getCurrentToken() == JsonToken.VALUE_TRUE);
-        return _valueInstantiator.createFromBoolean(ctxt, value);
-    }
-
-    public Object deserializeFromArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-    	if (_delegateDeserializer != null) {
-    	    try {
-    	        Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-    	        if (_injectables != null) {
-    	            injectValues(ctxt, bean);
-    	        }
-    	        return bean;
-            } catch (Exception e) {
-                wrapInstantiationProblem(e, ctxt);
-            }
-    	}
-    	throw ctxt.mappingException(getBeanClass());
-    }
-
-    /**
-     * Method called to deserialize bean using "property-based creator":
-     * this means that a non-default constructor or factory method is
-     * called, and then possibly other setters. The trick is that
-     * values for creator method need to be buffered, first; and 
-     * due to non-guaranteed ordering possibly some other properties
-     * as well.
-     */
-    protected final Object _deserializeUsingPropertyBased(final JsonParser jp, final DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    { 
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-        
-        // 04-Jan-2010, tatu: May need to collect unknown properties for polymorphic cases
-        TokenBuffer unknown = null;
-
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken(); // to point to value
-            // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    jp.nextToken(); // to move to following FIELD_NAME/END_OBJECT
-                    Object bean;
-                    try {
-                        bean = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        bean = null; // never gets here
-                    }
-                    //  polymorphic?
-		    if (bean.getClass() != _beanType.getRawClass()) {
-			return handlePolymorphic(jp, ctxt, bean, unknown);
-		    }
-                    if (unknown != null) { // nope, just extra unknown stuff...
-                        bean = handleUnknownProperties(ctxt, bean, unknown);
-		    }
-		    // or just clean?
-                    return deserialize(jp, ctxt, bean);
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // "any property"?
-            if (_anySetter != null) {
-                buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(jp, ctxt));
-                continue;
-            }
-            // Ok then, let's collect the whole field; name and value
-            if (unknown == null) {
-                unknown = new TokenBuffer(jp.getCodec());
-            }
-            unknown.writeFieldName(propName);
-            unknown.copyCurrentStructure(jp);
-        }
-
-        // We hit END_OBJECT, so:
-        Object bean;
-        try {
-            bean =  creator.build(ctxt, buffer);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            bean = null; // never gets here
-        }
-        if (unknown != null) {
-            // polymorphic?
-            if (bean.getClass() != _beanType.getRawClass()) {
-                return handlePolymorphic(null, ctxt, bean, unknown);
-            }
-            // no, just some extra unknown properties
-            return handleUnknownProperties(ctxt, bean, unknown);
-        }
-        return bean;
-    }
-    
-    /**
-     * Method called in cases where we may have polymorphic deserialization
-     * case: that is, type of Creator-constructed bean is not the type
-     * of deserializer itself. It should be a sub-class or implementation
-     * class; either way, we may have more specific deserializer to use
-     * for handling it.
-     *
-     * @param jp (optional) If not null, parser that has more properties to handle
-     *   (in addition to buffered properties); if null, all properties are passed
-     *   in buffer
-     */
-    protected Object handlePolymorphic(JsonParser jp, DeserializationContext ctxt,                                          
-            Object bean, TokenBuffer unknownTokens)
-        throws IOException, JsonProcessingException
-    {  
-        // First things first: maybe there is a more specific deserializer available?
-        JsonDeserializer<Object> subDeser = _findSubclassDeserializer(ctxt, bean, unknownTokens);
-        if (subDeser != null) {
-            if (unknownTokens != null) {
-                // need to add END_OBJECT marker first
-                unknownTokens.writeEndObject();
-                JsonParser p2 = unknownTokens.asParser();
-                p2.nextToken(); // to get to first data field
-                bean = subDeser.deserialize(p2, ctxt, bean);
-            }
-            // Original parser may also have some leftovers
-            if (jp != null) {
-                bean = subDeser.deserialize(jp, ctxt, bean);
-            }
-            return bean;
-        }
-        // nope; need to use this deserializer. Unknowns we've seen so far?
-        if (unknownTokens != null) {
-            bean = handleUnknownProperties(ctxt, bean, unknownTokens);
-        }
-        // and/or things left to process via main parser?
-        if (jp != null) {
-            bean = deserialize(jp, ctxt, bean);
-        }
-        return bean;
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializing when we have to consider an active View
-    /**********************************************************
-     */
-    
-    protected final Object deserializeWithView(JsonParser jp, DeserializationContext ctxt,
-            Object bean, Class<?> activeView)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                if (!prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);
-            }
-        }
-        return bean;
-    }
-    
-    /*
-    /**********************************************************
-    /* Handling for cases where we have "unwrapped" values
-    /**********************************************************
-     */
-
-    /**
-     * Method called when there are declared "unwrapped" properties
-     * which need special handling
-     */
-    protected Object deserializeWithUnwrapped(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return deserializeUsingPropertyBasedWithUnwrapped(jp, ctxt);
-        }
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-        final Object bean = _valueInstantiator.createUsingDefault(ctxt);
-
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            // ignorable things should be ignored
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but... others should be passed to unwrapped property deserializers
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // how about any setter? We'll get copies but...
-            if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-        }
-        tokens.writeEndObject();
-        _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-        return bean;
-    }    
-
-    protected Object deserializeWithUnwrapped(JsonParser jp, DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            jp.nextToken();
-            if (prop != null) { // normal case
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but... others should be passed to unwrapped property deserializers
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // how about any setter? We'll get copies but...
-            if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-            }
-        }
-        tokens.writeEndObject();
-        _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-        return bean;
-    }
-
-    @SuppressWarnings("resource")
-    protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken(); // to point to value
-            // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    t = jp.nextToken(); // to move to following FIELD_NAME/END_OBJECT
-                    Object bean;
-                    try {
-                        bean = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
-                    }
-                    // if so, need to copy all remaining tokens into buffer
-                    while (t == JsonToken.FIELD_NAME) {
-                        jp.nextToken(); // to skip name
-                        tokens.copyCurrentStructure(jp);
-                        t = jp.nextToken();
-                    }
-                    tokens.writeEndObject();
-                    if (bean.getClass() != _beanType.getRawClass()) {
-                        // !!! 08-Jul-2011, tatu: Could probably support; but for now
-                        //   it's too complicated, so bail out
-                        tokens.close();
-                        throw ctxt.mappingException("Can not create polymorphic instances with unwrapped values");
-                    }
-                    return _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // "any property"?
-            if (_anySetter != null) {
-                buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(jp, ctxt));
-            }
-        }
-
-        // We hit END_OBJECT, so:
-        Object bean;
-        try {
-            bean =  creator.build(ctxt, buffer);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            return null; // never gets here
-        }
-        return _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-    }
-
-    /*
-    /**********************************************************
-    /* Handling for cases where we have property/-ies with
-    /* external type id
-    /**********************************************************
-     */
-    
-    protected Object deserializeWithExternalTypeId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_propertyBasedCreator != null) {
-            return deserializeUsingPropertyBasedWithExternalTypeId(jp, ctxt);
-        }
-        return deserializeWithExternalTypeId(jp, ctxt, _valueInstantiator.createUsingDefault(ctxt));
-    }
-    
-    protected Object deserializeWithExternalTypeId(JsonParser jp, DeserializationContext ctxt,
-            Object bean)
-        throws IOException, JsonProcessingException
-    {
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                // [JACKSON-831]: may have property AND be used as external type id:
-                if (jp.getCurrentToken().isScalarValue()) {
-                    ext.handleTypePropertyValue(jp, ctxt, propName, bean);
-                }
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            // ignorable things should be ignored
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but others are likely to be part of external type id thingy...
-            if (ext.handlePropertyValue(jp, ctxt, propName, bean)) {
-                continue;
-            }
-            // if not, the usual fallback handling:
-            if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            // Unknown: let's call handler method
-            handleUnknownProperty(jp, ctxt, bean, propName);         
-        }
-        // and when we get this far, let's try finalizing the deal:
-        return ext.complete(jp, ctxt, bean);
-    }        
-
-    @SuppressWarnings("resource")
-    protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken(); // to point to value
-            // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // first: let's check to see if this might be part of value with external type id:
-                if (ext.handlePropertyValue(jp, ctxt, propName, buffer)) {
-                    ;
-                } else {
-                    // Last creator property to set?
-                    Object value = creatorProp.deserialize(jp, ctxt);
-                    if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                        t = jp.nextToken(); // to move to following FIELD_NAME/END_OBJECT
-                        Object bean;
-                        try {
-                            bean = creator.build(ctxt, buffer);
-                        } catch (Exception e) {
-                            wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                            continue; // never gets here
-                        }
-                        // if so, need to copy all remaining tokens into buffer
-                        while (t == JsonToken.FIELD_NAME) {
-                            jp.nextToken(); // to skip name
-                            tokens.copyCurrentStructure(jp);
-                            t = jp.nextToken();
-                        }
-                        if (bean.getClass() != _beanType.getRawClass()) {
-                            // !!! 08-Jul-2011, tatu: Could probably support; but for now
-                            //   it's too complicated, so bail out
-                            throw ctxt.mappingException("Can not create polymorphic instances with unwrapped values");
-                        }
-                        return ext.complete(jp, ctxt, bean);
-                    }
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-                continue;
-            }
-            // external type id (or property that depends on it)?
-            if (ext.handlePropertyValue(jp, ctxt, propName, null)) {
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // "any property"?
-            if (_anySetter != null) {
-                buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(jp, ctxt));
-            }
-        }
-
-        // We hit END_OBJECT; resolve the pieces:
-        try {
-            return ext.complete(jp, ctxt, buffer, creator);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            return null; // never gets here
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
deleted file mode 100644
index f15ba73..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
+++ /dev/null
@@ -1,1063 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.impl.*;
-import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.util.*;
-
-/**
- * Base class for <code>BeanDeserializer</code>.
- */
-public abstract class BeanDeserializerBase
-    extends StdDeserializer<Object>
-    implements ContextualDeserializer, ResolvableDeserializer,
-        java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = -2038793552422727904L;
-
-    /*
-    /**********************************************************
-    /* Information regarding type being deserialized
-    /**********************************************************
-     */
-
-    /**
-     * Annotations from the bean class: used for accessing
-     * annotations during resolution
-     * (see {@link #resolve}) and
-     * contextualization (see {@link #createContextual})
-     *<p> 
-     * Transient since annotations only used during construction.
-     */
-    final private transient Annotations _classAnnotations;
-
-    /**
-     * Declared type of the bean this deserializer handles.
-     */
-    final protected JavaType _beanType;
-
-    /**
-     * Requested shape from bean class annotations.
-     */
-    final protected JsonFormat.Shape _serializationShape;
-    
-    /*
-    /**********************************************************
-    /* Configuration for creating value instance
-    /**********************************************************
-     */
-
-    /**
-     * Object that handles details of constructing initial 
-     * bean value (to which bind data to), unless instance
-     * is passed (via updateValue())
-     */
-    protected final ValueInstantiator _valueInstantiator;
-    
-    /**
-     * Deserializer that is used iff delegate-based creator is
-     * to be used for deserializing from JSON Object.
-     */
-    protected JsonDeserializer<Object> _delegateDeserializer;
-    
-    /**
-     * If the bean needs to be instantiated using constructor
-     * or factory method
-     * that takes one or more named properties as argument(s),
-     * this creator is used for instantiation.
-     * This value gets resolved during general resolution.
-     */
-    protected PropertyBasedCreator _propertyBasedCreator;
-
-    /**
-     * Flag that is set to mark "non-standard" cases; where either
-     * we use one of non-default creators, or there are unwrapped
-     * values to consider.
-     */
-    protected boolean _nonStandardCreation;
-
-    /**
-     * Flag that indicates that no "special features" whatsoever
-     * are enabled, so the simplest processing is possible.
-     */
-    protected boolean _vanillaProcessing;
-
-    /*
-    /**********************************************************
-    /* Property information, setters
-    /**********************************************************
-     */
-
-    /**
-     * Mapping of property names to properties, built when all properties
-     * to use have been successfully resolved.
-     */
-    final protected BeanPropertyMap _beanProperties;
-    
-    /**
-     * List of {@link ValueInjector}s, if any injectable values are
-     * expected by the bean; otherwise null.
-     * This includes injectors used for injecting values via setters
-     * and fields, but not ones passed through constructor parameters.
-     */
-    final protected ValueInjector[] _injectables;
-    
-    /**
-     * Fallback setter used for handling any properties that are not
-     * mapped to regular setters. If setter is not null, it will be
-     * called once for each such property.
-     */
-    protected SettableAnyProperty _anySetter;
-
-    /**
-     * In addition to properties that are set, we will also keep
-     * track of recognized but ignorable properties: these will
-     * be skipped without errors or warnings.
-     */
-    final protected HashSet<String> _ignorableProps;
-
-    /**
-     * Flag that can be set to ignore and skip unknown properties.
-     * If set, will not throw an exception for unknown properties.
-     */
-    final protected boolean _ignoreAllUnknown;
-
-    /**
-     * Flag that indicates that some aspect of deserialization depends
-     * on active view used (if any)
-     */
-    final protected boolean _needViewProcesing;
-    
-    /**
-     * We may also have one or more back reference fields (usually
-     * zero or one).
-     */
-    final protected Map<String, SettableBeanProperty> _backRefs;
-    
-    /*
-    /**********************************************************
-    /* Related handlers
-    /**********************************************************
-     */
-
-    /**
-     * Lazily constructed map used to contain deserializers needed
-     * for polymorphic subtypes.
-     * Note that this is <b>only needed</b> for polymorphic types,
-     * that is, when the actual type is not statically known.
-     * For other types this remains null.
-     */
-    protected transient HashMap<ClassKey, JsonDeserializer<Object>> _subDeserializers;
-
-    /**
-     * If one of properties has "unwrapped" value, we need separate
-     * helper object
-     */
-    protected UnwrappedPropertyHandler _unwrappedPropertyHandler;
-
-    /**
-     * Handler that we need iff any of properties uses external
-     * type id.
-     */
-    protected ExternalTypeHandler _externalTypeIdHandler;
-
-    /**
-     * If an Object Id is to be used for value handled by this
-     * deserializer, this reader is used for handling.
-     */
-    protected final ObjectIdReader _objectIdReader;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, initialization
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used when initially building a deserializer
-     * instance, given a {@link BeanDeserializerBuilder} that
-     * contains configuration.
-     */
-    protected BeanDeserializerBase(BeanDeserializerBuilder builder,
-            BeanDescription beanDesc,
-            BeanPropertyMap properties, Map<String, SettableBeanProperty> backRefs,
-            HashSet<String> ignorableProps, boolean ignoreAllUnknown,
-            boolean hasViews)
-    {
-        super(beanDesc.getType());
-
-        AnnotatedClass ac = beanDesc.getClassInfo();
-        _classAnnotations = ac.getAnnotations();       
-        _beanType = beanDesc.getType();
-        _valueInstantiator = builder.getValueInstantiator();
-        
-        _beanProperties = properties;
-        _backRefs = backRefs;
-        _ignorableProps = ignorableProps;
-        _ignoreAllUnknown = ignoreAllUnknown;
-
-        _anySetter = builder.getAnySetter();
-        List<ValueInjector> injectables = builder.getInjectables();
-        _injectables = (injectables == null || injectables.isEmpty()) ? null
-                : injectables.toArray(new ValueInjector[injectables.size()]);
-        _objectIdReader = builder.getObjectIdReader();
-        _nonStandardCreation = (_unwrappedPropertyHandler != null)
-            || _valueInstantiator.canCreateUsingDelegate()
-            || _valueInstantiator.canCreateFromObjectWith()
-            || !_valueInstantiator.canCreateUsingDefault()
-            ;
-
-        // Any transformation we may need to apply?
-        JsonFormat.Value format = beanDesc.findExpectedFormat(null);
-        _serializationShape = (format == null) ? null : format.getShape();
-
-        _needViewProcesing = hasViews;
-        _vanillaProcessing = !_nonStandardCreation
-                && (_injectables == null)
-                && !_needViewProcesing
-                // also, may need to reorder stuff if we expect Object Id:
-                && (_objectIdReader != null)
-                ;
-    }
-
-    protected BeanDeserializerBase(BeanDeserializerBase src)
-    {
-        this(src, src._ignoreAllUnknown);
-    }
-
-    protected BeanDeserializerBase(BeanDeserializerBase src, boolean ignoreAllUnknown)
-    {
-        super(src._beanType);
-        
-        _classAnnotations = src._classAnnotations;
-        _beanType = src._beanType;
-        
-        _valueInstantiator = src._valueInstantiator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        
-        _beanProperties = src._beanProperties;
-        _backRefs = src._backRefs;
-        _ignorableProps = src._ignorableProps;
-        _ignoreAllUnknown = ignoreAllUnknown;
-        _anySetter = src._anySetter;
-        _injectables = src._injectables;
-        _objectIdReader = src._objectIdReader;
-        
-        _nonStandardCreation = src._nonStandardCreation;
-        _unwrappedPropertyHandler = src._unwrappedPropertyHandler;
-        _needViewProcesing = src._needViewProcesing;
-        _serializationShape = src._serializationShape;
-
-        _vanillaProcessing = src._vanillaProcessing;
-    }
- 
-    protected BeanDeserializerBase(BeanDeserializerBase src, NameTransformer unwrapper)
-    {
-        super(src._beanType);
-
-        _classAnnotations = src._classAnnotations;
-        _beanType = src._beanType;
-        
-        _valueInstantiator = src._valueInstantiator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        
-        _backRefs = src._backRefs;
-        _ignorableProps = src._ignorableProps;
-        _ignoreAllUnknown = (unwrapper != null) || src._ignoreAllUnknown;
-        _anySetter = src._anySetter;
-        _injectables = src._injectables;
-        _objectIdReader = src._objectIdReader;
-
-        _nonStandardCreation = src._nonStandardCreation;
-        _unwrappedPropertyHandler = src._unwrappedPropertyHandler;
-
-        if (unwrapper != null) {
-            // delegate further unwraps, if any
-            if (_unwrappedPropertyHandler != null) { // got handler, delegate
-                _unwrappedPropertyHandler.renameAll(unwrapper);
-            }
-            // and handle direct unwrapping as well:
-            _beanProperties = src._beanProperties.renameAll(unwrapper);
-        } else {
-            _beanProperties = src._beanProperties;
-        }
-        _needViewProcesing = src._needViewProcesing;
-        _serializationShape = src._serializationShape;
-
-        // probably adds a twist, so:
-        _vanillaProcessing = false;
-    }
-
-    public BeanDeserializerBase(BeanDeserializerBase src, ObjectIdReader oir)
-    {
-        super(src._beanType);
-        
-        _classAnnotations = src._classAnnotations;
-        _beanType = src._beanType;
-        
-        _valueInstantiator = src._valueInstantiator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        
-        _backRefs = src._backRefs;
-        _ignorableProps = src._ignorableProps;
-        _ignoreAllUnknown = src._ignoreAllUnknown;
-        _anySetter = src._anySetter;
-        _injectables = src._injectables;
-        
-        _nonStandardCreation = src._nonStandardCreation;
-        _unwrappedPropertyHandler = src._unwrappedPropertyHandler;
-        _needViewProcesing = src._needViewProcesing;
-        _serializationShape = src._serializationShape;
-
-        _vanillaProcessing = src._vanillaProcessing;
-
-        // then actual changes:
-        _objectIdReader = oir;
-
-        if (oir == null) {
-            _beanProperties = src._beanProperties;
-        } else {
-            _beanProperties = src._beanProperties.withProperty(new ObjectIdValueProperty(oir));
-        }
-    }
-
-    public BeanDeserializerBase(BeanDeserializerBase src, HashSet<String> ignorableProps)
-    {
-        super(src._beanType);
-        
-        _classAnnotations = src._classAnnotations;
-        _beanType = src._beanType;
-        
-        _valueInstantiator = src._valueInstantiator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        
-        _backRefs = src._backRefs;
-        _ignorableProps = ignorableProps;
-        _ignoreAllUnknown = src._ignoreAllUnknown;
-        _anySetter = src._anySetter;
-        _injectables = src._injectables;
-        
-        _nonStandardCreation = src._nonStandardCreation;
-        _unwrappedPropertyHandler = src._unwrappedPropertyHandler;
-        _needViewProcesing = src._needViewProcesing;
-        _serializationShape = src._serializationShape;
-
-        _vanillaProcessing = src._vanillaProcessing;
-        _objectIdReader = src._objectIdReader;
-        _beanProperties = src._beanProperties;
-    }
-    
-    @Override
-    public abstract JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper);
-
-    public abstract BeanDeserializerBase withObjectIdReader(ObjectIdReader oir);
-
-    public abstract BeanDeserializerBase withIgnorableProperties(HashSet<String> ignorableProps);
-
-    /**
-     * Fluent factory for creating a variant that can handle
-     * POJO output as a JSON Array. Implementations may ignore this request
-     * if no such input is possible.
-     * 
-     * @since 2.1
-     */
-    protected abstract BeanDeserializerBase asArrayDeserializer();
-    
-    /*
-    /**********************************************************
-    /* Validation, post-processing
-    /**********************************************************
-     */
-
-    /**
-     * Method called to finalize setup of this deserializer,
-     * after deserializer itself has been registered.
-     * This is needed to handle recursive and transitive dependencies.
-     */
-//  @Override
-    public void resolve(DeserializationContext ctxt)
-        throws JsonMappingException
-    {
-        ExternalTypeHandler.Builder extTypes = null;
-        // if ValueInstantiator can use "creator" approach, need to resolve it here...
-        if (_valueInstantiator.canCreateFromObjectWith()) {
-            SettableBeanProperty[] creatorProps = _valueInstantiator.getFromObjectArguments(ctxt.getConfig());
-            _propertyBasedCreator = PropertyBasedCreator.construct(ctxt, _valueInstantiator, creatorProps);
-            // also: need to try to resolve 'external' type ids...
-            for (SettableBeanProperty prop : _propertyBasedCreator.properties()) {
-                if (prop.hasValueTypeDeserializer()) {
-                    TypeDeserializer typeDeser = prop.getValueTypeDeserializer();
-                    if (typeDeser.getTypeInclusion() == JsonTypeInfo.As.EXTERNAL_PROPERTY) {
-                        if (extTypes == null) {
-                            extTypes = new ExternalTypeHandler.Builder();
-                        }
-                        extTypes.addExternal(prop, typeDeser.getPropertyName());
-                    }
-                }
-            }
-        }
-
-        UnwrappedPropertyHandler unwrapped = null;
-
-        for (SettableBeanProperty origProp : _beanProperties) {
-            SettableBeanProperty prop = origProp;
-            // May already have deserializer from annotations, if so, skip:
-            if (!prop.hasValueDeserializer()) {
-                prop = prop.withValueDeserializer(findDeserializer(ctxt, prop.getType(), prop));
-            } else { // may need contextual version
-                JsonDeserializer<Object> deser = prop.getValueDeserializer();
-                if (deser instanceof ContextualDeserializer) {
-                    JsonDeserializer<?> cd = ((ContextualDeserializer) deser).createContextual(ctxt, prop);
-                    if (cd != deser) {
-                        prop = prop.withValueDeserializer(cd);
-                    }
-                }
-            }
-            // [JACKSON-235]: need to link managed references with matching back references
-            prop = _resolveManagedReferenceProperty(ctxt, prop);
-            // [JACKSON-132]: support unwrapped values (via @JsonUnwrapped)
-            SettableBeanProperty u = _resolveUnwrappedProperty(ctxt, prop);
-            if (u != null) {
-                prop = u;
-                if (unwrapped == null) {
-                    unwrapped = new UnwrappedPropertyHandler();
-                }
-                unwrapped.addProperty(prop);
-                continue;
-            }
-            // [JACKSON-594]: non-static inner classes too:
-            prop = _resolveInnerClassValuedProperty(ctxt, prop);
-            if (prop != origProp) {
-                _beanProperties.replace(prop);
-            }
-            
-            /* one more thing: if this property uses "external property" type inclusion
-             * (see [JACKSON-453]), it needs different handling altogether
-             */
-            if (prop.hasValueTypeDeserializer()) {
-                TypeDeserializer typeDeser = prop.getValueTypeDeserializer();
-                if (typeDeser.getTypeInclusion() == JsonTypeInfo.As.EXTERNAL_PROPERTY) {
-                    if (extTypes == null) {
-                        extTypes = new ExternalTypeHandler.Builder();
-                    }
-                    extTypes.addExternal(prop, typeDeser.getPropertyName());
-                    // In fact, remove from list of known properties to simplify later handling
-                    _beanProperties.remove(prop);
-                    continue;
-                }
-            }
-        }
-
-        // "any setter" may also need to be resolved now
-        if (_anySetter != null && !_anySetter.hasValueDeserializer()) {
-            _anySetter = _anySetter.withValueDeserializer(findDeserializer(ctxt,
-                    _anySetter.getType(), _anySetter.getProperty()));
-        }
-
-        // as well as delegate-based constructor:
-        if (_valueInstantiator.canCreateUsingDelegate()) {
-            JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
-            if (delegateType == null) {
-                throw new IllegalArgumentException("Invalid delegate-creator definition for "+_beanType
-                        +": value instantiator ("+_valueInstantiator.getClass().getName()
-                        +") returned true for 'canCreateUsingDelegate()', but null for 'getDelegateType()'");
-            }
-            AnnotatedWithParams delegateCreator = _valueInstantiator.getDelegateCreator();
-            // Need to create a temporary property to allow contextual deserializers:
-            BeanProperty.Std property = new BeanProperty.Std(null,
-                    delegateType, _classAnnotations, delegateCreator);
-            _delegateDeserializer = findDeserializer(ctxt, delegateType, property);
-        }
-        
-        if (extTypes != null) {
-            _externalTypeIdHandler = extTypes.build();
-            // we consider this non-standard, to offline handling
-            _nonStandardCreation = true;
-        }
-        
-        _unwrappedPropertyHandler = unwrapped;
-        if (unwrapped != null) { // we consider this non-standard, to offline handling
-            _nonStandardCreation = true;
-        }
-
-        // may need to disable vanilla processing, if unwrapped handling was enabled...
-        _vanillaProcessing = _vanillaProcessing && !_nonStandardCreation;
-    }
-
-    /**
-     * Although most of post-processing is done in resolve(), we only get
-     * access to referring property's annotations here; and this is needed
-     * to support per-property ObjectIds.
-     * We will also consider Shape transformations (read from Array) at this
-     * point, since it may come from either Class definition or property.
-     */
-//  @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        ObjectIdReader oir = _objectIdReader;
-        String[] ignorals = null;
-
-        // First: may have an override for Object Id:
-        final AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        final AnnotatedMember accessor = (property == null || intr == null)
-                ? null : property.getMember();
-        if (property != null && intr != null) {
-            ignorals = intr.findPropertiesToIgnore(accessor);
-            ObjectIdInfo objectIdInfo = intr.findObjectIdInfo(accessor);
-            if (objectIdInfo != null) { // some code duplication here as well (from BeanDeserializerFactory)
-                // 2.1: allow modifications by "id ref" annotations as well:
-                objectIdInfo = intr.findObjectReferenceInfo(accessor, objectIdInfo);
-                
-                Class<?> implClass = objectIdInfo.getGeneratorType();
-                // Property-based generator is trickier
-                JavaType idType;
-                SettableBeanProperty idProp;
-                ObjectIdGenerator<?> idGen;
-                if (implClass == ObjectIdGenerators.PropertyGenerator.class) {
-                    String propName = objectIdInfo.getPropertyName();
-                    idProp = findProperty(propName);
-                    if (idProp == null) {
-                        throw new IllegalArgumentException("Invalid Object Id definition for "
-                                +getBeanClass().getName()+": can not find property with name '"+propName+"'");
-                    }
-                    idType = idProp.getType();
-                    idGen = new PropertyBasedObjectIdGenerator(objectIdInfo.getScope());
-                } else { // other types need to be simpler
-                    JavaType type = ctxt.constructType(implClass);
-                    idType = ctxt.getTypeFactory().findTypeParameters(type, ObjectIdGenerator.class)[0];
-                    idProp = null;
-                    idGen = ctxt.objectIdGeneratorInstance(accessor, objectIdInfo);
-                }
-                JsonDeserializer<?> deser = ctxt.findRootValueDeserializer(idType);
-                oir = ObjectIdReader.construct(idType, objectIdInfo.getPropertyName(),
-                		idGen, deser, idProp);
-            }
-        }
-        // either way, need to resolve serializer:
-        BeanDeserializerBase contextual = this;
-        if (oir != null && oir != _objectIdReader) {
-            contextual = contextual.withObjectIdReader(oir);
-        }
-        // And possibly add more properties to ignore
-        if (ignorals != null && ignorals.length != 0) {
-            HashSet<String> newIgnored = ArrayBuilders.setAndArray(contextual._ignorableProps, ignorals);
-            contextual = contextual.withIgnorableProperties(newIgnored);
-        }
-
-        // One more thing: are we asked to serialize POJO as array?
-        JsonFormat.Shape shape = null;
-        if (accessor != null) {
-            JsonFormat.Value format = intr.findFormat((Annotated) accessor);
-
-            if (format != null) {
-                shape = format.getShape();
-            }
-        }
-        if (shape == null) {
-            shape = _serializationShape;
-        }
-        if (shape == JsonFormat.Shape.ARRAY) {
-            contextual = contextual.asArrayDeserializer();
-        }
-        return contextual;
-    }
-
-    
-    /**
-     * Helper method called to see if given property is part of 'managed' property
-     * pair (managed + back reference), and if so, handle resolution details.
-     */
-    protected SettableBeanProperty _resolveManagedReferenceProperty(DeserializationContext ctxt,
-            SettableBeanProperty prop)
-    {
-        String refName = prop.getManagedReferenceName();
-        if (refName == null) {
-            return prop;
-        }
-        JsonDeserializer<?> valueDeser = prop.getValueDeserializer();
-        SettableBeanProperty backProp = null;
-        boolean isContainer = false;
-        if (valueDeser instanceof BeanDeserializerBase) {
-            backProp = ((BeanDeserializerBase) valueDeser).findBackReference(refName);
-        } else if (valueDeser instanceof ContainerDeserializerBase<?>) {
-            JsonDeserializer<?> contentDeser = ((ContainerDeserializerBase<?>) valueDeser).getContentDeserializer();
-            if (!(contentDeser instanceof BeanDeserializerBase)) {
-                String deserName = (contentDeser == null) ? "NULL" : contentDeser.getClass().getName();
-                throw new IllegalArgumentException("Can not handle managed/back reference '"+refName
-                        +"': value deserializer is of type ContainerDeserializerBase, but content type is not handled by a BeanDeserializer "
-                        +" (instead it's of type "+deserName+")");
-            }
-            backProp = ((BeanDeserializerBase) contentDeser).findBackReference(refName);
-            isContainer = true;
-        } else if (valueDeser instanceof AbstractDeserializer) {
-            backProp = ((AbstractDeserializer) valueDeser).findBackReference(refName);
-        } else {
-            throw new IllegalArgumentException("Can not handle managed/back reference '"+refName
-                    +"': type for value deserializer is not BeanDeserializer or ContainerDeserializerBase, but "
-                    +valueDeser.getClass().getName());
-        }
-        if (backProp == null) {
-            throw new IllegalArgumentException("Can not handle managed/back reference '"+refName+"': no back reference property found from type "
-                    +prop.getType());
-        }
-        // also: verify that type is compatible
-        JavaType referredType = _beanType;
-        JavaType backRefType = backProp.getType();
-        if (!backRefType.getRawClass().isAssignableFrom(referredType.getRawClass())) {
-            throw new IllegalArgumentException("Can not handle managed/back reference '"+refName+"': back reference type ("
-                    +backRefType.getRawClass().getName()+") not compatible with managed type ("
-                    +referredType.getRawClass().getName()+")");
-        }
-        return new ManagedReferenceProperty(prop, refName, backProp,
-                _classAnnotations, isContainer);
-    }
-
-    /**
-     * Helper method called to see if given property might be so-called unwrapped
-     * property: these require special handling.
-     */
-    protected SettableBeanProperty _resolveUnwrappedProperty(DeserializationContext ctxt,
-            SettableBeanProperty prop)
-    {
-        AnnotatedMember am = prop.getMember();
-        if (am != null) {
-            NameTransformer unwrapper = ctxt.getAnnotationIntrospector().findUnwrappingNameTransformer(am);
-            if (unwrapper != null) {
-                JsonDeserializer<Object> orig = prop.getValueDeserializer();
-                JsonDeserializer<Object> unwrapping = orig.unwrappingDeserializer(unwrapper);
-                if (unwrapping != orig && unwrapping != null) {
-                    // might be cleaner to create new instance; but difficult to do reliably, so:
-                    return prop.withValueDeserializer(unwrapping);
-                }
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Helper method that will handle gruesome details of dealing with properties
-     * that have non-static inner class as value...
-     */
-    protected SettableBeanProperty _resolveInnerClassValuedProperty(DeserializationContext ctxt,
-            SettableBeanProperty prop)
-    {            
-        /* Should we encounter a property that has non-static inner-class
-         * as value, we need to add some more magic to find the "hidden" constructor...
-         */
-        JsonDeserializer<Object> deser = prop.getValueDeserializer();
-        // ideally wouldn't rely on it being BeanDeserializerBase; but for now it'll have to do
-        if (deser instanceof BeanDeserializerBase) {
-            BeanDeserializerBase bd = (BeanDeserializerBase) deser;
-            ValueInstantiator vi = bd.getValueInstantiator();
-            if (!vi.canCreateUsingDefault()) { // no default constructor
-                Class<?> valueClass = prop.getType().getRawClass();
-                Class<?> enclosing = ClassUtil.getOuterClass(valueClass);
-                // and is inner class of the bean class...
-                if (enclosing != null && enclosing == _beanType.getRawClass()) {
-                    for (Constructor<?> ctor : valueClass.getConstructors()) {
-                        Class<?>[] paramTypes = ctor.getParameterTypes();
-                        if (paramTypes.length == 1 && paramTypes[0] == enclosing) {
-                            if (ctxt.getConfig().canOverrideAccessModifiers()) {
-                                ClassUtil.checkAndFixAccess(ctor);
-                            }
-                            return new InnerClassProperty(prop, ctor);
-                        }
-                    }
-                }
-            }
-        }
-        return prop;
-    }
-
-    /*
-    /**********************************************************
-    /* Public accessors
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isCachable() { return true; }
-
-    /**
-     * Overridden to return true for those instances that are
-     * handling value for which Object Identity handling is enabled
-     * (either via value type or referring property).
-     */
-    @Override
-    public ObjectIdReader getObjectIdReader() {
-        return _objectIdReader;
-    }
-    
-    public boolean hasProperty(String propertyName) {
-        return _beanProperties.find(propertyName) != null;
-    }
-
-    public boolean hasViews() {
-        return _needViewProcesing;
-    }
-    
-    /**
-     * Accessor for checking number of deserialized properties.
-     */
-    public int getPropertyCount() { 
-        return _beanProperties.size();
-    }
-
-    @Override
-    public Collection<Object> getKnownPropertyNames() {
-        ArrayList<Object> names = new ArrayList<Object>();
-        for (SettableBeanProperty prop : _beanProperties) {
-            names.add(prop.getName());
-        }
-        return names;
-    }
-    
-    public final Class<?> getBeanClass() { return _beanType.getRawClass(); }
-
-    @Override public JavaType getValueType() { return _beanType; }
-
-    /**
-     * Accessor for iterating over properties this deserializer uses; with
-     * the exception that properties passed via Creator methods
-     * (specifically, "property-based constructor") are not included,
-     * but can be accessed separate by calling
-     * {@link #creatorProperties}
-     */
-    public Iterator<SettableBeanProperty> properties()
-    {
-        if (_beanProperties == null) {
-            throw new IllegalStateException("Can only call after BeanDeserializer has been resolved");
-        }
-        return _beanProperties.iterator();
-    }
-
-    /**
-     * Accessor for finding properties that represents values to pass
-     * through property-based creator method (constructor or
-     * factory method)
-     * 
-     * @since 2.0
-     */
-    public Iterator<SettableBeanProperty> creatorProperties()
-    {
-        if (_propertyBasedCreator == null) {
-            return Collections.<SettableBeanProperty>emptyList().iterator();
-        }
-        return _propertyBasedCreator.properties().iterator();
-    }
-
-    /**
-     * Accessor for finding the property with given name, if POJO
-     * has one. Name used is the external name, i.e. name used
-     * in external data representation (JSON).
-     * 
-     * @since 2.0
-     */
-    public SettableBeanProperty findProperty(String propertyName)
-    {
-        SettableBeanProperty prop = (_beanProperties == null) ?
-                null : _beanProperties.find(propertyName);
-        if (prop == null && _propertyBasedCreator != null) {
-            prop = _propertyBasedCreator.findCreatorProperty(propertyName);
-        }
-        return prop;
-    }
-    
-    /**
-     * Method needed by {@link BeanDeserializerFactory} to properly link
-     * managed- and back-reference pairs.
-     */
-    public SettableBeanProperty findBackReference(String logicalName)
-    {
-        if (_backRefs == null) {
-            return null;
-        }
-        return _backRefs.get(logicalName);
-    }
-
-    public ValueInstantiator getValueInstantiator() {
-        return _valueInstantiator;
-    }
-
-    /*
-    /**********************************************************
-    /* Mutators
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to replace an existing property with
-     * a modified one.
-     *<p>
-     * NOTE: only ever use this method if you know what you are doing;
-     * incorrect usage can break deserializer.
-     *
-     * @param original Property to replace
-     * @param replacement Property to replace it with
-     * 
-     * @since 2.1
-     */
-    public void replaceProperty(SettableBeanProperty original,
-            SettableBeanProperty replacement)
-    {
-        _beanProperties.replace(replacement);
-    }
-
-    /*
-    /**********************************************************
-    /* Partial deserializer implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public final Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        /* 16-Feb-2012, tatu: ObjectId may be used as well... need to check
-         *    that first
-         */
-        if (_objectIdReader != null) {
-            JsonToken t = jp.getCurrentToken();
-            // should be good enough check; we only care about Strings, integral numbers:
-            if (t != null && t.isScalarValue()) {
-                return deserializeFromObjectId(jp, ctxt);
-            }
-        }
-        // In future could check current token... for now this should be enough:
-        return typeDeserializer.deserializeTypedFromObject(jp, ctxt);
-    }
-
-    /**
-     * Method called in cases where it looks like we got an Object Id
-     * to parse and use as a reference.
-     */
-    protected Object deserializeFromObjectId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        Object id = _objectIdReader.deserializer.deserialize(jp, ctxt);
-        ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator);
-        // do we have it resolved?
-        Object pojo = roid.item;
-        if (pojo == null) { // not yet; should wait...
-            throw new IllegalStateException("Could not resolve Object Id ["+id+"] -- unresolved forward-reference?");
-        }
-        return pojo;
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable helper methods
-    /**********************************************************
-     */
-
-    protected void injectValues(DeserializationContext ctxt, Object bean)
-            throws IOException, JsonProcessingException
-    {
-        for (ValueInjector injector : _injectables) {
-            injector.inject(ctxt, bean);
-        }
-    }
-    
-    /**
-     * Method called when a JSON property is encountered that has not matching
-     * setter, any-setter or field, and thus can not be assigned.
-     */
-    @Override
-    protected void handleUnknownProperty(JsonParser jp, DeserializationContext ctxt,
-            Object beanOrClass, String propName)
-        throws IOException, JsonProcessingException
-    {
-        /* 22-Aug-2010, tatu: Caller now mostly checks for ignorable properties, so
-         *    following should not be necessary. However, "handleUnknownProperties()" seems
-         *    to still possibly need it so it is left for now.
-         */
-        // If registered as ignorable, skip
-        if (_ignoreAllUnknown ||
-            (_ignorableProps != null && _ignorableProps.contains(propName))) {
-            jp.skipChildren();
-            return;
-        }
-        /* Otherwise use default handling (call handler(s); if not
-         * handled, throw exception or skip depending on settings)
-         */
-        super.handleUnknownProperty(jp, ctxt, beanOrClass, propName);
-    }
-
-    /**
-     * Method called to handle set of one or more unknown properties,
-     * stored in their entirety in given {@link TokenBuffer}
-     * (as field entries, name and value).
-     */
-    protected Object handleUnknownProperties(DeserializationContext ctxt, Object bean, TokenBuffer unknownTokens)
-        throws IOException, JsonProcessingException
-    {
-        // First: add closing END_OBJECT as marker
-        unknownTokens.writeEndObject();
-        
-        // note: buffer does NOT have starting START_OBJECT
-        JsonParser bufferParser = unknownTokens.asParser();
-        while (bufferParser.nextToken() != JsonToken.END_OBJECT) {
-            String propName = bufferParser.getCurrentName();
-            // Unknown: let's call handler method
-            bufferParser.nextToken();
-            handleUnknownProperty(bufferParser, ctxt, bean, propName);
-        }
-        return bean;
-    }
-    
-    /**
-     * Helper method called to (try to) locate deserializer for given sub-type of
-     * type that this deserializer handles.
-     */
-    protected JsonDeserializer<Object> _findSubclassDeserializer(DeserializationContext ctxt,
-            Object bean, TokenBuffer unknownTokens)
-        throws IOException, JsonProcessingException
-    {  
-        JsonDeserializer<Object> subDeser;
-
-        // First: maybe we have already created sub-type deserializer?
-        synchronized (this) {
-            subDeser = (_subDeserializers == null) ? null : _subDeserializers.get(new ClassKey(bean.getClass()));
-        }
-        if (subDeser != null) {
-            return subDeser;
-        }
-        // If not, maybe we can locate one. First, need provider
-        JavaType type = ctxt.constructType(bean.getClass());
-        /* 30-Jan-2012, tatu: Ideally we would be passing referring
-         *   property; which in theory we could keep track of via
-         *   ResolvableDeserializer (if we absolutely must...).
-         *   But for now, let's not bother.
-         */
-//        subDeser = ctxt.findValueDeserializer(type, _property);
-        subDeser = ctxt.findRootValueDeserializer(type);
-        // Also, need to cache it
-        if (subDeser != null) {
-            synchronized (this) {
-                if (_subDeserializers == null) {
-                    _subDeserializers = new HashMap<ClassKey,JsonDeserializer<Object>>();;
-                }
-                _subDeserializers.put(new ClassKey(bean.getClass()), subDeser);
-            }            
-        }
-        return subDeser;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods for error reporting
-    /**********************************************************
-     */
-
-    /**
-     * Method that will modify caught exception (passed in as argument)
-     * as necessary to include reference information, and to ensure it
-     * is a subtype of {@link IOException}, or an unchecked exception.
-     *<p>
-     * Rules for wrapping and unwrapping are bit complicated; essentially:
-     *<ul>
-     * <li>Errors are to be passed as is (if uncovered via unwrapping)
-     * <li>"Plain" IOExceptions (ones that are not of type
-     *   {@link JsonMappingException} are to be passed as is
-     *</ul>
-     */
-    public void wrapAndThrow(Throwable t, Object bean, String fieldName,
-            DeserializationContext ctxt)
-        throws IOException
-    {
-        /* 05-Mar-2009, tatu: But one nasty edge is when we get
-         *   StackOverflow: usually due to infinite loop. But that
-         *   usually gets hidden within an InvocationTargetException...
-         */
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors and "plain" IOExceptions to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
-        // Ditto for IOExceptions; except we may want to wrap mapping exceptions
-        if (t instanceof IOException) {
-            if (!wrap || !(t instanceof JsonMappingException)) {
-                throw (IOException) t;
-            }
-        } else if (!wrap) { // [JACKSON-407] -- allow disabling wrapping for unchecked exceptions
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            }
-        }
-        // [JACKSON-55] Need to add reference information
-        throw JsonMappingException.wrapWithPath(t, bean, fieldName);
-    }
-
-    public void wrapAndThrow(Throwable t, Object bean, int index, DeserializationContext ctxt)
-        throws IOException
-    {
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors and "plain" IOExceptions to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
-        // Ditto for IOExceptions; except we may want to wrap mapping exceptions
-        if (t instanceof IOException) {
-            if (!wrap || !(t instanceof JsonMappingException)) {
-                throw (IOException) t;
-            }
-        } else if (!wrap) { // [JACKSON-407] -- allow disabling wrapping for unchecked exceptions
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            }
-        }
-        // [JACKSON-55] Need to add reference information
-        throw JsonMappingException.wrapWithPath(t, bean, index);
-    }
-
-    protected void wrapInstantiationProblem(Throwable t, DeserializationContext ctxt)
-        throws IOException
-    {
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors and "plain" IOExceptions to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
-        if (t instanceof IOException) {
-            // Since we have no more information to add, let's not actually wrap..
-            throw (IOException) t;
-        } else if (!wrap) { // [JACKSON-407] -- allow disabling wrapping for unchecked exceptions
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            }
-        }
-        throw ctxt.instantiationException(_beanType.getRawClass(), t);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java
deleted file mode 100644
index 564d50f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java
+++ /dev/null
@@ -1,401 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.util.*;
-
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdValueProperty;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.deser.impl.ValueInjector;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Builder class used for aggregating deserialization information about
- * a POJO, in order to build a {@link JsonDeserializer} for deserializing
- * instances.
- */
-public class BeanDeserializerBuilder
-{
-    /*
-    /**********************************************************
-    /* General information about POJO
-    /**********************************************************
-     */
-
-    final protected BeanDescription _beanDesc;
-
-    final protected boolean _defaultViewInclusion;
-    
-    /*
-    /**********************************************************
-    /* Accumulated information about properties
-    /**********************************************************
-     */
-    
-    /**
-     * Properties to deserialize collected so far.
-     */
-    final protected Map<String, SettableBeanProperty> _properties
-        = new LinkedHashMap<String, SettableBeanProperty>();
-    
-    /**
-     * Value injectors for deserialization
-     */
-    protected List<ValueInjector> _injectables;
-    
-    /**
-     * Back-reference properties this bean contains (if any)
-     */
-    protected HashMap<String, SettableBeanProperty> _backRefProperties;
-
-    /**
-     * Set of names of properties that are recognized but are to be ignored for deserialization
-     * purposes (meaning no exception is thrown, value is just skipped).
-     */
-    protected HashSet<String> _ignorableProps;
-    
-    /**
-     * Object that will handle value instantiation for the bean type.
-     */
-    protected ValueInstantiator _valueInstantiator;
-
-    protected ObjectIdReader _objectIdReader;
-    
-    /**
-     * Fallback setter used for handling any properties that are not
-     * mapped to regular setters. If setter is not null, it will be
-     * called once for each such property.
-     */
-    protected SettableAnyProperty _anySetter;
-
-    /**
-     * Flag that can be set to ignore and skip unknown properties.
-     * If set, will not throw an exception for unknown properties.
-     */
-    protected boolean _ignoreAllUnknown;
-
-    /**
-     * When creating Builder-based deserializers, this indicates
-     * method to call on builder to finalize value.
-     */
-    protected AnnotatedMethod _buildMethod;
-
-    /**
-     * In addition, Builder may have additional configuration
-     */
-    protected JsonPOJOBuilder.Value _builderConfig;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: construction
-    /**********************************************************
-     */
-    
-    public BeanDeserializerBuilder(BeanDescription beanDesc,
-            DeserializationConfig config)
-    { 
-        _beanDesc = beanDesc;
-        _defaultViewInclusion = config.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION);
-    }
-
-    /**
-     * Copy constructor for sub-classes to use, when constructing
-     * custom builder instances
-     */
-    protected BeanDeserializerBuilder(BeanDeserializerBuilder src)
-    {
-        _beanDesc = src._beanDesc;
-        _anySetter = src._anySetter;
-        _ignoreAllUnknown = src._ignoreAllUnknown;
-
-        // let's make copy of properties
-        _properties.putAll(src._properties);
-        _backRefProperties = _copy(src._backRefProperties);
-        // Hmmh. Should we create defensive copies here? For now, not yet
-        _ignorableProps = src._ignorableProps;        
-        _valueInstantiator = src._valueInstantiator;
-        _defaultViewInclusion = src._defaultViewInclusion;
-    }
-
-    private static HashMap<String, SettableBeanProperty> _copy(HashMap<String, SettableBeanProperty> src)
-    {
-        if (src == null) {
-            return null;
-        }
-        return new HashMap<String, SettableBeanProperty>(src);
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: state modification (adders, setters)
-    /**********************************************************
-     */
-
-    /**
-     * Method for adding a new property or replacing a property.
-     */
-    public void addOrReplaceProperty(SettableBeanProperty prop, boolean allowOverride)
-    {
-        _properties.put(prop.getName(), prop);
-    }
-
-    /**
-     * Method to add a property setter. Will ensure that there is no
-     * unexpected override; if one is found will throw a
-     * {@link IllegalArgumentException}.
-     */
-    public void addProperty(SettableBeanProperty prop)
-    {
-        SettableBeanProperty old =  _properties.put(prop.getName(), prop);
-        if (old != null && old != prop) { // should never occur...
-            throw new IllegalArgumentException("Duplicate property '"+prop.getName()+"' for "+_beanDesc.getType());
-        }
-    }
-
-    /**
-     * Method called to add a property that represents so-called back reference;
-     * reference that "points back" to object that has forward reference to
-     * currently built bean.
-     */
-    public void  addBackReferenceProperty(String referenceName, SettableBeanProperty prop)
-    {
-        if (_backRefProperties == null) {
-            _backRefProperties = new HashMap<String, SettableBeanProperty>(4);
-        }
-        _backRefProperties.put(referenceName, prop);
-        // also: if we had property with same name, actually remove it
-        if (_properties != null) {
-            _properties.remove(prop.getName());
-        }
-        // ??? 23-Jul-2012, tatu: Should it be included in list of all properties?
-        //   For now, won't add, since it is inferred, not explicit...
-    }
-
-    public void addInjectable(String propertyName, JavaType propertyType,
-            Annotations contextAnnotations, AnnotatedMember member,
-            Object valueId)
-    {
-        if (_injectables == null) {
-            _injectables = new ArrayList<ValueInjector>();
-        }
-        _injectables.add(new ValueInjector(propertyName, propertyType,
-                contextAnnotations, member, valueId));
-    }
-    
-    /**
-     * Method that will add property name as one of properties that can
-     * be ignored if not recognized.
-     */
-    public void addIgnorable(String propName)
-    {
-        if (_ignorableProps == null) {
-            _ignorableProps = new HashSet<String>();
-        }
-        _ignorableProps.add(propName);
-    }
-
-    /**
-     * Method called by deserializer factory, when a "creator property"
-     * (something that is passed via constructor- or factory method argument;
-     * instead of setter or field).
-     *<p>
-     * Default implementation does not do anything; we may need to revisit this
-     * decision if these properties need to be available through accessors.
-     * For now, however, we just have to ensure that we don't try to resolve
-     * types that masked setter/field has (see [JACKSON-700] for details).
-     */
-    public void addCreatorProperty(SettableBeanProperty prop)
-    {
-        addProperty(prop);
-    }
-
-    /**
-     * @deprecated since 2.1, override {@link #addCreatorProperty(SettableBeanProperty)} instead.
-     */
-    @Deprecated
-    public void addCreatorProperty(BeanPropertyDefinition propDef)
-    {
-        // do nothing
-    }
-    
-    public void setAnySetter(SettableAnyProperty s)
-    {
-        if (_anySetter != null && s != null) {
-            throw new IllegalStateException("_anySetter already set to non-null");
-        }
-        _anySetter = s;
-    }
-
-    public void setIgnoreUnknownProperties(boolean ignore) {
-        _ignoreAllUnknown = ignore;
-    }
-
-    public void setValueInstantiator(ValueInstantiator inst) {
-        _valueInstantiator = inst;
-    }
-
-    public void setObjectIdReader(ObjectIdReader r) {
-        _objectIdReader = r;
-    }
-
-    public void setPOJOBuilder(AnnotatedMethod buildMethod,
-            JsonPOJOBuilder.Value config) {
-    	_buildMethod = buildMethod;
-    	_builderConfig = config;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public accessors
-    /**********************************************************
-     */
-    
-    /**
-     * Method that allows accessing all properties that this
-     * builder currently contains.
-     *<p>
-     * Note that properties are returned in order that properties
-     * are ordered (explictly, or by rule), which is the serialization
-     * order.
-     */
-    public Iterator<SettableBeanProperty> getProperties() {
-        return _properties.values().iterator();
-    }
-
-    public SettableBeanProperty findProperty(String propertyName) {
-    	return _properties.get(propertyName);
-    }
-    
-    public boolean hasProperty(String propertyName) {
-        return findProperty(propertyName) != null;
-    }
-    
-    public SettableBeanProperty removeProperty(String name) {
-        return _properties.remove(name);
-    }
-
-    public SettableAnyProperty getAnySetter() {
-        return _anySetter;
-    }
-    
-    public ValueInstantiator getValueInstantiator() {
-        return _valueInstantiator;
-    }
-
-    public List<ValueInjector> getInjectables() {
-        return _injectables;
-    }
-
-    public ObjectIdReader getObjectIdReader() {
-        return _objectIdReader;
-    }
-
-    public AnnotatedMethod getBuildMethod() {
-    	return _buildMethod;
-    }
-
-    public JsonPOJOBuilder.Value getBuilderConfig() {
-        return _builderConfig;
-    }
-    
-    /*
-    /**********************************************************
-    /* Build method(s)
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing a {@link BeanDeserializer}, given all
-     * information collected.
-     */
-    public BeanDeserializer build()
-    {
-        Collection<SettableBeanProperty> props = _properties.values();
-        BeanPropertyMap propertyMap = new BeanPropertyMap(props);
-        propertyMap.assignIndexes();
-
-        // view processing must be enabled if:
-        // (a) fields are not included by default (when deserializing with view), OR
-        // (b) one of properties has view(s) to included in defined
-        boolean anyViews = !_defaultViewInclusion;
-
-        if (!anyViews) {
-            for (SettableBeanProperty prop : props) {
-                if (prop.hasViews()) {
-                    anyViews = true;
-                    break;
-                }
-            }
-        }
-
-        // one more thing: may need to create virtual ObjectId property:
-        if (_objectIdReader != null) {
-            ObjectIdValueProperty prop = new ObjectIdValueProperty(_objectIdReader);
-            propertyMap = propertyMap.withProperty(prop);
-        }
-        
-        return new BeanDeserializer(this,
-                _beanDesc, propertyMap, _backRefProperties, _ignorableProps, _ignoreAllUnknown,
-                anyViews);
-    }
-
-    /**
-     * Alternate build method used when we must be using some form of
-     * abstract resolution, usually by using addition Type Id
-     * ("polymorphic deserialization")
-     * 
-     * @since 2.0
-     */
-    public AbstractDeserializer buildAbstract()
-    {
-        return new AbstractDeserializer(this, _beanDesc, _backRefProperties);
-    }
-    
-    /**
-     * Method for constructing a specialized deserializer that uses
-     * additional external Builder object during data binding.
-     */
-    public JsonDeserializer<?> buildBuilderBased(JavaType valueType,
-    		String expBuildMethodName)
-    {
-    	// First: validation; must have build method that returns compatible type
-    	if (_buildMethod == null) {
-        	throw new IllegalArgumentException("Builder class "+_beanDesc.getBeanClass().getName()
-        			+" does not have build method '"+expBuildMethodName+"()'");
-    	}
-    	// also: type of the method must be compatible
-    	Class<?> rawBuildType = _buildMethod.getRawReturnType();
-    	if (!valueType.getRawClass().isAssignableFrom(rawBuildType)) {
-        	throw new IllegalArgumentException("Build method '"+_buildMethod.getFullName()
-        			+" has bad return type ("+rawBuildType.getName()
-        			+"), not compatible with POJO type ("+valueType.getRawClass().getName()+")");
-    	}
-    	// And if so, we can try building the deserializer
-        Collection<SettableBeanProperty> props = _properties.values();
-        BeanPropertyMap propertyMap = new BeanPropertyMap(props);
-        propertyMap.assignIndexes();
-
-        boolean anyViews = !_defaultViewInclusion;
-
-        if (!anyViews) {
-            for (SettableBeanProperty prop : props) {
-                if (prop.hasViews()) {
-                    anyViews = true;
-                    break;
-                }
-            }
-        }
-
-        if (_objectIdReader != null) {
-            ObjectIdValueProperty prop = new ObjectIdValueProperty(_objectIdReader);
-            propertyMap = propertyMap.withProperty(prop);
-        }
-        
-        return new BuilderBasedDeserializer(this,
-                _beanDesc, propertyMap, _backRefProperties, _ignorableProps, _ignoreAllUnknown,
-                anyViews);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
deleted file mode 100644
index aa67054..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java
+++ /dev/null
@@ -1,846 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;
-import com.fasterxml.jackson.databind.deser.impl.FieldProperty;
-import com.fasterxml.jackson.databind.deser.impl.MethodProperty;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.deser.impl.PropertyBasedObjectIdGenerator;
-import com.fasterxml.jackson.databind.deser.impl.SetterlessProperty;
-import com.fasterxml.jackson.databind.deser.std.JdkDeserializers;
-import com.fasterxml.jackson.databind.deser.std.ThrowableDeserializer;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.SimpleBeanPropertyDefinition;
-
-/**
- * Concrete deserializer factory class that adds full Bean deserializer
- * construction logic using class introspection.
- * Note that factories specifically do not implement any form of caching:
- * aside from configuration they are stateless; caching is implemented
- * by other components.
- *<p>
- * Instances of this class are fully immutable as all configuration is
- * done by using "fluent factories" (methods that construct new factory
- * instances with different configuration, instead of modifying instance).
- */
-public class BeanDeserializerFactory
-    extends BasicDeserializerFactory
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Signature of <b>Throwable.initCause</b> method.
-     */
-    private final static Class<?>[] INIT_CAUSE_PARAMS = new Class<?>[] { Throwable.class };
-
-    private final static Class<?>[] NO_VIEWS = new Class<?>[0];
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    /**
-     * Globally shareable thread-safe instance which has no additional custom deserializers
-     * registered
-     */
-    public final static BeanDeserializerFactory instance = new BeanDeserializerFactory(
-            new DeserializerFactoryConfig());
-
-    public BeanDeserializerFactory(DeserializerFactoryConfig config) {
-        super(config);
-    }
-    
-    /**
-     * Method used by module registration functionality, to construct a new bean
-     * deserializer factory
-     * with different configuration settings.
-     */
-    @Override
-    public DeserializerFactory withConfig(DeserializerFactoryConfig config)
-    {
-        if (_factoryConfig == config) {
-            return this;
-        }
-        /* 22-Nov-2010, tatu: Handling of subtypes is tricky if we do immutable-with-copy-ctor;
-         *    and we pretty much have to here either choose between losing subtype instance
-         *    when registering additional deserializers, or losing deserializers.
-         *    Instead, let's actually just throw an error if this method is called when subtype
-         *    has not properly overridden this method; this to indicate problem as soon as possible.
-         */
-        if (getClass() != BeanDeserializerFactory.class) {
-            throw new IllegalStateException("Subtype of BeanDeserializerFactory ("+getClass().getName()
-                    +") has not properly overridden method 'withAdditionalDeserializers': can not instantiate subtype with "
-                    +"additional deserializer definitions");
-        }
-        return new BeanDeserializerFactory(config);
-    }
-    
-    /*
-    /**********************************************************
-    /* Overrides for super-class methods used for finding
-    /* custom deserializers
-    /**********************************************************
-     */
-
-    // Note: NOT overriding, superclass has no matching method
-    @SuppressWarnings("unchecked")
-    protected JsonDeserializer<Object> _findCustomBeanDeserializer(JavaType type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        for (Deserializers d  : _factoryConfig.deserializers()) {
-            JsonDeserializer<?> deser = d.findBeanDeserializer(type, config, beanDesc);
-            if (deser != null) {
-                return (JsonDeserializer<Object>) deser;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* DeserializerFactory API implementation
-    /**********************************************************
-     */
-
-    /**
-     * Method that {@link DeserializerCache}s call to create a new
-     * deserializer for types other than Collections, Maps, arrays and
-     * enums.
-     */
-    @Override
-    public JsonDeserializer<Object> createBeanDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        // We may also have custom overrides:
-        JsonDeserializer<Object> custom = _findCustomBeanDeserializer(type, config, beanDesc);
-        if (custom != null) {
-            return custom;
-        }
-        /* One more thing to check: do we have an exception type
-         * (Throwable or its sub-classes)? If so, need slightly
-         * different handling.
-         */
-        if (type.isThrowable()) {
-            return buildThrowableDeserializer(ctxt, type, beanDesc);
-        }
-        /* Or, for abstract types, may have alternate means for resolution
-         * (defaulting, materialization)
-         */
-        if (type.isAbstract()) {
-            // [JACKSON-41] (v1.6): Let's make it possible to materialize abstract types.
-            JavaType concreteType = materializeAbstractType(config, beanDesc);
-            if (concreteType != null) {
-                /* important: introspect actual implementation (abstract class or
-                 * interface doesn't have constructors, for one)
-                 */
-                beanDesc = config.introspect(concreteType);
-                return buildBeanDeserializer(ctxt, concreteType, beanDesc);
-            }
-        }
-
-        // Otherwise, may want to check handlers for standard types, from superclass:
-        JsonDeserializer<Object> deser = findStdDeserializer(config, type);
-        if (deser != null) {
-            return deser;
-        }
-
-        // Otherwise: could the class be a Bean class? If not, bail out
-        if (!isPotentialBeanType(type.getRawClass())) {
-            return null;
-        }
-        // Use generic bean introspection to build deserializer
-        return buildBeanDeserializer(ctxt, type, beanDesc);
-    }
-
-    @Override
-    public JsonDeserializer<Object> createBuilderBasedDeserializer(
-    		DeserializationContext ctxt, JavaType valueType, BeanDescription beanDesc,
-    		Class<?> builderClass)
-        throws JsonMappingException
-    {
-    	// First: need a BeanDescription for builder class
-    	JavaType builderType = ctxt.constructType(builderClass);
-    	BeanDescription builderDesc = ctxt.getConfig().introspectForBuilder(builderType);
-    	return buildBuilderBasedDeserializer(ctxt, valueType, builderDesc);
-    }
-    
-    /**
-     * Method called by {@link BeanDeserializerFactory} to see if there might be a standard
-     * deserializer registered for given type.
-     */
-    @SuppressWarnings("unchecked")
-    protected JsonDeserializer<Object> findStdDeserializer(DeserializationConfig config,
-            JavaType type)
-        throws JsonMappingException
-    {
-        Class<?> cls = type.getRawClass();
-        // note: we do NOT check for custom deserializers here; that's for sub-class to do
-        JsonDeserializer<Object> deser = _simpleDeserializers.get(new ClassKey(cls));
-        if (deser != null) {
-            return deser;
-        }
-        
-        // [JACKSON-283]: AtomicReference is a rather special type...
-        if (AtomicReference.class.isAssignableFrom(cls)) {
-            // Must find parameterization
-            TypeFactory tf = config.getTypeFactory();
-            JavaType[] params = tf.findTypeParameters(type, AtomicReference.class);
-            JavaType referencedType;
-            if (params == null || params.length < 1) { // untyped (raw)
-                referencedType = TypeFactory.unknownType();
-            } else {
-                referencedType = params[0];
-            }
-            
-            JsonDeserializer<?> d2 = new JdkDeserializers.AtomicReferenceDeserializer(referencedType);
-            return (JsonDeserializer<Object>)d2;
-        }
-        // [JACKSON-386]: External/optional type handlers are handled somewhat differently
-        JsonDeserializer<?> d = optionalHandlers.findDeserializer(type, config);
-        if (d != null) {
-            return (JsonDeserializer<Object>)d;
-        }
-        return null;
-    }
-    
-    protected JavaType materializeAbstractType(DeserializationConfig config,
-            BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        final JavaType abstractType = beanDesc.getType();
-        
-        /* [JACKSON-502] (1.8): Now it is possible to have multiple resolvers too,
-         *   as they are registered via module interface.
-         */
-        for (AbstractTypeResolver r : _factoryConfig.abstractTypeResolvers()) {
-            JavaType concrete = r.resolveAbstractType(config, abstractType);
-            if (concrete != null) {
-                return concrete;
-            }
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public construction method beyond DeserializerFactory API:
-    /* can be called from outside as well as overridden by
-    /* sub-classes
-    /**********************************************************
-     */
-
-    /**
-     * Method that is to actually build a bean deserializer instance.
-     * All basic sanity checks have been done to know that what we have
-     * may be a valid bean type, and that there are no default simple
-     * deserializers.
-     */
-    @SuppressWarnings("unchecked")
-    public JsonDeserializer<Object> buildBeanDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        // First: check what creators we can use, if any
-        ValueInstantiator valueInstantiator = findValueInstantiator(ctxt, beanDesc);
-        BeanDeserializerBuilder builder = constructBeanDeserializerBuilder(ctxt, beanDesc);
-        builder.setValueInstantiator(valueInstantiator);
-         // And then setters for deserializing from JSON Object
-        addBeanProps(ctxt, beanDesc, builder);
-        addObjectIdReader(ctxt, beanDesc, builder);
-
-        // managed/back reference fields/setters need special handling... first part
-        addReferenceProperties(ctxt, beanDesc, builder);
-        addInjectables(ctxt, beanDesc, builder);
-        
-        final DeserializationConfig config = ctxt.getConfig();
-        // [JACKSON-440]: update builder now that all information is in?
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                builder = mod.updateBuilder(config, beanDesc, builder);
-            }
-        }
-        JsonDeserializer<?> deserializer;
-
-        /* 19-Mar-2012, tatu: This check used to be done earlier; but we have to defer
-         *   it a bit to collect information on ObjectIdReader, for example.
-         */
-        if (type.isAbstract() && !valueInstantiator.canInstantiate()) {
-            deserializer = builder.buildAbstract();
-        } else {
-            deserializer = builder.build();
-        }
-
-        // [JACKSON-440]: may have modifier(s) that wants to modify or replace serializer we just built:
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                deserializer = mod.modifyDeserializer(config, beanDesc, deserializer);
-            }
-        }
-        return (JsonDeserializer<Object>) deserializer;
-    }
-    
-    /**
-     * Method for constructing a bean deserializer that uses specified
-     * intermediate Builder for binding data, and construction of the
-     * value instance.
-     * Note that implementation is mostly copied from the regular
-     * BeanDeserializer build method.
-     */
-    @SuppressWarnings("unchecked")
-    protected JsonDeserializer<Object> buildBuilderBasedDeserializer(
-    		DeserializationContext ctxt, JavaType valueType, BeanDescription builderDesc)
-        throws JsonMappingException
-    {
-    	// Creators, anyone? (to create builder itself)
-        ValueInstantiator valueInstantiator = findValueInstantiator(ctxt, builderDesc);
-        final DeserializationConfig config = ctxt.getConfig();
-        BeanDeserializerBuilder builder = constructBeanDeserializerBuilder(ctxt, builderDesc);
-        builder.setValueInstantiator(valueInstantiator);
-         // And then "with methods" for deserializing from JSON Object
-        addBeanProps(ctxt, builderDesc, builder);
-        addObjectIdReader(ctxt, builderDesc, builder);
-        
-        // managed/back reference fields/setters need special handling... first part
-        addReferenceProperties(ctxt, builderDesc, builder);
-        addInjectables(ctxt, builderDesc, builder);
-
-        JsonPOJOBuilder.Value builderConfig = builderDesc.findPOJOBuilderConfig();
-        final String buildMethodName = (builderConfig == null) ?
-                "build" : builderConfig.buildMethodName;
-        
-        // and lastly, find build method to use:
-        AnnotatedMethod buildMethod = builderDesc.findMethod(buildMethodName, null);
-        if (buildMethod != null) { // note: can't yet throw error; may be given build method
-            if (config.canOverrideAccessModifiers()) {
-            	ClassUtil.checkAndFixAccess(buildMethod.getMember());
-            }
-        }
-        builder.setPOJOBuilder(buildMethod, builderConfig);
-        // this may give us more information...
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                builder = mod.updateBuilder(config, builderDesc, builder);
-            }
-        }
-        JsonDeserializer<?> deserializer = builder.buildBuilderBased(
-        		valueType, buildMethodName);
-
-        // [JACKSON-440]: may have modifier(s) that wants to modify or replace serializer we just built:
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                deserializer = mod.modifyDeserializer(config, builderDesc, deserializer);
-            }
-        }
-        return (JsonDeserializer<Object>) deserializer;
-    }
-    
-    protected void addObjectIdReader(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder)
-        throws JsonMappingException
-    {
-        ObjectIdInfo objectIdInfo = beanDesc.getObjectIdInfo();
-        if (objectIdInfo == null) {
-            return;
-        }
-        Class<?> implClass = objectIdInfo.getGeneratorType();
-        JavaType idType;
-    	SettableBeanProperty idProp;
-        ObjectIdGenerator<?> gen;
-
-        // Just one special case: Property-based generator is trickier
-        if (implClass == ObjectIdGenerators.PropertyGenerator.class) { // most special one, needs extra work
-            String propName = objectIdInfo.getPropertyName();
-            idProp = builder.findProperty(propName);
-            if (idProp == null) {
-                throw new IllegalArgumentException("Invalid Object Id definition for "
-                        +beanDesc.getBeanClass().getName()+": can not find property with name '"+propName+"'");
-            }
-            idType = idProp.getType();
-            gen = new PropertyBasedObjectIdGenerator(objectIdInfo.getScope());
-        } else {
-            JavaType type = ctxt.constructType(implClass);
-            idType = ctxt.getTypeFactory().findTypeParameters(type, ObjectIdGenerator.class)[0];
-            idProp = null;
-            gen = ctxt.objectIdGeneratorInstance(beanDesc.getClassInfo(), objectIdInfo);
-        }
-        // also: unlike with value deserializers, let's just resolve one we need here
-        JsonDeserializer<?> deser = ctxt.findRootValueDeserializer(idType);
-        builder.setObjectIdReader(ObjectIdReader.construct(idType,
-                objectIdInfo.getPropertyName(), gen, deser, idProp));
-    }
-    
-    @SuppressWarnings("unchecked")
-    public JsonDeserializer<Object> buildThrowableDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-        // first: construct like a regular bean deserializer...
-        BeanDeserializerBuilder builder = constructBeanDeserializerBuilder(ctxt, beanDesc);
-        builder.setValueInstantiator(findValueInstantiator(ctxt, beanDesc));
-
-        addBeanProps(ctxt, beanDesc, builder);
-        // (and assume there won't be any back references)
-
-        // But then let's decorate things a bit
-        /* To resolve [JACKSON-95], need to add "initCause" as setter
-         * for exceptions (sub-classes of Throwable).
-         */
-        AnnotatedMethod am = beanDesc.findMethod("initCause", INIT_CAUSE_PARAMS);
-        if (am != null) { // should never be null
-            SimpleBeanPropertyDefinition propDef = new SimpleBeanPropertyDefinition(am, "cause");
-            SettableBeanProperty prop = constructSettableProperty(ctxt, beanDesc, propDef,
-                    am.getGenericParameterType(0));
-            if (prop != null) {
-                /* 21-Aug-2011, tatus: We may actually have found 'cause' property
-                 *   to set (with new 1.9 code)... but let's replace it just in case,
-                 *   otherwise can end up with odd errors.
-                 */
-                builder.addOrReplaceProperty(prop, true);
-            }
-        }
-
-        // And also need to ignore "localizedMessage"
-        builder.addIgnorable("localizedMessage");
-        // [JACKSON-794]: JDK 7 also added "getSuppressed", skip if we have such data:
-        builder.addIgnorable("suppressed");
-        /* As well as "message": it will be passed via constructor,
-         * as there's no 'setMessage()' method
-        */
-        builder.addIgnorable("message");
-
-        // [JACKSON-440]: update builder now that all information is in?
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                builder = mod.updateBuilder(config, beanDesc, builder);
-            }
-        }
-        JsonDeserializer<?> deserializer = builder.build();
-        
-        /* At this point it ought to be a BeanDeserializer; if not, must assume
-         * it's some other thing that can handle deserialization ok...
-         */
-        if (deserializer instanceof BeanDeserializer) {
-            deserializer = new ThrowableDeserializer((BeanDeserializer) deserializer);
-        }
-
-        // [JACKSON-440]: may have modifier(s) that wants to modify or replace serializer we just built:
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                deserializer = mod.modifyDeserializer(config, beanDesc, deserializer);
-            }
-        }
-        return (JsonDeserializer<Object>) deserializer;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for Bean deserializer construction,
-    /* overridable by sub-classes
-    /**********************************************************
-     */
-
-    /**
-     * Overridable method that constructs a {@link BeanDeserializerBuilder}
-     * which is used to accumulate information needed to create deserializer
-     * instance.
-     */
-    protected BeanDeserializerBuilder constructBeanDeserializerBuilder(DeserializationContext ctxt,
-            BeanDescription beanDesc) {
-        return new BeanDeserializerBuilder(beanDesc, ctxt.getConfig());
-    }
-    
-    /**
-     * Method called to figure out settable properties for the
-     * bean deserializer to use.
-     *<p>
-     * Note: designed to be overridable, and effort is made to keep interface
-     * similar between versions.
-     */
-    protected void addBeanProps(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder)
-        throws JsonMappingException
-    {
-        final SettableBeanProperty[] creatorProps =
-                builder.getValueInstantiator().getFromObjectArguments(ctxt.getConfig());
-        
-        // Things specified as "ok to ignore"? [JACKSON-77]
-        AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        boolean ignoreAny = false;
-        {
-            Boolean B = intr.findIgnoreUnknownProperties(beanDesc.getClassInfo());
-            if (B != null) {
-                ignoreAny = B.booleanValue();
-                builder.setIgnoreUnknownProperties(ignoreAny);
-            }
-        }
-        // Or explicit/implicit definitions?
-        Set<String> ignored = ArrayBuilders.arrayToSet(intr.findPropertiesToIgnore(beanDesc.getClassInfo()));        
-        for (String propName : ignored) {
-            builder.addIgnorable(propName);
-        }
-        // Also, do we have a fallback "any" setter?
-        AnnotatedMethod anySetter = beanDesc.findAnySetter();
-        if (anySetter != null) {
-            builder.setAnySetter(constructAnySetter(ctxt, beanDesc, anySetter));
-        }
-        // NOTE: we do NOT add @JsonIgnore'd properties into blocked ones if there's any setter
-        // Implicit ones via @JsonIgnore and equivalent?
-        if (anySetter == null) {
-            Collection<String> ignored2 = beanDesc.getIgnoredPropertyNames();
-            if (ignored2 != null) {
-                for (String propName : ignored2) {
-                    // allow ignoral of similarly named JSON property, but do not force;
-                    // latter means NOT adding this to 'ignored':
-                    builder.addIgnorable(propName);
-                }
-            }
-        }
-        final boolean useGettersAsSetters = (ctxt.isEnabled(MapperFeature.USE_GETTERS_AS_SETTERS)
-                && ctxt.isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
-
-        // Ok: let's then filter out property definitions
-        List<BeanPropertyDefinition> propDefs = filterBeanProps(ctxt,
-                beanDesc, builder, beanDesc.findProperties(), ignored);
-
-        // After which we can let custom code change the set
-        if (_factoryConfig.hasDeserializerModifiers()) {
-            for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {
-                propDefs = mod.updateProperties(ctxt.getConfig(), beanDesc, propDefs);
-            }
-        }
-        
-        // At which point we still have all kinds of properties; not all with mutators:
-        for (BeanPropertyDefinition propDef : propDefs) {
-            SettableBeanProperty prop = null;
-            if (propDef.hasConstructorParameter()) {
-                /* [JACKSON-700] If property is passed via constructor parameter, we must
-                 *   handle things in special way. Not sure what is the most optimal way...
-                 *   for now, let's just call a (new) method in builder, which does nothing.
-                 */
-                // but let's call a method just to allow custom builders to be aware...
-                final String name = propDef.getName();
-                for (SettableBeanProperty cp : creatorProps) {
-                    if (name.equals(cp.getName())) {
-                        prop = cp;
-                        break;
-                    }
-                }
-                if (prop == null) {
-                    throw ctxt.mappingException("Could not find creator property with name '"+name+"'");
-                }
-                builder.addCreatorProperty(prop);
-                continue;
-            }
-            if (propDef.hasSetter()) {
-                Type propertyType = propDef.getSetter().getGenericParameterType(0);
-                prop = constructSettableProperty(ctxt, beanDesc, propDef, propertyType);
-            } else if (propDef.hasField()) {
-                Type propertyType = propDef.getField().getGenericType();
-                prop = constructSettableProperty(ctxt, beanDesc, propDef, propertyType);
-            } else if (useGettersAsSetters && propDef.hasGetter()) {
-                /* As per [JACKSON-88], may also need to consider getters
-                 * for Map/Collection properties; but with lowest precedence
-                 */
-                AnnotatedMethod getter = propDef.getGetter();
-                // should only consider Collections and Maps, for now?
-                Class<?> rawPropertyType = getter.getRawType();
-                if (Collection.class.isAssignableFrom(rawPropertyType)
-                        || Map.class.isAssignableFrom(rawPropertyType)) {
-                    prop = constructSetterlessProperty(ctxt, beanDesc, propDef);
-                }
-            }
-            if (prop != null) {
-                Class<?>[] views = propDef.findViews();
-                if (views == null) {
-                    // one more twist: if default inclusion disabled, need to force empty set of views
-                    if (!ctxt.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)) {
-                        views = NO_VIEWS;
-                    }
-                }
-                // one more thing before adding to builder: copy any metadata
-                prop.setViews(views);
-                builder.addProperty(prop);
-            }
-        }
-    }
-    
-    /**
-     * Helper method called to filter out explicit ignored properties,
-     * as well as properties that have "ignorable types".
-     * Note that this will not remove properties that have no
-     * setters.
-     */
-    protected List<BeanPropertyDefinition> filterBeanProps(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder,
-            List<BeanPropertyDefinition> propDefsIn,
-            Set<String> ignored)
-        throws JsonMappingException
-    {
-        ArrayList<BeanPropertyDefinition> result = new ArrayList<BeanPropertyDefinition>(
-                Math.max(4, propDefsIn.size()));
-        HashMap<Class<?>,Boolean> ignoredTypes = new HashMap<Class<?>,Boolean>();
-        // These are all valid setters, but we do need to introspect bit more
-        for (BeanPropertyDefinition property : propDefsIn) {
-            String name = property.getName();
-            if (ignored.contains(name)) { // explicit ignoral using @JsonIgnoreProperties needs to block entries
-                continue;
-            }
-            if (!property.hasConstructorParameter()) { // never skip constructor params
-                Class<?> rawPropertyType = null;
-                if (property.hasSetter()) {
-                    rawPropertyType = property.getSetter().getRawParameterType(0);
-                } else if (property.hasField()) {
-                    rawPropertyType = property.getField().getRawType();
-                }
-
-                // [JACKSON-429] Some types are declared as ignorable as well
-                if ((rawPropertyType != null)
-                        && (isIgnorableType(ctxt.getConfig(), beanDesc, rawPropertyType, ignoredTypes))) {
-                    // important: make ignorable, to avoid errors if value is actually seen
-                    builder.addIgnorable(name);
-                    continue;
-                }
-            }
-            result.add(property);
-        }
-        return result;
-    }
-    
-    /**
-     * Method that will find if bean has any managed- or back-reference properties,
-     * and if so add them to bean, to be linked during resolution phase.
-     */
-    protected void addReferenceProperties(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder)
-        throws JsonMappingException
-    {
-        // and then back references, not necessarily found as regular properties
-        Map<String,AnnotatedMember> refs = beanDesc.findBackReferenceProperties();
-        if (refs != null) {
-            for (Map.Entry<String, AnnotatedMember> en : refs.entrySet()) {
-                String name = en.getKey();
-                AnnotatedMember m = en.getValue();
-                Type genericType;
-                if (m instanceof AnnotatedMethod) {
-                    genericType = ((AnnotatedMethod) m).getGenericParameterType(0);
-                } else {
-                    genericType = m.getRawType();
-                }
-                SimpleBeanPropertyDefinition propDef = new SimpleBeanPropertyDefinition(m);
-                builder.addBackReferenceProperty(name, constructSettableProperty(
-                        ctxt, beanDesc, propDef, genericType));
-            }
-        }
-    }
-    
-    /**
-     * Method called locate all members used for value injection (if any),
-     * constructor {@link com.fasterxml.jackson.databind.deser.impl.ValueInjector} instances, and add them to builder.
-     */
-    protected void addInjectables(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder)
-        throws JsonMappingException
-    {
-        Map<Object, AnnotatedMember> raw = beanDesc.findInjectables();
-        if (raw != null) {
-            boolean fixAccess = ctxt.canOverrideAccessModifiers();
-            for (Map.Entry<Object, AnnotatedMember> entry : raw.entrySet()) {
-                AnnotatedMember m = entry.getValue();
-                if (fixAccess) {
-                    m.fixAccess(); // to ensure we can call it
-                }
-                builder.addInjectable(m.getName(), beanDesc.resolveType(m.getGenericType()),
-                        beanDesc.getClassAnnotations(), m, entry.getKey());
-            }
-        }
-    }
-
-    /**
-     * Method called to construct fallback {@link SettableAnyProperty}
-     * for handling unknown bean properties, given a method that
-     * has been designated as such setter.
-     */
-    protected SettableAnyProperty constructAnySetter(DeserializationContext ctxt,
-            BeanDescription beanDesc, AnnotatedMethod setter)
-        throws JsonMappingException
-    {
-        if (ctxt.canOverrideAccessModifiers()) {
-            setter.fixAccess(); // to ensure we can call it
-        }
-        // we know it's a 2-arg method, second arg is the value
-        JavaType type = beanDesc.bindingsForBeanType().resolveType(setter.getGenericParameterType(1));
-        BeanProperty.Std property = new BeanProperty.Std(setter.getName(), type, beanDesc.getClassAnnotations(), setter);
-        type = resolveType(ctxt, beanDesc, type, setter);
-
-        /* AnySetter can be annotated with @JsonClass (etc) just like a
-         * regular setter... so let's see if those are used.
-         * Returns null if no annotations, in which case binding will
-         * be done at a later point.
-         */
-        JsonDeserializer<Object> deser = findDeserializerFromAnnotation(ctxt, setter);
-        if (deser != null) {
-            return new SettableAnyProperty(property, setter, type, deser);
-        }
-        /* Otherwise, method may specify more specific (sub-)class for
-         * value (no need to check if explicit deser was specified):
-         */
-        type = modifyTypeByAnnotation(ctxt, setter, type);
-        return new SettableAnyProperty(property, setter, type, null);
-    }
-
-    /**
-     * Method that will construct a regular bean property setter using
-     * the given setter method.
-     *
-     * @return Property constructed, if any; or null to indicate that
-     *   there should be no property based on given definitions.
-     */
-    protected SettableBeanProperty constructSettableProperty(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanPropertyDefinition propDef,
-            Type jdkType)
-        throws JsonMappingException
-    {
-        // need to ensure method is callable (for non-public)
-        AnnotatedMember mutator = propDef.getMutator();
-        if (ctxt.canOverrideAccessModifiers()) {
-            mutator.fixAccess();
-        }
-        // note: this works since we know there's exactly one argument for methods
-        JavaType t0 = beanDesc.resolveType(jdkType);
-
-        BeanProperty.Std property = new BeanProperty.Std(propDef.getName(), t0, beanDesc.getClassAnnotations(), mutator);
-        JavaType type = resolveType(ctxt, beanDesc, t0, mutator);
-        // did type change?
-        if (type != t0) {
-            property = property.withType(type);
-        }
-        
-        /* First: does the Method specify the deserializer to use?
-         * If so, let's use it.
-         */
-        JsonDeserializer<Object> propDeser = findDeserializerFromAnnotation(ctxt, mutator);
-        type = modifyTypeByAnnotation(ctxt, mutator, type);
-        TypeDeserializer typeDeser = type.getTypeHandler();
-        SettableBeanProperty prop;
-        if (mutator instanceof AnnotatedMethod) {
-            prop = new MethodProperty(propDef, type, typeDeser,
-                beanDesc.getClassAnnotations(), (AnnotatedMethod) mutator);
-        } else {
-            prop = new FieldProperty(propDef, type, typeDeser,
-                    beanDesc.getClassAnnotations(), (AnnotatedField) mutator);
-        }
-        if (propDeser != null) {
-            prop = prop.withValueDeserializer(propDeser);
-        }
-        // [JACKSON-235]: need to retain name of managed forward references:
-        AnnotationIntrospector.ReferenceProperty ref = propDef.findReferenceType();
-        if (ref != null && ref.isManagedReference()) {
-            prop.setManagedReferenceName(ref.getName());
-        }
-        return prop;
-    }
-
-    /**
-     * Method that will construct a regular bean property setter using
-     * the given setter method.
-     */
-    protected SettableBeanProperty constructSetterlessProperty(DeserializationContext ctxt,
-            BeanDescription beanDesc, BeanPropertyDefinition propDef)
-        throws JsonMappingException
-    {
-        final AnnotatedMethod getter = propDef.getGetter();
-        // need to ensure it is callable now:
-        if (ctxt.canOverrideAccessModifiers()) {
-            getter.fixAccess();
-        }
-
-        /* 26-Jan-2012, tatu: Alas, this complication is still needed to handle
-         *   (or at least work around) local type declarations...
-         */
-        JavaType type = getter.getType(beanDesc.bindingsForBeanType());
-        /* First: does the Method specify the deserializer to use?
-         * If so, let's use it.
-         */
-        JsonDeserializer<Object> propDeser = findDeserializerFromAnnotation(ctxt, getter);
-        type = modifyTypeByAnnotation(ctxt, getter, type);
-        TypeDeserializer typeDeser = type.getTypeHandler();
-        SettableBeanProperty prop = new SetterlessProperty(propDef, type, typeDeser,
-                beanDesc.getClassAnnotations(), getter);
-        if (propDeser != null) {
-            prop = prop.withValueDeserializer(propDeser);
-        }
-        return prop;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for Bean deserializer, other
-    /**********************************************************
-     */
-
-    /**
-     * Helper method used to skip processing for types that we know
-     * can not be (i.e. are never consider to be) beans: 
-     * things like primitives, Arrays, Enums, and proxy types.
-     *<p>
-     * Note that usually we shouldn't really be getting these sort of
-     * types anyway; but better safe than sorry.
-     */
-    protected boolean isPotentialBeanType(Class<?> type)
-    {
-        String typeStr = ClassUtil.canBeABeanType(type);
-        if (typeStr != null) {
-            throw new IllegalArgumentException("Can not deserialize Class "+type.getName()+" (of type "+typeStr+") as a Bean");
-        }
-        if (ClassUtil.isProxyType(type)) {
-            throw new IllegalArgumentException("Can not deserialize Proxy class "+type.getName()+" as a Bean");
-        }
-        /* also: can't deserialize some local classes: static are ok; in-method not;
-         * and with [JACKSON-594], other non-static inner classes are ok
-         */
-        typeStr = ClassUtil.isLocalType(type, true);
-        if (typeStr != null) {
-            throw new IllegalArgumentException("Can not deserialize Class "+type.getName()+" (of type "+typeStr+") as a Bean");
-        }
-    	return true;
-    }
-
-    /**
-     * Helper method that will check whether given raw type is marked as always ignorable
-     * (for purpose of ignoring properties with type)
-     */
-    protected boolean isIgnorableType(DeserializationConfig config, BeanDescription beanDesc,
-            Class<?> type, Map<Class<?>,Boolean> ignoredTypes)
-    {
-        Boolean status = ignoredTypes.get(type);
-        if (status == null) {
-            BeanDescription desc = config.introspectClassAnnotations(type);
-            status = config.getAnnotationIntrospector().isIgnorableType(desc.getClassInfo());
-            // We default to 'false', ie. not ignorable
-            if (status == null) {
-                status = Boolean.FALSE;
-            }
-        }
-        return status;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
deleted file mode 100644
index c3ab81f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.util.List;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializer;
-import com.fasterxml.jackson.databind.deser.BeanDeserializerFactory;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-
-/**
- * Abstract class that defines API for objects that can be registered (for {@link BeanDeserializerFactory}
- * to participate in constructing {@link BeanDeserializer} instances.
- * This is typically done by modules that want alter some aspects of deserialization
- * process; and is preferable to sub-classing of {@link BeanDeserializerFactory}.
- *<p>
- * Sequence in which callback methods are called is as follows:
- *  <li>{@link #updateProperties} is called once all property definitions are
- *    collected, and initial filtering (by ignorable type and explicit ignoral-by-bean)
- *    has been performed.
- *  <li>{@link #updateBuilder} is called once all initial pieces for building deserializer
- *    have been collected
- *   </li>
- *  <li>{@link #modifyDeserializer} is called after deserializer has been built
- *    by {@link BeanDeserializerBuilder}
- *    but before it is returned to be used
- *   </li>
- * </ol>
- *<p>
- * Default method implementations are "no-op"s, meaning that methods are implemented
- * but have no effect; this is mostly so that new methods can be added in later
- * versions.
- */
-public abstract class BeanDeserializerModifier
-{
-    /**
-     * Method called by {@link BeanDeserializerFactory} when it has collected
-     * initial list of {@link BeanPropertyDefinition}s, and done basic by-name
-     * and by-type filtering, but before constructing builder or actual
-     * property handlers; or arranging order.
-     * 
-     * The most common changes to make at this point are to completely remove
-     * specified properties, or rename then: other modifications are easier
-     * to make at later points.
-     */
-    public List<BeanPropertyDefinition> updateProperties(DeserializationConfig config,
-            BeanDescription beanDesc, List<BeanPropertyDefinition> propDefs) {
-        return propDefs;
-    }
-    
-    /**
-     * Method called by {@link BeanDeserializerFactory} when it has collected
-     * basic information such as tentative list of properties to deserialize.
-     *
-     * Implementations may choose to modify state of builder (to affect deserializer being
-     * built), or even completely replace it (if they want to build different kind of
-     * deserializer). Typically changes mostly concern set of properties to deserialize.
-     */
-    public BeanDeserializerBuilder updateBuilder(DeserializationConfig config,
-            BeanDescription beanDesc, BeanDeserializerBuilder builder) {
-        return builder;
-    }
-
-    /**
-     * Method called by {@link BeanDeserializerFactory} after constructing default
-     * bean deserializer instance with properties collected and ordered earlier.
-     * Implementations can modify or replace given deserializer and return deserializer
-     * to use. Note that although initial deserializer being passed is of type
-     * {@link BeanDeserializer}, modifiers may return deserializers of other types;
-     * and this is why implementations must check for type before casting.
-     */
-    public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config,
-            BeanDescription beanDesc, JsonDeserializer<?> deserializer) {
-        return deserializer;
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
deleted file mode 100644
index 975aad4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
+++ /dev/null
@@ -1,949 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.impl.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Class that handles deserialization using a separate
- * Builder class, which is used for data binding and
- * produces actual deserialized value at the end
- * of data binding.
- *<p>
- * Note on implementation: much of code has been copied from
- * {@link BeanDeserializer}; there may be opportunities to
- * refactor this in future.
- */
-public class BuilderBasedDeserializer
-    extends BeanDeserializerBase
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final AnnotatedMethod _buildMethod;
-	
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, initialization
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by {@link BeanDeserializerBuilder}.
-     */
-    public BuilderBasedDeserializer(BeanDeserializerBuilder builder,
-            BeanDescription beanDesc,
-            BeanPropertyMap properties, Map<String, SettableBeanProperty> backRefs,
-            HashSet<String> ignorableProps, boolean ignoreAllUnknown,
-            boolean hasViews)
-    {
-    	super(builder, beanDesc, properties, backRefs,
-    			ignorableProps, ignoreAllUnknown, hasViews);
-    	_buildMethod = builder.getBuildMethod();
-    	// 05-Mar-2012, tatu: Can not really make Object Ids work with builders, not yet anyway
-    	if (_objectIdReader != null) {
-    	    throw new IllegalArgumentException("Can not use Object Id with Builder-based deserialization (type "
-    	            +beanDesc.getType()+")");
-    	}
-    }
-
-    /**
-     * Copy-constructor that can be used by sub-classes to allow
-     * copy-on-write styling copying of settings of an existing instance.
-     */
-    protected BuilderBasedDeserializer(BuilderBasedDeserializer src)
-    {
-        this(src, src._ignoreAllUnknown);
-    }
-
-    protected BuilderBasedDeserializer(BuilderBasedDeserializer src, boolean ignoreAllUnknown)
-    {
-        super(src, ignoreAllUnknown);
-        _buildMethod = src._buildMethod;
-    }
-    
-    protected BuilderBasedDeserializer(BuilderBasedDeserializer src, NameTransformer unwrapper) {
-    	super(src, unwrapper);
-        _buildMethod = src._buildMethod;
-    }
-
-    public BuilderBasedDeserializer(BuilderBasedDeserializer src, ObjectIdReader oir) {
-        super(src, oir);
-        _buildMethod = src._buildMethod;
-    }
-
-    public BuilderBasedDeserializer(BuilderBasedDeserializer src, HashSet<String> ignorableProps) {
-        super(src, ignorableProps);
-        _buildMethod = src._buildMethod;
-    }
-    
-    @Override
-    public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
-    {
-        /* main thing really is to just enforce ignoring of unknown
-         * properties; since there may be multiple unwrapped values
-         * and properties for all may be interleaved...
-         */
-        return new BuilderBasedDeserializer(this, unwrapper);
-    }
-
-    @Override
-    public BuilderBasedDeserializer withObjectIdReader(ObjectIdReader oir) {
-        return new BuilderBasedDeserializer(this, oir);
-    }
-
-    @Override
-    public BuilderBasedDeserializer withIgnorableProperties(HashSet<String> ignorableProps) {
-        return new BuilderBasedDeserializer(this, ignorableProps);
-    }
-
-    @Override
-    protected BeanAsArrayBuilderDeserializer asArrayDeserializer() {
-        SettableBeanProperty[] props = _beanProperties.getPropertiesInInsertionOrder();
-        return new BeanAsArrayBuilderDeserializer(this, props, _buildMethod);
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer implementation
-    /**********************************************************
-     */
-    
-    protected final Object finishBuild(DeserializationContext ctxt, Object builder)
-            throws IOException
-    {
-        try {
-            return _buildMethod.getMember().invoke(builder);
-    	} catch (Exception e) {
-    	    wrapInstantiationProblem(e, ctxt);
-    	    return null;
-    	}
-    }
-    
-    /**
-     * Main deserialization method for bean-based objects (POJOs).
-     */
-    @Override
-    public final Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        
-        // common case first:
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-            if (_vanillaProcessing) {
-            	return finishBuild(ctxt, vanillaDeserialize(jp, ctxt, t));
-            }
-            Object builder = deserializeFromObject(jp, ctxt);
-            return finishBuild(ctxt, builder);
-        }
-        // and then others, generally requiring use of @JsonCreator
-        switch (t) {
-        case VALUE_STRING:
-            return finishBuild(ctxt, deserializeFromString(jp, ctxt));
-        case VALUE_NUMBER_INT:
-            return finishBuild(ctxt, deserializeFromNumber(jp, ctxt));
-        case VALUE_NUMBER_FLOAT:
-        	return finishBuild(ctxt, deserializeFromDouble(jp, ctxt));
-        case VALUE_EMBEDDED_OBJECT:
-            return jp.getEmbeddedObject();
-        case VALUE_TRUE:
-        case VALUE_FALSE:
-            return finishBuild(ctxt, deserializeFromBoolean(jp, ctxt));
-        case START_ARRAY:
-            // these only work if there's a (delegating) creator...
-            return finishBuild(ctxt, deserializeFromArray(jp, ctxt));
-        case FIELD_NAME:
-        case END_OBJECT: // added to resolve [JACKSON-319], possible related issues
-            return finishBuild(ctxt, deserializeFromObject(jp, ctxt));
-        }
-        throw ctxt.mappingException(getBeanClass());
-    }
-
-    /**
-     * Secondary deserialization method, called in cases where POJO
-     * instance is created as part of deserialization, potentially
-     * after collecting some or all of the properties to set.
-     */
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt,
-    		Object builder)
-        throws IOException, JsonProcessingException
-    {
-        /* Important: we call separate method which does NOT call
-         * 'finishBuild()', to avoid problems with recursion
-         */
-        return finishBuild(ctxt, _deserialize(jp, ctxt, builder));
-    }
-    
-    /*
-    /**********************************************************
-    /* Concrete deserialization methods
-    /**********************************************************
-     */
-
-    protected final Object _deserialize(JsonParser jp,
-            DeserializationContext ctxt, Object builder)
-        throws IOException, JsonProcessingException
-    {        
-        if (_injectables != null) {
-            injectValues(ctxt, builder);
-        }
-        if (_unwrappedPropertyHandler != null) {
-            return deserializeWithUnwrapped(jp, ctxt, builder);
-        }
-        if (_externalTypeIdHandler != null) {
-            return deserializeWithExternalTypeId(jp, ctxt, builder);
-        }
-        if (_needViewProcesing) {
-            Class<?> view = ctxt.getActiveView();
-            if (view != null) {
-                return deserializeWithView(jp, ctxt, builder, view);
-            }
-        }
-        JsonToken t = jp.getCurrentToken();
-        // 23-Mar-2010, tatu: In some cases, we start with full JSON object too...
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            
-            if (prop != null) { // normal case
-                try {
-                    builder = prop.deserializeSetAndReturn(jp, ctxt, builder);
-                } catch (Exception e) {
-                    wrapAndThrow(e, builder, propName, ctxt);
-                }
-                continue;
-            }
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                // should we try to get return value of any setter too?
-                _anySetter.deserializeAndSet(jp, ctxt, builder, propName);
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, builder, propName);
-            }
-        }
-        return builder;
-    }
-    
-    /**
-     * Streamlined version that is only used when no "special"
-     * features are enabled.
-     */
-    private final Object vanillaDeserialize(JsonParser jp,
-    		DeserializationContext ctxt, JsonToken t)
-        throws IOException, JsonProcessingException
-    {
-        Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-            } else {
-                _vanillaDeserializeHandleUnknown(jp, ctxt, bean, propName);
-            }
-        }
-        return bean;
-    }
-
-    /**
-     * Helper method called for an unknown property, when using "vanilla"
-     * processing.
-     */
-    private final void _vanillaDeserializeHandleUnknown(JsonParser jp, DeserializationContext ctxt,
-            Object bean, String propName)
-        throws IOException, JsonProcessingException
-    {
-        if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-            jp.skipChildren();
-        } else if (_anySetter != null) {
-            try {
-            	// should we consider return type of any setter?
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-            } catch (Exception e) {
-                wrapAndThrow(e, bean, propName, ctxt);
-            }
-        } else {
-            // Unknown: let's call handler method
-            handleUnknownProperty(jp, ctxt, bean, propName);         
-        }
-    }
-
-    /**
-     * General version used when handling needs more advanced
-     * features.
-     */
-    public Object deserializeFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_nonStandardCreation) {
-            if (_unwrappedPropertyHandler != null) {
-                return deserializeWithUnwrapped(jp, ctxt);
-            }
-            if (_externalTypeIdHandler != null) {
-                return deserializeWithExternalTypeId(jp, ctxt);
-            }
-            return deserializeFromObjectUsingNonDefault(jp, ctxt);
-        }
-        Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-        if (_needViewProcesing) {
-            Class<?> view = ctxt.getActiveView();
-            if (view != null) {
-                return deserializeWithView(jp, ctxt, bean, view);
-            }
-        }
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);         
-            }
-        }
-        return bean;
-    }
-
-    protected Object deserializeFromObjectUsingNonDefault(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {        
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return _deserializeUsingPropertyBased(jp, ctxt);
-        }
-        // should only occur for abstract types...
-        if (_beanType.isAbstract()) {
-            throw JsonMappingException.from(jp, "Can not instantiate abstract type "+_beanType
-                    +" (need to add/enable type information?)");
-        }
-        throw JsonMappingException.from(jp, "No suitable constructor found for type "
-                +_beanType+": can not instantiate from JSON object (need to add/enable type information?)");
-    }
-    
-    public Object deserializeFromString(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // First things first: id Object Id is used, most likely that's it
-        if (_objectIdReader != null) {
-            return deserializeFromObjectId(jp, ctxt);
-        }
-        
-        /* Bit complicated if we have delegating creator; may need to use it,
-         * or might not...
-         */
-        if (_delegateDeserializer != null) {
-            if (!_valueInstantiator.canCreateFromString()) {
-                Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                if (_injectables != null) {
-                    injectValues(ctxt, bean);
-                }
-                return bean;
-            }
-        }
-        return _valueInstantiator.createFromString(ctxt, jp.getText());
-    }
-
-    public Object deserializeFromNumber(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // First things first: id Object Id is used, most likely that's it
-        if (_objectIdReader != null) {
-            return deserializeFromObjectId(jp, ctxt);
-        }
-
-        switch (jp.getNumberType()) {
-        case INT:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromInt()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromInt(ctxt, jp.getIntValue());
-        case LONG:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromInt()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromLong(ctxt, jp.getLongValue());
-    	}
-        // actually, could also be BigInteger, so:
-        if (_delegateDeserializer != null) {
-            Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-            if (_injectables != null) {
-                injectValues(ctxt, bean);
-            }
-            return bean;
-        }
-        throw ctxt.instantiationException(getBeanClass(), "no suitable creator method found to deserialize from JSON integer number");
-    }
-
-    /**
-     * Method called to deserialize POJO value from a JSON floating-point
-     * number.
-     */
-    public Object deserializeFromDouble(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getNumberType()) {
-        case FLOAT: // no separate methods for taking float...
-        case DOUBLE:
-            if (_delegateDeserializer != null) {
-                if (!_valueInstantiator.canCreateFromDouble()) {
-                    Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                    if (_injectables != null) {
-                        injectValues(ctxt, bean);
-                    }
-                    return bean;
-                }
-            }
-            return _valueInstantiator.createFromDouble(ctxt, jp.getDoubleValue());
-        }
-        // actually, could also be BigDecimal, so:
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        throw ctxt.instantiationException(getBeanClass(), "no suitable creator method found to deserialize from JSON floating-point number");
-    }
-
-    /**
-     * Method called to deserialize POJO value from a JSON boolean value (true, false)
-     */
-    public Object deserializeFromBoolean(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            if (!_valueInstantiator.canCreateFromBoolean()) {
-                Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-                if (_injectables != null) {
-                    injectValues(ctxt, bean);
-                }
-                return bean;
-            }
-        }
-        boolean value = (jp.getCurrentToken() == JsonToken.VALUE_TRUE);
-        return _valueInstantiator.createFromBoolean(ctxt, value);
-    }
-
-    public Object deserializeFromArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-    	if (_delegateDeserializer != null) {
-    	    try {
-    	        Object bean = _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-    	        if (_injectables != null) {
-    	            injectValues(ctxt, bean);
-    	        }
-    	        return bean;
-            } catch (Exception e) {
-                wrapInstantiationProblem(e, ctxt);
-            }
-    	}
-    	throw ctxt.mappingException(getBeanClass());
-    }
-
-    /**
-     * Method called to deserialize bean using "property-based creator":
-     * this means that a non-default constructor or factory method is
-     * called, and then possibly other setters. The trick is that
-     * values for creator method need to be buffered, first; and 
-     * due to non-guaranteed ordering possibly some other properties
-     * as well.
-     */
-    protected final Object _deserializeUsingPropertyBased(final JsonParser jp,
-            final DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    { 
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        // 04-Jan-2010, tatu: May need to collect unknown properties for polymorphic cases
-        TokenBuffer unknown = null;
-
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken(); // to point to value
-            // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    jp.nextToken(); // to move to following FIELD_NAME/END_OBJECT
-                    Object bean;
-                    try {
-                        bean = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
-                    }
-                    //  polymorphic?
-                    if (bean.getClass() != _beanType.getRawClass()) {
-                        return handlePolymorphic(jp, ctxt, bean, unknown);
-                    }
-                    if (unknown != null) { // nope, just extra unknown stuff...
-                        bean = handleUnknownProperties(ctxt, bean, unknown);
-                    }
-                    // or just clean?
-                    return _deserialize(jp, ctxt, bean);
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // "any property"?
-            if (_anySetter != null) {
-                buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(jp, ctxt));
-                continue;
-            }
-            // Ok then, let's collect the whole field; name and value
-            if (unknown == null) {
-                unknown = new TokenBuffer(jp.getCodec());
-            }
-            unknown.writeFieldName(propName);
-            unknown.copyCurrentStructure(jp);
-        }
-
-        // We hit END_OBJECT, so:
-        Object bean;
-        try {
-            bean = creator.build(ctxt, buffer);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            return null; // never gets here
-        }
-        if (unknown != null) {
-            // polymorphic?
-            if (bean.getClass() != _beanType.getRawClass()) {
-                return handlePolymorphic(null, ctxt, bean, unknown);
-            }
-            // no, just some extra unknown properties
-            return handleUnknownProperties(ctxt, bean, unknown);
-        }
-        return bean;
-    }
-
-    /**
-     * Method called in cases where we may have polymorphic deserialization
-     * case: that is, type of Creator-constructed bean is not the type
-     * of deserializer itself. It should be a sub-class or implementation
-     * class; either way, we may have more specific deserializer to use
-     * for handling it.
-     *
-     * @param jp (optional) If not null, parser that has more properties to handle
-     *   (in addition to buffered properties); if null, all properties are passed
-     *   in buffer
-     */
-    protected Object handlePolymorphic(JsonParser jp, DeserializationContext ctxt,                                          
-            Object bean, TokenBuffer unknownTokens)
-        throws IOException, JsonProcessingException
-    {  
-        // First things first: maybe there is a more specific deserializer available?
-        JsonDeserializer<Object> subDeser = _findSubclassDeserializer(ctxt, bean, unknownTokens);
-        if (subDeser != null) {
-            if (unknownTokens != null) {
-                // need to add END_OBJECT marker first
-                unknownTokens.writeEndObject();
-                JsonParser p2 = unknownTokens.asParser();
-                p2.nextToken(); // to get to first data field
-                bean = subDeser.deserialize(p2, ctxt, bean);
-            }
-            // Original parser may also have some leftovers
-            if (jp != null) {
-                bean = subDeser.deserialize(jp, ctxt, bean);
-            }
-            return bean;
-        }
-        // nope; need to use this deserializer. Unknowns we've seen so far?
-        if (unknownTokens != null) {
-            bean = handleUnknownProperties(ctxt, bean, unknownTokens);
-        }
-        // and/or things left to process via main parser?
-        if (jp != null) {
-            bean = deserialize(jp, ctxt, bean);
-        }
-        return bean;
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializing when we have to consider an active View
-    /**********************************************************
-     */
-    
-    protected final Object deserializeWithView(JsonParser jp, DeserializationContext ctxt,
-            Object bean, Class<?> activeView)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            // Skip field name:
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                if (!prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-            } else if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);
-            }
-        }
-        return bean;
-    }
-    
-    /*
-    /**********************************************************
-    /* Handling for cases where we have "unwrapped" values
-    /**********************************************************
-     */
-
-    /**
-     * Method called when there are declared "unwrapped" properties
-     * which need special handling
-     */
-    protected Object deserializeWithUnwrapped(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return deserializeUsingPropertyBasedWithUnwrapped(jp, ctxt);
-        }
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-        Object bean = _valueInstantiator.createUsingDefault(ctxt);
-
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            // ignorable things should be ignored
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but... others should be passed to unwrapped property deserializers
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // how about any setter? We'll get copies but...
-            if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-        }
-        tokens.writeEndObject();
-        _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-        return bean;
-    }    
-
-    protected Object deserializeWithUnwrapped(JsonParser jp,
-    		DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            jp.nextToken();
-            if (prop != null) { // normal case
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but... others should be passed to unwrapped property deserializers
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // how about any setter? We'll get copies but...
-            if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-            }
-        }
-        tokens.writeEndObject();
-        _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-        return bean;
-    }
-
-    protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser jp,
-    		DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-        tokens.writeStartObject();
-
-        JsonToken t = jp.getCurrentToken();
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken(); // to point to value
-            // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    t = jp.nextToken(); // to move to following FIELD_NAME/END_OBJECT
-                    Object bean;
-                    try {
-                        bean = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
-                    }
-                    // if so, need to copy all remaining tokens into buffer
-                    while (t == JsonToken.FIELD_NAME) {
-                        jp.nextToken(); // to skip name
-                        tokens.copyCurrentStructure(jp);
-                        t = jp.nextToken();
-                    }
-                    tokens.writeEndObject();
-                    if (bean.getClass() != _beanType.getRawClass()) {
-                        // !!! 08-Jul-2011, tatu: Could probably support; but for now
-                        //   it's too complicated, so bail out
-                        throw ctxt.mappingException("Can not create polymorphic instances with unwrapped values");
-                    }
-                    return _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) {
-                buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-                continue;
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            tokens.writeFieldName(propName);
-            tokens.copyCurrentStructure(jp);
-            // "any property"?
-            if (_anySetter != null) {
-                buffer.bufferAnyProperty(_anySetter, propName, _anySetter.deserialize(jp, ctxt));
-            }
-        }
-
-        // We hit END_OBJECT, so:
-        Object bean;
-        // !!! 15-Feb-2012, tatu: Need to modify creator to use Builder!
-        try {
-            bean = creator.build(ctxt, buffer);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            return null; // never gets here
-        }
-        return _unwrappedPropertyHandler.processUnwrapped(jp, ctxt, bean, tokens);
-    }
-
-    /*
-    /**********************************************************
-    /* Handling for cases where we have property/-ies with
-    /* external type id
-    /**********************************************************
-     */
-    
-    protected Object deserializeWithExternalTypeId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_propertyBasedCreator != null) {
-            return deserializeUsingPropertyBasedWithExternalTypeId(jp, ctxt);
-        }
-        return deserializeWithExternalTypeId(jp, ctxt, _valueInstantiator.createUsingDefault(ctxt));
-    }
-
-    protected Object deserializeWithExternalTypeId(JsonParser jp,
-    		DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        final ExternalTypeHandler ext = _externalTypeIdHandler.start();
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            jp.nextToken();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            if (prop != null) { // normal case
-                if (activeView != null && !prop.visibleInView(activeView)) {
-                    jp.skipChildren();
-                    continue;
-                }
-                try {
-                    bean = prop.deserializeSetAndReturn(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            }
-            // ignorable things should be ignored
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // but others are likely to be part of external type id thingy...
-            if (ext.handlePropertyValue(jp, ctxt, propName, bean)) {
-                continue;
-            }
-            // if not, the usual fallback handling:
-            if (_anySetter != null) {
-                try {
-                    _anySetter.deserializeAndSet(jp, ctxt, bean, propName);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, propName, ctxt);
-                }
-                continue;
-            } else {
-                // Unknown: let's call handler method
-                handleUnknownProperty(jp, ctxt, bean, propName);         
-            }
-        }
-        // and when we get this far, let's try finalizing the deal:
-        return ext.complete(jp, ctxt, bean);
-    }        
-
-    protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser jp,
-    		DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // !!! 04-Mar-2012, TODO: Need to fix -- will not work as is...
-        throw new IllegalStateException("Deserialization with Builder, External type id, @JsonCreator not yet implemented");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualDeserializer.java
deleted file mode 100644
index 11c972b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualDeserializer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Add-on interface that {@link JsonDeserializer}s can implement to get a callback
- * that can be used to create contextual (context-dependent) instances of
- * deserializer to use for  handling properties of supported type.
- * This can be useful
- * for deserializers that can be configured by annotations, or should otherwise
- * have differing behavior depending on what kind of property is being deserialized.
- *<p>
- * Note that in cases where deserializer needs both contextualization and
- * resolution -- that is, implements both this interface and {@link ResolvableDeserializer}
- * -- resolution via {@link ResolvableDeserializer} occurs first, and contextual
- * resolution (via this interface) later on.
- */
-public interface ContextualDeserializer
-{
-    /**
-     * Method called to see if a different (or differently configured) deserializer
-     * is needed to deserialize values of specified property.
-     * Note that instance that this method is called on is typically shared one and
-     * as a result method should <b>NOT</b> modify this instance but rather construct
-     * and return a new instance. This instance should only be returned as-is, in case
-     * it is already suitable for use.
-     * 
-     * @param ctxt Deserialization context to access configuration, additional 
-     *    deserializers that may be needed by this deserializer
-     * @param property Method, field or constructor parameter that represents the property
-     *   (and is used to assign deserialized value).
-     *   Should be available; but there may be cases where caller can not provide it and
-     *   null is passed instead (in which case impls usually pass 'this' deserializer as is)
-     * 
-     * @return Deserializer to use for deserializing values of specified property;
-     *   may be this instance or a new instance.
-     * 
-     * @throws JsonMappingException
-     */
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.java
deleted file mode 100644
index 897dc79..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ContextualKeyDeserializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Add-on interface that {@link KeyDeserializer}s can implement to get a callback
- * that can be used to create contextual instances of key deserializer to use for
- * handling Map keys of supported type. This can be useful
- * for key deserializers that can be configured by annotations, or should otherwise
- * have differing behavior depending on what kind of Map property keys are being deserialized.
- */
-public interface ContextualKeyDeserializer
-{
-    /**
-     * Method called to see if a different (or differently configured) key deserializer
-     * is needed to deserialize keys of specified Map property.
-     * Note that instance that this method is called on is typically shared one and
-     * as a result method should <b>NOT</b> modify this instance but rather construct
-     * and return a new instance. This instance should only be returned as-is, in case
-     * it is already suitable for use.
-     * 
-     * @param ctxt Deserialization context to access configuration, additional 
-     *    deserializers that may be needed by this deserializer
-     * @param property Method, field or constructor parameter that declared Map for which
-     *   contextual instance will be used. Will not be available when deserializing root-level
-     *   Map value; otherwise should not be null.
-     * 
-     * @return Key deserializer to use for deserializing keys specified Map property,
-     *   may be this instance or a new instance.
-     */
-    public KeyDeserializer createContextual(DeserializationContext ctxt,
-            BeanProperty property)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/CreatorProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/CreatorProperty.java
deleted file mode 100644
index 5970965..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/CreatorProperty.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * This concrete sub-class implements property that is passed
- * via Creator (constructor or static factory method).
- * It is not a full-featured implementation in that its set method
- * should never be called -- instead, value must separately passed.
- *<p>
- * Note on injectable values: unlike with other mutators, where
- * deserializer and injecting are separate, here we deal the two as related
- * things. This is necessary to add proper priority, as well as to simplify
- * coordination.
- */
-public class CreatorProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Placeholder that represents constructor parameter, when it is created
-     * from actual constructor.
-     * May be null when a synthetic instance is created.
-     */
-    protected final AnnotatedParameter _annotated;
-
-    /**
-     * Id of value to inject, if value injection should be used for this parameter
-     * (in addition to, or instead of, regular deserialization).
-     */
-    protected final Object _injectableValueId;
-
-    /**
-     * @since 2.1
-     */
-    protected final int _creatorIndex;
-    
-    /**
-     * @param name Name of the logical property
-     * @param type Type of the property, used to find deserializer
-     * @param typeDeser Type deserializer to use for handling polymorphic type
-     *    information, if one is needed
-     * @param contextAnnotations Contextual annotations (usually by class that
-     *    declares creator [constructor, factory method] that includes
-     *    this property)
-     * @param param Representation of property, constructor or factory
-     *    method parameter; used for accessing annotations of the property
-     * @param index Index of this property within creator invocatino
-     */
-    public CreatorProperty(String name, JavaType type, TypeDeserializer typeDeser,
-            Annotations contextAnnotations, AnnotatedParameter param,
-            int index, Object injectableValueId)
-    {
-        super(name, type, typeDeser, contextAnnotations);
-        _annotated = param;
-        _creatorIndex = index;
-        _injectableValueId = injectableValueId;
-    }
-
-    protected CreatorProperty(CreatorProperty src, String newName) {
-        super(src, newName);
-        _annotated = src._annotated;
-        _creatorIndex = src._creatorIndex;
-        _injectableValueId = src._injectableValueId;
-    }
-    
-    protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser) {
-        super(src, deser);
-        _annotated = src._annotated;
-        _creatorIndex = src._creatorIndex;
-        _injectableValueId = src._injectableValueId;
-    }
-
-    @Override
-    public CreatorProperty withName(String newName) {
-        return new CreatorProperty(this, newName);
-    }
-    
-    @Override
-    public CreatorProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new CreatorProperty(this, deser);
-    }
-
-    /**
-     * Method that can be called to locate value to be injected for this
-     * property, if it is configured for this.
-     */
-    public Object findInjectableValue(DeserializationContext context, Object beanInstance)
-    {
-        if (_injectableValueId == null) {
-            throw new IllegalStateException("Property '"+getName()
-                    +"' (type "+getClass().getName()+") has no injectable value id configured");
-        }
-        return context.findInjectableValue(_injectableValueId, this, beanInstance);
-    }
-    
-    /**
-     * Method to find value to inject, and inject it to this property.
-     */
-    public void inject(DeserializationContext context, Object beanInstance)
-        throws IOException
-    {
-        set(beanInstance, findInjectableValue(context, beanInstance));
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        if (_annotated == null) {
-            return null;
-        }
-        return _annotated.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _annotated; }
-
-    @Override public int getCreatorIndex() {
-        return _creatorIndex;
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-                                  Object instance)
-        throws IOException, JsonProcessingException
-    {
-        set(instance, deserialize(jp, ctxt));
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        return setAndReturn(instance, deserialize(jp, ctxt));
-    }
-    
-    @Override
-    public void set(Object instance, Object value) throws IOException
-    {
-        /* Hmmmh. Should we return quietly (NOP), or error?
-         * Perhaps better to throw an exception, since it's generally an error.
-         */
-        throw new IllegalStateException("Method should never be called on a "+getClass().getName());
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value) throws IOException
-    {
-        return instance;
-    }
-    
-    @Override
-    public Object getInjectableValueId() {
-        return _injectableValueId;
-    }
-
-    @Override
-    public String toString() { return "[creator property, name '"+getName()+"'; inject id '"+_injectableValueId+"']"; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DataFormatReaders.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DataFormatReaders.java
deleted file mode 100644
index 1cf00fe..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DataFormatReaders.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.format.*;
-import com.fasterxml.jackson.core.io.MergedStream;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Alternative to {@link DataFormatDetector} that needs to be used when
- * using data-binding.
- * 
- * @since 2.1
- */
-public class DataFormatReaders
-{
-    /**
-     * By default we will look ahead at most 64 bytes; in most cases,
-     * much less (4 bytes or so) is needed, but we will allow bit more
-     * leniency to support data formats that need more complex heuristics.
-     */
-    public final static int DEFAULT_MAX_INPUT_LOOKAHEAD = 64;
-    
-    /**
-     * Ordered list of readers which both represent data formats to
-     * detect (in precedence order, starting with highest) and contain
-     * factories used for actual detection.
-     */
-    protected final ObjectReader[] _readers;
-
-    /**
-     * Strength of match we consider to be good enough to be used
-     * without checking any other formats.
-     * Default value is {@link MatchStrength#SOLID_MATCH}, 
-     */
-    protected final MatchStrength _optimalMatch;
-
-    /**
-     * Strength of minimal match we accept as the answer, unless
-     * better matches are found. 
-     * Default value is {@link MatchStrength#WEAK_MATCH}, 
-     */
-    protected final MatchStrength _minimalMatch;
-
-    /**
-     * Maximum number of leading bytes of the input that we can read
-     * to determine data format.
-     *<p>
-     * Default value is {@link #DEFAULT_MAX_INPUT_LOOKAHEAD}.
-     */
-    protected final int _maxInputLookahead;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-    
-    public DataFormatReaders(ObjectReader... detectors) {
-        this(detectors, MatchStrength.SOLID_MATCH, MatchStrength.WEAK_MATCH,
-            DEFAULT_MAX_INPUT_LOOKAHEAD);
-    }
-
-    public DataFormatReaders(Collection<ObjectReader> detectors) {
-        this(detectors.toArray(new ObjectReader[detectors.size()]));
-    }
-
-    private DataFormatReaders(ObjectReader[] detectors,
-            MatchStrength optMatch, MatchStrength minMatch,
-            int maxInputLookahead)
-    {
-        _readers = detectors;
-        _optimalMatch = optMatch;
-        _minimalMatch = minMatch;
-        _maxInputLookahead = maxInputLookahead;
-    }
-    
-    /*
-    /**********************************************************
-    /* Fluent factories for changing match settings
-    /**********************************************************
-     */
-    
-    public DataFormatReaders withOptimalMatch(MatchStrength optMatch) {
-        if (optMatch == _optimalMatch) {
-            return this;
-        }
-        return new DataFormatReaders(_readers, optMatch, _minimalMatch, _maxInputLookahead);
-    }
-
-    public DataFormatReaders withMinimalMatch(MatchStrength minMatch) {
-        if (minMatch == _minimalMatch) {
-            return this;
-        }
-        return new DataFormatReaders(_readers, _optimalMatch, minMatch, _maxInputLookahead);
-    }
-
-    public DataFormatReaders with(ObjectReader[] readers) {
-        return new DataFormatReaders(readers, _optimalMatch, _minimalMatch, _maxInputLookahead);
-    }
-    
-    public DataFormatReaders withMaxInputLookahead(int lookaheadBytes)
-    {
-        if (lookaheadBytes == _maxInputLookahead) {
-            return this;
-        }
-        return new DataFormatReaders(_readers, _optimalMatch, _minimalMatch, lookaheadBytes);
-    }
-
-    /*
-    /**********************************************************
-    /* Fluent factories for changing underlying readers
-    /**********************************************************
-     */
-
-    public DataFormatReaders with(DeserializationConfig config)
-    {
-        final int len = _readers.length;
-        ObjectReader[] r = new ObjectReader[len];
-        for (int i = 0; i < len; ++i) {
-            r[i] = _readers[i].with(config);
-        }
-        return new DataFormatReaders(r, _optimalMatch, _minimalMatch, _maxInputLookahead);
-    }
-
-    public DataFormatReaders withType(JavaType type)
-    {
-        final int len = _readers.length;
-        ObjectReader[] r = new ObjectReader[len];
-        for (int i = 0; i < len; ++i) {
-            r[i] = _readers[i].withType(type);
-        }
-        return new DataFormatReaders(r, _optimalMatch, _minimalMatch, _maxInputLookahead);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method to call to find format that content (accessible via given
-     * {@link InputStream}) given has, as per configuration of this detector
-     * instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     */
-    public Match findFormat(InputStream in) throws IOException
-    {
-        return _findFormat(new AccessorForReader(in, new byte[_maxInputLookahead]));
-    }
-
-    /**
-     * Method to call to find format that given content (full document)
-     * has, as per configuration of this detector instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     */
-    public Match findFormat(byte[] fullInputData) throws IOException
-    {
-        return _findFormat(new AccessorForReader(fullInputData));
-    }
-
-    /**
-     * Method to call to find format that given content (full document)
-     * has, as per configuration of this detector instance.
-     * 
-     * @return Matcher object which contains result; never null, even in cases
-     *    where no match (with specified minimal match strength) is found.
-     * 
-     * @since 2.1
-     */
-    public Match findFormat(byte[] fullInputData, int offset, int len) throws IOException
-    {
-        return _findFormat(new AccessorForReader(fullInputData, offset, len));
-    }
-    
-    /*
-    /**********************************************************
-    /* Overrides
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append('[');
-        final int len = _readers.length;
-        if (len > 0) {
-            sb.append(_readers[0].getFactory().getFormatName());
-            for (int i = 1; i < len; ++i) {
-                sb.append(", ");
-                sb.append(_readers[i].getFactory().getFormatName());
-            }
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private Match _findFormat(AccessorForReader acc) throws IOException
-    {
-        ObjectReader bestMatch = null;
-        MatchStrength bestMatchStrength = null;
-        for (ObjectReader f : _readers) {
-            acc.reset();
-            MatchStrength strength = f.getFactory().hasFormat(acc);
-            // if not better than what we have so far (including minimal level limit), skip
-            if (strength == null || strength.ordinal() < _minimalMatch.ordinal()) {
-                continue;
-            }
-            // also, needs to better match than before
-            if (bestMatch != null) {
-                if (bestMatchStrength.ordinal() >= strength.ordinal()) {
-                    continue;
-                }
-            }
-            // finally: if it's good enough match, we are done
-            bestMatch = f;
-            bestMatchStrength = strength;
-            if (strength.ordinal() >= _optimalMatch.ordinal()) {
-                break;
-            }
-        }
-        return acc.createMatcher(bestMatch, bestMatchStrength);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * We need sub-class here as well, to be able to access efficiently.
-     */
-    protected class AccessorForReader extends InputAccessor.Std
-    {
-        public AccessorForReader(InputStream in, byte[] buffer) {
-            super(in, buffer);
-        }
-        public AccessorForReader(byte[] inputDocument) {
-            super(inputDocument);
-        }
-        public AccessorForReader(byte[] inputDocument, int start, int len) {
-            super(inputDocument, start, len);
-        }
-
-        public Match createMatcher(ObjectReader match, MatchStrength matchStrength)
-        {
-            return new Match(_in, _buffer, _bufferedStart, (_bufferedEnd - _bufferedStart),
-                    match, matchStrength);
-        }
-    }
-    
-    /**
-     * Result class, similar to {@link DataFormatMatcher}
-     */
-    public static class Match
-    {
-        protected final InputStream _originalStream;
-
-        /**
-         * Content read during format matching process
-         */
-        protected final byte[] _bufferedData;
-
-        /**
-         * Pointer to the first byte in buffer available for reading
-         */
-        protected final int _bufferedStart;
-        
-        /**
-         * Number of bytes available in buffer.
-         */
-        protected final int _bufferedLength;
-
-        /**
-         * Factory that produced sufficient match (if any)
-         */
-        protected final ObjectReader _match;
-
-        /**
-         * Strength of match with {@link #_match}
-         */
-        protected final MatchStrength _matchStrength;
-        
-        protected Match(InputStream in, byte[] buffered,
-                int bufferedStart, int bufferedLength,
-                ObjectReader match, MatchStrength strength)
-        {
-            _originalStream = in;
-            _bufferedData = buffered;
-            _bufferedStart = bufferedStart;
-            _bufferedLength = bufferedLength;
-            _match = match;
-            _matchStrength = strength;
-        }
-
-        /*
-        /**********************************************************
-        /* Public API, simple accessors
-        /**********************************************************
-         */
-
-        /**
-         * Accessor to use to see if any formats matched well enough with
-         * the input data.
-         */
-        public boolean hasMatch() { return _match != null; }
-
-        /**
-         * Method for accessing strength of the match, if any; if no match,
-         * will return {@link MatchStrength#INCONCLUSIVE}.
-         */
-        public MatchStrength getMatchStrength() {
-            return (_matchStrength == null) ? MatchStrength.INCONCLUSIVE : _matchStrength;
-        }
-
-        /**
-         * Accessor for {@link JsonFactory} that represents format that data matched.
-         */
-        public ObjectReader getReader() { return _match; }
-
-        /**
-         * Accessor for getting brief textual name of matched format if any (null
-         * if none). Equivalent to:
-         *<pre>
-         *   return hasMatch() ? getMatch().getFormatName() : null;
-         *</pre>
-         */
-        public String getMatchedFormatName() {
-            return _match.getFactory().getFormatName();
-        }
-        
-        /*
-        /**********************************************************
-        /* Public API, factory methods
-        /**********************************************************
-         */
-        
-        /**
-         * Convenience method for trying to construct a {@link JsonParser} for
-         * parsing content which is assumed to be in detected data format.
-         * If no match was found, returns null.
-         */
-        public JsonParser createParserWithMatch() throws IOException
-        {
-            if (_match == null) {
-                return null;
-            }
-            JsonFactory jf = _match.getFactory();
-            if (_originalStream == null) {
-                return jf.createParser(_bufferedData, _bufferedStart, _bufferedLength);
-            }
-            return jf.createParser(getDataStream());
-        }
-        
-        /**
-         * Method to use for accessing input for which format detection has been done.
-         * This <b>must</b> be used instead of using stream passed to detector
-         * unless given stream itself can do buffering.
-         * Stream will return all content that was read during matching process, as well
-         * as remaining contents of the underlying stream.
-         */
-        public InputStream getDataStream() {
-            if (_originalStream == null) {
-                return new ByteArrayInputStream(_bufferedData, _bufferedStart, _bufferedLength);
-            }
-            return new MergedStream(null, _originalStream, _bufferedData, _bufferedStart, _bufferedLength);
-        }        
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
deleted file mode 100644
index 213b715..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.util.LinkedHashMap;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Complete {@link DeserializationContext} implementation that adds
- * extended API for {@link ObjectMapper} (and {@link ObjectReader})
- * to call, as well as implements certain parts that base class
- * has left abstract.
- * The remaining abstract methods ({@link #createInstance}, {@link #with})
- * are left so that custom implementations will properly implement them
- * to return intended subtype.
- */
-public abstract class DefaultDeserializationContext
-    extends DeserializationContext
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    protected transient LinkedHashMap<ObjectIdGenerator.IdKey, ReadableObjectId> _objectIds;
-    
-    /**
-     * Constructor that will pass specified deserializer factory and
-     * cache: cache may be null (in which case default implementation
-     * will be used), factory can not be null
-     */
-    protected DefaultDeserializationContext(DeserializerFactory df, DeserializerCache cache) {
-        super(df, cache);
-    }
-    
-    protected DefaultDeserializationContext(DefaultDeserializationContext src,
-            DeserializationConfig config, JsonParser jp, InjectableValues values) {
-        super(src, config, jp, values);
-    }
-
-    protected DefaultDeserializationContext(DefaultDeserializationContext src,
-            DeserializerFactory factory) {
-        super(src, factory);
-    }
-
-    /*
-    /**********************************************************
-    /* Abstract methods impls, Object Id
-    /**********************************************************
-     */
-
-    @Override
-    public ReadableObjectId findObjectId(Object id,
-            ObjectIdGenerator<?> generator)
-    {
-        final ObjectIdGenerator.IdKey key = generator.key(id);
-        if (_objectIds == null) {
-            _objectIds = new LinkedHashMap<ObjectIdGenerator.IdKey, ReadableObjectId>();
-        } else {
-            ReadableObjectId entry = _objectIds.get(key);
-            if (entry != null) {
-                return entry;
-            }
-        }
-        ReadableObjectId entry = new ReadableObjectId(id);
-        _objectIds.put(key, entry);
-        return entry;
-    }
-
-    @Override
-    public ObjectIdGenerator<?> objectIdGeneratorInstance(Annotated annotated,
-            ObjectIdInfo objectIdInfo)
-        throws JsonMappingException
-    {
-        Class<?> implClass = objectIdInfo.getGeneratorType();
-        HandlerInstantiator hi = _config.getHandlerInstantiator();
-        ObjectIdGenerator<?> gen;
-
-        if (hi != null) {
-            gen = hi.objectIdGeneratorInstance(_config, annotated, implClass);
-        } else {
-            gen = (ObjectIdGenerator<?>) ClassUtil.createInstance(implClass,
-                    _config.canOverrideAccessModifiers());
-        }
-        return gen.forScope(objectIdInfo.getScope());
-    }
-    
-    /*
-    /**********************************************************
-    /* Abstract methods impls, other factory methods
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public JsonDeserializer<Object> deserializerInstance(Annotated annotated,
-            Object deserDef)
-        throws JsonMappingException
-    {
-        if (deserDef == null) {
-            return null;
-        }
-        JsonDeserializer<?> deser;
-        
-        if (deserDef instanceof JsonDeserializer) {
-            deser = (JsonDeserializer<?>) deserDef;
-        } else {
-            /* Alas, there's no way to force return type of "either class
-             * X or Y" -- need to throw an exception after the fact
-             */
-            if (!(deserDef instanceof Class)) {
-                throw new IllegalStateException("AnnotationIntrospector returned deserializer definition of type "+deserDef.getClass().getName()+"; expected type JsonDeserializer or Class<JsonDeserializer> instead");
-            }
-            Class<?> deserClass = (Class<?>)deserDef;
-            // there are some known "no class" markers to consider too:
-            if (deserClass == JsonDeserializer.None.class || deserClass == NoClass.class) {
-                return null;
-            }
-            if (!JsonDeserializer.class.isAssignableFrom(deserClass)) {
-                throw new IllegalStateException("AnnotationIntrospector returned Class "+deserClass.getName()+"; expected Class<JsonDeserializer>");
-            }
-            HandlerInstantiator hi = _config.getHandlerInstantiator();
-            if (hi != null) {
-                deser = hi.deserializerInstance(_config, annotated, deserClass);
-            } else {
-                deser = (JsonDeserializer<?>) ClassUtil.createInstance(deserClass,
-                        _config.canOverrideAccessModifiers());
-            }
-        }
-        // First: need to resolve
-        if (deser instanceof ResolvableDeserializer) {
-            ((ResolvableDeserializer) deser).resolve(this);
-        }
-        return (JsonDeserializer<Object>) deser;
-    }
-
-    @Override
-    public final KeyDeserializer keyDeserializerInstance(Annotated annotated,
-            Object deserDef)
-        throws JsonMappingException
-    {
-        if (deserDef == null) {
-            return null;
-        }
-
-        KeyDeserializer deser;
-        
-        if (deserDef instanceof KeyDeserializer) {
-            deser = (KeyDeserializer) deserDef;
-        } else {
-            if (!(deserDef instanceof Class)) {
-                throw new IllegalStateException("AnnotationIntrospector returned key deserializer definition of type "
-                        +deserDef.getClass().getName()
-                        +"; expected type KeyDeserializer or Class<KeyDeserializer> instead");
-            }
-            Class<?> deserClass = (Class<?>)deserDef;
-            // there are some known "no class" markers to consider too:
-            if (deserClass == KeyDeserializer.None.class || deserClass == NoClass.class) {
-                return null;
-            }
-            if (!KeyDeserializer.class.isAssignableFrom(deserClass)) {
-                throw new IllegalStateException("AnnotationIntrospector returned Class "+deserClass.getName()
-                        +"; expected Class<KeyDeserializer>");
-            }
-            HandlerInstantiator hi = _config.getHandlerInstantiator();
-            if (hi != null) {
-                deser = hi.keyDeserializerInstance(_config, annotated, deserClass);
-            } else {
-                deser = (KeyDeserializer) ClassUtil.createInstance(deserClass,
-                        _config.canOverrideAccessModifiers());
-            }
-        }
-        // First: need to resolve
-        if (deser instanceof ResolvableDeserializer) {
-            ((ResolvableDeserializer) deser).resolve(this);
-        }
-        return deser;
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Fluent factory method used for constructing a blueprint instance
-     * with different factory
-     */
-    public abstract DefaultDeserializationContext with(DeserializerFactory factory);
-    
-    /**
-     * Method called to create actual usable per-deserialization
-     * context instance.
-     */
-    public abstract DefaultDeserializationContext createInstance(
-            DeserializationConfig config, JsonParser jp, InjectableValues values);
-    
-    /*
-    /**********************************************************
-    /* And then the concrete implementation class
-    /**********************************************************
-     */
-
-    /**
-     * Actual full concrete implementation
-     */
-    public final static class Impl extends DefaultDeserializationContext
-    {
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Default constructor for a blueprint object, which will use the standard
-         * {@link DeserializerCache}, given factory.
-         */
-        public Impl(DeserializerFactory df) {
-            super(df, null);
-        }
-
-        protected Impl(Impl src,
-                DeserializationConfig config, JsonParser jp, InjectableValues values) {
-            super(src, config, jp, values);
-        }
-
-        protected Impl(Impl src, DeserializerFactory factory) {
-            super(src, factory);
-        }
-        
-        @Override
-        public DefaultDeserializationContext createInstance(DeserializationConfig config,
-                JsonParser jp, InjectableValues values) {
-            return new Impl(this, config, jp, values);
-        }
-
-        @Override
-        public DefaultDeserializationContext with(DeserializerFactory factory) {
-            return new Impl(this, factory);
-        }        
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.java
deleted file mode 100644
index c04974d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializationProblemHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * This is the class that can be registered (via
- * {@link DeserializationConfig} object owner by
- * {@link ObjectMapper}) to get calledn when a potentially
- * recoverable problem is encountered during deserialization
- * process. Handlers can try to resolve the problem, throw
- * an exception or do nothing.
- *<p>
- * Default implementations for all methods implemented minimal
- * "do nothing" functionality, which is roughly equivalent to
- * not having a registered listener at all. This allows for
- * only implemented handler methods one is interested in, without
- * handling other cases.
- */
-public abstract class DeserializationProblemHandler
-{
-    /**
-     * Method called when a JSON Map ("Object") entry with an unrecognized
-     * name is encountered.
-     * Content (supposedly) matching the property are accessible via
-     * parser that can be obtained from passed deserialization context.
-     * Handler can also choose to skip the content; if so, it MUST return
-     * true to indicate it did handle property succesfully.
-     * Skipping is usually done like so:
-     *<pre>
-     *  ctxt.getParser().skipChildren();
-     *</pre>
-     *<p>
-     * Note: version 1.2 added new deserialization feature
-     * (<code>DeserializationConfig.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES</code>).
-     * It will only have effect <b>after</b> handler is called, and only
-     * if handler did <b>not</b> handle the problem.
-     *
-     * @param beanOrClass Either bean instance being deserialized (if one
-     *   has been instantiated so far); or Class that indicates type that
-     *   will be instantiated (if no instantiation done yet: for example
-     *   when bean uses non-default constructors)
-     * @param jp Parser to use for handling problematic content
-     * 
-     * @return True if the problem is resolved (and content available used or skipped);
-     *  false if the handler did not anything and the problem is unresolved. Note that in
-     *  latter case caller will either throw an exception or explicitly skip the content,
-     *  depending on configuration.
-     */
-    public boolean handleUnknownProperty(DeserializationContext ctxt, JsonParser jp,
-            JsonDeserializer<?> deserializer, Object beanOrClass, String propertyName)
-        throws IOException, JsonProcessingException
-    {
-        return false;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerCache.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerCache.java
deleted file mode 100644
index 64b5639..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerCache.java
+++ /dev/null
@@ -1,540 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Class that defines caching layer between callers (like
- * {@link ObjectMapper},
- * {@link com.fasterxml.jackson.databind.DeserializationContext})
- * and classes that construct deserializers
- * ({@link com.fasterxml.jackson.databind.deser.DeserializerFactory}).
- */
-public final class DeserializerCache
-    implements java.io.Serializable // since 2.1 -- needs to be careful tho
-{
-    private static final long serialVersionUID = 1L;
-
-    /*
-    /**********************************************************
-    /* Caching
-    /**********************************************************
-     */
-
-    /**
-     * We will also cache some dynamically constructed deserializers;
-     * specifically, ones that are expensive to construct.
-     * This currently means bean and Enum deserializers; array, List and Map
-     * deserializers will not be cached.
-     *<p>
-     * Given that we don't expect much concurrency for additions
-     * (should very quickly converge to zero after startup), let's
-     * explicitly define a low concurrency setting.
-     */
-    final protected ConcurrentHashMap<JavaType, JsonDeserializer<Object>> _cachedDeserializers
-        = new ConcurrentHashMap<JavaType, JsonDeserializer<Object>>(64, 0.75f, 2);
-
-    /**
-     * During deserializer construction process we may need to keep track of partially
-     * completed deserializers, to resolve cyclic dependencies. This is the
-     * map used for storing deserializers before they are fully complete.
-     */
-    final protected HashMap<JavaType, JsonDeserializer<Object>> _incompleteDeserializers
-        = new HashMap<JavaType, JsonDeserializer<Object>>(8);
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public DeserializerCache() { }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object writeReplace() {
-        // instead of making this transient, just clear it:
-        _incompleteDeserializers.clear();
-        // TODO: clear out "cheap" cached deserializers?
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Access to caching aspects
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to determine how many deserializers this
-     * provider is caching currently 
-     * (if it does caching: default implementation does)
-     * Exact count depends on what kind of deserializers get cached;
-     * default implementation caches only dynamically constructed deserializers,
-     * but not eagerly constructed standard deserializers (which is different
-     * from how serializer provider works).
-     *<p>
-     * The main use case for this method is to allow conditional flushing of
-     * deserializer cache, if certain number of entries is reached.
-     */
-    public int cachedDeserializersCount() {
-        return _cachedDeserializers.size();
-    }
-
-    /**
-     * Method that will drop all dynamically constructed deserializers (ones that
-     * are counted as result value for {@link #cachedDeserializersCount}).
-     * This can be used to remove memory usage (in case some deserializers are
-     * only used once or so), or to force re-construction of deserializers after
-     * configuration changes for mapper than owns the provider.
-     */
-    public void flushCachedDeserializers() {
-        _cachedDeserializers.clear();       
-    }
-
-    /*
-    /**********************************************************
-    /* General deserializer locating method
-    /**********************************************************
-     */
-
-    /**
-     * Method called to get hold of a deserializer for a value of given type;
-     * or if no such deserializer can be found, a default handler (which
-     * may do a best-effort generic serialization or just simply
-     * throw an exception when invoked).
-     *<p>
-     * Note: this method is only called for value types; not for keys.
-     * Key deserializers can be accessed using {@link #findKeyDeserializer}.
-     *<p>
-     * Note also that deserializer returned is guaranteed to be resolved
-     * (if it is of type {@link ResolvableDeserializer}), but
-     * not contextualized (wrt {@link ContextualDeserializer}): caller
-     * has to handle latter if necessary.
-     *
-     * @param ctxt Deserialization context
-     * @param propertyType Declared type of the value to deserializer (obtained using
-     *   'setter' method signature and/or type annotations
-     *
-     * @throws JsonMappingException if there are fatal problems with
-     *   accessing suitable deserializer; including that of not
-     *   finding any serializer
-     */
-    public JsonDeserializer<Object> findValueDeserializer(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType propertyType)
-        throws JsonMappingException
-    {
-        JsonDeserializer<Object> deser = _findCachedDeserializer(propertyType);
-        if (deser != null) {
-            return deser;
-        }
-        // If not, need to request factory to construct (or recycle)
-        deser = _createAndCacheValueDeserializer(ctxt, factory, propertyType);
-        if (deser == null) {
-            /* Should we let caller handle it? Let's have a helper method
-             * decide it; can throw an exception, or return a valid
-             * deserializer
-             */
-            deser = _handleUnknownValueDeserializer(propertyType);
-        }
-        return deser;
-    }
-
-    /**
-     * Method called to get hold of a deserializer to use for deserializing
-     * keys for {@link java.util.Map}.
-     *
-     * @throws JsonMappingException if there are fatal problems with
-     *   accessing suitable key deserializer; including that of not
-     *   finding any serializer
-     */
-    public KeyDeserializer findKeyDeserializer(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType type)
-        throws JsonMappingException
-    {
-        KeyDeserializer kd = factory.createKeyDeserializer(ctxt, type);
-        if (kd == null) { // if none found, need to use a placeholder that'll fail
-            return _handleUnknownKeyDeserializer(type);
-        }
-        // First: need to resolve?
-        if (kd instanceof ResolvableDeserializer) {
-            ((ResolvableDeserializer) kd).resolve(ctxt);
-        }
-        return kd;
-    }
-
-    /**
-     * Method called to find out whether provider would be able to find
-     * a deserializer for given type, using a root reference (i.e. not
-     * through fields or membership in an array or collection)
-     */
-    public boolean hasValueDeserializerFor(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType type)
-    {
-        /* Note: mostly copied from findValueDeserializer, except for
-         * handling of unknown types
-         */
-        JsonDeserializer<Object> deser = _findCachedDeserializer(type);
-        if (deser == null) {
-            try {
-                deser = _createAndCacheValueDeserializer(ctxt, factory, type);
-            } catch (Exception e) {
-                return false;
-            }
-        }
-        return (deser != null);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods that handle cache lookups
-    /**********************************************************
-     */
-
-    protected JsonDeserializer<Object> _findCachedDeserializer(JavaType type)
-    {
-        if (type == null) {
-            throw new IllegalArgumentException("Null JavaType passed");
-        }
-        return _cachedDeserializers.get(type);
-    }
-
-    /**
-     * Method that will try to create a deserializer for given type,
-     * and resolve and cache it if necessary
-     * 
-     * @param ctxt Currently active deserialization context
-     * @param type Type of property to deserialize
-     */
-    protected JsonDeserializer<Object>_createAndCacheValueDeserializer(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType type)
-        throws JsonMappingException
-    {
-        /* Only one thread to construct deserializers at any given point in time;
-         * limitations necessary to ensure that only completely initialized ones
-         * are visible and used.
-         */
-        synchronized (_incompleteDeserializers) {
-            // Ok, then: could it be that due to a race condition, deserializer can now be found?
-            JsonDeserializer<Object> deser = _findCachedDeserializer(type);
-            if (deser != null) {
-                return deser;
-            }
-            int count = _incompleteDeserializers.size();
-            // Or perhaps being resolved right now?
-            if (count > 0) {
-                deser = _incompleteDeserializers.get(type);
-                if (deser != null) {
-                    return deser;
-                }
-            }
-            // Nope: need to create and possibly cache
-            try {
-                return _createAndCache2(ctxt, factory, type);
-            } finally {
-                // also: any deserializers that have been created are complete by now
-                if (count == 0 && _incompleteDeserializers.size() > 0) {
-                    _incompleteDeserializers.clear();
-                }
-            }
-        }
-    }
-
-    /**
-     * Method that handles actual construction (via factory) and caching (both
-     * intermediate and eventual)
-     */
-    protected JsonDeserializer<Object> _createAndCache2(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType type)
-        throws JsonMappingException
-    {
-        JsonDeserializer<Object> deser;
-        try {
-            deser = _createDeserializer(ctxt, factory, type);
-        } catch (IllegalArgumentException iae) {
-            /* We better only expose checked exceptions, since those
-             * are what caller is expected to handle
-             */
-            throw new JsonMappingException(iae.getMessage(), null, iae);
-        }
-        if (deser == null) {
-            return null;
-        }
-        /* cache resulting deserializer? always true for "plain" BeanDeserializer
-         * (but can be re-defined for sub-classes by using @JsonCachable!)
-         */
-        // 08-Jun-2010, tatu: Related to [JACKSON-296], need to avoid caching MapSerializers... so:
-        boolean isResolvable = (deser instanceof ResolvableDeserializer);
-        boolean addToCache = deser.isCachable();
-
-        /* we will temporarily hold on to all created deserializers (to
-         * handle cyclic references, and possibly reuse non-cached
-         * deserializers (list, map))
-         */
-        /* 07-Jun-2010, tatu: Danger: [JACKSON-296] was caused by accidental
-         *   resolution of a reference -- couple of ways to prevent this;
-         *   either not add Lists or Maps, or clear references eagerly.
-         *   Let's actually do both; since both seem reasonable.
-         */
-        /* Need to resolve? Mostly done for bean deserializers; required for
-         * resolving cyclic references.
-         */
-        if (isResolvable) {
-            _incompleteDeserializers.put(type, deser);
-            ((ResolvableDeserializer)deser).resolve(ctxt);
-            _incompleteDeserializers.remove(type);
-        }
-        if (addToCache) {
-            _cachedDeserializers.put(type, deser);
-        }
-        return deser;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for actual construction of deserializers
-    /**********************************************************
-     */
-    
-    /**
-     * Method that does the heavy lifting of checking for per-type annotations,
-     * find out full type, and figure out which actual factory method
-     * to call.
-     */
-    @SuppressWarnings("unchecked")
-    protected JsonDeserializer<Object> _createDeserializer(DeserializationContext ctxt,
-            DeserializerFactory factory, JavaType type)
-        throws JsonMappingException
-    {
-        final DeserializationConfig config = ctxt.getConfig();
-
-        // First things first: do we need to use abstract type mapping?
-        if (type.isAbstract() || type.isMapLikeType() || type.isCollectionLikeType()) {
-            type = factory.mapAbstractType(config, type);
-        }
-        BeanDescription beanDesc = config.introspect(type);
-        // Then: does type define explicit deserializer to use, with annotation(s)?
-        JsonDeserializer<Object> deser = findDeserializerFromAnnotation(ctxt,
-                beanDesc.getClassInfo());
-        if (deser != null) {
-            return deser;
-        }
-
-        // If not, may have further type-modification annotations to check:
-        JavaType newType = modifyTypeByAnnotation(ctxt, beanDesc.getClassInfo(), type);
-        if (newType != type) {
-            type = newType;
-            beanDesc = config.introspect(newType);
-        }
-
-        // We may also have a Builder type to consider...
-        Class<?> builder = beanDesc.findPOJOBuilder();
-        if (builder != null) {
-            return (JsonDeserializer<Object>) factory.createBuilderBasedDeserializer(
-            		ctxt, type, beanDesc, builder);
-        }
-        
-        // If not, let's see which factory method to use:
-        if (type.isEnumType()) {
-            return (JsonDeserializer<Object>) factory.createEnumDeserializer(ctxt,
-                    type, beanDesc);
-        }
-        if (type.isContainerType()) {
-            if (type.isArrayType()) {
-                return (JsonDeserializer<Object>) factory.createArrayDeserializer(ctxt,
-                        (ArrayType) type, beanDesc);
-            }
-            if (type.isMapLikeType()) {
-                MapLikeType mlt = (MapLikeType) type;
-                if (mlt.isTrueMapType()) {
-                    return (JsonDeserializer<Object>) factory.createMapDeserializer(ctxt,
-                            (MapType) mlt, beanDesc);
-                }
-                return (JsonDeserializer<Object>) factory.createMapLikeDeserializer(ctxt,
-                        mlt, beanDesc);
-            }
-            if (type.isCollectionLikeType()) {
-                /* 03-Aug-2012, tatu: As per [Issue#40], one exception is if shape
-                 *   is to be Shape.OBJECT. Ideally we'd determine it bit later on
-                 *   (to allow custom handler checks), but that won't work for other
-                 *   reasons. So do it here.
-                 */
-                JsonFormat.Value format = beanDesc.findExpectedFormat(null);
-                if (format == null || format.getShape() != JsonFormat.Shape.OBJECT) {
-                    CollectionLikeType clt = (CollectionLikeType) type;
-                    if (clt.isTrueCollectionType()) {
-                        return (JsonDeserializer<Object>) factory.createCollectionDeserializer(ctxt,
-                                (CollectionType) clt, beanDesc);
-                    }
-                    return (JsonDeserializer<Object>) factory.createCollectionLikeDeserializer(ctxt,
-                            clt, beanDesc);
-                }
-            }
-        }
-        if (JsonNode.class.isAssignableFrom(type.getRawClass())) {
-            return (JsonDeserializer<Object>) factory.createTreeDeserializer(config, type, beanDesc);
-        }
-        return (JsonDeserializer<Object>) factory.createBeanDeserializer(ctxt, type, beanDesc);
-    }
-
-    /**
-     * Helper method called to check if a class or method
-     * has annotation that tells which class to use for deserialization.
-     * Returns null if no such annotation found.
-     */
-    protected JsonDeserializer<Object> findDeserializerFromAnnotation(DeserializationContext ctxt,
-            Annotated ann)
-        throws JsonMappingException
-    {
-        Object deserDef = ctxt.getAnnotationIntrospector().findDeserializer(ann);
-        if (deserDef == null) {
-            return null;
-        }
-        return ctxt.deserializerInstance(ann, deserDef);
-    }
-
-    /**
-     * Method called to see if given method has annotations that indicate
-     * a more specific type than what the argument specifies.
-     * If annotations are present, they must specify compatible Class;
-     * instance of which can be assigned using the method. This means
-     * that the Class has to be raw class of type, or its sub-class
-     * (or, implementing class if original Class instance is an interface).
-     *
-     * @param a Method or field that the type is associated with
-     * @param type Type derived from the setter argument
-     *
-     * @return Original type if no annotations are present; or a more
-     *   specific type derived from it if type annotation(s) was found
-     *
-     * @throws JsonMappingException if invalid annotation is found
-     */
-    private JavaType modifyTypeByAnnotation(DeserializationContext ctxt,
-            Annotated a, JavaType type)
-        throws JsonMappingException
-    {
-        // first: let's check class for the instance itself:
-        AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        Class<?> subclass = intr.findDeserializationType(a, type);
-        if (subclass != null) {
-            try {
-                type = type.narrowBy(subclass);
-            } catch (IllegalArgumentException iae) {
-                throw new JsonMappingException("Failed to narrow type "+type+" with concrete-type annotation (value "+subclass.getName()+"), method '"+a.getName()+"': "+iae.getMessage(), null, iae);
-            }
-        }
-
-        // then key class
-        if (type.isContainerType()) {
-            Class<?> keyClass = intr.findDeserializationKeyType(a, type.getKeyType());
-            if (keyClass != null) {
-                // illegal to use on non-Maps
-                if (!(type instanceof MapLikeType)) {
-                    throw new JsonMappingException("Illegal key-type annotation: type "+type+" is not a Map(-like) type");
-                }
-                try {
-                    type = ((MapLikeType) type).narrowKey(keyClass);
-                } catch (IllegalArgumentException iae) {
-                    throw new JsonMappingException("Failed to narrow key type "+type+" with key-type annotation ("+keyClass.getName()+"): "+iae.getMessage(), null, iae);
-                }
-            }
-            JavaType keyType = type.getKeyType();
-            /* 21-Mar-2011, tatu: ... and associated deserializer too (unless already assigned)
-             *   (not 100% why or how, but this does seem to get called more than once, which
-             *   is not good: for now, let's just avoid errors)
-             */
-            if (keyType != null && keyType.getValueHandler() == null) {
-                Object kdDef = intr.findKeyDeserializer(a);
-                if (kdDef != null) {
-                    KeyDeserializer kd = ctxt.keyDeserializerInstance(a, kdDef);
-                    if (kd != null) {
-                        type = ((MapLikeType) type).withKeyValueHandler(kd);
-                        keyType = type.getKeyType(); // just in case it's used below
-                    }
-                }
-            }            
-            
-            // and finally content class; only applicable to structured types
-            Class<?> cc = intr.findDeserializationContentType(a, type.getContentType());
-            if (cc != null) {
-                try {
-                    type = type.narrowContentsBy(cc);
-                } catch (IllegalArgumentException iae) {
-                    throw new JsonMappingException("Failed to narrow content type "+type+" with content-type annotation ("+cc.getName()+"): "+iae.getMessage(), null, iae);
-                }
-            }
-            // ... as well as deserializer for contents:
-            JavaType contentType = type.getContentType();
-            if (contentType.getValueHandler() == null) { // as with above, avoid resetting (which would trigger exception)
-                Object cdDef = intr.findContentDeserializer(a);
-                if (cdDef != null) {
-                    JsonDeserializer<?> cd = null;
-                    if (cdDef instanceof JsonDeserializer<?>) {
-                        cdDef = (JsonDeserializer<?>) cdDef;
-                    } else {
-                        Class<?> cdClass = _verifyAsClass(cdDef, "findContentDeserializer", JsonDeserializer.None.class);
-                        if (cdClass != null) {
-                            cd = ctxt.deserializerInstance(a, cdClass);
-                        }
-                    }
-                    if (cd != null) {
-                        type = type.withContentValueHandler(cd);
-                    }
-                }
-            }
-        }
-        return type;
-    }
-
-    private Class<?> _verifyAsClass(Object src, String methodName, Class<?> noneClass)
-    {
-        if (src == null) {
-            return null;
-        }
-        if (!(src instanceof Class)) {
-            throw new IllegalStateException("AnnotationIntrospector."+methodName+"() returned value of type "+src.getClass().getName()+": expected type JsonSerializer or Class<JsonSerializer> instead");
-        }
-        Class<?> cls = (Class<?>) src;
-        if (cls == noneClass || cls == NoClass.class) {
-            return null;
-        }
-        return cls;
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable error reporting methods
-    /**********************************************************
-     */
-
-    protected JsonDeserializer<Object> _handleUnknownValueDeserializer(JavaType type)
-        throws JsonMappingException
-    {
-        /* Let's try to figure out the reason, to give better error
-         * messages
-         */
-        Class<?> rawClass = type.getRawClass();
-        if (!ClassUtil.isConcrete(rawClass)) {
-            throw new JsonMappingException("Can not find a Value deserializer for abstract type "+type);
-        }
-        throw new JsonMappingException("Can not find a Value deserializer for type "+type);
-    }
-
-    protected KeyDeserializer _handleUnknownKeyDeserializer(JavaType type)
-        throws JsonMappingException
-    {
-        throw new JsonMappingException("Can not find a (Map) Key deserializer for type "+type);
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerFactory.java
deleted file mode 100644
index ae2f364..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/DeserializerFactory.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.*;
-
-/**
- * Abstract class that defines API used by {@link DeserializationContext}
- * to construct actual
- * {@link JsonDeserializer} instances (which are then cached by
- * context and/or dedicated cache).
- *<p>
- * Since there are multiple broad categories of deserializers, there are 
- * multiple factory methods:
- *<ul>
- * <li>For JSON "Array" type, we need 2 methods: one to deal with expected
- *   Java arrays ({@link #createArrayDeserializer})
- *   and the other for other Java containers like {@link java.util.List}s
- *   and {@link java.util.Set}s ({@link #createCollectionDeserializer}).
- *   Actually there is also a third method for "Collection-like" types;
- *   things like Scala collections that act like JDK collections but do not
- *   implement same interfaces.
- *  </li>
- * <li>For JSON "Object" type, we need 2 methods: one to deal with
- *   expected Java {@link java.util.Map}s
- *   ({@link #createMapDeserializer}), and another for POJOs
- *   ({@link #createBeanDeserializer}.
- *   As an additional twist there is also a callback for "Map-like" types,
- *   mostly to make it possible to support Scala Maps (which are NOT JDK
- *   Map compatible).
- *  </li>
- * <li>For Tree Model ({@link com.fasterxml.jackson.databind.JsonNode}) properties there is
- *    {@link #createTreeDeserializer}
- * <li>For enumerated types ({@link java.lang.Enum}) there is
- *    {@link #createEnumDeserializer}
- *  </li>
- * <li>For all other types, {@link #createBeanDeserializer} is used.
- * </ul>
- *<p>
- */
-public abstract class DeserializerFactory
-{
-    protected final static Deserializers[] NO_DESERIALIZERS = new Deserializers[0];
-
-    /*
-    /********************************************************
-    /* Configuration handling
-    /********************************************************
-     */
-
-    /**
-     * Convenience method for creating a new factory instance with additional deserializer
-     * provider.
-     */
-    public abstract DeserializerFactory withAdditionalDeserializers(Deserializers additional);
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link KeyDeserializers}.
-     */
-    public abstract DeserializerFactory withAdditionalKeyDeserializers(KeyDeserializers additional);
-    
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link BeanDeserializerModifier}.
-     */
-    public abstract DeserializerFactory withDeserializerModifier(BeanDeserializerModifier modifier);
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link AbstractTypeResolver}.
-     */
-    public abstract DeserializerFactory withAbstractTypeResolver(AbstractTypeResolver resolver);
-
-    /**
-     * Convenience method for creating a new factory instance with additional
-     * {@link ValueInstantiators}.
-     */
-    public abstract DeserializerFactory withValueInstantiators(ValueInstantiators instantiators);
-    
-    /*
-    /**********************************************************
-    /* Basic DeserializerFactory API:
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to try to resolve an abstract type
-     * (interface, abstract class) into a concrete type, or at least
-     * something "more concrete" (abstract class instead of interface).
-     * Will either return passed type, or a more specific type.
-     */
-    public abstract JavaType mapAbstractType(DeserializationConfig config, JavaType type)
-        throws JsonMappingException;
-
-    /**
-     * Method that is to find all creators (constructors, factory methods)
-     * for the bean type to deserialize.
-     */
-    public abstract ValueInstantiator findValueInstantiator(DeserializationContext ctxt,
-            BeanDescription beanDesc)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to create (or, for completely immutable deserializers,
-     * reuse) a deserializer that can convert JSON content into values of
-     * specified Java "bean" (POJO) type.
-     * At this point it is known that the type is not otherwise recognized
-     * as one of structured types (array, Collection, Map) or a well-known
-     * JDK type (enum, primitives/wrappers, String); this method only
-     * gets called if other options are exhausted. This also means that
-     * this method can be overridden to add support for custom types.
-     *
-     * @param type Type to be deserialized
-     */
-    public abstract JsonDeserializer<Object> createBeanDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    /**
-     * Method called to create a deserializer that will use specified Builder
-     * class for building value instances.
-     * 
-     * @since 2.0
-     */
-    public abstract JsonDeserializer<Object> createBuilderBasedDeserializer(
-    		DeserializationContext ctxt, JavaType type, BeanDescription beanDesc,
-    		Class<?> builderClass)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to create (or, for completely immutable deserializers,
-     * reuse) a deserializer that can convert JSON content into values of
-     * specified Java type.
-     *
-     * @param type Type to be deserialized
-     */
-    public abstract JsonDeserializer<?> createArrayDeserializer(DeserializationContext ctxt,
-            ArrayType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    public abstract JsonDeserializer<?> createCollectionDeserializer(DeserializationContext ctxt,
-            CollectionType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    public abstract JsonDeserializer<?> createCollectionLikeDeserializer(DeserializationContext ctxt,
-            CollectionLikeType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-    
-    public abstract JsonDeserializer<?> createEnumDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    public abstract JsonDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
-            MapType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    public abstract JsonDeserializer<?> createMapLikeDeserializer(DeserializationContext ctxt,
-            MapLikeType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    /**
-     * Method called to create and return a deserializer that can construct
-     * JsonNode(s) from JSON content.
-     */
-    public abstract JsonDeserializer<?> createTreeDeserializer(DeserializationConfig config,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    /**
-     * Method called to find if factory knows how to create a key deserializer
-     * for specified type; currently this means checking if a module has registered
-     * possible deserializers.
-     * 
-     * @return Key deserializer to use for specified type, if one found; null if not
-     *   (and default key deserializer should be used)
-     */
-    public abstract KeyDeserializer createKeyDeserializer(DeserializationContext ctxt,
-            JavaType type)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to find and create a type information deserializer for given base type,
-     * if one is needed. If not needed (no polymorphic handling configured for type),
-     * should return null.
-     *<p>
-     * Note that this method is usually only directly called for values of container (Collection,
-     * array, Map) types and root values, but not for bean property values.
-     *
-     * @param baseType Declared base type of the value to deserializer (actual
-     *    deserializer type will be this type or its subtype)
-     * 
-     * @return Type deserializer to use for given base type, if one is needed; null if not.
-     */
-    public abstract TypeDeserializer findTypeDeserializer(DeserializationConfig config,
-            JavaType baseType)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/Deserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/Deserializers.java
deleted file mode 100644
index b413947..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/Deserializers.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.*;
-
-/**
- * Interface that defines API for simple extensions that can provide additional deserializers
- * for various types. Access is by a single callback method; instance is to either return
- * a configured {@link JsonDeserializer} for specified type, or null to indicate that it
- * does not support handling of the type. In latter case, further calls can be made
- * for other providers; in former case returned deserializer is used for handling of
- * instances of specified type.
- *<p>
- * Unlike with {@link com.fasterxml.jackson.databind.ser.Serializers},
- * multiple different methods are used since different kinds of types typically
- * require different kinds of inputs.
- */
-public interface Deserializers
-{
-    /**
-     * Method called to locate serializer for specified array type.
-     *<p>
-     * Deserializer for element type may be passed, if configured explicitly at higher level (by
-     * annotations, typically), but usually are not.
-     * Type deserializer for element is passed if one is needed based on contextual information
-     * (annotations on declared element class; or on field or method type is associated with).
-     * 
-     * @param type Type of array instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * @param elementTypeDeserializer If element type needs polymorphic type handling, this is
-     *    the type information deserializer to use; should usually be used as is when constructing
-     *    array deserializer.
-     * @param elementDeserializer Deserializer to use for elements, if explicitly defined (by using
-     *    annotations, for exmple). May be null, in which case it should be resolved here (or using
-     *    {@link ResolvableDeserializer} callback)
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findArrayDeserializer(ArrayType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException;
-
-    /**
-     * Method called to locate serializer for specified {@link java.util.Collection} (List, Set etc) type.
-     *<p>
-     * Deserializer for element type may be passed, if configured explicitly at higher level (by
-     * annotations, typically), but usually are not.
-     * Type deserializer for element is passed if one is needed based on contextual information
-     * (annotations on declared element class; or on field or method type is associated with).
-     * 
-     * @param type Type of collection instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * @param elementTypeDeserializer If element type needs polymorphic type handling, this is
-     *    the type information deserializer to use; should usually be used as is when constructing
-     *    array deserializer.
-     * @param elementDeserializer Deserializer to use for elements, if explicitly defined (by using
-     *    annotations, for exmple). May be null, in which case it should be resolved here (or using
-     *    {@link ResolvableDeserializer} callback)
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findCollectionDeserializer(CollectionType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException;
-
-    /**
-     * Method called to locate serializer for specified
-     * "Collection-like" type (one that acts
-     * like {@link java.util.Collection} but does not implement it).
-     *<p>
-     * Deserializer for element type may be passed, if configured explicitly at higher level (by
-     * annotations, typically), but usually are not.
-     * Type deserializer for element is passed if one is needed based on contextual information
-     * (annotations on declared element class; or on field or method type is associated with).
-     * 
-     * @param type Type of instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * @param elementTypeDeserializer If element type needs polymorphic type handling, this is
-     *    the type information deserializer to use; should usually be used as is when constructing
-     *    array deserializer.
-     * @param elementDeserializer Deserializer to use for elements, if explicitly defined (by using
-     *    annotations, for exmple). May be null, in which case it should be resolved here (or using
-     *    {@link ResolvableDeserializer} callback)
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findCollectionLikeDeserializer(CollectionLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to locate deserializer for specified {@link java.lang.Enum} type.
-     * 
-     * @param type Type of {@link java.lang.Enum} instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findEnumDeserializer(Class<?> type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    /**
-     * Method called to locate deserializer for specified {@link java.util.Map} type.
-     *<p>
-     * Deserializer for element type may be passed, if configured explicitly at higher level (by
-     * annotations, typically), but usually are not.
-     * Type deserializer for element is passed if one is needed based on contextual information
-     * (annotations on declared element class; or on field or method type is associated with).
-     *<p>
-     * Similarly, a {@link KeyDeserializer} may be passed, but this is only done if there is
-     * a specific configuration override (annotations) to indicate instance to use.
-     * Otherwise null is passed, and key deserializer needs to be obtained later during
-     * resolution (using {@link ResolvableDeserializer#resolve}).
-     * 
-     * @param type Type of {@link java.util.Map} instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * @param keyDeserializer Key deserializer use, if it is defined via annotations or other configuration;
-     *    null if default key deserializer for key type can be used.
-     * @param elementTypeDeserializer If element type needs polymorphic type handling, this is
-     *    the type information deserializer to use; should usually be used as is when constructing
-     *    array deserializer.
-     * @param elementDeserializer Deserializer to use for elements, if explicitly defined (by using
-     *    annotations, for exmple). May be null, in which case it should be resolved here (or using
-     *    {@link ResolvableDeserializer} callback)
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findMapDeserializer(MapType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException;
-
-    /**
-     * Method called to locate serializer for specified
-     * "Map-like" type (one that acts
-     * like {@link java.util.Map} but does not implement it).
-     *<p>
-     * Deserializer for element type may be passed, if configured explicitly at higher level (by
-     * annotations, typically), but usually are not.
-     * Type deserializer for element is passed if one is needed based on contextual information
-     * (annotations on declared element class; or on field or method type is associated with).
-     *<p>
-     * Similarly, a {@link KeyDeserializer} may be passed, but this is only done if there is
-     * a specific configuration override (annotations) to indicate instance to use.
-     * Otherwise null is passed, and key deserializer needs to be obtained later during
-     * resolution (using {@link ResolvableDeserializer#resolve}).
-     * 
-     * @param type Type of {@link java.util.Map} instances to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * @param keyDeserializer Key deserializer use, if it is defined via annotations or other configuration;
-     *    null if default key deserializer for key type can be used.
-     * @param elementTypeDeserializer If element type needs polymorphic type handling, this is
-     *    the type information deserializer to use; should usually be used as is when constructing
-     *    array deserializer.
-     * @param elementDeserializer Deserializer to use for elements, if explicitly defined (by using
-     *    annotations, for exmple). May be null, in which case it should be resolved here (or using
-     *    {@link ResolvableDeserializer} callback)
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findMapLikeDeserializer(MapLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to locate deserializer for specified JSON tree node type.
-     * 
-     * @param nodeType Specific type of JSON tree nodes to deserialize
-     *  (subtype of {@link com.fasterxml.jackson.databind.JsonNode})
-     * @param config Configuration in effect
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findTreeNodeDeserializer(Class<? extends JsonNode> nodeType,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to locate deserializer for specified value type which does not belong to any other
-     * category (not an Enum, Collection, Map, Array or tree node)
-     * 
-     * @param type Bean type to deserialize
-     * @param config Configuration in effect
-     * @param beanDesc Definition of the enumeration type that contains class annotations and
-     *    other information typically needed for building deserializers
-     * 
-     * @return Deserializer to use for the type; or null if this provider does not know how to construct it
-     */
-    public JsonDeserializer<?> findBeanDeserializer(JavaType type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException;
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Basic {@link Deserializers} implementation that implements all methods but provides
-     * no deserializers. Its main purpose is to serve as a base class so that
-     * sub-classes only need to override methods they need, as most of the time some
-     * of methods are not needed (especially enumeration and array deserializers are
-     * very rarely overridden).
-     */
-    public static class Base implements Deserializers
-    {
-//      @Override
-        public JsonDeserializer<?> findArrayDeserializer(ArrayType type,
-                DeserializationConfig config, BeanDescription beanDesc,
-                TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findCollectionDeserializer(CollectionType type,
-                DeserializationConfig config, BeanDescription beanDesc,
-                TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findCollectionLikeDeserializer(CollectionLikeType type,
-                DeserializationConfig config, BeanDescription beanDesc,
-                TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findMapDeserializer(MapType type,
-                DeserializationConfig config, BeanDescription beanDesc,
-                KeyDeserializer keyDeserializer,
-                TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findMapLikeDeserializer(MapLikeType type,
-                DeserializationConfig config, BeanDescription beanDesc,
-                KeyDeserializer keyDeserializer,
-                TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findEnumDeserializer(Class<?> type,
-                DeserializationConfig config, BeanDescription beanDesc)
-            throws JsonMappingException
-        {
-            return null;
-        }
-        
-//      @Override
-        public JsonDeserializer<?> findTreeNodeDeserializer(Class<? extends JsonNode> nodeType,
-                DeserializationConfig config, BeanDescription beanDesc)
-            throws JsonMappingException
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonDeserializer<?> findBeanDeserializer(JavaType type,
-                DeserializationConfig config, BeanDescription beanDesc)
-            throws JsonMappingException
-        {
-            return null;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/KeyDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/KeyDeserializers.java
deleted file mode 100644
index 652170b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/KeyDeserializers.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Interface that defines API for simple extensions that can provide additional deserializers
- * for deserializer Map keys of various types, from JSON property names.
- * Access is by a single callback method; instance is to either return
- * a configured {@link KeyDeserializer} for specified type, or null to indicate that it
- * does not support handling of the type. In latter case, further calls can be made
- * for other providers; in former case returned key deserializer is used for handling of
- * key instances of specified type.
- */
-public interface KeyDeserializers
-{
-    public KeyDeserializer findKeyDeserializer(JavaType type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ResolvableDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ResolvableDeserializer.java
deleted file mode 100644
index 0d97b2d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ResolvableDeserializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-/**
- * Interface used to indicate deserializers that want to do post-processing
- * after construction but before being returned to caller (and possibly cached)
- * and used.
- * This is typically used to resolve references
- * to other contained types; for example, bean deserializers use this callback
- * to locate deserializers for contained field types.
- * Main reason for using a callback (instead of trying to resolve dependencies
- * immediately) is to make it possible to cleanly handle self-references;
- * otherwise it would be easy to get into infinite recursion.
- *<p>
- * Note that {@link #resolve} method does NOT allow returning anything 
- * (specifically, a new deserializer instance): reason for this is that
- * allowing this would not work with proper handling of cyclic dependencies,
- * which are resolved by two-phase processing, where initially constructed
- * deserializer is added as known deserializer, and only after this
- * resolution is done. Resolution is the part that results in lookups for
- * dependant deserializers, which may include handling references to
- * deserializer itself.
- *<p>
- * Note that in cases where deserializer needs both contextualization and
- * resolution -- that is, implements both this interface and {@link ContextualDeserializer}
- * -- resolution via this interface occurs first, and contextual
- * resolution (using {@link ContextualDeserializer}) later on.
- */
-public interface ResolvableDeserializer
-{
-    /**
-     * Method called after deserializer instance has been constructed
-     * (and registered as necessary by provider objects),
-     * but before it has returned it to the caller.
-     * Called object can then resolve its dependencies to other types,
-     * including self-references (direct or indirect).
-     *
-     * @param ctxt Context to use for accessing configuration, resolving
-     *    secondary deserializers
-     */
-    public abstract void resolve(DeserializationContext ctxt)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
deleted file mode 100644
index 9d90d42..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.lang.reflect.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-
-/**
- * Class that represents a "wildcard" set method which can be used
- * to generically set values of otherwise unmapped (aka "unknown")
- * properties read from Json content.
- *<p>
- * !!! Note: might make sense to refactor to share some code
- * with {@link SettableBeanProperty}?
- */
-public final class SettableAnyProperty
-{
-    /**
-     * Method used for setting "any" properties, along with annotation
-     * information. Retained to allow contextualization of any properties.
-     */
-    final protected BeanProperty _property;
-    
-    /**
-     * Physical JDK object used for assigning properties.
-     */
-    final protected Method _setter;
-
-    final protected JavaType _type;
-
-    protected JsonDeserializer<Object> _valueDeserializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public SettableAnyProperty(BeanProperty property, AnnotatedMethod setter, JavaType type,
-            JsonDeserializer<Object> valueDeser) {
-        this(property, setter.getAnnotated(), type, valueDeser);
-    }
-
-    public SettableAnyProperty(BeanProperty property, Method rawSetter, JavaType type,
-            JsonDeserializer<Object> valueDeser) {
-        _property = property;
-        _type = type;
-        _setter = rawSetter;
-        _valueDeserializer = valueDeser;
-    }
-
-    public SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser) {
-        return new SettableAnyProperty(_property, _setter, _type, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, accessors
-    /**********************************************************
-     */
-
-    public BeanProperty getProperty() { return _property; }
-    
-    public boolean hasValueDeserializer() { return (_valueDeserializer != null); }
-
-    public JavaType getType() { return _type; }
-
-    /*
-    /**********************************************************
-    /* Public API, deserialization
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to deserialize appropriate value, given parser (and
-     * context), and set it using appropriate method (a setter method).
-     */
-    public final void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-                                        Object instance, String propName)
-        throws IOException, JsonProcessingException
-    {
-        set(instance, propName, deserialize(jp, ctxt));
-    }
-
-    public final Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NULL) {
-            return null;
-        }
-        return _valueDeserializer.deserialize(jp, ctxt);
-    }
-
-    public final void set(Object instance, String propName, Object value)
-        throws IOException
-    {
-        try {
-            _setter.invoke(instance, propName, value);
-        } catch (Exception e) {
-            _throwAsIOE(e, propName, value);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /**
-     * @param e Exception to re-throw or wrap
-     * @param propName Name of property (from Json input) to set
-     * @param value Value of the property
-     */
-    protected void _throwAsIOE(Exception e, String propName, Object value)
-        throws IOException
-    {
-        if (e instanceof IllegalArgumentException) {
-            String actType = (value == null) ? "[NULL]" : value.getClass().getName();
-            StringBuilder msg = new StringBuilder("Problem deserializing \"any\" property '").append(propName);
-            msg.append("' of class "+getClassName()+" (expected type: ").append(_type);
-            msg.append("; actual type: ").append(actType).append(")");
-            String origMsg = e.getMessage();
-            if (origMsg != null) {
-                msg.append(", problem: ").append(origMsg);
-            } else {
-                msg.append(" (no error message provided)");
-            }
-            throw new JsonMappingException(msg.toString(), null, e);
-        }
-        if (e instanceof IOException) {
-            throw (IOException) e;
-        }
-        if (e instanceof RuntimeException) {
-            throw (RuntimeException) e;
-        }
-        // let's wrap the innermost problem
-        Throwable t = e;
-        while (t.getCause() != null) {
-            t = t.getCause();
-        }
-        throw new JsonMappingException(t.getMessage(), null, t);
-    }
-
-    private String getClassName() { return _setter.getDeclaringClass().getName(); }
-
-    @Override public String toString() { return "[any property on class "+getClassName()+"]"; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java
deleted file mode 100644
index 03ef61b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java
+++ /dev/null
@@ -1,425 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.util.InternCache;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.impl.NullProvider;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.Annotations;
-import com.fasterxml.jackson.databind.util.ViewMatcher;
-
-/**
- * Base class for deserilizable properties of a bean: contains
- * both type and name definitions, and reflection-based set functionality.
- * Concrete sub-classes implement details, so that field- and
- * setter-backed properties, as well as a few more esoteric variations,
- * can be handled.
- */
-public abstract class SettableBeanProperty
-    implements BeanProperty,
-        java.io.Serializable
-{
-    private static final long serialVersionUID = -1026580169193933453L;
-
-    /**
-     * Logical name of the property (often but not always derived
-     * from the setter method name)
-     */
-    protected final String _propName;
-
-    /**
-     * Base type for property; may be a supertype of actual value.
-     */
-    protected final JavaType _type;
-    
-    /**
-     * Class that contains this property (either class that declares
-     * the property or one of its subclasses), class that is
-     * deserialized using deserializer that contains this property.
-     */
-    protected final transient Annotations _contextAnnotations;
-    
-    /**
-     * Deserializer used for handling property value.
-     */
-    protected JsonDeserializer<Object> _valueDeserializer;
-
-    /**
-     * If value will contain type information (to support
-     * polymorphic handling), this is the type deserializer
-     * used to handle type resolution.
-     */
-    protected TypeDeserializer _valueTypeDeserializer;
-    
-    /**
-     * Object used to figure out value to be used when 'null' literal is encountered in JSON.
-     * For most types simply Java null, but for primitive types must
-     * be a non-null value (like Integer.valueOf(0) for int).
-     */
-    protected NullProvider _nullProvider;
-
-    /**
-     * If property represents a managed (forward) reference
-     * (see [JACKSON-235]), we will need name of reference for
-     * later linking.
-     */
-    protected String _managedReferenceName;
-
-    /**
-     * Helper object used for checking whether this property is to
-     * be included in the active view, if property is view-specific;
-     * null otherwise.
-     */
-    protected ViewMatcher _viewMatcher;
-    
-    /**
-     * Index of property (within all property of a bean); assigned
-     * when all properties have been collected. Order of entries
-     * is arbitrary, but once indexes are assigned they are not
-     * changed.
-     */
-    protected int _propertyIndex = -1;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle (construct & configure)
-    /**********************************************************
-     */
-
-    protected SettableBeanProperty(BeanPropertyDefinition propDef,
-            JavaType type, TypeDeserializer typeDeser, Annotations contextAnnotations)
-    {
-        this(propDef.getName(), type, typeDeser, contextAnnotations);
-    }
-    
-    protected SettableBeanProperty(String propName,
-            JavaType type, TypeDeserializer typeDeser, Annotations contextAnnotations)
-    {
-        /* 09-Jan-2009, tatu: Intern()ing makes sense since Jackson parsed
-         *   field names are (usually) interned too, hence lookups will be faster.
-         */
-        // 23-Oct-2009, tatu: should this be disabled wrt [JACKSON-180]?
-        /*   Probably need not, given that namespace of field/method names
-         *   is not unbounded, unlike potential JSON names.
-         */
-        if (propName == null || propName.length() == 0) {
-            _propName = "";
-        } else {
-            _propName = InternCache.instance.intern(propName);
-        }
-        _type = type;
-        _contextAnnotations = contextAnnotations;
-        _viewMatcher = null;
-
-        // 30-Jan-2012, tatu: Important: contextualize TypeDeserializer now...
-        if (typeDeser != null) {
-            typeDeser = typeDeser.forProperty(this);
-        }
-        _valueTypeDeserializer = typeDeser;
-    }
-
-    /**
-     * Basic copy-constructor for sub-classes to use.
-     */
-    protected SettableBeanProperty(SettableBeanProperty src)
-    {
-        _propName = src._propName;
-        _type = src._type;
-        _contextAnnotations = src._contextAnnotations;
-        _valueDeserializer = src._valueDeserializer;
-        _valueTypeDeserializer = src._valueTypeDeserializer;
-        _nullProvider = src._nullProvider;
-        _managedReferenceName = src._managedReferenceName;
-        _propertyIndex = src._propertyIndex;
-        _viewMatcher = src._viewMatcher;
-    }
-
-    /**
-     * Copy-with-deserializer-change constructor for sub-classes to use.
-     */
-    @SuppressWarnings("unchecked")
-    protected SettableBeanProperty(SettableBeanProperty src, JsonDeserializer<?> deser)
-    {
-        _propName = src._propName;
-        _type = src._type;
-        _contextAnnotations = src._contextAnnotations;
-        _valueTypeDeserializer = src._valueTypeDeserializer;
-        _managedReferenceName = src._managedReferenceName;
-        _propertyIndex = src._propertyIndex;
-
-        _valueDeserializer = (JsonDeserializer<Object>) deser;
-        if (deser == null) {
-            _nullProvider = null;
-        } else {
-            Object nvl = deser.getNullValue();
-            _nullProvider = (nvl == null) ? null : new NullProvider(_type, nvl);
-        }
-        _viewMatcher = src._viewMatcher;
-    }
-
-    /**
-     * Copy-with-deserializer-change constructor for sub-classes to use.
-     */
-    protected SettableBeanProperty(SettableBeanProperty src, String newName)
-    {
-        _propName = newName;
-        _type = src._type;
-        _contextAnnotations = src._contextAnnotations;
-        _valueDeserializer = src._valueDeserializer;
-        _valueTypeDeserializer = src._valueTypeDeserializer;
-        _nullProvider = src._nullProvider;
-        _managedReferenceName = src._managedReferenceName;
-        _propertyIndex = src._propertyIndex;
-        _viewMatcher = src._viewMatcher;
-    }
-
-    /**
-     * Fluent factory method for constructing and returning a new instance
-     * with specified value deserializer.
-     * Note that this method should NOT change configuration of this instance.
-     * 
-     * @param deser Deserializer to assign to the new property instance
-     * 
-     * @return Newly constructed instance, if value deserializer differs from the
-     *   one used for this instance; or 'this' if not.
-     */
-    public abstract SettableBeanProperty withValueDeserializer(JsonDeserializer<?> deser);
-
-    /**
-     * Fluent factory method for constructing and returning a new instance
-     * with specified propert name.
-     * Note that this method should NOT change configuration of this instance.
-     * 
-     * @param newName Name to use for the new instance.
-     * 
-     * @return Newly constructed instance, if property name differs from the
-     *   one used for this instance; or 'this' if not.
-     */
-    public abstract SettableBeanProperty withName(String newName);
-    
-    public void setManagedReferenceName(String n) {
-        _managedReferenceName = n;
-    }
-    
-    public void setViews(Class<?>[] views) {
-        if (views == null) {
-            _viewMatcher = null;
-        } else {
-            _viewMatcher = ViewMatcher.construct(views);
-        }
-    }
-    
-    /**
-     * Method used to assign index for property.
-     */
-    public void assignIndex(int index) {
-        if (_propertyIndex != -1) {
-            throw new IllegalStateException("Property '"+getName()+"' already had index ("+_propertyIndex+"), trying to assign "+index);
-        }
-        _propertyIndex = index;
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-//  @Override
-    public final String getName() { return _propName; }
-
-//  @Override
-    public JavaType getType() { return _type; }
-
-    public abstract <A extends Annotation> A getAnnotation(Class<A> acls);
-
-//  @Override
-    public abstract AnnotatedMember getMember();
-
-    public <A extends Annotation> A getContextAnnotation(Class<A> acls) {
-        return _contextAnnotations.get(acls);
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    protected final Class<?> getDeclaringClass() {
-        return getMember().getDeclaringClass();
-    }
-
-    public String getManagedReferenceName() { return _managedReferenceName; }
-
-    public boolean hasValueDeserializer() { return (_valueDeserializer != null); }
-
-    public boolean hasValueTypeDeserializer() { return (_valueTypeDeserializer != null); }
-    
-    public JsonDeserializer<Object> getValueDeserializer() { return _valueDeserializer; }
-
-    public TypeDeserializer getValueTypeDeserializer() { return _valueTypeDeserializer; }
-
-    public boolean visibleInView(Class<?> activeView) {
-        return (_viewMatcher == null) || _viewMatcher.isVisibleForView(activeView);
-    }
-    
-    public boolean hasViews() { return _viewMatcher != null; }
-    
-    /**
-     * Method for accessing unique index of this property; indexes are
-     * assigned once all properties of a {@link BeanDeserializer} have
-     * been collected.
-     * 
-     * @return Index of this property
-     */
-    public int getPropertyIndex() { return _propertyIndex; }
-
-    /**
-     * Method for accessing index of the creator property: for other
-     * types of properties will simply return -1.
-     * 
-     * @since 2.1
-     */
-    public int getCreatorIndex() { return -1; }
-    
-    /**
-     * Accessor for id of injectable value, if this bean property supports
-     * value injection.
-     */
-    public Object getInjectableValueId() { return null; }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method called to deserialize appropriate value, given parser (and
-     * context), and set it using appropriate mechanism.
-     * Pre-condition is that passed parser must point to the first token
-     * that should be consumed to produce the value (the only value for
-     * scalars, multiple for Objects and Arrays).
-     */
-    public abstract void deserializeAndSet(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException;
-
-	/**
-	 * Alternative to {@link #deserializeAndSet} that returns
-	 * either return value of setter method called (if one is),
-	 * or null to indicate that no return value is available.
-	 * Mostly used to support Builder style deserialization.
-	 *
-	 * @since 2.0
-	 */
-    public abstract Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to assign given value to this property, on
-     * specified Object.
-     *<p>
-     * Note: this is an optional operation, not supported by all
-     * implementations, creator-backed properties for example do not
-     * support this method.
-     */
-    public abstract void set(Object instance, Object value)
-        throws IOException;
-
-    /**
-     * Method called to assign given value to this property, on
-     * specified Object, and return whatever delegating accessor
-     * returned (if anything)
-     *<p>
-     * Note: this is an optional operation, not supported by all
-     * implementations, creator-backed properties for example do not
-     * support this method.
-     * 
-     * @since 2.0
-     */
-    public abstract Object setAndReturn(Object instance, Object value)
-            throws IOException;
-    
-    /**
-     * This method is needed by some specialized bean deserializers,
-     * and also called by some {@link #deserializeAndSet} implementations.
-     *<p>
-     * Pre-condition is that passed parser must point to the first token
-     * that should be consumed to produce the value (the only value for
-     * scalars, multiple for Objects and Arrays).
-     *<p> 
-     * Note that this method is final for performance reasons: to override
-     * functionality you must override other methods that call this method;
-     * this method should also not be called directly unless you really know
-     * what you are doing (and probably not even then).
-     */
-    public final Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        
-        if (t == JsonToken.VALUE_NULL) {
-            return (_nullProvider == null) ? null : _nullProvider.nullValue(ctxt);
-        }
-        if (_valueTypeDeserializer != null) {
-            return _valueDeserializer.deserializeWithType(jp, ctxt, _valueTypeDeserializer);
-        }
-        return _valueDeserializer.deserialize(jp, ctxt);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that takes in exception of any type, and casts or wraps it
-     * to an IOException or its subclass.
-     */
-    protected void _throwAsIOE(Exception e, Object value)
-        throws IOException
-    {
-        if (e instanceof IllegalArgumentException) {
-            String actType = (value == null) ? "[NULL]" : value.getClass().getName();
-            StringBuilder msg = new StringBuilder("Problem deserializing property '").append(getName());
-            msg.append("' (expected type: ").append(getType());
-            msg.append("; actual type: ").append(actType).append(")");
-            String origMsg = e.getMessage();
-            if (origMsg != null) {
-                msg.append(", problem: ").append(origMsg);
-            } else {
-                msg.append(" (no error message provided)");
-            }
-            throw new JsonMappingException(msg.toString(), null, e);
-        }
-        _throwAsIOE(e);
-    }
-
-    protected IOException _throwAsIOE(Exception e)
-        throws IOException
-    {
-        if (e instanceof IOException) {
-            throw (IOException) e;
-        }
-        if (e instanceof RuntimeException) {
-            throw (RuntimeException) e;
-        }
-        // let's wrap the innermost problem
-        Throwable th = e;
-        while (th.getCause() != null) {
-            th = th.getCause();
-        }
-        throw new JsonMappingException(th.getMessage(), null, th);
-    }
-
-    @Override public String toString() { return "[property '"+getName()+"']"; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiator.java
deleted file mode 100644
index df463a4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiator.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.introspect.AnnotatedWithParams;
-
-
-/**
- * Class that defines simple API implemented by objects that create value
- * instances.  Some or all of properties of value instances may 
- * be initialized by instantiator, rest being populated by deserializer,
- * to which value instance is passed.
- * Since different kinds of JSON values (structured and scalar)
- * may be bound to Java values, in some cases instantiator
- * fully defines resulting value; this is the case when JSON value
- * is a scalar value (String, number, boolean).
- *<p>
- * Note that this type is not parameterized (even though it would seemingly
- * make sense), because such type information can not be use effectively
- * during runtime: access is always using either wildcard type, or just
- * basic {@link java.lang.Object}; and so adding type parameter seems
- * like unnecessary extra work.
- *<p>
- * Actual implementations are strongly recommended to be based on
- * {@link com.fasterxml.jackson.databind.deser.std.StdValueInstantiator}
- * which implements all methods, and as such will be compatible
- * across versions even if new methods were added to this interface.
- */
-public abstract class ValueInstantiator
-{
-    /*
-    /**********************************************************
-    /* Metadata accessors
-    /**********************************************************
-     */
-
-    /**
-     * Method that returns description of the value type this instantiator
-     * handles. Used for error messages, diagnostics.
-     */
-    public abstract String getValueTypeDesc();
-
-    /**
-     * Method that will return true if any of <code>canCreateXxx</code> method
-     * returns true: that is, if there is any way that an instance could
-     * be created.
-     */
-    public boolean canInstantiate() {
-        return
-             canCreateUsingDefault()
-             || canCreateUsingDelegate()
-             || canCreateFromObjectWith()
-             || canCreateFromString()
-             || canCreateFromInt()
-             || canCreateFromLong()
-             || canCreateFromDouble()
-             || canCreateFromBoolean()
-             ;
-    }    
-    
-    /**
-     * Method that can be called to check whether a String-based creator
-     * is available for this instantiator
-     */
-    public boolean canCreateFromString() {
-        return false;
-    }
-
-    /**
-     * Method that can be called to check whether an integer (int, Integer) based
-     * creator is available to use (to call {@link #createFromInt}).
-     */
-    public boolean canCreateFromInt() {
-        return false;
-    }
-
-    /**
-     * Method that can be called to check whether a long (long, Long) based
-     * creator is available to use (to call {@link #createFromLong}).
-     */
-    public boolean canCreateFromLong() {
-        return false;
-    }
-
-    /**
-     * Method that can be called to check whether a double (double / Double) based
-     * creator is available to use (to call {@link #createFromDouble}).
-     */
-    public boolean canCreateFromDouble() {
-        return false;
-    }
-
-    /**
-     * Method that can be called to check whether a double (boolean / Boolean) based
-     * creator is available to use (to call {@link #createFromDouble}).
-     */
-    public boolean canCreateFromBoolean() {
-        return false;
-    }
-    
-    /**
-     * Method that can be called to check whether a default creator (constructor,
-     * or no-arg static factory method)
-     * is available for this instantiator
-     */
-    public boolean canCreateUsingDefault() {
-        return getDefaultCreator() != null;
-    }
-
-    /**
-     * Method that can be called to check whether a delegate-based creator (single-arg
-     * constructor or factory method)
-     * is available for this instantiator
-     */
-    public boolean canCreateUsingDelegate() {
-        return false;
-    }
-
-    /**
-     * Method that can be called to check whether a property-based creator
-     * (argument-taking constructor or factory method)
-     * is available to instantiate values from JSON Object
-     */
-    public boolean canCreateFromObjectWith() {
-        return false;
-    }
-
-    /**
-     * Method called to determine types of instantiation arguments
-     * to use when creating instances with creator arguments
-     * (when {@link #canCreateFromObjectWith()} returns  true).
-     * These arguments are bound from JSON, using specified
-     * property types to locate deserializers.
-     *<p>
-     * NOTE: all properties will be of type
-     * {@link com.fasterxml.jackson.databind.deser.CreatorProperty}.
-     */
-    public SettableBeanProperty[] getFromObjectArguments(DeserializationConfig config) {
-        return null;
-    }
-
-    /**
-     * Method that can be used to determine what is the type of delegate
-     * type to use, if any; if no delegates are used, will return null.
-     * If non-null type is returned, deserializer will bind JSON into
-     * specified type (using standard deserializer for that type), and
-     * pass that to instantiator.
-     */
-    public JavaType getDelegateType(DeserializationConfig config) {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Instantiation methods for JSON Object
-    /**********************************************************
-     */
-
-    /**
-     * Method called to create value instance from a JSON value when
-     * no data needs to passed to creator (constructor, factory method);
-     * typically this will call the default constructor of the value object.
-     * It will only be used if more specific creator methods are not
-     * applicable; hence "default".
-     *<p>
-     * This method is called if {@link #getFromObjectArguments} returns
-     * null or empty List.
-     */
-    public Object createUsingDefault(DeserializationContext ctxt)
-        throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+"; no default creator found");
-    }
-
-    /**
-     * Method called to create value instance from JSON Object when
-     * instantiation arguments are passed; this is done, for example when passing information
-     * specified with "Creator" annotations.
-     *<p>
-     * This method is called if {@link #getFromObjectArguments} returns
-     * a non-empty List of arguments.
-     */
-    public Object createFromObjectWith(DeserializationContext ctxt, Object[] args)
-        throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" with arguments");
-    }
-
-    /**
-     * Method to called to create value instance from JSON Object using
-     * an intermediate "delegate" value to pass to createor method
-     */
-    public Object createUsingDelegate(DeserializationContext ctxt, Object delegate)
-        throws IOException, JsonProcessingException
-    {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" using delegate");
-    }
-    
-    /*
-    /**********************************************************
-    /* Instantiation methods for JSON scalar types
-    /* (String, Number, Boolean)
-    /**********************************************************
-     */
-    
-    public Object createFromString(DeserializationContext ctxt, String value)
-            throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" from String value");
-    }
-    
-    public Object createFromInt(DeserializationContext ctxt, int value)
-            throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" from Integer number (int)");
-    }
-
-    public Object createFromLong(DeserializationContext ctxt, long value)
-            throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" from Integer number (long)");
-    }
-
-    public Object createFromDouble(DeserializationContext ctxt, double value)
-            throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" from Floating-point number (double)");
-    }
-    
-    public Object createFromBoolean(DeserializationContext ctxt, boolean value)
-            throws IOException, JsonProcessingException {
-        throw new JsonMappingException("Can not instantiate value of type "
-                +getValueTypeDesc()+" from Boolean value");
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors for underlying creator objects (optional)
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to try to access member (constructor,
-     * static factory method) that is used as the "default creator"
-     * (creator that is called without arguments; typically default
-     * [zero-argument] constructor of the type).
-     * Note that implementations not required to return actual object
-     * they use (or, they may use some other instantiation) method.
-     * That is, even if {@link #canCreateUsingDefault()} returns true,
-     * this method may return null .
-     */
-    public AnnotatedWithParams getDefaultCreator() {
-        return null;
-    }
-    
-    /**
-     * Method that can be called to try to access member (constructor,
-     * static factory method) that is used as the "delegate creator".
-     * Note that implementations not required to return actual object
-     * they use (or, they may use some other instantiation) method.
-     * That is, even if {@link #canCreateUsingDelegate()} returns true,
-     * this method may return null .
-     */
-    public AnnotatedWithParams getDelegateCreator() {
-        return null;
-    }
-
-    /**
-     * Method that can be called to try to access member (constructor,
-     * static factory method) that is used as the "non-default creator"
-     * (constructor or factory method that takes one or more arguments).
-     * Note that implementations not required to return actual object
-     * they use (or, they may use some other instantiation) method.
-     * That is, even if {@link #canCreateFromObjectWith()} returns true,
-     * this method may return null .
-     */
-    public AnnotatedWithParams getWithArgsCreator() {
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiators.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiators.java
deleted file mode 100644
index 304fb34..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/ValueInstantiators.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.fasterxml.jackson.databind.deser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Interface for providers of {@link ValueInstantiator} instances.
- * Implemented when an object wants to provide custom value instantiators,
- * usually to support custom value types with alternate constructors, or
- * which need specified post-processing after construction but before
- * binding data.
- */
-public interface ValueInstantiators
-{
-    /**
-     * Method called to find the {@link ValueInstantiator} to use for creating
-     * instances of specified type during deserialization.
-     * Note that a default value instantiator is always created first and passed;
-     * if an implementation does not want to modify or replace it, it has to return
-     * passed instance as is (returning null is an error)
-     * 
-     * @param config Deserialization configuration in use
-     * @param beanDesc Additional information about POJO type to be instantiated
-     * @param defaultInstantiator Instantiator that will be used if no changes are made;
-     *   passed to allow custom instances to use annotation-provided information
-     *   (note, however, that earlier {@link ValueInstantiators} may have changed it to
-     *   a custom instantiator already)
-     *   
-     * @return Instantiator to use; either <code>defaultInstantiator</code> that was passed,
-     *   or a custom variant; can not be null.
-     */
-    public ValueInstantiator findValueInstantiator(DeserializationConfig config,
-            BeanDescription beanDesc, ValueInstantiator defaultInstantiator);
-
-    /**
-     * Basic "NOP" implementation that can be used as the base class for custom implementations.
-     * Safer to extend (instead of implementing {@link ValueInstantiators}) in case later
-     * Jackson versions add new methods in base interface.
-     */
-    public static class Base implements ValueInstantiators
-    {
-//      @Override
-        public ValueInstantiator findValueInstantiator(DeserializationConfig config,
-                BeanDescription beanDesc, ValueInstantiator defaultInstantiator) {
-            return defaultInstantiator;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java
deleted file mode 100644
index adda8c4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.util.HashSet;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-public class BeanAsArrayBuilderDeserializer
-    extends BeanDeserializerBase
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Deserializer we delegate operations that we can not handle.
-     */
-    protected final BeanDeserializerBase _delegate;
-
-    /**
-     * Properties in order expected to be found in JSON array.
-     */
-    protected final SettableBeanProperty[] _orderedProperties;
-
-    protected final AnnotatedMethod _buildMethod;
-        
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, initialization
-    /**********************************************************
-     */
-    
-    /**
-     * Main constructor used both for creating new instances (by
-     * {@link BeanDeserializer#asArrayDeserializer}) and for
-     * creating copies with different delegate.
-     */
-    public BeanAsArrayBuilderDeserializer(BeanDeserializerBase delegate,
-            SettableBeanProperty[] ordered,
-            AnnotatedMethod buildMethod)
-    {
-        super(delegate);
-        _delegate = delegate;
-        _orderedProperties = ordered;
-        _buildMethod = buildMethod;
-    }
-    
-    @Override
-    public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
-    {
-        /* We can't do much about this; could either replace _delegate
-         * with unwrapping instance, or just replace this one. Latter seems
-         * more sensible.
-         */
-        return _delegate.unwrappingDeserializer(unwrapper);
-    }
-
-    @Override
-    public BeanAsArrayBuilderDeserializer withObjectIdReader(ObjectIdReader oir) {
-        return new BeanAsArrayBuilderDeserializer(_delegate.withObjectIdReader(oir),
-                _orderedProperties, _buildMethod);
-    }
-
-    @Override
-    public BeanAsArrayBuilderDeserializer withIgnorableProperties(HashSet<String> ignorableProps) {
-        return new BeanAsArrayBuilderDeserializer(_delegate.withIgnorableProperties(ignorableProps),
-                _orderedProperties, _buildMethod);
-    }
-
-    @Override
-    protected BeanAsArrayBuilderDeserializer asArrayDeserializer() {
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializer implementation
-    /**********************************************************
-     */
-
-    protected final Object finishBuild(DeserializationContext ctxt, Object builder)
-            throws IOException
-    {
-        try {
-            return _buildMethod.getMember().invoke(builder);
-        } catch (Exception e) {
-            wrapInstantiationProblem(e, ctxt);
-            return null;
-        }
-    }
-    
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Let's delegate just in case we got a JSON Object (could error out, alternatively?)
-        if (jp.getCurrentToken() != JsonToken.START_ARRAY) {
-            return finishBuild(ctxt, _deserializeFromNonArray(jp, ctxt));
-        }
-        if (!_vanillaProcessing) {
-            return finishBuild(ctxt, _deserializeNonVanilla(jp, ctxt));
-        }
-        Object builder = _valueInstantiator.createUsingDefault(ctxt);
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return finishBuild(ctxt, builder);
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            if (prop != null) { // normal case
-                try {
-                    builder = prop.deserializeSetAndReturn(jp, ctxt, builder);
-                } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
-                }
-            } else { // just skip?
-                jp.skipChildren();
-            }
-            ++i;
-        }
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return finishBuild(ctxt, builder);
-    }
-
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt, Object builder)
-        throws IOException, JsonProcessingException
-    {
-        /* No good way to verify that we have an array... although could I guess
-         * check via JsonParser. So let's assume everything is working fine, for now.
-         */
-        if (_injectables != null) {
-            injectValues(ctxt, builder);
-        }
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return finishBuild(ctxt, builder);
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            if (prop != null) { // normal case
-                try {
-                    builder = prop.deserializeSetAndReturn(jp, ctxt, builder);
-                } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
-                }
-            } else { // just skip?
-                jp.skipChildren();
-            }
-            ++i;
-        }
-        
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return finishBuild(ctxt, builder);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, non-standard creation
-    /**********************************************************
-     */
-
-    /**
-     * Alternate deserialization method that has to check many more configuration
-     * aspects than the "vanilla" processing.
-     * Note: should NOT resolve builder; caller will do that
-     * 
-     * @return Builder object in use.
-     */
-    protected Object _deserializeNonVanilla(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_nonStandardCreation) {
-            return _deserializeWithCreator(jp, ctxt);
-        }
-        Object builder = _valueInstantiator.createUsingDefault(ctxt);
-        if (_injectables != null) {
-            injectValues(ctxt, builder);
-        }
-        Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return builder;
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            ++i;
-            if (prop != null) { // normal case
-                if (activeView == null || prop.visibleInView(activeView)) {
-                    try {
-                        prop.deserializeSetAndReturn(jp, ctxt, builder);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, builder, prop.getName(), ctxt);
-                    }
-                    continue;
-                }
-            }
-            // otherwise, skip it (view-filtered, no prop etc)
-            jp.skipChildren();
-        }
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return builder;
-    }
-    
-    protected Object _deserializeWithCreator(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {        
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return _deserializeUsingPropertyBased(jp, ctxt);
-        }
-        // should only occur for abstract types...
-        if (_beanType.isAbstract()) {
-            throw JsonMappingException.from(jp, "Can not instantiate abstract type "+_beanType
-                    +" (need to add/enable type information?)");
-        }
-        throw JsonMappingException.from(jp, "No suitable constructor found for type "
-                +_beanType+": can not instantiate from JSON object (need to add/enable type information?)");
-    }
-
-    /**
-     * Method called to deserialize bean using "property-based creator":
-     * this means that a non-default constructor or factory method is
-     * called, and then possibly other setters. The trick is that
-     * values for creator method need to be buffered, first; and 
-     * due to non-guaranteed ordering possibly some other properties
-     * as well.
-     */
-    protected final Object _deserializeUsingPropertyBased(final JsonParser jp,
-            final DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        final SettableBeanProperty[] props = _orderedProperties;
-        final int propCount = props.length;
-        int i = 0;
-        Object builder = null;
-        
-        for (; jp.nextToken() != JsonToken.END_ARRAY; ++i) {
-            SettableBeanProperty prop = (i < propCount) ? props[i] : null;
-            if (prop == null) { // we get null if there are extra elements; maybe otherwise too?
-                jp.skipChildren();
-                continue;
-            }
-            // if we have already constructed POJO, things are simple:
-            if (builder != null) {
-                try {
-                    builder = prop.deserializeSetAndReturn(jp, ctxt, builder);
-                } catch (Exception e) {
-                    wrapAndThrow(e, builder, prop.getName(), ctxt);
-                }
-                continue;
-            }
-            final String propName = prop.getName();
-            // if not yet, maybe we got a creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    try {
-                        builder = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
-                    }
-                    //  polymorphic?
-                    if (builder.getClass() != _beanType.getRawClass()) {
-                        /* 23-Jul-2012, tatu: Not sure if these could ever be properly
-                         *   supported (since ordering of elements may not be guaranteed);
-                         *   but make explicitly non-supported for now.
-                         */
-                        throw ctxt.mappingException("Can not support implicit polymorphic deserialization for POJOs-as-Arrays style: "
-                                +"nominal type "+_beanType.getRawClass().getName()+", actual type "+builder.getClass().getName());
-                    }
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-        }
-
-        // In case we didn't quite get all the creator properties, we may have to do this:
-        if (builder == null) {
-            try {
-                builder = creator.build(ctxt, buffer);
-            } catch (Exception e) {
-                wrapInstantiationProblem(e, ctxt);
-                return null; // never gets here
-            }
-        }
-        return builder;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, error reporting
-    /**********************************************************
-     */
-
-    protected Object _deserializeFromNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        // Let's start with failure
-        throw ctxt.mappingException("Can not deserialize a POJO (of type "+_beanType.getRawClass().getName()
-                +") from non-Array representation (token: "+jp.getCurrentToken()
-                +"): type/property designed to be serialized as JSON Array");
-        // in future, may allow use of "standard" POJO serialization as well; if so, do:
-        //return _delegate.deserialize(jp, ctxt);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java
deleted file mode 100644
index bae67bb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.util.HashSet;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Variant of {@link BeanDeserializer} used for handling deserialization
- * of POJOs when serialized as JSON Arrays, instead of JSON Objects.
- * 
- * @since 2.1
- */
-public class BeanAsArrayDeserializer
-    extends BeanDeserializerBase
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Deserializer we delegate operations that we can not handle.
-     */
-    protected final BeanDeserializerBase _delegate;
-
-    /**
-     * Properties in order expected to be found in JSON array.
-     */
-    protected final SettableBeanProperty[] _orderedProperties;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle, construction, initialization
-    /**********************************************************
-     */
-
-    /**
-     * Main constructor used both for creating new instances (by
-     * {@link BeanDeserializer#asArrayDeserializer}) and for
-     * creating copies with different delegate.
-     */
-    public BeanAsArrayDeserializer(BeanDeserializerBase delegate,
-            SettableBeanProperty[] ordered)
-    {
-        super(delegate);
-        _delegate = delegate;
-        _orderedProperties = ordered;
-    }
-    
-    @Override
-    public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
-    {
-        /* We can't do much about this; could either replace _delegate
-         * with unwrapping instance, or just replace this one. Latter seems
-         * more sensible.
-         */
-        return _delegate.unwrappingDeserializer(unwrapper);
-    }
-
-    @Override
-    public BeanAsArrayDeserializer withObjectIdReader(ObjectIdReader oir) {
-        return new BeanAsArrayDeserializer(_delegate.withObjectIdReader(oir),
-                _orderedProperties);
-    }
-
-    @Override
-    public BeanAsArrayDeserializer withIgnorableProperties(HashSet<String> ignorableProps) {
-        return new BeanAsArrayDeserializer(_delegate.withIgnorableProperties(ignorableProps),
-                _orderedProperties);
-    }
-
-    @Override
-    protected BeanDeserializerBase asArrayDeserializer() {
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializer implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Let's delegate just in case we got a JSON Object (could error out, alternatively?)
-        if (jp.getCurrentToken() != JsonToken.START_ARRAY) {
-            return _deserializeFromNonArray(jp, ctxt);
-        }
-        if (!_vanillaProcessing) {
-            return _deserializeNonVanilla(jp, ctxt);
-        }
-        final Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return bean;
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            if (prop != null) { // normal case
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
-                }
-            } else { // just skip?
-                jp.skipChildren();
-            }
-            ++i;
-        }
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return bean;
-    }
-
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        /* No good way to verify that we have an array... although could I guess
-         * check via JsonParser. So let's assume everything is working fine, for now.
-         */
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return bean;
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            if (prop != null) { // normal case
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
-                }
-            } else { // just skip?
-                jp.skipChildren();
-            }
-            ++i;
-        }
-        
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return bean;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, non-standard creation
-    /**********************************************************
-     */
-
-    /**
-     * Alternate deserialization method that has to check many more configuration
-     * aspects than the "vanilla" processing.
-     */
-    protected Object _deserializeNonVanilla(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_nonStandardCreation) {
-            return _deserializeWithCreator(jp, ctxt);
-        }
-        final Object bean = _valueInstantiator.createUsingDefault(ctxt);
-        if (_injectables != null) {
-            injectValues(ctxt, bean);
-        }
-        Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
-        final SettableBeanProperty[] props = _orderedProperties;
-        int i = 0;
-        final int propCount = props.length;
-        while (true) {
-            if (jp.nextToken() == JsonToken.END_ARRAY) {
-                return bean;
-            }
-            if (i == propCount) {
-                break;
-            }
-            SettableBeanProperty prop = props[i];
-            ++i;
-            if (prop != null) { // normal case
-                if (activeView == null || prop.visibleInView(activeView)) {
-                    try {
-                        prop.deserializeAndSet(jp, ctxt, bean);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, bean, prop.getName(), ctxt);
-                    }
-                    continue;
-                }
-            }
-            // otherwise, skip it (view-filtered, no prop etc)
-            jp.skipChildren();
-        }
-        // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
-            throw ctxt.mappingException("Unexpected JSON values; expected at most "+propCount+" properties (in JSON Array)");
-        }
-        // otherwise, skip until end
-        while (jp.nextToken() != JsonToken.END_ARRAY) {
-            jp.skipChildren();
-        }
-        return bean;
-    }
-    
-    protected Object _deserializeWithCreator(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {        
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt, _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_propertyBasedCreator != null) {
-            return _deserializeUsingPropertyBased(jp, ctxt);
-        }
-        // should only occur for abstract types...
-        if (_beanType.isAbstract()) {
-            throw JsonMappingException.from(jp, "Can not instantiate abstract type "+_beanType
-                    +" (need to add/enable type information?)");
-        }
-        throw JsonMappingException.from(jp, "No suitable constructor found for type "
-                +_beanType+": can not instantiate from JSON object (need to add/enable type information?)");
-    }
-
-    /**
-     * Method called to deserialize bean using "property-based creator":
-     * this means that a non-default constructor or factory method is
-     * called, and then possibly other setters. The trick is that
-     * values for creator method need to be buffered, first; and 
-     * due to non-guaranteed ordering possibly some other properties
-     * as well.
-     */
-    protected final Object _deserializeUsingPropertyBased(final JsonParser jp, final DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, _objectIdReader);
-
-        final SettableBeanProperty[] props = _orderedProperties;
-        final int propCount = props.length;
-        int i = 0;
-        Object bean = null;
-        
-        for (; jp.nextToken() != JsonToken.END_ARRAY; ++i) {
-            SettableBeanProperty prop = (i < propCount) ? props[i] : null;
-            if (prop == null) { // we get null if there are extra elements; maybe otherwise too?
-                jp.skipChildren();
-                continue;
-            }
-            // if we have already constructed POJO, things are simple:
-            if (bean != null) {
-                try {
-                    prop.deserializeAndSet(jp, ctxt, bean);
-                } catch (Exception e) {
-                    wrapAndThrow(e, bean, prop.getName(), ctxt);
-                }
-                continue;
-            }
-            final String propName = prop.getName();
-            // if not yet, maybe we got a creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                // Last creator property to set?
-                Object value = creatorProp.deserialize(jp, ctxt);
-                if (buffer.assignParameter(creatorProp.getCreatorIndex(), value)) {
-                    try {
-                        bean = creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        continue; // never gets here
-                    }
-                    //  polymorphic?
-                    if (bean.getClass() != _beanType.getRawClass()) {
-                        /* 23-Jul-2012, tatu: Not sure if these could ever be properly
-                         *   supported (since ordering of elements may not be guaranteed);
-                         *   but make explicitly non-supported for now.
-                         */
-                        throw ctxt.mappingException("Can not support implicit polymorphic deserialization for POJOs-as-Arrays style: "
-                                +"nominal type "+_beanType.getRawClass().getName()+", actual type "+bean.getClass().getName());
-                    }
-                }
-                continue;
-            }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
-            // regular property? needs buffering
-            buffer.bufferProperty(prop, prop.deserialize(jp, ctxt));
-        }
-
-        // In case we didn't quite get all the creator properties, we may have to do this:
-        if (bean == null) {
-            try {
-                bean = creator.build(ctxt, buffer);
-            } catch (Exception e) {
-                wrapInstantiationProblem(e, ctxt);
-                return null; // never gets here
-            }
-        }
-        return bean;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, error reporting
-    /**********************************************************
-     */
-
-    protected Object _deserializeFromNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        // Let's start with failure
-        throw ctxt.mappingException("Can not deserialize a POJO (of type "+_beanType.getRawClass().getName()
-                +") from non-Array representation (token: "+jp.getCurrentToken()
-                +"): type/property designed to be serialized as JSON Array");
-        // in future, may allow use of "standard" POJO serialization as well; if so, do:
-        //return _delegate.deserialize(jp, ctxt);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java
deleted file mode 100644
index 454f8ac..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Helper class used for storing mapping from property name to
- * {@link SettableBeanProperty} instances.
- *<p>
- * Note that this class is used instead of generic {@link java.util.HashMap}
- * for bit of performance gain (and some memory savings): although default
- * implementation is very good for generic use cases, it can be streamlined
- * a bit for specific use case we have. Even relatively small improvements
- * matter since this is directly on the critical path during deserialization,
- * as it is done for each and every POJO property deserialized.
- */
-public final class BeanPropertyMap
-    implements Iterable<SettableBeanProperty>,
-        java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    private final Bucket[] _buckets;
-    
-    private final int _hashMask;
-
-    private final int _size;
-
-    /**
-     * Counter we use to keep track of insertion order of properties
-     * (to be able to recreate insertion order when needed).
-     *<p>
-     * Note: is kept up-to-date with additions, but can NOT handle
-     * removals (i.e. "holes" may be left)
-     */
-    private int _nextBucketIndex = 0;
-
-    public BeanPropertyMap(Collection<SettableBeanProperty> properties)
-    {
-        _size = properties.size();
-        int bucketCount = findSize(_size);
-        _hashMask = bucketCount-1;
-        Bucket[] buckets = new Bucket[bucketCount];
-        for (SettableBeanProperty property : properties) {
-            String key = property.getName();
-            int index = key.hashCode() & _hashMask;
-            buckets[index] = new Bucket(buckets[index], key, property, _nextBucketIndex++);
-        }
-        _buckets = buckets;
-    }
-
-    private BeanPropertyMap(Bucket[] buckets, int size, int index)
-    {
-        _buckets = buckets;
-        _size = size;
-        _hashMask = buckets.length-1;
-        _nextBucketIndex = index;
-    }
-    
-    /**
-     * Fluent copy method that creates a new instance that is a copy
-     * of this instance except for one additional property that is
-     * passed as the argument.
-     * Note that method does not modify this instance but constructs
-     * and returns a new one.
-     * 
-     * @since 2.0
-     */
-    public BeanPropertyMap withProperty(SettableBeanProperty newProperty)
-    {
-    	// first things first: can just copy hash area:
-    	final int bcount = _buckets.length;
-        Bucket[] newBuckets = new Bucket[bcount];
-        System.arraycopy(_buckets, 0, newBuckets, 0, bcount);
-        final String propName = newProperty.getName();
-        // and then see if it's add or replace:
-    	SettableBeanProperty oldProp = find(newProperty.getName());
-    	if (oldProp == null) { // add
-    	    // first things first: add or replace?
-    	    // can do a straight copy, since all additions are at the front
-    	    // and then insert the new property:
-    	    int index = propName.hashCode() & _hashMask;
-    	    newBuckets[index] = new Bucket(newBuckets[index],
-    	            propName, newProperty, _nextBucketIndex++);
-    	    return new BeanPropertyMap(newBuckets, _size+1, _nextBucketIndex);
-    	}
-    	// replace: easy, close + replace
-    	BeanPropertyMap newMap = new BeanPropertyMap(newBuckets, bcount, _nextBucketIndex);
-    	newMap.replace(newProperty);
-    	return newMap;
-    }
-    
-    /**
-     * Factory method for constructing a map where all entries use given
-     * prefix
-     */
-    public BeanPropertyMap renameAll(NameTransformer transformer)
-    {
-        if (transformer == null || (transformer == NameTransformer.NOP)) {
-            return this;
-        }
-        Iterator<SettableBeanProperty> it = iterator();
-        ArrayList<SettableBeanProperty> newProps = new ArrayList<SettableBeanProperty>();
-        while (it.hasNext()) {
-            SettableBeanProperty prop = it.next();
-            String newName = transformer.transform(prop.getName());
-            prop = prop.withName(newName);
-            JsonDeserializer<?> deser = prop.getValueDeserializer();
-            if (deser != null) {
-                @SuppressWarnings("unchecked")
-                JsonDeserializer<Object> newDeser = (JsonDeserializer<Object>)
-                    deser.unwrappingDeserializer(transformer);
-                if (newDeser != deser) {
-                    prop = prop.withValueDeserializer(newDeser);
-                }
-            }
-            newProps.add(prop);
-        }
-        // should we try to re-index? Ordering probably changed but called probably doesn't want changes...
-        return new BeanPropertyMap(newProps);
-    }
-    
-    public BeanPropertyMap assignIndexes()
-    {
-        // order is arbitrary, but stable:
-        int index = 0;
-        for (Bucket bucket : _buckets) {
-            while (bucket != null) {
-                bucket.value.assignIndex(index++);
-                bucket = bucket.next;
-            }
-        }
-        return this;
-    }
-    
-    private final static int findSize(int size)
-    {
-        // For small enough results (32 or less), we'll require <= 50% fill rate; otherwise 80%
-        int needed = (size <= 32) ? (size + size) : (size + (size >> 2));
-        int result = 2;
-        while (result < needed) {
-            result += result;
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Iterable, for convenient iterating over all properties
-    /**********************************************************
-     */
-    
-    /**
-     * Accessor for traversing over all contained properties.
-     */
-//    @Override
-    public Iterator<SettableBeanProperty> iterator() {
-        return new IteratorImpl(_buckets);
-    }
-    
-    /**
-     * Method that will re-create initial insertion-ordering of
-     * properties contained in this map. Note that if properties
-     * have been removed, array may contain nulls; otherwise
-     * it should be consecutive.
-     * 
-     * @since 2.1
-     */
-    public SettableBeanProperty[] getPropertiesInInsertionOrder()
-    {
-        int len = _nextBucketIndex;
-        SettableBeanProperty[] result = new SettableBeanProperty[len];
-        for (Bucket root : _buckets) {
-            for (Bucket bucket = root; bucket != null; bucket = bucket.next) {
-                result[bucket.index] = bucket.value;
-            }
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    public int size() { return _size; }
-    
-    public SettableBeanProperty find(String key)
-    {
-        int index = key.hashCode() & _hashMask;
-        Bucket bucket = _buckets[index];
-        // Let's unroll first lookup since that is null or match in 90+% cases
-        if (bucket == null) {
-            return null;
-        }
-        // Primarily we do just identity comparison as keys should be interned
-        if (bucket.key == key) {
-            return bucket.value;
-        }
-        while ((bucket = bucket.next) != null) {
-            if (bucket.key == key) {
-                return bucket.value;
-            }
-        }
-        // Do we need fallback for non-interned Strings?
-        return _findWithEquals(key, index);
-    }
-
-    /**
-     * Specialized method that can be used to replace an existing entry
-     * (note: entry MUST exist; otherwise exception is thrown) with
-     * specified replacement.
-     */
-    public void replace(SettableBeanProperty property)
-    {
-        String name = property.getName();
-        int index = name.hashCode() & (_buckets.length-1);
-
-        /* This is bit tricky just because buckets themselves
-         * are immutable, so we need to recreate the chain. Fine.
-         */
-        Bucket tail = null;
-        int foundIndex = -1;
-        
-        for (Bucket bucket = _buckets[index]; bucket != null; bucket = bucket.next) {
-            // match to remove?
-            if (foundIndex < 0 && bucket.key.equals(name)) {
-                foundIndex = bucket.index;
-            } else {
-                tail = new Bucket(tail, bucket.key, bucket.value, bucket.index);
-            }
-        }
-        // Not finding specified entry is error, so:
-        if (foundIndex < 0) {
-            throw new NoSuchElementException("No entry '"+property+"' found, can't replace");
-        }
-        /* So let's attach replacement in front: useful also because
-         * it allows replacement even when iterating over entries
-         */
-        _buckets[index] = new Bucket(tail, name, property, foundIndex);
-    }
-
-    /**
-     * Specialized method for removing specified existing entry.
-     * NOTE: entry MUST exist, otherwise an exception is thrown.
-     */
-    public void remove(SettableBeanProperty property)
-    {
-        // Mostly this is the same as code with 'replace', just bit simpler...
-        String name = property.getName();
-        int index = name.hashCode() & (_buckets.length-1);
-        Bucket tail = null;
-        boolean found = false;
-        // slightly complex just because chain is immutable, must recreate
-        for (Bucket bucket = _buckets[index]; bucket != null; bucket = bucket.next) {
-            // match to remove?
-            if (!found && bucket.key.equals(name)) {
-                found = true;
-            } else {
-                tail = new Bucket(tail, bucket.key, bucket.value, bucket.index);
-            }
-        }
-        if (!found) { // must be found
-            throw new NoSuchElementException("No entry '"+property+"' found, can't remove");
-        }
-        _buckets[index] = tail;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    private SettableBeanProperty _findWithEquals(String key, int index)
-    {
-        Bucket bucket = _buckets[index];
-        while (bucket != null) {
-            if (key.equals(bucket.key)) {
-                return bucket.value;
-            }
-            bucket = bucket.next;
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper beans
-    /**********************************************************
-     */
-    
-    private final static class Bucket
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        public final Bucket next;
-        public final String key;
-        public final SettableBeanProperty value;
-
-        /**
-         * Index that indicates insertion order of the bucket
-         */
-        public final int index;
-        
-        public Bucket(Bucket next, String key, SettableBeanProperty value, int index)
-        {
-            this.next = next;
-            this.key = key;
-            this.value = value;
-            this.index = index;
-        }
-    }
-
-    private final static class IteratorImpl
-        implements Iterator<SettableBeanProperty>
-    {
-        /**
-         * Buckets of the map
-         */
-        private final Bucket[] _buckets;
-
-        /**
-         * Bucket that contains next value to return (if any); null if nothing more to iterate
-         */
-        private Bucket _currentBucket;
-
-        /**
-         * Index of the next bucket in bucket array to check.
-         */
-        private int _nextBucketIndex;
-        
-        public IteratorImpl(Bucket[] buckets) {
-            _buckets = buckets;
-            // need to initialize to point to first entry...
-            int i = 0;
-            for (int len = _buckets.length; i < len; ) {
-                Bucket b = _buckets[i++];
-                if (b != null) {
-                    _currentBucket = b;
-                    break;
-                }
-            }
-            _nextBucketIndex = i;
-        }
-
-//        @Override
-        public boolean hasNext() {
-            return _currentBucket != null;
-        }
-
-//        @Override
-        public SettableBeanProperty next()
-        {
-            Bucket curr = _currentBucket;
-            if (curr == null) { // sanity check
-                throw new NoSuchElementException();
-            }
-            // need to advance, too
-            Bucket b = curr.next;
-            while (b == null && _nextBucketIndex < _buckets.length) {
-                b = _buckets[_nextBucketIndex++];
-            }
-            _currentBucket = b;
-            return curr.value;
-        }
-
-//       @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java
deleted file mode 100644
index d8773a3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.lang.reflect.Member;
-import java.util.*;
-
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.deser.CreatorProperty;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Container class for storing information on creators (based on annotations,
- * visibility), to be able to build actual instantiator later on.
- */
-public class CreatorCollector
-{
-    /// Type of bean being created
-    final protected BeanDescription _beanDesc;
-
-    final protected boolean _canFixAccess;
-
-    /**
-     * Reference to the default creator (constructor or factory method).
-     *<p>
-     * Note: name is a misnomer, after resolving of [JACKSON-850], since this
-     * can also point to factory method.
-     */
-    protected AnnotatedWithParams _defaultConstructor;
-    
-    protected AnnotatedWithParams _stringCreator, _intCreator, _longCreator;
-    protected AnnotatedWithParams _doubleCreator, _booleanCreator;
-
-    protected AnnotatedWithParams _delegateCreator;
-    // when there are injectable values along with delegate:
-    protected CreatorProperty[] _delegateArgs;
-    
-    protected AnnotatedWithParams _propertyBasedCreator;
-    protected CreatorProperty[] _propertyBasedArgs = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public CreatorCollector(BeanDescription beanDesc, boolean canFixAccess)
-    {
-        _beanDesc = beanDesc;
-        _canFixAccess = canFixAccess;
-    }
-
-    public ValueInstantiator constructValueInstantiator(DeserializationConfig config)
-    {
-        StdValueInstantiator inst = new StdValueInstantiator(config, _beanDesc.getType());
-
-        JavaType delegateType;
-
-        if (_delegateCreator == null) {
-            delegateType = null;
-        } else {
-            // need to find type...
-            int ix = 0;
-            if (_delegateArgs != null) {
-                for (int i = 0, len = _delegateArgs.length; i < len; ++i) {
-                    if (_delegateArgs[i] == null) { // marker for delegate itself
-                        ix = i;
-                        break;
-                    }
-                }
-            }
-            TypeBindings bindings = _beanDesc.bindingsForBeanType();
-            delegateType = bindings.resolveType(_delegateCreator.getGenericParameterType(ix));
-        }
-        
-        inst.configureFromObjectSettings(_defaultConstructor,
-                _delegateCreator, delegateType, _delegateArgs,
-                _propertyBasedCreator, _propertyBasedArgs);
-        inst.configureFromStringCreator(_stringCreator);
-        inst.configureFromIntCreator(_intCreator);
-        inst.configureFromLongCreator(_longCreator);
-        inst.configureFromDoubleCreator(_doubleCreator);
-        inst.configureFromBooleanCreator(_booleanCreator);
-        return inst;
-    }
-    
-    /*
-    /**********************************************************
-    /* Setters
-    /**********************************************************
-     */
-
-    /**
-     * @deprecated since 2.1, use {@link #setDefaultCreator} instead.
-     */
-    @Deprecated
-    public void setDefaultConstructor(AnnotatedConstructor ctor) {
-        _defaultConstructor = _fixAccess(ctor);
-    }
-    
-    /**
-     * Method called to indicate the default creator: no-arguments
-     * constructor or factory method that is called to instantiate
-     * a value before populating it with data. Default creator is
-     * only used if no other creators are indicated.
-     * 
-     * @param creator Creator method; no-arguments constructor or static
-     *   factory method.
-     */
-    public void setDefaultCreator(AnnotatedWithParams creator)
-    {
-        // !!! TODO: 23-Jul-2012, tatu: Should change to directly change things
-        //    here in future; but for backwards compatibility, can't do that yet
-        if (creator instanceof AnnotatedConstructor) {
-            setDefaultConstructor((AnnotatedConstructor) creator);
-            return;
-        }
-        _defaultConstructor = _fixAccess(creator);
-    }
-    
-    public void addStringCreator(AnnotatedWithParams creator) {
-        _stringCreator = verifyNonDup(creator, _stringCreator, "String");
-    }
-    public void addIntCreator(AnnotatedWithParams creator) {
-        _intCreator = verifyNonDup(creator, _intCreator, "int");
-    }
-    public void addLongCreator(AnnotatedWithParams creator) {
-        _longCreator = verifyNonDup(creator, _longCreator, "long");
-    }
-    public void addDoubleCreator(AnnotatedWithParams creator) {
-        _doubleCreator = verifyNonDup(creator, _doubleCreator, "double");
-    }
-    public void addBooleanCreator(AnnotatedWithParams creator) {
-        _booleanCreator = verifyNonDup(creator, _booleanCreator, "boolean");
-    }
-
-    public void addDelegatingCreator(AnnotatedWithParams creator,
-            CreatorProperty[] injectables)
-    {
-        _delegateCreator = verifyNonDup(creator, _delegateCreator, "delegate");
-        _delegateArgs = injectables;
-    }
-    
-    public void addPropertyCreator(AnnotatedWithParams creator, CreatorProperty[] properties)
-    {
-        _propertyBasedCreator = verifyNonDup(creator, _propertyBasedCreator, "property-based");
-        // [JACKSON-470] Better ensure we have no duplicate names either...
-        if (properties.length > 1) {
-            HashMap<String,Integer> names = new HashMap<String,Integer>();
-            for (int i = 0, len = properties.length; i < len; ++i) {
-                String name = properties[i].getName();
-                /* [Issue-13]: Need to consider Injectables, which may not have
-                 *   a name at all, and need to be skipped
-                 */
-                if (name.length() == 0 && properties[i].getInjectableValueId() != null) {
-                    continue;
-                }
-                Integer old = names.put(name, Integer.valueOf(i));
-                if (old != null) {
-                    throw new IllegalArgumentException("Duplicate creator property \""+name+"\" (index "+old+" vs "+i+")");
-                }
-            }
-        }
-        _propertyBasedArgs = properties;
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    /**
-     * @since 2.1
-     */
-    public boolean hasDefaultCreator() {
-        return _defaultConstructor != null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    private <T extends AnnotatedMember> T _fixAccess(T member)
-    {
-        if (member != null && _canFixAccess) {
-            ClassUtil.checkAndFixAccess((Member) member.getAnnotated());
-        }
-        return member;
-    }
-
-    protected AnnotatedWithParams verifyNonDup(AnnotatedWithParams newOne, AnnotatedWithParams oldOne,
-            String type)
-    {
-        if (oldOne != null) {
-            // important: ok to override factory with constructor; but not within same type, so:
-            if (oldOne.getClass() == newOne.getClass()) {
-                throw new IllegalArgumentException("Conflicting "+type+" creators: already had "+oldOne+", encountered "+newOne);
-            }
-        }
-        return _fixAccess(newOne);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.java
deleted file mode 100644
index ea453cf..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ExternalTypeHandler.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Helper class that is used to flatten JSON structure when using
- * "external type id" (see {@link com.fasterxml.jackson.annotation.JsonTypeInfo.As#EXTERNAL_PROPERTY}).
- * This is needed to store temporary state and buffer tokens, as the structure is
- * rearranged a bit so that actual type deserializer can resolve type and 
- * finalize deserialization.
- */
-public class ExternalTypeHandler
-{
-    private final ExtTypedProperty[] _properties;
-    private final HashMap<String, Integer> _nameToPropertyIndex;
-
-    private final String[] _typeIds;
-    private final TokenBuffer[] _tokens;
-    
-    protected ExternalTypeHandler(ExtTypedProperty[] properties,
-            HashMap<String, Integer> nameToPropertyIndex,
-            String[] typeIds, TokenBuffer[] tokens)
-    {
-        _properties = properties;        
-        _nameToPropertyIndex = nameToPropertyIndex;
-        _typeIds = typeIds;
-        _tokens = tokens;
-    }
-
-    protected ExternalTypeHandler(ExternalTypeHandler h)
-    {
-        _properties = h._properties;
-        _nameToPropertyIndex = h._nameToPropertyIndex;
-        int len = _properties.length;
-        _typeIds = new String[len];
-        _tokens = new TokenBuffer[len];
-    }
-    
-    public ExternalTypeHandler start() {
-        return new ExternalTypeHandler(this);
-    }
-
-    /**
-     * Method called to see if given property/value pair is an external type
-     * id; and if so handle it. This is <b>only</b> to be called in case
-     * containing POJO has similarly named property as the external type id;
-     * otherwise {@link #handlePropertyValue} should be called instead.
-     */
-    public boolean handleTypePropertyValue(JsonParser jp, DeserializationContext ctxt,
-            String propName, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        Integer I = _nameToPropertyIndex.get(propName);
-        if (I == null) {
-            return false;
-        }
-        int index = I.intValue();
-        ExtTypedProperty prop = _properties[index];
-        if (!prop.hasTypePropertyName(propName)) {
-            return false;
-        }
-        _typeIds[index] = jp.getText();
-        // note: can NOT skip child values (should always be String anyway)
-        boolean canDeserialize = (bean != null) && (_tokens[index] != null);
-        // Minor optimization: deserialize properties as soon as we have all we need:
-        if (canDeserialize) {
-            _deserializeAndSet(jp, ctxt, bean, index);
-            // clear stored data, to avoid deserializing+setting twice:
-            _typeIds[index] = null;
-            _tokens[index] = null;
-        }
-        return true;
-    }
-    
-    /**
-     * Method called to ask handler to handle value of given property,
-     * at point where parser points to the first token of the value.
-     * Handling can mean either resolving type id it contains (if it matches type
-     * property name), or by buffering the value for further use.
-     * 
-     * @return True, if the given property was properly handled
-     */
-    public boolean handlePropertyValue(JsonParser jp, DeserializationContext ctxt,
-            String propName, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        Integer I = _nameToPropertyIndex.get(propName);
-        if (I == null) {
-            return false;
-        }
-        int index = I.intValue();
-        ExtTypedProperty prop = _properties[index];
-        boolean canDeserialize;
-        if (prop.hasTypePropertyName(propName)) {
-            _typeIds[index] = jp.getText();
-            jp.skipChildren();
-            canDeserialize = (bean != null) && (_tokens[index] != null);
-        } else {
-            TokenBuffer tokens = new TokenBuffer(jp.getCodec());
-            tokens.copyCurrentStructure(jp);
-            _tokens[index] = tokens;
-            canDeserialize = (bean != null) && (_typeIds[index] != null);
-        }
-        /* Minor optimization: let's deserialize properties as soon as
-         * we have all pertinent information:
-         */
-        if (canDeserialize) {
-            _deserializeAndSet(jp, ctxt, bean, index);
-            // clear stored data, to avoid deserializing+setting twice:
-            _typeIds[index] = null;
-            _tokens[index] = null;
-        }
-        return true;
-    }
-    
-    public Object complete(JsonParser jp, DeserializationContext ctxt, Object bean)
-        throws IOException, JsonProcessingException
-    {
-        for (int i = 0, len = _properties.length; i < len; ++i) {
-            if (_typeIds[i] == null) {
-                // let's allow missing both type and property (may already have been set, too)
-                if (_tokens[i] == null) {
-                    continue;
-                }
-                // but not just one
-                throw ctxt.mappingException("Missing external type id property '"+_properties[i].getTypePropertyName());
-            } else if (_tokens[i] == null) {
-                SettableBeanProperty prop = _properties[i].getProperty();
-                throw ctxt.mappingException("Missing property '"+prop.getName()+"' for external type id '"+_properties[i].getTypePropertyName());
-            }
-            _deserializeAndSet(jp, ctxt, bean, i);
-        }
-        return bean;
-    }
-
-    /**
-     * Variant called when creation of the POJO involves buffering of creator properties
-     * as well as property-based creator.
-     */
-    public Object complete(JsonParser jp, DeserializationContext ctxt,
-            PropertyValueBuffer buffer, PropertyBasedCreator creator)
-        throws IOException, JsonProcessingException
-    {
-        // first things first: deserialize all data buffered:
-        final int len = _properties.length;
-        Object[] values = new Object[len];
-        for (int i = 0; i < len; ++i) {
-            if (_typeIds[i] == null) {
-                // let's allow missing both type and property (may already have been set, too)
-                if (_tokens[i] == null) {
-                    continue;
-                }
-                // but not just one
-                throw ctxt.mappingException("Missing external type id property '"+_properties[i].getTypePropertyName());
-            } else if (_tokens[i] == null) {
-                SettableBeanProperty prop = _properties[i].getProperty();
-                throw ctxt.mappingException("Missing property '"+prop.getName()+"' for external type id '"+_properties[i].getTypePropertyName());
-            }
-            values[i] = _deserialize(jp, ctxt, i);
-        }
-        // second: fill in creator properties:
-        for (int i = 0; i < len; ++i) {
-            SettableBeanProperty prop = _properties[i].getProperty();
-            if (creator.findCreatorProperty(prop.getName()) != null) {
-                buffer.assignParameter(prop.getCreatorIndex(), values[i]);
-            }
-        }
-        Object bean = creator.build(ctxt, buffer);
-        // third: assign non-creator properties
-        for (int i = 0; i < len; ++i) {
-            SettableBeanProperty prop = _properties[i].getProperty();
-            if (creator.findCreatorProperty(prop.getName()) == null) {
-                prop.set(bean, values[i]);
-            }
-        }
-        return bean;
-    }
-
-    protected final Object _deserialize(JsonParser jp, DeserializationContext ctxt,
-            int index)
-        throws IOException, JsonProcessingException
-    {
-        TokenBuffer merged = new TokenBuffer(jp.getCodec());
-        merged.writeStartArray();
-        merged.writeString(_typeIds[index]);
-        JsonParser p2 = _tokens[index].asParser(jp);
-        p2.nextToken();
-        merged.copyCurrentStructure(p2);
-        merged.writeEndArray();
-        // needs to point to START_OBJECT (or whatever first token is)
-        p2 = merged.asParser(jp);
-        p2.nextToken();
-        return _properties[index].getProperty().deserialize(p2, ctxt);
-    }
-    
-    protected final void _deserializeAndSet(JsonParser jp, DeserializationContext ctxt, Object bean, int index)
-        throws IOException, JsonProcessingException
-    {
-        /* Ok: time to mix type id, value; and we will actually use "wrapper-array"
-         * style to ensure we can handle all kinds of JSON constructs.
-         */
-        TokenBuffer merged = new TokenBuffer(jp.getCodec());
-        merged.writeStartArray();
-        merged.writeString(_typeIds[index]);
-        JsonParser p2 = _tokens[index].asParser(jp);
-        p2.nextToken();
-        merged.copyCurrentStructure(p2);
-        merged.writeEndArray();
-        // needs to point to START_OBJECT (or whatever first token is)
-        p2 = merged.asParser(jp);
-        p2.nextToken();
-        _properties[index].getProperty().deserializeAndSet(p2, ctxt, bean);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-    
-    public static class Builder
-    {
-        private final ArrayList<ExtTypedProperty> _properties = new ArrayList<ExtTypedProperty>();
-        private final HashMap<String, Integer> _nameToPropertyIndex = new HashMap<String, Integer>();
-        
-        public void addExternal(SettableBeanProperty property, String extPropName)
-        {
-            Integer index = _properties.size();
-            _properties.add(new ExtTypedProperty(property, extPropName));
-            _nameToPropertyIndex.put(property.getName(), index);
-            _nameToPropertyIndex.put(extPropName, index);
-        }
-        
-        public ExternalTypeHandler build() {
-            return new ExternalTypeHandler(_properties.toArray(new ExtTypedProperty[_properties.size()]),
-                    _nameToPropertyIndex, null, null);
-        }
-    }
-
-    private final static class ExtTypedProperty
-    {
-        private final SettableBeanProperty _property;
-        private final String _typePropertyName;
-        
-        public ExtTypedProperty(SettableBeanProperty property, String typePropertyName)
-        {
-            _property = property;
-            _typePropertyName = typePropertyName;
-        }
-
-        public boolean hasTypePropertyName(String n) {
-            return n.equals(_typePropertyName);
-        }
-
-        public String getTypePropertyName() { return _typePropertyName; }
-        
-        public SettableBeanProperty getProperty() {
-            return _property;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java
deleted file mode 100644
index dcce7b3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * This concrete sub-class implements property that is set
- * directly assigning to a Field.
- */
-public final class FieldProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Transient since there is no need to persist; only needed during
-     * construction of objects.
-     */
-    protected final AnnotatedField _annotated;
-
-    /**
-     * Actual field to set when deserializing this property.
-     */
-    protected final transient Field _field;
-    
-    public FieldProperty(BeanPropertyDefinition propDef, JavaType type,
-            TypeDeserializer typeDeser, Annotations contextAnnotations, AnnotatedField field)
-    {
-        super(propDef, type, typeDeser, contextAnnotations);
-        _annotated = field;
-        _field = field.getAnnotated();
-    }
-
-    protected FieldProperty(FieldProperty src, JsonDeserializer<?> deser) {
-        super(src, deser);
-        _annotated = src._annotated;
-        _field = src._field;
-    }
-
-    protected FieldProperty(FieldProperty src, String newName) {
-        super(src, newName);
-        _annotated = src._annotated;
-        _field = src._field;
-    }
-
-    /**
-     * Constructor used for JDK Serialization when reading persisted object
-     */
-    protected FieldProperty(FieldProperty src, Field f)
-    {
-        super(src);
-        _annotated = src._annotated;
-        if (f == null) {
-            throw new IllegalArgumentException("No Field passed for property '"+src.getName()
-                    +"' (class "+src.getDeclaringClass().getName()+")");
-        }
-        _field = f;
-    }
-    
-    @Override
-    public FieldProperty withName(String newName) {
-        return new FieldProperty(this, newName);
-    }
-    
-    @Override
-    public FieldProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new FieldProperty(this, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _annotated.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _annotated; }
-
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        set(instance, deserialize(jp, ctxt));
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        return setAndReturn(instance, deserialize(jp, ctxt));
-    }
-    
-    @Override
-    public final void set(Object instance, Object value)
-        throws IOException
-    {
-        try {
-            _field.set(instance, value);
-        } catch (Exception e) {
-            _throwAsIOE(e, value);
-        }
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-        throws IOException
-    {
-        try {
-            _field.set(instance, value);
-        } catch (Exception e) {
-            _throwAsIOE(e, value);
-        }
-        return instance;
-    }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object readResolve() {
-        return new FieldProperty(this, _annotated.getAnnotated());
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/InnerClassProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/InnerClassProperty.java
deleted file mode 100644
index ee21f8c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/InnerClassProperty.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * This sub-class is used to handle special case of value being a
- * non-static inner class. If so, we will have to use a special
- * alternative for default constructor; but otherwise can delegate
- * to regular implementation.
- */
-public final class InnerClassProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Actual property that we use after value construction.
-     */
-    protected final SettableBeanProperty _delegate;
-
-    /**
-     * Single-arg constructor we use for value instantiation.
-     */
-    protected final Constructor<?> _creator;
-    
-    public InnerClassProperty(SettableBeanProperty delegate,
-            Constructor<?> ctor)
-    {
-        super(delegate);
-        _delegate = delegate;
-        _creator = ctor;
-    }
-
-    protected InnerClassProperty(InnerClassProperty src, JsonDeserializer<?> deser)
-    {
-        super(src, deser);
-        _delegate = src._delegate.withValueDeserializer(deser);
-        _creator = src._creator;
-    }
-
-    protected InnerClassProperty(InnerClassProperty src, String newName) {
-        super(src, newName);
-        _delegate = src._delegate.withName(newName);
-        _creator = src._creator;
-    }
-
-    @Override
-    public InnerClassProperty withName(String newName) {
-        return new InnerClassProperty(this, newName);
-    }
-
-    @Override
-    public InnerClassProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new InnerClassProperty(this, deser);
-    }
-    
-    // // // BeanProperty impl
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _delegate.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _delegate.getMember(); }
-
-    /*
-    /**********************************************************
-    /* Deserialization methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-            Object bean)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        Object value;
-        if (t == JsonToken.VALUE_NULL) {
-            value = (_nullProvider == null) ? null : _nullProvider.nullValue(ctxt);
-        } else if (_valueTypeDeserializer != null) {
-            value = _valueDeserializer.deserializeWithType(jp, ctxt, _valueTypeDeserializer);
-        } else  { // the usual case
-            try {
-                value = _creator.newInstance(bean);
-            } catch (Exception e) {
-                ClassUtil.unwrapAndThrowAsIAE(e, "Failed to instantiate class "+_creator.getDeclaringClass().getName()+", problem: "+e.getMessage());
-                value = null;
-            }
-            _valueDeserializer.deserialize(jp, ctxt, value);
-        }
-        set(bean, value);
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        return setAndReturn(instance, deserialize(jp, ctxt));
-    }
-    
-    @Override
-    public final void set(Object instance, Object value) throws IOException
-    {
-        _delegate.set(instance, value);
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-            throws IOException
-    {
-    	return _delegate.setAndReturn(instance, value);
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.java
deleted file mode 100644
index 55b8f38..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Wrapper property that is used to handle managed (forward) properties
- * (see [JACKSON-235] for more information). Basically just need to
- * delegate first to actual forward property, and 
- */
-public final class ManagedReferenceProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final String _referenceName;
-    
-    /**
-     * Flag that indicates whether property to handle is a container type
-     * (array, Collection, Map) or not.
-     */
-    protected final boolean _isContainer;
-    
-    protected final SettableBeanProperty _managedProperty;
-
-    protected final SettableBeanProperty _backProperty;
-    
-    public ManagedReferenceProperty(SettableBeanProperty forward,
-            String refName, SettableBeanProperty backward,
-            Annotations contextAnnotations, boolean isContainer)
-    {
-        super(forward.getName(), forward.getType(), forward.getValueTypeDeserializer(),
-                contextAnnotations);
-        _referenceName = refName;
-        _managedProperty = forward;
-        _backProperty = backward;
-        _isContainer = isContainer;
-    }
-
-    protected ManagedReferenceProperty(ManagedReferenceProperty src, JsonDeserializer<?> deser)
-    {
-        super(src, deser);
-        _referenceName = src._referenceName;
-        _isContainer = src._isContainer;
-        _managedProperty = src._managedProperty;
-        _backProperty = src._backProperty;
-    }
-
-    protected ManagedReferenceProperty(ManagedReferenceProperty src, String newName) {
-        super(src, newName);
-        _referenceName = src._referenceName;
-        _isContainer = src._isContainer;
-        _managedProperty = src._managedProperty;
-        _backProperty = src._backProperty;
-    }
-
-    @Override
-    public ManagedReferenceProperty withName(String newName) {
-        return new ManagedReferenceProperty(this, newName);
-    }
-    
-    @Override
-    public ManagedReferenceProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new ManagedReferenceProperty(this, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _managedProperty.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _managedProperty.getMember(); }
-
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-                                  Object instance)
-        throws IOException, JsonProcessingException
-    {
-        set(instance, _managedProperty.deserialize(jp, ctxt));
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        return setAndReturn(instance, deserialize(jp, ctxt));
-    }
-    
-    @Override
-    public final void set(Object instance, Object value)
-        throws IOException
-    {
-    	setAndReturn(instance, value);
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-   		throws IOException
-	{
-    	Object result = _managedProperty.setAndReturn(instance, value);
-        /* And then back reference, if (and only if!) we actually have a non-null
-         * reference
-         */
-        if (value != null) {
-            if (_isContainer) { // ok, this gets ugly... but has to do for now
-                if (value instanceof Object[]) {
-                    for (Object ob : (Object[]) value) {
-                        if (ob != null) {
-                            _backProperty.set(ob, instance);                            
-                        }
-                    }
-                } else if (value instanceof Collection<?>) {
-                    for (Object ob : (Collection<?>) value) {
-                        if (ob != null) {
-                            _backProperty.set(ob, instance);                            
-                        }
-                    }
-                } else if (value instanceof Map<?,?>) {
-                    for (Object ob : ((Map<?,?>) value).values()) {
-                        if (ob != null) {
-                            _backProperty.set(ob, instance);                            
-                        }
-                    }
-                } else {
-                    throw new IllegalStateException("Unsupported container type ("+value.getClass().getName()
-                            +") when resolving reference '"+_referenceName+"'");
-                }
-            } else {
-                _backProperty.set(value, instance);
-            }
-        }
-    	return result;
-	}
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/MethodProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/MethodProperty.java
deleted file mode 100644
index fa30f54..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/MethodProperty.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * This concrete sub-class implements property that is set
- * using regular "setter" method.
- */
-public final class MethodProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1;
-
-    protected final AnnotatedMethod _annotated;
-    
-    /**
-     * Setter method for modifying property value; used for
-     * "regular" method-accessible properties.
-     */
-    protected final transient Method _setter;
-    
-    public MethodProperty(BeanPropertyDefinition propDef,
-            JavaType type, TypeDeserializer typeDeser,
-            Annotations contextAnnotations, AnnotatedMethod method)
-    {
-        super(propDef, type, typeDeser, contextAnnotations);
-        _annotated = method;
-        _setter = method.getAnnotated();
-    }
-
-    protected MethodProperty(MethodProperty src, JsonDeserializer<?> deser) {
-        super(src, deser);
-        _annotated = src._annotated;
-        _setter = src._setter;
-    }
-
-    protected MethodProperty(MethodProperty src, String newName) {
-        super(src, newName);
-        _annotated = src._annotated;
-        _setter = src._setter;
-    }
-
-    /**
-     * Constructor used for JDK Serialization when reading persisted object
-     */
-    protected MethodProperty(MethodProperty src, Method m) {
-        super(src);
-        _annotated = src._annotated;
-        _setter = m;
-    }
-    
-    @Override
-    public MethodProperty withName(String newName) {
-        return new MethodProperty(this, newName);
-    }
-    
-    @Override
-    public MethodProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new MethodProperty(this, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _annotated.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _annotated; }
-
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-            Object instance)
-        throws IOException, JsonProcessingException
-    {
-        set(instance, deserialize(jp, ctxt));
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-    	return setAndReturn(instance, deserialize(jp, ctxt));
-    }
-    
-    @Override
-    public final void set(Object instance, Object value)
-        throws IOException
-    {
-        try {
-            _setter.invoke(instance, value);
-        } catch (Exception e) {
-            _throwAsIOE(e, value);
-        }
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-		throws IOException
-    {
-        try {
-            Object result = _setter.invoke(instance, value);
-            return (result == null) ? instance : result;
-        } catch (Exception e) {
-            _throwAsIOE(e, value);
-            return null;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object readResolve() {
-        return new MethodProperty(this, _annotated.getAnnotated());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/NullProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/NullProvider.java
deleted file mode 100644
index 54e3d4f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/NullProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * To support [JACKSON-420] we need bit more indirection; this is used to produce
- * artificial failure for primitives that don't accept JSON null as value.
- */
-public final class NullProvider
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    private final Object _nullValue;
-
-    private final boolean _isPrimitive;
-    
-    private final Class<?> _rawType;
-    
-    public NullProvider(JavaType type, Object nullValue)
-    {
-        _nullValue = nullValue;
-        // [JACKSON-420]
-        _isPrimitive = type.isPrimitive();
-        _rawType = type.getRawClass();
-    }
-
-    public Object nullValue(DeserializationContext ctxt) throws JsonProcessingException
-    {
-        if (_isPrimitive && ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
-            throw ctxt.mappingException("Can not map JSON null into type "+_rawType.getName()
-                    +" (set DeserializationConfig.DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES to 'false' to allow)");
-        }
-        return _nullValue;
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.java
deleted file mode 100644
index bd5485a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdReader.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-
-/**
- * Object that knows how to serialize Object Ids.
- */
-public final class ObjectIdReader
-{
-    public final JavaType idType;
-
-    public final String propertyName;
-    
-    /**
-     * Blueprint generator instance: actual instance will be
-     * fetched from {@link SerializerProvider} using this as
-     * the key.
-     */
-    public final ObjectIdGenerator<?> generator;
-    
-    /**
-     * Deserializer used for deserializing id values.
-     */
-    public final JsonDeserializer<Object> deserializer;
-
-    public final SettableBeanProperty idProperty;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    protected ObjectIdReader(JavaType t, String propName, ObjectIdGenerator<?> gen,
-            JsonDeserializer<?> deser, SettableBeanProperty idProp)
-    {
-        idType = t;
-        propertyName = propName;
-        generator = gen;
-        deserializer = (JsonDeserializer<Object>) deser;
-        idProperty = idProp;
-    }
-
-    /**
-     * Factory method called by {@link com.fasterxml.jackson.databind.ser.std.BeanSerializerBase}
-     * with the initial information based on standard settings for the type
-     * for which serializer is being built.
-     */
-    public static ObjectIdReader construct(JavaType idType, String propName,
-            ObjectIdGenerator<?> generator, JsonDeserializer<?> deser,
-            SettableBeanProperty idProp)
-    {
-        return new ObjectIdReader(idType, propName, generator, deser, idProp);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.java
deleted file mode 100644
index 96f253e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-
-/**
- * Specialized {@link SettableBeanProperty} implementation used
- * for virtual property that represents Object Id that is used
- * for some POJO types (or properties).
- */
-public final class ObjectIdValueProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final ObjectIdReader _objectIdReader;
-    
-    public ObjectIdValueProperty(ObjectIdReader objectIdReader)
-    {
-        super(objectIdReader.propertyName, objectIdReader.idType, null, null);
-        _objectIdReader = objectIdReader;
-        _valueDeserializer = objectIdReader.deserializer;
-    }
-
-    protected ObjectIdValueProperty(ObjectIdValueProperty src, JsonDeserializer<?> deser)
-    {
-        super(src, deser);
-        _objectIdReader = src._objectIdReader;
-    }
-
-    protected ObjectIdValueProperty(ObjectIdValueProperty src, String newName) {
-        super(src, newName);
-        _objectIdReader = src._objectIdReader;
-    }
-
-    @Override
-    public ObjectIdValueProperty withName(String newName) {
-        return new ObjectIdValueProperty(this, newName);
-    }
-
-    @Override
-    public ObjectIdValueProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new ObjectIdValueProperty(this, deser);
-    }
-    
-    // // // BeanProperty impl
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return null;
-    }
-
-    @Override public AnnotatedMember getMember() {  return null; }
-
-    /*
-    /**********************************************************
-    /* Deserialization methods
-    /**********************************************************
-     */
-
-    @Override
-    public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-            Object instance)
-        throws IOException, JsonProcessingException
-    {
-    	deserializeSetAndReturn(jp, ctxt, instance);
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-        // note: no null checks (unlike usually); deserializer should fail if one found
-        Object id = _valueDeserializer.deserialize(jp, ctxt);
-        ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator);
-        roid.bindItem(instance);
-        // also: may need to set a property value as well
-        SettableBeanProperty idProp = _objectIdReader.idProperty;
-        if (idProp != null) {
-            return idProp.setAndReturn(instance, id);
-        }
-        return instance;
-    }
-    
-    
-    @Override
-    public void set(Object instance, Object value) throws IOException {
-    	setAndReturn(instance, value);
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-        throws IOException
-    {
-        SettableBeanProperty idProp = _objectIdReader.idProperty;
-        if (idProp == null) {
-            throw new UnsupportedOperationException(
-                    "Should not call set() on ObjectIdProperty that has no SettableBeanProperty");
-        }
-        return idProp.setAndReturn(instance, value);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.java
deleted file mode 100644
index 324683d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-
-import com.fasterxml.jackson.core.JsonParser;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Object that is used to collect arguments for non-default creator
- * (non-default-constructor, or argument-taking factory method)
- * before creator can be called.
- * Since ordering of JSON properties is not guaranteed, this may
- * require buffering of values other than ones being passed to
- * creator.
- */
-public final class PropertyBasedCreator
-{
-    protected final ValueInstantiator _valueInstantiator;
-    
-    /**
-     * Map that contains property objects for either constructor or factory
-     * method (whichever one is null: one property for each
-     * parameter for that one), keyed by logical property name
-     */
-    protected final HashMap<String, SettableBeanProperty> _properties;
-
-    /**
-     * Number of properties: usually same as size of {@link #_properties},
-     * but not necessarily, when we have unnamed injectable properties.
-     */
-    protected final int _propertyCount;
-    
-    /**
-     * If some property values must always have a non-null value (like
-     * primitive types do), this array contains such default values.
-     */
-    protected final Object[]  _defaultValues;
-
-    /**
-     * Array that contains properties that expect value to inject, if any;
-     * null if no injectable values are expected.
-     */
-    protected final SettableBeanProperty[] _propertiesWithInjectables;
-    
-    /*
-    /**********************************************************
-    /* Construction, initialization
-    /**********************************************************
-     */
-    
-    protected PropertyBasedCreator(ValueInstantiator valueInstantiator,
-            SettableBeanProperty[] creatorProps, Object[] defaultValues)
-    {
-        _valueInstantiator = valueInstantiator;
-        _properties = new HashMap<String, SettableBeanProperty>();
-        SettableBeanProperty[] propertiesWithInjectables = null;
-        final int len = creatorProps.length;
-        _propertyCount = len;
-        for (int i = 0; i < len; ++i) {
-            SettableBeanProperty prop = creatorProps[i];
-            _properties.put(prop.getName(), prop);
-            Object injectableValueId = prop.getInjectableValueId();
-            if (injectableValueId != null) {
-                if (propertiesWithInjectables == null) {
-                    propertiesWithInjectables = new SettableBeanProperty[len];
-                }
-                propertiesWithInjectables[i] = prop;
-            }
-        }
-        _defaultValues = defaultValues;
-        _propertiesWithInjectables = propertiesWithInjectables;
-    }
-
-    /**
-     * Factory method used for building actual instances: resolves deserializers
-     * and checks for "null values".
-     */
-    public static PropertyBasedCreator construct(DeserializationContext ctxt,
-            ValueInstantiator valueInstantiator, SettableBeanProperty[] srcProps)
-        throws JsonMappingException
-    {
-        final int len = srcProps.length;
-        SettableBeanProperty[] creatorProps = new SettableBeanProperty[len];
-        Object[] defaultValues = null;
-        for (int i = 0; i < len; ++i) {
-            SettableBeanProperty prop = srcProps[i];
-            if (!prop.hasValueDeserializer()) {
-                prop = prop.withValueDeserializer(ctxt.findContextualValueDeserializer(prop.getType(), prop));
-            }
-            creatorProps[i] = prop;
-            // [JACKSON-372]: primitive types need extra care
-            // [JACKSON-774]: as do non-default nulls...
-            JsonDeserializer<?> deser = prop.getValueDeserializer();
-            Object nullValue = (deser == null) ? null : deser.getNullValue();
-            if ((nullValue == null) && prop.getType().isPrimitive()) {
-                nullValue = ClassUtil.defaultValue(prop.getType().getRawClass());
-            }
-            if (nullValue != null) {
-                if (defaultValues == null) {
-                    defaultValues = new Object[len];
-                }
-                defaultValues[i] = nullValue;
-            }
-        }
-        return new PropertyBasedCreator(valueInstantiator, creatorProps, defaultValues);
-    }
-    
-    public void assignDeserializer(SettableBeanProperty prop, JsonDeserializer<Object> deser) {
-        prop = prop.withValueDeserializer(deser);
-        _properties.put(prop.getName(), prop);
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    public Collection<SettableBeanProperty> properties() {
-        return _properties.values();
-    }
-    
-    public SettableBeanProperty findCreatorProperty(String name) {
-        return _properties.get(name);
-    }
-
-    /*
-    /**********************************************************
-    /* Building process
-    /**********************************************************
-     */
-
-    /**
-     * Method called when starting to build a bean instance.
-     * 
-     * @since 2.1 (added ObjectIdReader parameter -- existed in previous versions without)
-     */
-    public PropertyValueBuffer startBuilding(JsonParser jp, DeserializationContext ctxt,
-            ObjectIdReader oir)
-    {
-        PropertyValueBuffer buffer = new PropertyValueBuffer(jp, ctxt, _propertyCount, oir);
-        if (_propertiesWithInjectables != null) {
-            buffer.inject(_propertiesWithInjectables);
-        }
-        return buffer;
-    }
-
-    public Object build(DeserializationContext ctxt, PropertyValueBuffer buffer) throws IOException
-    {
-        Object bean = _valueInstantiator.createFromObjectWith(ctxt, buffer.getParameters(_defaultValues));
-        // Object Id to handle?
-        bean = buffer.handleIdValue(ctxt, bean);
-        
-        // Anything buffered?
-        for (PropertyValue pv = buffer.buffered(); pv != null; pv = pv.next) {
-            pv.assign(bean);
-        }
-        return bean;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.java
deleted file mode 100644
index 6fb5958..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyBasedObjectIdGenerator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
-// Simple placeholder
-public class PropertyBasedObjectIdGenerator
-	extends ObjectIdGenerators.PropertyGenerator
-{
-    public PropertyBasedObjectIdGenerator(Class<?> scope) {
-        super(scope);
-    }
-    
-    @Override
-    public Object generateId(Object forPojo) {
-    	throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ObjectIdGenerator<Object> forScope(Class<?> scope) {
-        return (scope == _scope) ? this : new PropertyBasedObjectIdGenerator(scope);
-    }
-
-    @Override
-    public ObjectIdGenerator<Object> newForSerialization(Object context) {
-        return this;
-    }
-
-    @Override
-    public com.fasterxml.jackson.annotation.ObjectIdGenerator.IdKey key(Object key) {
-        // should we use general type for all; or type of property itself?
-        return new IdKey(getClass(), _scope, key);
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValue.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValue.java
deleted file mode 100644
index c23f043..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValue.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import com.fasterxml.jackson.databind.deser.SettableAnyProperty;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-
-/**
- * Base class for property values that need to be buffered during
- * deserialization.
- */
-public abstract class PropertyValue
-{
-    public final PropertyValue next;
-
-    /**
-     * Value to assign when POJO has been instantiated.
-     */
-    public final Object value;
-    
-    protected PropertyValue(PropertyValue next, Object value)
-    {
-        this.next = next;
-        this.value = value;
-    }
-
-    /**
-     * Method called to assign stored value of this property to specified
-     * bean instance
-     */
-    public abstract void assign(Object bean)
-        throws IOException, JsonProcessingException;
-
-    /*
-    /**********************************************************
-    /* Concrete property value classes
-    /**********************************************************
-     */
-
-    /**
-     * Property value that used when assigning value to property using
-     * a setter method or direct field access.
-     */
-    final static class Regular
-        extends PropertyValue
-    {
-        final SettableBeanProperty _property;
-        
-        public Regular(PropertyValue next, Object value,
-                       SettableBeanProperty prop)
-        {
-            super(next, value);
-            _property = prop;
-        }
-
-        @Override
-        public void assign(Object bean)
-            throws IOException, JsonProcessingException
-        {
-            _property.set(bean, value);
-        }
-    }
-    
-    /**
-     * Property value type used when storing entries to be added
-     * to a POJO using "any setter" (method that takes name and
-     * value arguments, allowing setting multiple different
-     * properties using single method).
-     */
-    final static class Any
-        extends PropertyValue
-    {
-        final SettableAnyProperty _property;
-        final String _propertyName;
-        
-        public Any(PropertyValue next, Object value,
-                   SettableAnyProperty prop,
-                   String propName)
-        {
-            super(next, value);
-            _property = prop;
-            _propertyName = propName;
-        }
-
-        @Override
-        public void assign(Object bean)
-            throws IOException, JsonProcessingException
-        {
-            _property.set(bean, _propertyName, value);
-        }
-    }
-
-    /**
-     * Property value type used when storing entries to be added
-     * to a Map.
-     */
-    final static class Map
-        extends PropertyValue
-    {
-        final Object _key;
-        
-        public Map(PropertyValue next, Object value, Object key)
-        {
-            super(next, value);
-            _key = key;
-        }
-
-        @SuppressWarnings("unchecked") 
-        @Override
-        public void assign(Object bean)
-            throws IOException, JsonProcessingException
-        {
-            ((java.util.Map<Object,Object>) bean).put(_key, value);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
deleted file mode 100644
index 2ea3815..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.SettableAnyProperty;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-
-/**
- * Simple container used for temporarily buffering a set of
- * <code>PropertyValue</code>s.
- * Using during construction of beans (and Maps) that use Creators, 
- * and hence need buffering before instance (that will have properties
- * to assign values to) is constructed.
- */
-public final class PropertyValueBuffer
-{
-    protected final JsonParser _parser;
-    protected final DeserializationContext _context;
-    
-    /**
-     * Buffer used for storing creator parameters for constructing
-     * instance
-     */
-    protected final Object[] _creatorParameters;
-
-    protected final ObjectIdReader _objectIdReader;
-    
-    /**
-     * Number of creator parameters we are still missing.
-     *<p>
-     * NOTE: assumes there are no duplicates, for now.
-     */
-    private int _paramsNeeded;
-    
-    /**
-     * If we get non-creator parameters before or between
-     * creator parameters, those need to be buffered. Buffer
-     * is just a simple linked list
-     */
-    private PropertyValue _buffered;
-
-    /**
-     * In case there is an Object Id property to handle, this is the value
-     * we have for it.
-     */
-    private Object _idValue;
-    
-    public PropertyValueBuffer(JsonParser jp, DeserializationContext ctxt, int paramCount,
-            ObjectIdReader oir)
-    {
-        _parser = jp;
-        _context = ctxt;
-        _paramsNeeded = paramCount;
-        _objectIdReader = oir;
-        _creatorParameters = new Object[paramCount];
-    }
-
-    public void inject(SettableBeanProperty[] injectableProperties)
-    {
-        for (int i = 0, len = injectableProperties.length; i < len; ++i) {
-            SettableBeanProperty prop = injectableProperties[i];
-            if (prop != null) {
-                // null since there is no POJO yet
-                _creatorParameters[i] = _context.findInjectableValue(prop.getInjectableValueId(),
-                        prop, null);
-            }
-        }
-    }
-    
-    /**
-     * @param defaults If any of parameters requires nulls to be replaced with a non-null
-     *    object (usually primitive types), this is a non-null array that has such replacement
-     *    values (and nulls for cases where nulls are ok)
-     */
-    protected final Object[] getParameters(Object[] defaults)
-    {
-        if (defaults != null) {
-            for (int i = 0, len = _creatorParameters.length; i < len; ++i) {
-                if (_creatorParameters[i] == null) {
-                    Object value = defaults[i];
-                    if (value != null) {
-                        _creatorParameters[i] = value;
-                    }
-                }
-            }
-        }
-        return _creatorParameters;
-    }
-
-
-    /**
-     * Helper method called to see if given non-creator property is the "id property";
-     * and if so, handle appropriately.
-     * 
-     * @since 2.1
-     */
-    public boolean readIdProperty(String propName) throws IOException
-    {
-        if ((_objectIdReader != null) && propName.equals(_objectIdReader.propertyName)) {
-            _idValue = _objectIdReader.deserializer.deserialize(_parser, _context);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Helper method called to handle Object Id value collected earlier, if any
-     */
-    public Object handleIdValue(final DeserializationContext ctxt, Object bean)
-        throws IOException
-    {
-        if (_objectIdReader != null) {
-            if (_idValue != null) {
-                ReadableObjectId roid = ctxt.findObjectId(_idValue, _objectIdReader.generator);
-                roid.bindItem(bean);
-                // also: may need to set a property value as well
-                SettableBeanProperty idProp = _objectIdReader.idProperty;
-                if (idProp != null) {
-                    return idProp.setAndReturn(bean, _idValue);
-                }
-            } else {
-                // TODO: is this an error case?
-            }
-        }
-        return bean;
-    }
-    
-    protected PropertyValue buffered() { return _buffered; }
-
-    public boolean isComplete() { return _paramsNeeded <= 0; }
-    
-    /**
-     * @return True if we have received all creator parameters
-     */
-    public boolean assignParameter(int index, Object value) {
-        _creatorParameters[index] = value;
-        return --_paramsNeeded <= 0;
-    }
-    
-    public void bufferProperty(SettableBeanProperty prop, Object value) {
-        _buffered = new PropertyValue.Regular(_buffered, value, prop);
-    }
-    
-    public void bufferAnyProperty(SettableAnyProperty prop, String propName, Object value) {
-        _buffered = new PropertyValue.Any(_buffered, value, prop, propName);
-    }
-
-    public void bufferMapProperty(Object key, Object value) {
-        _buffered = new PropertyValue.Map(_buffered, value, key);
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ReadableObjectId.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ReadableObjectId.java
deleted file mode 100644
index 90aaa96..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ReadableObjectId.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-
-/**
- * Simple value container for containing information about single
- * Object Id during deserialization.
- */
-public class ReadableObjectId
-{
-    public final Object id;
-    
-    public Object item;
-    
-    public ReadableObjectId(Object id)
-    {
-        this.id = id;
-    }
-
-    /**
-     * Method called to assign actual POJO to which ObjectId refers to:
-     * will also handle referring properties, if any, by assigning POJO.
-     */
-    public void bindItem(Object ob) throws IOException
-    {
-        if (item != null) {
-            throw new IllegalStateException("Already had POJO for id ("+id.getClass().getName()+") ["+id+"]");
-        }
-        item = ob;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.java
deleted file mode 100644
index b742dd8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * This concrete sub-class implements Collection or Map property that is
- * indirectly by getting the property value and directly modifying it.
- */
-public final class SetterlessProperty
-    extends SettableBeanProperty
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final AnnotatedMethod _annotated;
-
-    /**
-     * Get method for accessing property value used to access property
-     * (of Collection or Map type) to modify.
-     */
-    protected final Method _getter;
-
-    public SetterlessProperty(BeanPropertyDefinition propDef, JavaType type,
-            TypeDeserializer typeDeser, Annotations contextAnnotations, AnnotatedMethod method)
-        {
-        super(propDef, type, typeDeser, contextAnnotations);
-        _annotated = method;
-        _getter = method.getAnnotated();
-    }
-
-    protected SetterlessProperty(SetterlessProperty src, JsonDeserializer<?> deser) {
-        super(src, deser);
-        _annotated = src._annotated;
-        _getter = src._getter;
-    }
-
-    protected SetterlessProperty(SetterlessProperty src, String newName) {
-        super(src, newName);
-        _annotated = src._annotated;
-        _getter = src._getter;
-    }
-
-    @Override
-    public SetterlessProperty withName(String newName) {
-        return new SetterlessProperty(this, newName);
-    }
-    
-    @Override
-    public SetterlessProperty withValueDeserializer(JsonDeserializer<?> deser) {
-        return new SetterlessProperty(this, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _annotated.getAnnotation(acls);
-    }
-
-    @Override public AnnotatedMember getMember() {  return _annotated; }
-
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-    
-    @Override
-    public final void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
-            Object instance)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NULL) {
-            /* Hmmh. Is this a problem? We won't be setting anything, so it's
-             * equivalent of empty Collection/Map in this case
-             */
-            return;
-        }
-
-        // Ok: then, need to fetch Collection/Map to modify:
-        Object toModify;
-        try {
-            toModify = _getter.invoke(instance);
-        } catch (Exception e) {
-            _throwAsIOE(e);
-            return; // never gets here
-        }
-        /* Note: null won't work, since we can't then inject anything
-         * in. At least that's not good in common case. However,
-         * theoretically the case where we get JSON null might
-         * be compatible. If so, implementation could be changed.
-         */
-        if (toModify == null) {
-            throw new JsonMappingException("Problem deserializing 'setterless' property '"+getName()+"': get method returned null");
-        }
-        _valueDeserializer.deserialize(jp, ctxt, toModify);
-    }
-
-    @Override
-    public Object deserializeSetAndReturn(JsonParser jp,
-    		DeserializationContext ctxt, Object instance)
-        throws IOException, JsonProcessingException
-    {
-    	deserializeAndSet(jp, ctxt, instance);
-    	return instance;
-    }
-    
-    @Override
-    public final void set(Object instance, Object value)
-        throws IOException
-    {
-        throw new UnsupportedOperationException("Should never call 'set' on setterless property");
-    }
-
-    @Override
-    public Object setAndReturn(Object instance, Object value)
-            throws IOException
-    {
-    	set(instance, value);
-    	return null;
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/TypeWrappedDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/TypeWrappedDeserializer.java
deleted file mode 100644
index b58db0c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/TypeWrappedDeserializer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Simple deserializer that will call configured type deserializer, passing
- * in configured data deserializer, and exposing it all as a simple
- * deserializer.
- * This is necessary when there is no "parent" deserializer which could handle
- * details of calling a {@link TypeDeserializer}, most commonly used with
- * root values.
- */
-public final class TypeWrappedDeserializer
-    extends JsonDeserializer<Object>
-{
-    final TypeDeserializer _typeDeserializer;
-    final JsonDeserializer<Object> _deserializer;
-
-    public TypeWrappedDeserializer(TypeDeserializer typeDeser, JsonDeserializer<Object> deser)
-    {
-        super();
-        _typeDeserializer = typeDeser;
-        _deserializer = deser;
-    }
-
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        return _deserializer.deserializeWithType(jp, ctxt, _typeDeserializer);
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-        TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-    {
-        // should never happen? (if it can, could call on that object)
-        throw new IllegalStateException("Type-wrapped deserializer's deserializeWithType should never get called");
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.java
deleted file mode 100644
index b8d02ba..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/UnwrappedPropertyHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Object that is responsible for handling acrobatics related to
- * deserializing "unwrapped" values; sets of properties that are
- * embedded (inlined) as properties of parent JSON object.
- */
-public class UnwrappedPropertyHandler
-{
-    protected final ArrayList<SettableBeanProperty> _properties = new ArrayList<SettableBeanProperty>();
-    
-    public UnwrappedPropertyHandler()  { }
-
-    public void addProperty(SettableBeanProperty property) {
-        _properties.add(property);
-    }
-
-    public void renameAll(NameTransformer transformer)
-    {
-        ArrayList<SettableBeanProperty> oldProps = new ArrayList<SettableBeanProperty>(_properties);
-        Iterator<SettableBeanProperty> it = oldProps.iterator();
-        _properties.clear();
-        while (it.hasNext()) {
-            SettableBeanProperty prop = it.next();
-            String newName = transformer.transform(prop.getName());
-            prop = prop.withName(newName);
-            JsonDeserializer<?> deser = prop.getValueDeserializer();
-            if (deser != null) {
-                @SuppressWarnings("unchecked")
-                JsonDeserializer<Object> newDeser = (JsonDeserializer<Object>)
-                    deser.unwrappingDeserializer(transformer);
-                if (newDeser != deser) {
-                    prop = prop.withValueDeserializer(newDeser);
-                }
-            }
-            _properties.add(prop);
-        }
-    }
-    
-    public Object processUnwrapped(JsonParser originalParser, DeserializationContext ctxt, Object bean,
-            TokenBuffer buffered)
-        throws IOException, JsonProcessingException
-    {
-        for (int i = 0, len = _properties.size(); i < len; ++i) {
-            SettableBeanProperty prop = _properties.get(i);
-            JsonParser jp = buffered.asParser();
-            jp.nextToken();
-            prop.deserializeAndSet(jp, ctxt, bean);
-        }
-        return bean;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ValueInjector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ValueInjector.java
deleted file mode 100644
index ec47acd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/ValueInjector.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fasterxml.jackson.databind.deser.impl;
-
-import java.io.IOException;
-
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Class that encapsulates details of value injection that occurs before
- * deserialization of a POJO. Details include information needed to find
- * injectable value (logical id) as well as method used for assigning
- * value (setter or field)
- */
-public class ValueInjector
-    extends BeanProperty.Std
-{
-    /**
-     * Identifier used for looking up value to inject
-     */
-    protected final Object _valueId;
-
-    public ValueInjector(String propertyName, JavaType type,
-            Annotations contextAnnotations, AnnotatedMember mutator,
-            Object valueId)
-    {
-        super(propertyName, type, contextAnnotations, mutator);
-        _valueId = valueId;
-    }
-
-    public Object findValue(DeserializationContext context, Object beanInstance)
-    {
-        return context.findInjectableValue(_valueId, this, beanInstance);
-    }
-    
-    public void inject(DeserializationContext context, Object beanInstance)
-        throws IOException
-    {
-        _member.setValue(beanInstance, findValue(context, beanInstance));
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/package-info.java
deleted file mode 100644
index 5ce9e49..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/impl/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Contains those implementation classes of deserialization part of 
- * data binding that are not considered part of public or semi-public
- * interfaces. Use of these classes by non-core classes is discouraged,
- * although occasionally this may be necessary.
- * Note that backwards-compatibility of these classes is not guaranteed
- * between minor releases (but is between patch releases).
- */
-package com.fasterxml.jackson.databind.deser.impl;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/package-info.java
deleted file mode 100644
index 3bba0d0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Contains implementation classes of deserialization part of 
- * data binding.
- */
-package com.fasterxml.jackson.databind.deser;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ClassDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ClassDeserializer.java
deleted file mode 100644
index c50a167..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ClassDeserializer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-@JacksonStdImpl
-public class ClassDeserializer
-    extends StdScalarDeserializer<Class<?>>
-{
-    public ClassDeserializer() { super(Class.class); }
-
-    @Override
-    public Class<?> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken curr = jp.getCurrentToken();
-        // Currently will only accept if given simple class name
-        if (curr == JsonToken.VALUE_STRING) {
-            String className = jp.getText().trim();
-            try {
-                return ctxt.findClass(className);
-            } catch (Exception e) {
-                throw ctxt.instantiationException(_valueClass, ClassUtil.getRootCause(e));
-            }
-        }
-        throw ctxt.mappingException(_valueClass, curr);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java
deleted file mode 100644
index a264463..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Basic serializer that can take JSON "Array" structure and
- * construct a {@link java.util.Collection} instance, with typed contents.
- *<p>
- * Note: for untyped content (one indicated by passing Object.class
- * as the type), {@link UntypedObjectDeserializer} is used instead.
- * It can also construct {@link java.util.List}s, but not with specific
- * POJO types, only other containers and primitives/wrappers.
- */
-@JacksonStdImpl
-public class CollectionDeserializer
-    extends ContainerDeserializerBase<Collection<Object>>
-    implements ContextualDeserializer
-{
-    // // Configuration
-
-    protected final JavaType _collectionType;
-    
-    /**
-     * Value deserializer.
-     */
-    protected final JsonDeserializer<Object> _valueDeserializer;
-
-    /**
-     * If element instances have polymorphic type information, this
-     * is the type deserializer that can handle it
-     */
-    protected final TypeDeserializer _valueTypeDeserializer;
-
-    // // Instance construction settings:
-    
-    protected final ValueInstantiator _valueInstantiator;
-    
-    /**
-     * Deserializer that is used iff delegate-based creator is
-     * to be used for deserializing from JSON Object.
-     */
-    protected final JsonDeserializer<Object> _delegateDeserializer;
-
-    // NOTE: no PropertyBasedCreator, as JSON Arrays have no properties
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * Constructor for context-free instances, where we do not yet know
-     * which property is using this deserializer.
-     */
-    public CollectionDeserializer(JavaType collectionType,
-            JsonDeserializer<Object> valueDeser,
-            TypeDeserializer valueTypeDeser, ValueInstantiator valueInstantiator)
-    {
-        this(collectionType, valueDeser, valueTypeDeser, valueInstantiator, null);
-    }
-
-    /**
-     * Constructor used when creating contextualized instances.
-     */
-    protected CollectionDeserializer(JavaType collectionType,
-            JsonDeserializer<Object> valueDeser, TypeDeserializer valueTypeDeser,
-            ValueInstantiator valueInstantiator,
-            JsonDeserializer<Object> delegateDeser)
-    {
-        super(collectionType.getRawClass());
-        _collectionType = collectionType;
-        _valueDeserializer = valueDeser;
-        _valueTypeDeserializer = valueTypeDeser;
-        _valueInstantiator = valueInstantiator;
-        _delegateDeserializer = delegateDeser;
-    }
-
-    /**
-     * Copy-constructor that can be used by sub-classes to allow
-     * copy-on-write styling copying of settings of an existing instance.
-     */
-    protected CollectionDeserializer(CollectionDeserializer src)
-    {
-        super(src._valueClass);
-        _collectionType = src._collectionType;
-        _valueDeserializer = src._valueDeserializer;
-        _valueTypeDeserializer = src._valueTypeDeserializer;
-        _valueInstantiator = src._valueInstantiator;
-        _delegateDeserializer = src._delegateDeserializer;
-    }
-
-    /**
-     * Fluent-factory method call to construct contextual instance.
-     */
-    @SuppressWarnings("unchecked")
-    protected CollectionDeserializer withResolved(JsonDeserializer<?> dd,
-            JsonDeserializer<?> vd, TypeDeserializer vtd)
-    {
-        if ((dd == _delegateDeserializer) && (vd == _valueDeserializer) && (vtd == _valueTypeDeserializer)) {
-            return this;
-        }
-        return new CollectionDeserializer(_collectionType,
-                (JsonDeserializer<Object>) vd, vtd,
-                _valueInstantiator, (JsonDeserializer<Object>) dd);
-                
-    }
-    
-    /*
-    /**********************************************************
-    /* Validation, post-processing (ResolvableDeserializer)
-    /**********************************************************
-     */
-
-    /**
-     * Method called to finalize setup of this deserializer,
-     * when it is known for which property deserializer is needed
-     * for.
-     */
-//    @Override
-    public CollectionDeserializer createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        // May need to resolve types for delegate-based creators:
-        JsonDeserializer<Object> delegateDeser = null;
-        if ((_valueInstantiator != null) && _valueInstantiator.canCreateUsingDelegate()) {
-            JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
-            if (delegateType == null) {
-                throw new IllegalArgumentException("Invalid delegate-creator definition for "+_collectionType
-                        +": value instantiator ("+_valueInstantiator.getClass().getName()
-                        +") returned true for 'canCreateUsingDelegate()', but null for 'getDelegateType()'");
-            }
-            delegateDeser = findDeserializer(ctxt, delegateType, property);
-        }
-        // also, often value deserializer is resolved here:
-        JsonDeserializer<?> valueDeser = _valueDeserializer;
-        if (valueDeser == null) {
-            valueDeser = ctxt.findContextualValueDeserializer(
-                    _collectionType.getContentType(), property);
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (valueDeser instanceof ContextualDeserializer) {
-                valueDeser = ((ContextualDeserializer) valueDeser).createContextual(ctxt, property);
-            }
-        }
-        // and finally, type deserializer needs context as well
-        TypeDeserializer valueTypeDeser = _valueTypeDeserializer;
-        if (valueTypeDeser != null) {
-            valueTypeDeser = valueTypeDeser.forProperty(property);
-        }
-        return withResolved(delegateDeser, valueDeser, valueTypeDeser);
-    }
-    
-    /*
-    /**********************************************************
-    /* ContainerDeserializerBase API
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return _collectionType.getContentType();
-    }
-
-    @Override
-    public JsonDeserializer<Object> getContentDeserializer() {
-        return _valueDeserializer;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer API
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public Collection<Object> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            return (Collection<Object>) _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        /* [JACKSON-620]: empty String may be ok; bit tricky to check, however, since
-         *  there is also possibility of "auto-wrapping" of single-element arrays.
-         *  Hence we only accept empty String here.
-         */
-        if (jp.getCurrentToken() == JsonToken.VALUE_STRING) {
-            String str = jp.getText();
-            if (str.length() == 0) {
-                return (Collection<Object>) _valueInstantiator.createFromString(ctxt, str);
-            }
-        }
-        return deserialize(jp, ctxt, (Collection<Object>) _valueInstantiator.createUsingDefault(ctxt));
-    }
-
-    @Override
-    public Collection<Object> deserialize(JsonParser jp, DeserializationContext ctxt,
-            Collection<Object> result)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_ARRAY (or equivalent)
-        if (!jp.isExpectedStartArrayToken()) {
-            return handleNonArray(jp, ctxt, result);
-        }
-
-        JsonDeserializer<Object> valueDes = _valueDeserializer;
-        JsonToken t;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
-
-        while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-            Object value;
-            
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else if (typeDeser == null) {
-                value = valueDes.deserialize(jp, ctxt);
-            } else {
-                value = valueDes.deserializeWithType(jp, ctxt, typeDeser);
-            }
-            result.add(value);
-        }
-        return result;
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // In future could check current token... for now this should be enough:
-        return typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-    }
-
-    /**
-     * Helper method called when current token is no START_ARRAY. Will either
-     * throw an exception, or try to handle value as if member of implicit
-     * array, depending on configuration.
-     */
-    private final Collection<Object> handleNonArray(JsonParser jp, DeserializationContext ctxt,
-            Collection<Object> result)
-        throws IOException, JsonProcessingException
-    {
-        // [JACKSON-526]: implicit arrays from single values?
-        if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-            throw ctxt.mappingException(_collectionType.getRawClass());
-        }
-        JsonDeserializer<Object> valueDes = _valueDeserializer;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
-        JsonToken t = jp.getCurrentToken();
-
-        Object value;
-        
-        if (t == JsonToken.VALUE_NULL) {
-            value = null;
-        } else if (typeDeser == null) {
-            value = valueDes.deserialize(jp, ctxt);
-        } else {
-            value = valueDes.deserializeWithType(jp, ctxt, typeDeser);
-        }
-        result.add(value);
-        return result;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.java
deleted file mode 100644
index 93cdf04..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ContainerDeserializerBase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-/**
- * Intermediate base deserializer class that adds more shared accessor
- * so that other classes can access information about contained (value)
- * types
- */
-@SuppressWarnings("serial")
-public abstract class ContainerDeserializerBase<T>
-    extends StdDeserializer<T>
-{
-    protected ContainerDeserializerBase(Class<?> selfType)
-    {
-        super(selfType);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for declared type of contained value elements; either exact
-     * type, or one of its supertypes.
-     */
-    public abstract JavaType getContentType();
-
-    /**
-     * Accesor for deserializer use for deserializing content values.
-     */
-    public abstract JsonDeserializer<Object> getContentDeserializer();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DateDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DateDeserializers.java
deleted file mode 100644
index 1ebce19..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DateDeserializers.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-
-/**
- * Container class for core JDK date/time type deserializers.
- */
-@SuppressWarnings("serial")
-public class DateDeserializers
-{
-    public static StdDeserializer<?>[] all()
-    {
-        return  new StdDeserializer[] {
-            new CalendarDeserializer(), // for nominal type of java.util.Calendar
-            new DateDeserializer(),
-            /* 24-Jan-2010, tatu: When including type information, we may
-             *    know that we specifically need GregorianCalendar...
-             */
-            new CalendarDeserializer(GregorianCalendar.class),
-            new SqlDateDeserializer(),
-            new TimestampDeserializer(),
-            new TimeZoneDeserializer()
-        };
-    }
-
-    /*
-    /**********************************************************
-    /* Intermediate class for Date-based ones
-    /**********************************************************
-     */
-
-    protected abstract static class DateBasedDeserializer<T>
-        extends StdScalarDeserializer<T>
-        implements ContextualDeserializer
-    {
-        /**
-         * Specific format to use, if non-null; if null will
-         * just use default format.
-         */
-        protected final DateFormat _customFormat;
-
-        /**
-         * Let's also keep format String for reference, to use for error messages
-         */
-        protected final String _formatString;
-        
-        protected DateBasedDeserializer(Class<?> clz) {
-            super(clz);
-            _customFormat = null;
-            _formatString = null;
-        }
-
-        protected DateBasedDeserializer(DateBasedDeserializer<T> base,
-                DateFormat format, String formatStr) {
-            super(base._valueClass);
-            _customFormat = format;
-            _formatString = formatStr;
-        }
-
-        protected abstract DateBasedDeserializer<T> withDateFormat(DateFormat df, String formatStr);
-        
-//      @Override
-        public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
-           throws JsonMappingException
-        {
-            if (property != null) {
-                JsonFormat.Value format = ctxt.getAnnotationIntrospector().findFormat((Annotated) property.getMember());
-                if (format != null) {
-                    TimeZone tz = format.getTimeZone();
-                    // First: fully custom pattern?
-                    String pattern = format.getPattern();
-                    if (pattern.length() > 0){
-                        Locale loc = format.getLocale();
-                        if (loc == null) {
-                            loc = ctxt.getLocale();
-                        }
-                        SimpleDateFormat df = new SimpleDateFormat(pattern, loc);
-                        if (tz == null) {
-                            tz = ctxt.getTimeZone();
-                        }
-                        df.setTimeZone(tz);
-                        return withDateFormat(df, pattern);
-                    }
-                    // But if not, can still override timezone
-                    if (tz != null) {
-                        DateFormat df = ctxt.getConfig().getDateFormat();
-                        // one shortcut: with our custom format, can simplify handling a bit
-                        if (df.getClass() == StdDateFormat.class) {
-                            df = ((StdDateFormat) df).withTimeZone(tz);
-                        } else {
-                            // otherwise need to clone, re-set timezone:
-                            df = (DateFormat) df.clone();
-                            df.setTimeZone(tz);
-                        }
-                        return withDateFormat(df, pattern);
-                    }
-                }
-            }
-            return this;
-        }
-        
-        @Override
-        protected java.util.Date _parseDate(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (_customFormat != null && jp.getCurrentToken() == JsonToken.VALUE_STRING) {
-                String str = jp.getText().trim();
-                if (str.length() == 0) {
-                    return (Date) getEmptyValue();
-                }
-                synchronized (_customFormat) {
-                    try {
-                        return _customFormat.parse(str);
-                    } catch (ParseException e) {
-                        throw new IllegalArgumentException("Failed to parse Date value '"+str
-                                +"' (format: \""+_formatString+"\"): "+e.getMessage());
-                    }
-                }
-            }
-            return super._parseDate(jp, ctxt);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializer implementations for Date types
-    /**********************************************************
-     */
-    
-    @JacksonStdImpl
-    public static class CalendarDeserializer
-        extends DateBasedDeserializer<Calendar>
-    {
-        /**
-         * We may know actual expected type; if so, it will be
-         * used for instantiation.
-         */
-        protected final Class<? extends Calendar> _calendarClass;
-        
-        public CalendarDeserializer() {
-            super(Calendar.class);
-            _calendarClass = null;
-        }
-
-        public CalendarDeserializer(Class<? extends Calendar> cc) {
-            super(cc);
-            _calendarClass = cc;
-        }
-
-        public CalendarDeserializer(CalendarDeserializer src, DateFormat df, String formatString) {
-            super(src, df, formatString);
-            _calendarClass = src._calendarClass;
-        }
-
-        @Override
-        protected CalendarDeserializer withDateFormat(DateFormat df, String formatString) {
-            return new CalendarDeserializer(this, df, formatString);
-        }
-        
-        @Override
-        public Calendar deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            Date d = _parseDate(jp, ctxt);
-            if (d == null) {
-                return null;
-            }
-            if (_calendarClass == null) {
-                return ctxt.constructCalendar(d);
-            }
-            try {
-                Calendar c = _calendarClass.newInstance();            
-                c.setTimeInMillis(d.getTime());
-                return c;
-            } catch (Exception e) {
-                throw ctxt.instantiationException(_calendarClass, e);
-            }
-        }
-    }
-
-    /**
-     * Simple deserializer for handling {@link java.util.Date} values.
-     *<p>
-     * One way to customize Date formats accepted is to override method
-     * {@link DeserializationContext#parseDate} that this basic
-     * deserializer calls.
-     */
-    public static class DateDeserializer
-        extends DateBasedDeserializer<Date>
-    {
-        public DateDeserializer() { super(Date.class); }
-        public DateDeserializer(DateDeserializer base, DateFormat df, String formatString) {
-            super(base, df, formatString);
-        }
-
-        @Override
-        protected DateDeserializer withDateFormat(DateFormat df, String formatString) {
-            return new DateDeserializer(this, df, formatString);
-        }
-        
-        @Override
-        public java.util.Date deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseDate(jp, ctxt);
-        }
-    }
-
-    /**
-     * Compared to plain old {@link java.util.Date}, SQL version is easier
-     * to deal with: mostly because it is more limited.
-     */
-    public static class SqlDateDeserializer
-        extends DateBasedDeserializer<java.sql.Date>
-    {
-        public SqlDateDeserializer() { super(java.sql.Date.class); }
-        public SqlDateDeserializer(SqlDateDeserializer src, DateFormat df, String formatString) {
-            super(src, df, formatString);
-        }
-
-        @Override
-        protected SqlDateDeserializer withDateFormat(DateFormat df, String formatString) {
-            return new SqlDateDeserializer(this, df, formatString);
-        }
-        
-        @Override
-        public java.sql.Date deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            Date d = _parseDate(jp, ctxt);
-            return (d == null) ? null : new java.sql.Date(d.getTime());
-        }
-    }
-
-    /**
-     * Simple deserializer for handling {@link java.sql.Timestamp} values.
-     *<p>
-     * One way to customize Timestamp formats accepted is to override method
-     * {@link DeserializationContext#parseDate} that this basic
-     * deserializer calls.
-     */
-    public static class TimestampDeserializer
-        extends DateBasedDeserializer<Timestamp>
-    {
-        public TimestampDeserializer() { super(Timestamp.class); }
-        public TimestampDeserializer(TimestampDeserializer src, DateFormat df, String formatString) {
-            super(src, df, formatString);
-        }
-
-        @Override
-        protected TimestampDeserializer withDateFormat(DateFormat df, String formatString) {
-            return new TimestampDeserializer(this, df, formatString);
-        }
-        
-        @Override
-        public java.sql.Timestamp deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return new Timestamp(_parseDate(jp, ctxt).getTime());
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Deserializer implementations for Date-related types
-    /**********************************************************
-     */
-    
-    /**
-     * As per [JACKSON-522], also need special handling for TimeZones
-     */
-    protected static class TimeZoneDeserializer
-        extends FromStringDeserializer<TimeZone>
-    {
-        public TimeZoneDeserializer() { super(TimeZone.class); }
-
-        @Override
-        protected TimeZone _deserialize(String value, DeserializationContext ctxt)
-            throws IOException
-        {
-            return TimeZone.getTimeZone(value);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.java
deleted file mode 100644
index fd69104..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/DelegatingDeserializer.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Base class that simplifies implementations of {@link JsonDeserializer}s
- * that mostly delegate functionality to another deserializer implementation
- * (possibly forming a chaing of deserializers delegating functionality
- * in some cases)
- * 
- * @since 2.1
- */
-public abstract class DelegatingDeserializer
-    extends StdDeserializer<Object>
-    implements ContextualDeserializer, ResolvableDeserializer
-{
-    protected final JsonDeserializer<?> _delegatee;
-    
-    /*
-    /**********************************************************************
-    /* Construction
-    /**********************************************************************
-     */
-
-    public DelegatingDeserializer(JsonDeserializer<?> delegatee)
-    {
-        super(_figureType(delegatee));
-        _delegatee = delegatee;
-    }
-
-    protected abstract JsonDeserializer<?> newDelegatingInstance(JsonDeserializer<?> newDelegatee);
-    
-    private static Class<?> _figureType(JsonDeserializer<?> deser)
-    {
-        if (deser instanceof StdDeserializer<?>) {
-            return ((StdDeserializer<?>) deser).getValueClass();
-        }
-        return Object.class;
-    }
-    
-    /*
-    /**********************************************************************
-    /* Overridden methods for contextualization, resolving
-    /**********************************************************************
-     */
-
-    public void resolve(DeserializationContext ctxt) throws JsonMappingException {
-        if (_delegatee instanceof ResolvableDeserializer) {
-            ((ResolvableDeserializer) _delegatee).resolve(ctxt);
-        }
-    }
-
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        JsonDeserializer<?> del = _delegatee;
-        if (del instanceof ContextualDeserializer) {
-            del = ((ContextualDeserializer) del).createContextual(ctxt, property);
-        }
-        return _createContextual(ctxt, property, del);
-    }
-
-    protected JsonDeserializer<?> _createContextual(DeserializationContext ctxt,
-            BeanProperty property, JsonDeserializer<?> newDelegatee)
-    {
-        if (newDelegatee == _delegatee) {
-            return this;
-        }
-        return newDelegatingInstance(newDelegatee);
-    }
-
-    /*
-    /**********************************************************************
-    /* Overridden deserialization methods
-    /**********************************************************************
-     */
-
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _delegatee.deserialize(jp,  ctxt);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt,
-            Object intoValue)
-        throws IOException, JsonProcessingException
-    {
-        return ((JsonDeserializer<Object>)_delegatee).deserialize(jp, ctxt, intoValue);
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        return _delegatee.deserializeWithType(jp, ctxt, typeDeserializer);
-    }
-
-    /*
-    /**********************************************************************
-    /* Overridden other methods
-    /**********************************************************************
-     */
-
-    @Override
-    public JsonDeserializer<?> replaceDelegatee(JsonDeserializer<?> delegatee)
-    {
-        if (delegatee == _delegatee) {
-            return this;
-        }
-        return newDelegatingInstance(delegatee);
-    }
-
-    @Override
-    public Object getNullValue() { return _delegatee.getNullValue(); }
-
-    @Override
-    public Object getEmptyValue() { return _delegatee.getEmptyValue(); }
-
-    @Override
-    public Collection<Object> getKnownPropertyNames() { return _delegatee.getKnownPropertyNames(); }
-    
-    @Override
-    public boolean isCachable() { return false; }
-
-    @Override
-    public ObjectIdReader getObjectIdReader() { return _delegatee.getObjectIdReader(); }
-
-    @Override
-    public JsonDeserializer<?> getDelegatee() {
-        return _delegatee;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java
deleted file mode 100644
index 01a94e8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.EnumResolver;
-
-/**
- * Deserializer class that can deserialize instances of
- * specified Enum class from Strings and Integers.
- */
-public class EnumDeserializer
-    extends StdScalarDeserializer<Enum<?>>
-{
-    protected final EnumResolver<?> _resolver;
-    
-    public EnumDeserializer(EnumResolver<?> res)
-    {
-        super(Enum.class);
-        _resolver = res;
-    }
-
-    /**
-     * Factory method used when Enum instances are to be deserialized
-     * using a creator (static factory method)
-     * 
-     * @return Deserializer based on given factory method, if type was suitable;
-     *  null if type can not be used
-     */
-    public static JsonDeserializer<?> deserializerForCreator(DeserializationConfig config,
-            Class<?> enumClass, AnnotatedMethod factory)
-    {
-        
-        // note: caller has verified there's just one arg; but we must verify its type
-        Class<?> paramClass = factory.getRawParameterType(0);
-        if (paramClass == String.class) {
-            paramClass = null;
-        } else  if (paramClass == Integer.TYPE || paramClass == Integer.class) {
-            paramClass = Integer.class;
-        } else  if (paramClass == Long.TYPE || paramClass == Long.class) {
-            paramClass = Long.class;
-        } else {
-            throw new IllegalArgumentException("Parameter #0 type for factory method ("+factory
-                    +") not suitable, must be java.lang.String or int/Integer/long/Long");
-        }
-        if (config.canOverrideAccessModifiers()) {
-            ClassUtil.checkAndFixAccess(factory.getMember());
-        }
-        return new FactoryBasedDeserializer(enumClass, factory, paramClass);
-    }
-    
-    /*
-    /**********************************************************
-    /* Default JsonDeserializer implementation
-    /**********************************************************
-     */
-
-    /**
-     * Because of costs associated with constructing Enum resolvers,
-     * let's cache instances by default.
-     */
-    @Override
-    public boolean isCachable() { return true; }
-    
-    @Override
-    public Enum<?> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken curr = jp.getCurrentToken();
-        
-        // Usually should just get string value:
-        if (curr == JsonToken.VALUE_STRING || curr == JsonToken.FIELD_NAME) {
-            String name = jp.getText();
-            Enum<?> result = _resolver.findEnum(name);
-            if (result == null  && !ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                throw ctxt.weirdStringException(name, _resolver.getEnumClass(),
-                        "value not one of declared Enum instance names");
-            }
-            return result;
-        }
-        // But let's consider int acceptable as well (if within ordinal range)
-        if (curr == JsonToken.VALUE_NUMBER_INT) {
-            /* ... unless told not to do that. :-)
-             * (as per [JACKSON-412]
-             */
-            if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
-                throw ctxt.mappingException("Not allowed to deserialize Enum value out of JSON number (disable DeserializationConfig.DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS to allow)");
-            }
-            
-            int index = jp.getIntValue();
-            Enum<?> result = _resolver.getEnum(index);
-            if (result == null && !ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                throw ctxt.weirdNumberException(Integer.valueOf(index), _resolver.getEnumClass(),
-                        "index value outside legal index range [0.."+_resolver.lastValidIndex()+"]");
-            }
-            return result;
-        }
-        throw ctxt.mappingException(_resolver.getEnumClass());
-    }
-
-    /*
-    /**********************************************************
-    /* Default JsonDeserializer implementation
-    /**********************************************************
-     */
-
-    /**
-     * Deserializer that uses a single-String static factory method
-     * for locating Enum values by String id.
-     */
-    protected static class FactoryBasedDeserializer
-        extends StdScalarDeserializer<Object>
-    {
-        protected final Class<?> _enumClass;
-        // Marker type; null if String expected; otherwise numeric wrapper
-        protected final Class<?> _inputType;
-        protected final Method _factory;
-        
-        public FactoryBasedDeserializer(Class<?> cls, AnnotatedMethod f,
-                Class<?> inputType)
-        {
-            super(Enum.class);
-            _enumClass = cls;
-            _factory = f.getAnnotated();
-            _inputType = inputType;
-        }
-
-        @Override
-        public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // couple of accepted types...
-            Object value;
-            if (_inputType == null) {
-                value = jp.getText();
-            } else  if (_inputType == Integer.class) {
-                value = Integer.valueOf(jp.getValueAsInt());
-            } else  if (_inputType == Long.class) {
-                value = Long.valueOf(jp.getValueAsLong());
-            } else {
-                throw ctxt.mappingException(_enumClass);
-            }
-            try {
-                return _factory.invoke(_enumClass, value);
-            } catch (Exception e) {
-                ClassUtil.unwrapAndThrowAsIAE(e);
-            }
-            return null;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
deleted file mode 100644
index 96f72d2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Deserializer for {@link EnumMap} values.
- * <p>
- * Note: casting within this class is all messed up -- just could not figure out a way
- * to properly deal with recursive definition of "EnumMap<K extends Enum<K>, V>
- * 
- * @author tsaloranta
- */
-@SuppressWarnings({ "unchecked", "rawtypes" }) 
-public class EnumMapDeserializer
-    extends StdDeserializer<EnumMap<?,?>>
-    implements ContextualDeserializer
-{
-    protected final JavaType _mapType;
-    
-    protected final Class<?> _enumClass;
-
-    protected JsonDeserializer<Enum<?>> _keyDeserializer;
-
-    protected JsonDeserializer<Object> _valueDeserializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public EnumMapDeserializer(JavaType mapType,
-            JsonDeserializer<?> keyDeserializer, JsonDeserializer<?> valueDeser)
-    {
-        super(EnumMap.class);
-        _mapType = mapType;
-        _enumClass = mapType.getKeyType().getRawClass();
-        _keyDeserializer = (JsonDeserializer<Enum<?>>) keyDeserializer;
-        _valueDeserializer = (JsonDeserializer<Object>) valueDeser;
-    }
-
-    public EnumMapDeserializer withResolved(JsonDeserializer<?> keyDeserializer,
-            JsonDeserializer<?> valueDeserializer)
-    {
-        if ((keyDeserializer == _keyDeserializer) && valueDeserializer == _valueDeserializer) {
-            return this;
-        }
-        return new EnumMapDeserializer(_mapType,
-                keyDeserializer, valueDeserializer);
-    }
-    
-    /**
-     * Method called to finalize setup of this deserializer,
-     * when it is known for which property deserializer is needed for.
-     */
-//  @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        // note: instead of finding key deserializer, with enums we actually
-        // work with regular deserializers (less code duplication; but not
-        // quite as clean as it ought to be)
-        JsonDeserializer<?> kd = _keyDeserializer;
-        if (kd == null) {
-            kd = ctxt.findContextualValueDeserializer(_mapType.getKeyType(), property);
-        }
-        JsonDeserializer<?> vd = _valueDeserializer;
-        if (vd == null) {
-            vd = ctxt.findContextualValueDeserializer(_mapType.getContentType(), property);
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (vd instanceof ContextualDeserializer) {
-                vd = ((ContextualDeserializer) vd).createContextual(ctxt, property);
-            }
-        }
-
-        return withResolved(kd, vd);
-    }
-    
-    /**
-     * Because of costs associated with constructing Enum resolvers,
-     * let's cache instances by default.
-     */
-    @Override
-    public boolean isCachable() { return true; }
-    
-    /*
-    /**********************************************************
-    /* Actual deserialization
-    /**********************************************************
-     */
-
-    @Override
-    public EnumMap<?,?> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_OBJECT
-        if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
-            throw ctxt.mappingException(EnumMap.class);
-        }
-        EnumMap result = constructMap();
-
-        while ((jp.nextToken()) != JsonToken.END_OBJECT) {
-            Enum<?> key = _keyDeserializer.deserialize(jp, ctxt);
-            if (key == null) {
-                if (!ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                    String value = null;
-                    try { // bit ugly, but will have to do; works with usual scalars
-                        if (jp.hasCurrentToken()) {
-                            value = jp.getText();
-                        }
-                    } catch (Exception e) { }
-                    throw ctxt.weirdStringException(value, _enumClass, "value not one of declared Enum instance names");
-                }
-                /* 24-Mar-2012, tatu: Null won't work as a key anyway, so let's
-                 *  just skip the entry then. But we must skip the value then.
-                 */
-                jp.nextToken();
-                jp.skipChildren();
-                continue;
-            }
-            // And then the value...
-            JsonToken t = jp.nextToken();
-            /* note: MUST check for nulls separately: deserializers will
-             * not handle them (and maybe fail or return bogus data)
-             */
-            Object value = (t == JsonToken.VALUE_NULL) ?
-                null :  _valueDeserializer.deserialize(jp, ctxt);
-            result.put(key, value);
-        }
-        return result;
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // In future could check current token... for now this should be enough:
-        return typeDeserializer.deserializeTypedFromObject(jp, ctxt);
-    }
-    
-    private EnumMap<?,?> constructMap() {
-        return new EnumMap(_enumClass);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java
deleted file mode 100644
index e3ff4f3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Standard deserializer for {@link EnumSet}s.
- * <p>
- * Note: casting within this class is all messed up -- just could not figure out a way
- * to properly deal with recursive definition of "EnumSet<K extends Enum<K>, V>
- */
-@SuppressWarnings("rawtypes")
-public class EnumSetDeserializer
-    extends StdDeserializer<EnumSet<?>>
-    implements ContextualDeserializer
-{
-    protected final JavaType _enumType;
-
-    protected final Class<Enum> _enumClass;
-
-    protected JsonDeserializer<Enum<?>> _enumDeserializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked" )
-    public EnumSetDeserializer(JavaType enumType, JsonDeserializer<?> deser)
-    {
-        super(EnumSet.class);
-        _enumType = enumType;
-        _enumClass = (Class<Enum>) enumType.getRawClass();
-        _enumDeserializer = (JsonDeserializer<Enum<?>>) deser;
-    }
-
-    public EnumSetDeserializer withDeserializer(JsonDeserializer<?> deser) {
-        if (_enumDeserializer == deser) {
-            return this;
-        }
-        return new EnumSetDeserializer(_enumType, deser);
-    }
-    
-    /**
-     * Because of costs associated with constructing Enum resolvers,
-     * let's cache instances by default.
-     */
-    @Override
-    public boolean isCachable() { return true; }
-    
-//    @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        JsonDeserializer<?> deser = _enumDeserializer;
-        if (deser == null) {
-            deser = ctxt.findContextualValueDeserializer(_enumType, property);
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (deser instanceof ContextualDeserializer) {
-                deser = ((ContextualDeserializer) deser).createContextual(ctxt, property);
-            }
-        }
-        return withDeserializer(deser);
-    }
-
-    /*
-    /**********************************************************
-    /* JsonDeserializer API
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked") 
-    @Override
-    public EnumSet<?> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_ARRAY (or equivalent)
-        if (!jp.isExpectedStartArrayToken()) {
-            throw ctxt.mappingException(EnumSet.class);
-        }
-        EnumSet result = constructSet();
-        JsonToken t;
-
-        while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-            /* What to do with nulls? Fail or ignore? Fail, for now
-             * (note: would fail if we passed it to EnumDeserializer, too,
-             * but in general nulls should never be passed to non-container
-             * deserializers)
-             */
-            if (t == JsonToken.VALUE_NULL) {
-                throw ctxt.mappingException(_enumClass);
-            }
-            Enum<?> value = _enumDeserializer.deserialize(jp, ctxt);
-            /* 24-Mar-2012, tatu: As per [JACKSON-810], may actually get nulls;
-             *    but EnumSets don't allow nulls so need to skip.
-             */
-            if (value != null) { 
-                result.add(value);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        return typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-    }
-    
-    @SuppressWarnings("unchecked") 
-    private EnumSet constructSet()
-    {
-    	// superbly ugly... but apparently necessary
-    	return EnumSet.noneOf(_enumClass);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java
deleted file mode 100644
index 3d9ce46..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-
-/**
- * Base class for simple deserializers that only accept JSON String
- * values as the source.
- */
-public abstract class FromStringDeserializer<T>
-    extends StdScalarDeserializer<T>
-{
-    protected FromStringDeserializer(Class<?> vc) {
-        super(vc);
-    }
-
-    /*
-    /**********************************************************
-    /* Deserializer implementations
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public final T deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // 22-Sep-2012, tatu: For 2.1, use this new method, may force coercion:
-        String text = jp.getValueAsString();
-        if (text != null) { // has String representation
-            if (text.length() == 0 || (text = text.trim()).length() == 0) {
-                // 15-Oct-2010, tatu: Empty String usually means null, so
-                return null;
-            }
-            try {
-                T result = _deserialize(text, ctxt);
-                if (result != null) {
-                    return result;
-                }
-            } catch (IllegalArgumentException iae) {
-                // nothing to do here, yet? We'll fail anyway
-            }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid textual representation");
-        }
-        if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT) {
-            // Trivial cases; null to null, instance of type itself returned as is
-            Object ob = jp.getEmbeddedObject();
-            if (ob == null) {
-                return null;
-            }
-            if (_valueClass.isAssignableFrom(ob.getClass())) {
-                return (T) ob;
-            }
-            return _deserializeEmbedded(ob, ctxt);
-        }
-        throw ctxt.mappingException(_valueClass);
-    }
-        
-    protected abstract T _deserialize(String value, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    protected T _deserializeEmbedded(Object ob, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // default impl: error out
-        throw ctxt.mappingException("Don't know how to convert embedded Object of type "
-                +ob.getClass().getName()+" into "+_valueClass.getName());
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JacksonDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JacksonDeserializers.java
deleted file mode 100644
index 2fbf85e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JacksonDeserializers.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.CreatorProperty;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Container class for core Jackson type deserializers.
- */
-public class JacksonDeserializers
-{
-    public static StdDeserializer<?>[] all()
-    {
-        // note: JsonLocation supported via ValueInstantiator
-        return  new StdDeserializer[] {
-            new JavaTypeDeserializer(),
-            new TokenBufferDeserializer(),
-        };
-    }
-
-    public static ValueInstantiator findValueInstantiator(DeserializationConfig config,
-            BeanDescription beanDesc)
-    {
-        if (beanDesc.getBeanClass() == JsonLocation.class) {
-            return new JsonLocationInstantiator();
-        }
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializer implementations
-    /**********************************************************
-     */
-    
-    /**
-     * Deserializer for {@link JavaType} values.
-     */
-    public static class JavaTypeDeserializer
-        extends StdScalarDeserializer<JavaType>
-    {
-        public JavaTypeDeserializer() { super(JavaType.class); }
-        
-        @Override
-        public JavaType deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken curr = jp.getCurrentToken();
-            // Usually should just get string value:
-            if (curr == JsonToken.VALUE_STRING) {
-                String str = jp.getText().trim();
-                if (str.length() == 0) {
-                    return getEmptyValue();
-                }
-                return ctxt.getTypeFactory().constructFromCanonical(str);
-            }
-            // or occasionally just embedded object maybe
-            if (curr == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                return (JavaType) jp.getEmbeddedObject();
-            }
-            throw ctxt.mappingException(_valueClass);
-        }
-    }
-
-    /**
-     * For {@link JsonLocation}, we should be able to just implement
-     * {@link ValueInstantiator} (not that explicit one would be very
-     * hard but...)
-     */
-    public static class JsonLocationInstantiator extends ValueInstantiator
-    {
-        @Override
-        public String getValueTypeDesc() {
-            return JsonLocation.class.getName();
-        }
-        
-        @Override
-        public boolean canCreateFromObjectWith() { return true; }
-        
-        @Override
-        public CreatorProperty[] getFromObjectArguments(DeserializationConfig config) {
-            JavaType intType = config.constructType(Integer.TYPE);
-            JavaType longType = config.constructType(Long.TYPE);
-            return  new CreatorProperty[] {
-                    new CreatorProperty("sourceRef", config.constructType(Object.class), null, null, null, 0, null),
-                    new CreatorProperty("byteOffset", longType, null, null, null, 1, null),
-                    new CreatorProperty("charOffset", longType, null, null, null, 2, null),
-                    new CreatorProperty("lineNr", intType, null, null, null, 3, null),
-                    new CreatorProperty("columnNr", intType, null, null, null, 4, null)
-            };
-        }
-
-        @Override
-        public Object createFromObjectWith(DeserializationContext ctxt, Object[] args) {
-            return new JsonLocation(args[0], _long(args[1]), _long(args[2]),
-                    _int(args[3]), _int(args[4]));
-        }
-
-        private final static long _long(Object o) {
-            return (o == null) ? 0L : ((Number) o).longValue();
-        }
-        private final static int _int(Object o) {
-            return (o == null) ? 0 : ((Number) o).intValue();
-        }
-    }
-    
-    /**
-     * We also want to directly support deserialization of {@link TokenBuffer}.
-     *<p>
-     * Note that we use scalar deserializer base just because we claim
-     * to be of scalar for type information inclusion purposes; actual
-     * underlying content can be of any (Object, Array, scalar) type.
-     */
-    @JacksonStdImpl
-    public static class TokenBufferDeserializer
-        extends StdScalarDeserializer<TokenBuffer>
-    {
-        public TokenBufferDeserializer() { super(TokenBuffer.class); }
-
-        @Override
-        public TokenBuffer deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            TokenBuffer tb = new TokenBuffer(jp.getCodec());
-            // quite simple, given that TokenBuffer is a JsonGenerator:
-            tb.copyCurrentStructure(jp);
-            return tb;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.java
deleted file mode 100644
index d6f58aa..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JdkDeserializers.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.*;
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Pattern;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-
-@SuppressWarnings("serial")
-public class JdkDeserializers
-{
-    public static StdDeserializer<?>[] all()
-    {
-        return new StdDeserializer[] {
-
-            // from String types:
-            new StringDeserializer(),
-            new UUIDDeserializer(),
-            new URLDeserializer(),
-            new URIDeserializer(),
-            new CurrencyDeserializer(),
-            new PatternDeserializer(),
-            new LocaleDeserializer(),
-            new InetAddressDeserializer(),
-            new CharsetDeserializer(),
-
-            // other types:
-
-            // (note: AtomicInteger/Long work due to single-arg constructor;
-            new AtomicBooleanDeserializer(),
-            new ClassDeserializer(),
-            new StackTraceElementDeserializer()
-        };
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializer implementations: from-String deserializers
-    /**********************************************************
-     */
-    
-    /**
-     * Note: final as performance optimization: not expected to need sub-classing;
-     * if sub-classing was needed could re-factor into reusable part, final
-     * "Impl" sub-class
-     */
-    /*
-    @JacksonStdImpl
-    public final static class StringDeserializer
-        extends StdScalarDeserializer<String>
-    {
-        public StringDeserializer() { super(String.class); }
-
-        @Override
-        public String deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // 22-Sep-2012, tatu: For 2.1, use this new method, may force coercion:
-            String text = jp.getValueAsString();
-            if (text != null) {
-                return text;
-            }
-            // [JACKSON-330]: need to gracefully handle byte[] data, as base64
-            JsonToken curr = jp.getCurrentToken();
-            if (curr == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                Object ob = jp.getEmbeddedObject();
-                if (ob == null) {
-                    return null;
-                }
-                if (ob instanceof byte[]) {
-                    return Base64Variants.getDefaultVariant().encode((byte[]) ob, false);
-                }
-                // otherwise, try conversion using toString()...
-                return ob.toString();
-            }
-            throw ctxt.mappingException(_valueClass, curr);
-        }
-
-        // 1.6: since we can never have type info ("natural type"; String, Boolean, Integer, Double):
-        // (is it an error to even call this version?)
-        @Override
-        public String deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-                TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            return deserialize(jp, ctxt);
-        }
-    }
-    */
-    
-    public static class UUIDDeserializer
-        extends FromStringDeserializer<UUID>
-    {
-        public UUIDDeserializer() { super(UUID.class); }
-
-        @Override
-        protected UUID _deserialize(String value, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return UUID.fromString(value);
-        }
-    
-        @Override
-        protected UUID _deserializeEmbedded(Object ob, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (ob instanceof byte[]) {
-                byte[] bytes = (byte[]) ob;
-                if (bytes.length != 16) {
-                    ctxt.mappingException("Can only construct UUIDs from 16 byte arrays; got "+bytes.length+" bytes");
-                }
-                // clumsy, but should work for now...
-                DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
-                long l1 = in.readLong();
-                long l2 = in.readLong();
-                return new UUID(l1, l2);
-            }
-            super._deserializeEmbedded(ob, ctxt);
-            return null; // never gets here
-        }
-    }
-
-    public static class URLDeserializer
-        extends FromStringDeserializer<URL>
-    {
-        public URLDeserializer() { super(URL.class); }
-        
-        @Override
-        protected URL _deserialize(String value, DeserializationContext ctxt)
-            throws IOException
-        {
-            return new URL(value);
-        }
-    }
-    
-    public static class URIDeserializer
-        extends FromStringDeserializer<URI>
-    {
-        public URIDeserializer() { super(URI.class); }
-    
-        @Override
-        protected URI _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            return URI.create(value);
-        }
-    }
-    
-    public static class CurrencyDeserializer
-        extends FromStringDeserializer<Currency>
-    {
-        public CurrencyDeserializer() { super(Currency.class); }
-        
-        @Override
-        protected Currency _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            // will throw IAE if unknown:
-            return Currency.getInstance(value);
-        }
-    }
-    
-    public static class PatternDeserializer
-        extends FromStringDeserializer<Pattern>
-    {
-        public PatternDeserializer() { super(Pattern.class); }
-        
-        @Override
-        protected Pattern _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            // will throw IAE (or its subclass) if malformed
-            return Pattern.compile(value);
-        }
-    }
-    
-    /**
-     * Kept protected as it's not meant to be extensible at this point
-     */
-    protected static class LocaleDeserializer
-        extends FromStringDeserializer<Locale>
-    {
-        public LocaleDeserializer() { super(Locale.class); }
-        
-        @Override
-        protected Locale _deserialize(String value, DeserializationContext ctxt)
-            throws IOException
-        {
-            int ix = value.indexOf('_');
-            if (ix < 0) { // single argument
-                return new Locale(value);
-            }
-            String first = value.substring(0, ix);
-            value = value.substring(ix+1);
-            ix = value.indexOf('_');
-            if (ix < 0) { // two pieces
-                return new Locale(first, value);
-            }
-            String second = value.substring(0, ix);
-            return new Locale(first, second, value.substring(ix+1));
-        }
-    }
-    
-    /**
-     * As per [JACKSON-484], also need special handling for InetAddress...
-     */
-    protected static class InetAddressDeserializer
-        extends FromStringDeserializer<InetAddress>
-    {
-        public InetAddressDeserializer() { super(InetAddress.class); }
-    
-        @Override
-        protected InetAddress _deserialize(String value, DeserializationContext ctxt)
-            throws IOException
-        {
-            return InetAddress.getByName(value);
-        }
-    }
-
-    // [JACKSON-789]
-    protected static class CharsetDeserializer
-        extends FromStringDeserializer<Charset>
-    {
-        public CharsetDeserializer() { super(Charset.class); }
-    
-        @Override
-        protected Charset _deserialize(String value, DeserializationContext ctxt)
-            throws IOException
-        {
-            return Charset.forName(value);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* AtomicXxx types
-    /**********************************************************
-     */
-    
-    public static class AtomicReferenceDeserializer
-        extends StdScalarDeserializer<AtomicReference<?>>
-        implements ContextualDeserializer
-    {
-        /**
-         * Type of value that we reference
-         */
-        protected final JavaType _referencedType;
-        
-        protected final JsonDeserializer<?> _valueDeserializer;
-        
-        /**
-         * @param referencedType Parameterization of this reference
-         */
-        public AtomicReferenceDeserializer(JavaType referencedType) {
-            this(referencedType, null);
-        }
-        
-        public AtomicReferenceDeserializer(JavaType referencedType,
-                JsonDeserializer<?> deser)
-        {
-            super(AtomicReference.class);
-            _referencedType = referencedType;
-            _valueDeserializer = deser;
-        }
-        
-        @Override
-        public AtomicReference<?> deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return new AtomicReference<Object>(_valueDeserializer.deserialize(jp, ctxt));
-        }
-        
-//        @Override
-        public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-                BeanProperty property) throws JsonMappingException
-        {
-            JsonDeserializer<?> deser = _valueDeserializer;
-            if (deser != null) {
-                return this;
-            }
-            return new AtomicReferenceDeserializer(_referencedType,
-                    ctxt.findContextualValueDeserializer(_referencedType, property));
-        }
-    }
-
-    public static class AtomicBooleanDeserializer
-        extends StdScalarDeserializer<AtomicBoolean>
-    {
-        public AtomicBooleanDeserializer() { super(AtomicBoolean.class); }
-        
-        @Override
-        public AtomicBoolean deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // 16-Dec-2010, tatu: Should we actually convert null to null AtomicBoolean?
-            return new AtomicBoolean(_parseBooleanPrimitive(jp, ctxt));
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserializers for other JDK types
-    /**********************************************************
-     */
-
-    public static class StackTraceElementDeserializer
-        extends StdScalarDeserializer<StackTraceElement>
-    {
-        public StackTraceElementDeserializer() { super(StackTraceElement.class); }
-    
-        @Override
-        public StackTraceElement deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            // Must get an Object
-            if (t == JsonToken.START_OBJECT) {
-                String className = "", methodName = "", fileName = "";
-                int lineNumber = -1;
-    
-                while ((t = jp.nextValue()) != JsonToken.END_OBJECT) {
-                    String propName = jp.getCurrentName();
-                    if ("className".equals(propName)) {
-                        className = jp.getText();
-                    } else if ("fileName".equals(propName)) {
-                        fileName = jp.getText();
-                    } else if ("lineNumber".equals(propName)) {
-                        if (t.isNumeric()) {
-                            lineNumber = jp.getIntValue();
-                        } else {
-                            throw JsonMappingException.from(jp, "Non-numeric token ("+t+") for property 'lineNumber'");
-                        }
-                    } else if ("methodName".equals(propName)) {
-                        methodName = jp.getText();
-                    } else if ("nativeMethod".equals(propName)) {
-                        // no setter, not passed via constructor: ignore
-                    } else {
-                        handleUnknownProperty(jp, ctxt, _valueClass, propName);
-                    }
-                }
-                return new StackTraceElement(className, methodName, fileName, lineNumber);
-            }
-            throw ctxt.mappingException(_valueClass, t);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
deleted file mode 100644
index 2d7cc63..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.node.*;
-
-/**
- * Deserializer that can build instances of {@link JsonNode} from any
- * JSON content, using appropriate {@link JsonNode} type.
- */
-public class JsonNodeDeserializer
-    extends BaseNodeDeserializer<JsonNode>
-{
-    /**
-     * Singleton instance of generic deserializer for {@link JsonNode}.
-     * Only used for types other than JSON Object and Array.
-     */
-    private final static JsonNodeDeserializer instance = new JsonNodeDeserializer();
-
-    protected JsonNodeDeserializer() { super(JsonNode.class); }
-
-    /**
-     * Factory method for accessing deserializer for specific node type
-     */
-    public static JsonDeserializer<? extends JsonNode> getDeserializer(Class<?> nodeClass)
-    {
-        if (nodeClass == ObjectNode.class) {
-            return ObjectDeserializer.getInstance();
-        }
-        if (nodeClass == ArrayNode.class) {
-            return ArrayDeserializer.getInstance();
-        }
-        // For others, generic one works fine
-        return instance;
-    }
-    
-    /*
-    /**********************************************************
-    /* Actual deserializer implementations
-    /**********************************************************
-     */
-
-    /**
-     * Implementation that will produce types of any JSON nodes; not just one
-     * deserializer is registered to handle (in case of more specialized handler).
-     * Overridden by typed sub-classes for more thorough checking
-     */
-    @Override
-    public JsonNode deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getCurrentToken()) {
-        case START_OBJECT:
-            return deserializeObject(jp, ctxt, ctxt.getNodeFactory());
-        case START_ARRAY:
-            return deserializeArray(jp, ctxt, ctxt.getNodeFactory());
-        default:
-            return deserializeAny(jp, ctxt, ctxt.getNodeFactory());
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Specific instances for more accurate types
-    /**********************************************************
-     */
-
-    final static class ObjectDeserializer
-        extends BaseNodeDeserializer<ObjectNode>
-    {
-        protected final static ObjectDeserializer _instance = new ObjectDeserializer();
-
-        protected ObjectDeserializer() {
-            super(ObjectNode.class);
-        }
-
-        public static ObjectDeserializer getInstance() { return _instance; }
-        
-        @Override
-        public ObjectNode deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (jp.getCurrentToken() == JsonToken.START_OBJECT) {
-                jp.nextToken();
-                return deserializeObject(jp, ctxt, ctxt.getNodeFactory());
-            }
-            if (jp.getCurrentToken() == JsonToken.FIELD_NAME) {
-                return deserializeObject(jp, ctxt, ctxt.getNodeFactory());
-            }
-            throw ctxt.mappingException(ObjectNode.class);
-         }
-    }
-        
-    final static class ArrayDeserializer
-        extends BaseNodeDeserializer<ArrayNode>
-    {
-        protected final static ArrayDeserializer _instance = new ArrayDeserializer();
-
-        protected ArrayDeserializer() {
-            super(ArrayNode.class);
-        }
-
-        public static ArrayDeserializer getInstance() { return _instance; }
-        
-        @Override
-        public ArrayNode deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (jp.isExpectedStartArrayToken()) {
-                return deserializeArray(jp, ctxt, ctxt.getNodeFactory());
-            }
-            throw ctxt.mappingException(ArrayNode.class);
-        }
-    }
-}
-
-/**
- * Base class for all actual {@link JsonNode} deserializer
- * implementations
- */
-abstract class BaseNodeDeserializer<N extends JsonNode>
-    extends StdDeserializer<N>
-{
-    public BaseNodeDeserializer(Class<N> nodeClass)
-    {
-        super(nodeClass);
-    }
-    
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        /* Output can be as JSON Object, Array or scalar: no way to know
-         * a priori. So:
-         */
-        return typeDeserializer.deserializeTypedFromAny(jp, ctxt);
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable methods
-    /**********************************************************
-     */
-    
-    protected void _reportProblem(JsonParser jp, String msg)
-        throws JsonMappingException
-    {
-        throw new JsonMappingException(msg, jp.getTokenLocation());
-    }
-    
-    /**
-     * Method called when there is a duplicate value for a field.
-     * By default we don't care, and the last value is used.
-     * Can be overridden to provide alternate handling, such as throwing
-     * an exception, or choosing different strategy for combining values
-     * or choosing which one to keep.
-     *
-     * @param fieldName Name of the field for which duplicate value was found
-     * @param objectNode Object node that contains values
-     * @param oldValue Value that existed for the object node before newValue
-     *   was added
-     * @param newValue Newly added value just added to the object node
-     */
-    protected void _handleDuplicateField(String fieldName, ObjectNode objectNode,
-                                         JsonNode oldValue, JsonNode newValue)
-        throws JsonProcessingException
-    {
-        // By default, we don't do anything
-        ;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    protected final ObjectNode deserializeObject(JsonParser jp, DeserializationContext ctxt,
-            final JsonNodeFactory nodeFactory)            
-        throws IOException, JsonProcessingException
-    {
-        ObjectNode node = nodeFactory.objectNode();
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String fieldName = jp.getCurrentName();
-            JsonNode value;
-            switch (jp.nextToken()) {
-            case START_OBJECT:
-                value = deserializeObject(jp, ctxt, nodeFactory);
-                break;
-            case START_ARRAY:
-                value = deserializeArray(jp, ctxt, nodeFactory);
-                break;
-            case VALUE_STRING:
-                value = nodeFactory.textNode(jp.getText());
-                break;
-            default:
-                value = deserializeAny(jp, ctxt, nodeFactory);
-            }
-            JsonNode old = node.replace(fieldName, value);
-            if (old != null) {
-                _handleDuplicateField(fieldName, node, old, value);
-            }
-        }
-        return node;
-    }
-    
-    protected final ArrayNode deserializeArray(JsonParser jp, DeserializationContext ctxt,
-            final JsonNodeFactory nodeFactory)            
-        throws IOException, JsonProcessingException
-    {
-        ArrayNode node = nodeFactory.arrayNode();
-        while (true) {
-            JsonToken t = jp.nextToken();
-            if (t == null) {
-                throw ctxt.mappingException("Unexpected end-of-input when binding data into ArrayNode");
-            }
-            switch (t) {
-            case START_OBJECT:
-                node.add(deserializeObject(jp, ctxt, nodeFactory));
-                break;
-            case START_ARRAY:
-                node.add(deserializeArray(jp, ctxt, nodeFactory));
-                break;
-            case END_ARRAY:
-                return node;
-            case VALUE_STRING:
-                node.add(nodeFactory.textNode(jp.getText()));
-                break;
-            default:
-                node.add(deserializeAny(jp, ctxt, nodeFactory));
-                break;
-            }
-        }
-    }
-
-    protected final JsonNode deserializeAny(JsonParser jp, DeserializationContext ctxt,
-            final JsonNodeFactory nodeFactory)            
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getCurrentToken()) {
-        case START_OBJECT:
-            return deserializeObject(jp, ctxt, nodeFactory);
-
-        case START_ARRAY:
-            return deserializeArray(jp, ctxt, nodeFactory);
-
-        case FIELD_NAME:
-            return deserializeObject(jp, ctxt, nodeFactory);
-
-        case VALUE_EMBEDDED_OBJECT:
-            // [JACKSON-796]
-            {
-                Object ob = jp.getEmbeddedObject();
-                if (ob == null) { // should this occur?
-                    return nodeFactory.nullNode();
-                }
-                Class<?> type = ob.getClass();
-                if (type == byte[].class) { // most common special case
-                    return nodeFactory.binaryNode((byte[]) ob);
-                }
-                // any other special handling needed?
-                return nodeFactory.POJONode(ob);
-            }
-
-        case VALUE_STRING:
-            return nodeFactory.textNode(jp.getText());
-
-        case VALUE_NUMBER_INT:
-            {
-                JsonParser.NumberType nt = jp.getNumberType();
-                if (nt == JsonParser.NumberType.BIG_INTEGER
-                    || ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-                    return nodeFactory.numberNode(jp.getBigIntegerValue());
-                }
-                if (nt == JsonParser.NumberType.INT) {
-                    return nodeFactory.numberNode(jp.getIntValue());
-                }
-                return nodeFactory.numberNode(jp.getLongValue());
-            }
-
-        case VALUE_NUMBER_FLOAT:
-            {
-                JsonParser.NumberType nt = jp.getNumberType();
-                if (nt == JsonParser.NumberType.BIG_DECIMAL
-                    || ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-                    return nodeFactory.numberNode(jp.getDecimalValue());
-                }
-                return nodeFactory.numberNode(jp.getDoubleValue());
-            }
-
-        case VALUE_TRUE:
-            return nodeFactory.booleanNode(true);
-
-        case VALUE_FALSE:
-            return nodeFactory.booleanNode(false);
-
-        case VALUE_NULL:
-            return nodeFactory.nullNode();
-            
-            // These states can not be mapped; input stream is
-            // off by an event or two
-
-        //case END_OBJECT:
-        //case END_ARRAY:
-        default:
-            throw ctxt.mappingException(getValueClass());
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
deleted file mode 100644
index ad990c4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
+++ /dev/null
@@ -1,518 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.*;
-import com.fasterxml.jackson.databind.deser.impl.PropertyBasedCreator;
-import com.fasterxml.jackson.databind.deser.impl.PropertyValueBuffer;
-import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-
-/**
- * Basic serializer that can take Json "Object" structure and
- * construct a {@link java.util.Map} instance, with typed contents.
- *<p>
- * Note: for untyped content (one indicated by passing Object.class
- * as the type), {@link UntypedObjectDeserializer} is used instead.
- * It can also construct {@link java.util.Map}s, but not with specific
- * POJO types, only other containers and primitives/wrappers.
- */
-@JacksonStdImpl
-public class MapDeserializer
-    extends ContainerDeserializerBase<Map<Object,Object>>
-    implements ContextualDeserializer, ResolvableDeserializer
-{
-    // // Configuration: typing, deserializers
-
-    protected final JavaType _mapType;
-    
-    /**
-     * Key deserializer to use; either passed via constructor
-     * (when indicated by annotations), or resolved when
-     * {@link #resolve} is called;
-     */
-    protected final KeyDeserializer _keyDeserializer;
-
-    /**
-     * Flag set to indicate that the key type is
-     * {@link java.lang.String} (or {@link java.lang.Object}, for
-     * which String is acceptable), <b>and</b> that the
-     * default Jackson key deserializer would be used.
-     * If both are true, can optimize handling.
-     */
-    protected boolean _standardStringKey;
-    
-    /**
-     * Value deserializer.
-     */
-    protected final JsonDeserializer<Object> _valueDeserializer;
-
-    /**
-     * If value instances have polymorphic type information, this
-     * is the type deserializer that can handle it
-     */
-    protected final TypeDeserializer _valueTypeDeserializer;
-    
-    // // Instance construction settings:
-
-    protected final ValueInstantiator _valueInstantiator;
-
-    protected final boolean _hasDefaultCreator;
-
-    /**
-     * Deserializer that is used iff delegate-based creator is
-     * to be used for deserializing from JSON Object.
-     */
-    protected JsonDeserializer<Object> _delegateDeserializer;
-    
-    /**
-     * If the Map is to be instantiated using non-default constructor
-     * or factory method
-     * that takes one or more named properties as argument(s),
-     * this creator is used for instantiation.
-     */
-    protected PropertyBasedCreator _propertyBasedCreator;    
-    
-    // // Any properties to ignore if seen?
-    
-    protected HashSet<String> _ignorableProperties;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public MapDeserializer(JavaType mapType, ValueInstantiator valueInstantiator,
-            KeyDeserializer keyDeser, JsonDeserializer<Object> valueDeser,
-            TypeDeserializer valueTypeDeser)
-    {
-        super(Map.class);
-        _mapType = mapType;
-        _keyDeserializer = keyDeser;
-        _valueDeserializer = valueDeser;
-        _valueTypeDeserializer = valueTypeDeser;
-        _valueInstantiator = valueInstantiator;
-        _hasDefaultCreator = valueInstantiator.canCreateUsingDefault();
-        _delegateDeserializer = null;
-        _propertyBasedCreator = null;
-        _standardStringKey = _isStdKeyDeser(mapType, keyDeser);
-    }
-
-    /**
-     * Copy-constructor that can be used by sub-classes to allow
-     * copy-on-write styling copying of settings of an existing instance.
-     */
-    protected MapDeserializer(MapDeserializer src)
-    {
-        super(src._valueClass);
-        _mapType = src._mapType;
-        _keyDeserializer = src._keyDeserializer;
-        _valueDeserializer = src._valueDeserializer;
-        _valueTypeDeserializer = src._valueTypeDeserializer;
-        _valueInstantiator = src._valueInstantiator;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _hasDefaultCreator = src._hasDefaultCreator;
-        // should we make a copy here?
-        _ignorableProperties = src._ignorableProperties;
-
-        _standardStringKey = src._standardStringKey;
-    }
-
-    protected MapDeserializer(MapDeserializer src,
-            KeyDeserializer keyDeser, JsonDeserializer<Object> valueDeser,
-            TypeDeserializer valueTypeDeser,
-            HashSet<String> ignorable)
-    {
-        super(src._valueClass);
-        _mapType = src._mapType;
-        _keyDeserializer = keyDeser;
-        _valueDeserializer = valueDeser;
-        _valueTypeDeserializer = valueTypeDeser;
-        _valueInstantiator = src._valueInstantiator;
-        _propertyBasedCreator = src._propertyBasedCreator;
-        _delegateDeserializer = src._delegateDeserializer;
-        _hasDefaultCreator = src._hasDefaultCreator;
-        _ignorableProperties = ignorable;
-
-        _standardStringKey = _isStdKeyDeser(_mapType, keyDeser);
-    }
-
-    /**
-     * Fluent factory method used to create a copy with slightly
-     * different settings. When sub-classing, MUST be overridden.
-     */
-    @SuppressWarnings("unchecked")
-    protected MapDeserializer withResolved(KeyDeserializer keyDeser,
-            TypeDeserializer valueTypeDeser, JsonDeserializer<?> valueDeser,
-            HashSet<String> ignorable)
-    {
-        
-        if ((_keyDeserializer == keyDeser) && (_valueDeserializer == valueDeser) && (_valueTypeDeserializer == valueTypeDeser)
-                && (_ignorableProperties == ignorable)) {
-            return this;
-        }
-        return new MapDeserializer(this,
-                keyDeser, (JsonDeserializer<Object>) valueDeser, valueTypeDeser, ignorable);
-    }
-    
-    /**
-     * Helper method used to check whether we can just use the default key
-     * deserialization, where JSON String becomes Java String.
-     */
-    protected final boolean _isStdKeyDeser(JavaType mapType, KeyDeserializer keyDeser)
-    {
-        if (keyDeser == null) {
-            return true;
-        }
-        JavaType keyType = mapType.getKeyType();
-        if (keyType == null) { // assumed to be Object
-            return true;
-        }
-        Class<?> rawKeyType = keyType.getRawClass();
-        return ((rawKeyType == String.class || rawKeyType == Object.class)
-                && isDefaultKeyDeserializer(keyDeser));
-    }
-    
-    public void setIgnorableProperties(String[] ignorable)
-    {
-        _ignorableProperties = (ignorable == null || ignorable.length == 0) ?
-            null : ArrayBuilders.arrayToSet(ignorable);
-    }
-
-    /*
-    /**********************************************************
-    /* Validation, post-processing (ResolvableDeserializer)
-    /**********************************************************
-     */
-
-//    @Override
-    public void resolve(DeserializationContext ctxt) throws JsonMappingException
-    {
-        // May need to resolve types for delegate- and/or property-based creators:
-        if (_valueInstantiator.canCreateUsingDelegate()) {
-            JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
-            if (delegateType == null) {
-                throw new IllegalArgumentException("Invalid delegate-creator definition for "+_mapType
-                        +": value instantiator ("+_valueInstantiator.getClass().getName()
-                        +") returned true for 'canCreateUsingDelegate()', but null for 'getDelegateType()'");
-            }
-            /* Theoretically should be able to get CreatorProperty for delegate
-             * parameter to pass; but things get tricky because DelegateCreator
-             * may contain injectable values. So, for now, let's pass nothing.
-             */
-            _delegateDeserializer = findDeserializer(ctxt, delegateType, null);
-        }
-        if (_valueInstantiator.canCreateFromObjectWith()) {
-            SettableBeanProperty[] creatorProps = _valueInstantiator.getFromObjectArguments(ctxt.getConfig());
-            _propertyBasedCreator = PropertyBasedCreator.construct(ctxt, _valueInstantiator, creatorProps);
-        }
-        _standardStringKey = _isStdKeyDeser(_mapType, _keyDeserializer);
-    }
-
-    /**
-     * Method called to finalize setup of this deserializer,
-     * when it is known for which property deserializer is needed for.
-     */
-//    @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        KeyDeserializer kd = _keyDeserializer;
-        if (kd == null) {
-            kd = ctxt.findKeyDeserializer(_mapType.getKeyType(), property);
-        } else {
-            if (kd instanceof ContextualKeyDeserializer) {
-                kd = ((ContextualKeyDeserializer) kd).createContextual(ctxt, property);
-            }
-        }
-        JsonDeserializer<?> vd = _valueDeserializer;
-        if (vd == null) {
-            vd = ctxt.findContextualValueDeserializer(_mapType.getContentType(), property);
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (vd instanceof ContextualDeserializer) {
-                vd = ((ContextualDeserializer) vd).createContextual(ctxt, property);
-            }
-        }
-        TypeDeserializer vtd = _valueTypeDeserializer;
-        if (vtd != null) {
-            vtd = vtd.forProperty(property);
-        }
-        HashSet<String> ignored = _ignorableProperties;
-        AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
-        if (intr != null && property != null) {
-            String[] moreToIgnore = intr.findPropertiesToIgnore(property.getMember());
-            if (moreToIgnore != null) {
-                ignored = (ignored == null) ? new HashSet<String>() : new HashSet<String>(ignored);
-                for (String str : moreToIgnore) {
-                    ignored.add(str);
-                }
-            }
-        }
-        return withResolved(kd, vtd, vd, ignored);
-    }
-    
-    /*
-    /**********************************************************
-    /* ContainerDeserializerBase API
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return _mapType.getContentType();
-    }
-
-    @Override
-    public JsonDeserializer<Object> getContentDeserializer() {
-        return _valueDeserializer;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer API
-    /**********************************************************
-     */
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<Object,Object> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_propertyBasedCreator != null) {
-            return _deserializeUsingCreator(jp, ctxt);
-        }
-        if (_delegateDeserializer != null) {
-            return (Map<Object,Object>) _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (!_hasDefaultCreator) {
-            throw ctxt.instantiationException(getMapClass(), "No default constructor found");
-        }
-        // Ok: must point to START_OBJECT, FIELD_NAME or END_OBJECT
-        JsonToken t = jp.getCurrentToken();
-        if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME && t != JsonToken.END_OBJECT) {
-            // [JACKSON-620] (empty) String may be ok however:
-            if (t == JsonToken.VALUE_STRING) {
-                return (Map<Object,Object>) _valueInstantiator.createFromString(ctxt, jp.getText());
-            }
-            throw ctxt.mappingException(getMapClass());
-        }
-        final Map<Object,Object> result = (Map<Object,Object>) _valueInstantiator.createUsingDefault(ctxt);
-        if (_standardStringKey) {
-            _readAndBindStringMap(jp, ctxt, result);
-            return result;
-        }
-        _readAndBind(jp, ctxt, result);
-        return result;
-    }
-
-    @Override
-    public Map<Object,Object> deserialize(JsonParser jp, DeserializationContext ctxt,
-            Map<Object,Object> result)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_OBJECT or FIELD_NAME
-        JsonToken t = jp.getCurrentToken();
-        if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME) {
-            throw ctxt.mappingException(getMapClass());
-        }
-        if (_standardStringKey) {
-            _readAndBindStringMap(jp, ctxt, result);
-            return result;
-        }
-        _readAndBind(jp, ctxt, result);
-        return result;
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // In future could check current token... for now this should be enough:
-        return typeDeserializer.deserializeTypedFromObject(jp, ctxt);
-    }
-    
-    /*
-    /**********************************************************
-    /* Other public accessors
-    /**********************************************************
-     */
-
-    @SuppressWarnings("unchecked")
-    public final Class<?> getMapClass() { return (Class<Map<Object,Object>>) _mapType.getRawClass(); }
-
-    @Override public JavaType getValueType() { return _mapType; }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected final void _readAndBind(JsonParser jp, DeserializationContext ctxt,
-            Map<Object,Object> result)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        final KeyDeserializer keyDes = _keyDeserializer;
-        
-        final JsonDeserializer<Object> valueDes = _valueDeserializer;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            // Must point to field name
-            String fieldName = jp.getCurrentName();
-            Object key = keyDes.deserializeKey(fieldName, ctxt);
-            // And then the value...
-            t = jp.nextToken();
-            if (_ignorableProperties != null && _ignorableProperties.contains(fieldName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // Note: must handle null explicitly here; value deserializers won't
-            Object value;            
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else if (typeDeser == null) {
-                value = valueDes.deserialize(jp, ctxt);
-            } else {
-                value = valueDes.deserializeWithType(jp, ctxt, typeDeser);
-            }
-            /* !!! 23-Dec-2008, tatu: should there be an option to verify
-             *   that there are no duplicate field names? (and/or what
-             *   to do, keep-first or keep-last)
-             */
-            result.put(key, value);
-        }
-    }
-
-    /**
-     * Optimized method used when keys can be deserialized as plain old
-     * {@link java.lang.String}s, and there is no custom deserialized
-     * specified.
-     */
-    protected final void _readAndBindStringMap(JsonParser jp, DeserializationContext ctxt,
-            Map<Object,Object> result)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        final JsonDeserializer<Object> valueDes = _valueDeserializer;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            // Must point to field name
-            String fieldName = jp.getCurrentName();
-            // And then the value...
-            t = jp.nextToken();
-            if (_ignorableProperties != null && _ignorableProperties.contains(fieldName)) {
-                jp.skipChildren();
-                continue;
-            }
-            // Note: must handle null explicitly here; value deserializers won't
-            Object value;            
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else if (typeDeser == null) {
-                value = valueDes.deserialize(jp, ctxt);
-            } else {
-                value = valueDes.deserializeWithType(jp, ctxt, typeDeser);
-            }
-            result.put(fieldName, value);
-        }
-    }
-    
-    @SuppressWarnings("unchecked") 
-    public Map<Object,Object> _deserializeUsingCreator(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        final PropertyBasedCreator creator = _propertyBasedCreator;
-        // null -> no ObjectIdReader for Maps (yet?)
-        PropertyValueBuffer buffer = creator.startBuilding(jp, ctxt, null);
-
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        final JsonDeserializer<Object> valueDes = _valueDeserializer;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            t = jp.nextToken(); // to get to value
-            if (_ignorableProperties != null && _ignorableProperties.contains(propName)) {
-                jp.skipChildren(); // and skip it (in case of array/object)
-                continue;
-            }
-            // creator property?
-            SettableBeanProperty prop = creator.findCreatorProperty(propName);
-            if (prop != null) {
-                // Last property to set?
-                Object value = prop.deserialize(jp, ctxt);
-                if (buffer.assignParameter(prop.getCreatorIndex(), value)) {
-                    jp.nextToken();
-                    Map<Object,Object> result;
-                    try {
-                        result = (Map<Object,Object>)creator.build(ctxt, buffer);
-                    } catch (Exception e) {
-                        wrapAndThrow(e, _mapType.getRawClass());
-                        return null;
-                    }
-                    _readAndBind(jp, ctxt, result);
-                    return result;
-                }
-                continue;
-            }
-            // other property? needs buffering
-            String fieldName = jp.getCurrentName();
-            Object key = _keyDeserializer.deserializeKey(fieldName, ctxt);
-            Object value;            
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else if (typeDeser == null) {
-                value = valueDes.deserialize(jp, ctxt);
-            } else {
-                value = valueDes.deserializeWithType(jp, ctxt, typeDeser);
-            }
-            buffer.bufferMapProperty(key, value);
-        }
-        // end of JSON object?
-        // if so, can just construct and leave...
-        try {
-            return (Map<Object,Object>)creator.build(ctxt, buffer);
-        } catch (Exception e) {
-            wrapAndThrow(e, _mapType.getRawClass());
-            return null;
-        }
-    }
-
-    // note: copied form BeanDeserializer; should try to share somehow...
-    protected void wrapAndThrow(Throwable t, Object ref)
-        throws IOException
-    {
-        // to handle StackOverflow:
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors and "plain" IOExceptions to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        // ... except for mapping exceptions
-        if (t instanceof IOException && !(t instanceof JsonMappingException)) {
-            throw (IOException) t;
-        }
-        throw JsonMappingException.wrapWithPath(t, ref, null);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java
deleted file mode 100644
index 3973561..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Container class for deserializers that handle core JDK primitive
- * (and matching wrapper) types, as well as standard "big" numeric types.
- * Note that this includes types such as {@link java.lang.Boolean}
- * and {@link java.lang.Character} which are not strictly numeric,
- * but are part of primitive/wrapper types.
- */
-public class NumberDeserializers
-{
-    public static StdDeserializer<?>[] all()
-    {
-        return new StdDeserializer<?>[] {
-                // primitive-wrappers (simple):
-                new BooleanDeserializer(Boolean.class, null),
-                new ByteDeserializer(Byte.class, null),
-                new ShortDeserializer(Short.class, null),
-                new CharacterDeserializer(Character.class, null),
-                new IntegerDeserializer(Integer.class, null),
-                new LongDeserializer(Long.class, null),
-                new FloatDeserializer(Float.class, null),
-                new DoubleDeserializer(Double.class, null),
-
-                /* And actual primitives: difference is the way nulls are to be
-                 * handled...
-                 */
-                new BooleanDeserializer(Boolean.TYPE, Boolean.FALSE),
-                new ByteDeserializer(Byte.TYPE, Byte.valueOf((byte)(0))),
-                new ShortDeserializer(Short.TYPE, Short.valueOf((short)0)),
-                new CharacterDeserializer(Character.TYPE, Character.valueOf('\0')),
-                new IntegerDeserializer(Integer.TYPE, Integer.valueOf(0)),
-                new LongDeserializer(Long.TYPE, Long.valueOf(0L)),
-                new FloatDeserializer(Float.TYPE, Float.valueOf(0.0f)),
-                new DoubleDeserializer(Double.TYPE, Double.valueOf(0.0)),
-                
-                // and related
-                new NumberDeserializer(),
-                new BigDecimalDeserializer(),
-                new BigIntegerDeserializer()
-        };
-    }
-    
-    /*
-    /**********************************************************
-    /* Then one intermediate base class for things that have
-    /* both primitive and wrapper types
-    /**********************************************************
-     */
-
-    protected abstract static class PrimitiveOrWrapperDeserializer<T>
-        extends StdScalarDeserializer<T>
-    {
-        private static final long serialVersionUID = 1L;
-
-        protected final T _nullValue;
-        
-        protected PrimitiveOrWrapperDeserializer(Class<T> vc, T nvl)
-        {
-            super(vc);
-            _nullValue = nvl;
-        }
-        
-        @Override
-        public final T getNullValue() {
-            return _nullValue;
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Then primitive/wrapper types
-    /**********************************************************
-     */
-
-    @JacksonStdImpl
-    public final static class BooleanDeserializer
-        extends PrimitiveOrWrapperDeserializer<Boolean>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public BooleanDeserializer(Class<Boolean> cls, Boolean nvl)
-        {
-            super(cls, nvl);
-        }
-        
-        @Override
-        public Boolean deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseBoolean(jp, ctxt);
-        }
-
-        // 1.6: since we can never have type info ("natural type"; String, Boolean, Integer, Double):
-        // (is it an error to even call this version?)
-        @Override
-        public Boolean deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-                TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            return _parseBoolean(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class ByteDeserializer
-        extends PrimitiveOrWrapperDeserializer<Byte>
-    {
-        public ByteDeserializer(Class<Byte> cls, Byte nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Byte deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseByte(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class ShortDeserializer
-        extends PrimitiveOrWrapperDeserializer<Short>
-    {
-        public ShortDeserializer(Class<Short> cls, Short nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Short deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseShort(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class CharacterDeserializer
-        extends PrimitiveOrWrapperDeserializer<Character>
-    {
-        public CharacterDeserializer(Class<Character> cls, Character nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Character deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            int value;
-
-            if (t == JsonToken.VALUE_NUMBER_INT) { // ok iff ascii value
-                value = jp.getIntValue();
-                if (value >= 0 && value <= 0xFFFF) {
-                    return Character.valueOf((char) value);
-                }
-            } else if (t == JsonToken.VALUE_STRING) { // this is the usual type
-                // But does it have to be exactly one char?
-                String text = jp.getText();
-                if (text.length() == 1) {
-                    return Character.valueOf(text.charAt(0));
-                }
-                // actually, empty should become null?
-                if (text.length() == 0) {
-                    return (Character) getEmptyValue();
-                }
-            }
-            throw ctxt.mappingException(_valueClass, t);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class IntegerDeserializer
-        extends PrimitiveOrWrapperDeserializer<Integer>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public IntegerDeserializer(Class<Integer> cls, Integer nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Integer deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseInteger(jp, ctxt);
-        }
-
-        // 1.6: since we can never have type info ("natural type"; String, Boolean, Integer, Double):
-        // (is it an error to even call this version?)
-        @Override
-        public Integer deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-                TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            return _parseInteger(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class LongDeserializer
-        extends PrimitiveOrWrapperDeserializer<Long>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public LongDeserializer(Class<Long> cls, Long nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Long deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseLong(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class FloatDeserializer
-        extends PrimitiveOrWrapperDeserializer<Float>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public FloatDeserializer(Class<Float> cls, Float nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Float deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            /* 22-Jan-2009, tatu: Bounds/range checks would be tricky
-             *   here, so let's not bother even trying...
-             */
-            return _parseFloat(jp, ctxt);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class DoubleDeserializer
-        extends PrimitiveOrWrapperDeserializer<Double>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public DoubleDeserializer(Class<Double> cls, Double nvl)
-        {
-            super(cls, nvl);
-        }
-
-        @Override
-        public Double deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            return _parseDouble(jp, ctxt);
-        }
-
-        // 1.6: since we can never have type info ("natural type"; String, Boolean, Integer, Double):
-        // (is it an error to even call this version?)
-        @Override
-        public Double deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-                TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            return _parseDouble(jp, ctxt);
-        }
-    }
-
-    /**
-     * For type <code>Number.class</code>, we can just rely on type
-     * mappings that plain {@link JsonParser#getNumberValue} returns.
-     *<p>
-     * Since 1.5, there is one additional complication: some numeric
-     * types (specifically, int/Integer and double/Double) are "non-typed";
-     * meaning that they will NEVER be output with type information.
-     * But other numeric types may need such type information.
-     * This is why {@link #deserializeWithType} must be overridden.
-     */
-    @SuppressWarnings("serial")
-    @JacksonStdImpl
-    public final static class NumberDeserializer
-        extends StdScalarDeserializer<Number>
-    {
-        public NumberDeserializer() { super(Number.class); }
-
-        @Override
-        public Number deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-                    return jp.getBigIntegerValue();
-                }
-                return jp.getNumberValue();
-            } else if (t == JsonToken.VALUE_NUMBER_FLOAT) {
-                /* [JACKSON-72]: need to allow overriding the behavior
-                 * regarding which type to use
-                 */
-                if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-                    return jp.getDecimalValue();
-                }
-                return Double.valueOf(jp.getDoubleValue());
-            }
-
-            /* Textual values are more difficult... not parsing itself, but figuring
-             * out 'minimal' type to use 
-             */
-            if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-                String text = jp.getText().trim();
-                try {
-                    if (text.indexOf('.') >= 0) { // floating point
-                        // as per [JACKSON-72]:
-                        if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-                            return new BigDecimal(text);
-                        }
-                        return new Double(text);
-                    }
-                    // as per [JACKSON-100]:
-                    if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-                        return new BigInteger(text);
-                    }
-                    long value = Long.parseLong(text);
-                    if (value <= Integer.MAX_VALUE && value >= Integer.MIN_VALUE) {
-                        return Integer.valueOf((int) value);
-                    }
-                    return Long.valueOf(value);
-                } catch (IllegalArgumentException iae) {
-                    throw ctxt.weirdStringException(text, _valueClass, "not a valid number");
-                }
-            }
-            // Otherwise, no can do:
-            throw ctxt.mappingException(_valueClass, t);
-        }
-
-        /**
-         * As mentioned in class Javadoc, there is additional complexity in
-         * handling potentially mixed type information here. Because of this,
-         * we must actually check for "raw" integers and doubles first, before
-         * calling type deserializer.
-         */
-        @Override
-        public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-                                          TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            switch (jp.getCurrentToken()) {
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-            case VALUE_STRING:
-                // can not point to type information: hence must be non-typed (int/double)
-                return deserialize(jp, ctxt);
-            }
-            return typeDeserializer.deserializeTypedFromScalar(jp, ctxt);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* And then bit more complicated (but non-structured) number
-    /* types
-    /**********************************************************
-     */
-    
-    /**
-     * This is bit trickier to implement efficiently, while avoiding
-     * overflow problems.
-     */
-    @SuppressWarnings("serial")
-    @JacksonStdImpl
-    public static class BigIntegerDeserializer
-        extends StdScalarDeserializer<BigInteger>
-    {
-        public BigIntegerDeserializer() { super(BigInteger.class); }
-
-        @Override
-                public BigInteger deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            String text;
-
-            if (t == JsonToken.VALUE_NUMBER_INT) {
-                switch (jp.getNumberType()) {
-                case INT:
-                case LONG:
-                    return BigInteger.valueOf(jp.getLongValue());
-                }
-            } else if (t == JsonToken.VALUE_NUMBER_FLOAT) {
-                /* Whether to fail if there's non-integer part?
-                 * Could do by calling BigDecimal.toBigIntegerExact()
-                 */
-                return jp.getDecimalValue().toBigInteger();
-            } else if (t != JsonToken.VALUE_STRING) { // let's do implicit re-parse
-                // String is ok too, can easily convert; otherwise, no can do:
-                throw ctxt.mappingException(_valueClass, t);
-            }
-            text = jp.getText().trim();
-            if (text.length() == 0) {
-                return null;
-            }
-            try {
-                return new BigInteger(text);
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(text, _valueClass, "not a valid representation");
-            }
-        }
-    }
-    
-    @SuppressWarnings("serial")
-    @JacksonStdImpl
-    public static class BigDecimalDeserializer
-        extends StdScalarDeserializer<BigDecimal>
-    {
-        public BigDecimalDeserializer() { super(BigDecimal.class); }
-
-        @Override
-        public BigDecimal deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
-                return jp.getDecimalValue();
-            }
-            // String is ok too, can easily convert
-            if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-                String text = jp.getText().trim();
-                if (text.length() == 0) {
-                    return null;
-                }
-                try {
-                    return new BigDecimal(text);
-                } catch (IllegalArgumentException iae) {
-                    throw ctxt.weirdStringException(text, _valueClass, "not a valid representation");
-                }
-            }
-            // Otherwise, no can do:
-            throw ctxt.mappingException(_valueClass, t);
-        }
-    }
-
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java
deleted file mode 100644
index ce62d56..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Array;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.ArrayType;
-import com.fasterxml.jackson.databind.util.ObjectBuffer;
-
-/**
- * Basic serializer that can serialize non-primitive arrays.
- */
-@JacksonStdImpl
-public class ObjectArrayDeserializer
-    extends ContainerDeserializerBase<Object[]>
-    implements ContextualDeserializer
-{
-    // // Configuration
-
-    /**
-     * Full generic type of the array being deserialized
-     */
-    protected final ArrayType _arrayType;
-    
-    /**
-     * Flag that indicates whether the component type is Object or not.
-     * Used for minor optimization when constructing result.
-     */
-    protected final boolean _untyped;
-
-    /**
-     * Type of contained elements: needed for constructing actual
-     * result array
-     */
-    protected final Class<?> _elementClass;
-
-    /**
-     * Element deserializer
-     */
-    protected JsonDeserializer<Object> _elementDeserializer;
-
-    /**
-     * If element instances have polymorphic type information, this
-     * is the type deserializer that can handle it
-     */
-    protected final TypeDeserializer _elementTypeDeserializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public ObjectArrayDeserializer(ArrayType arrayType,
-            JsonDeserializer<Object> elemDeser, TypeDeserializer elemTypeDeser)
-    {
-        super(Object[].class);
-        _arrayType = arrayType;
-        _elementClass = arrayType.getContentType().getRawClass();
-        _untyped = (_elementClass == Object.class);
-        _elementDeserializer = elemDeser;
-        _elementTypeDeserializer = elemTypeDeser;
-    }
-
-    /**
-     * Overridable fluent-factory method used to create contextual instances
-     */
-    @SuppressWarnings("unchecked")
-    public ObjectArrayDeserializer withDeserializer(TypeDeserializer elemTypeDeser,
-            JsonDeserializer<?> elemDeser)
-    {
-        if ((elemDeser == _elementDeserializer) && (elemTypeDeser == _elementTypeDeserializer)) {
-            return this;
-        }
-        return new ObjectArrayDeserializer(_arrayType,
-                (JsonDeserializer<Object>) elemDeser, elemTypeDeser);
-    }
-
-//    @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        JsonDeserializer<?> deser = _elementDeserializer;
-        if (deser == null) {
-            deser = ctxt.findContextualValueDeserializer(_arrayType.getContentType(), property);
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (deser instanceof ContextualDeserializer) {
-                deser = ((ContextualDeserializer) deser).createContextual(ctxt, property);
-            }
-        }
-        TypeDeserializer elemTypeDeser = _elementTypeDeserializer;
-        if (elemTypeDeser != null) {
-            elemTypeDeser = elemTypeDeser.forProperty(property);
-        }
-        return withDeserializer(elemTypeDeser, deser);
-    }
-    
-    /*
-    /**********************************************************
-    /* ContainerDeserializerBase API
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return _arrayType.getContentType();
-    }
-
-    @Override
-    public JsonDeserializer<Object> getContentDeserializer() {
-        return _elementDeserializer;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer API
-    /**********************************************************
-     */
-    
-    @Override
-    public Object[] deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_ARRAY (or equivalent)
-        if (!jp.isExpectedStartArrayToken()) {
-            return handleNonArray(jp, ctxt);
-        }
-
-        final ObjectBuffer buffer = ctxt.leaseObjectBuffer();
-        Object[] chunk = buffer.resetAndStart();
-        int ix = 0;
-        JsonToken t;
-        final TypeDeserializer typeDeser = _elementTypeDeserializer;
-
-        while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-            // Note: must handle null explicitly here; value deserializers won't
-            Object value;
-            
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else if (typeDeser == null) {
-                value = _elementDeserializer.deserialize(jp, ctxt);
-            } else {
-                value = _elementDeserializer.deserializeWithType(jp, ctxt, typeDeser);
-            }
-            if (ix >= chunk.length) {
-                chunk = buffer.appendCompletedChunk(chunk);
-                ix = 0;
-            }
-            chunk[ix++] = value;
-        }
-
-        Object[] result;
-
-        if (_untyped) {
-            result = buffer.completeAndClearBuffer(chunk, ix);
-        } else {
-            result = buffer.completeAndClearBuffer(chunk, ix, _elementClass);
-        }
-        ctxt.returnObjectBuffer(buffer);
-        return result;
-    }
-
-    @Override
-    public Object[] deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        /* Should there be separate handling for base64 stuff?
-         * for now this should be enough:
-         */
-        return (Object[]) typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    protected Byte[] deserializeFromBase64(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // First same as what PrimitiveArrayDeserializers.ByteDeser does:
-        byte[] b = jp.getBinaryValue(ctxt.getBase64Variant());
-        // But then need to convert to wrappers
-        Byte[] result = new Byte[b.length];
-        for (int i = 0, len = b.length; i < len; ++i) {
-            result[i] = Byte.valueOf(b[i]);
-        }
-        return result;
-    }
-
-    private final Object[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // [JACKSON-620] Empty String can become null...
-        if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-            String str = jp.getText();
-            if (str.length() == 0) {
-                return null;
-            }
-        }
-        
-        // Can we do implicit coercion to a single-element array still?
-        if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-            /* 04-Oct-2009, tatu: One exception; byte arrays are generally
-             *   serialized as base64, so that should be handled
-             */
-            if (jp.getCurrentToken() == JsonToken.VALUE_STRING
-                && _elementClass == Byte.class) {
-                return deserializeFromBase64(jp, ctxt);
-            }
-            throw ctxt.mappingException(_arrayType.getRawClass());
-        }
-        JsonToken t = jp.getCurrentToken();
-        Object value;
-        
-        if (t == JsonToken.VALUE_NULL) {
-            value = null;
-        } else if (_elementTypeDeserializer == null) {
-            value = _elementDeserializer.deserialize(jp, ctxt);
-        } else {
-            value = _elementDeserializer.deserializeWithType(jp, ctxt, _elementTypeDeserializer);
-        }
-        // Ok: bit tricky, since we may want T[], not just Object[]
-        Object[] result;
-
-        if (_untyped) {
-            result = new Object[1];
-        } else {
-            result = (Object[]) Array.newInstance(_elementClass, 1);
-        }
-        result[0] = value;
-        return result;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java
deleted file mode 100644
index cdde202..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java
+++ /dev/null
@@ -1,602 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.ObjectBuffer;
-
-
-/**
- * Container for deserializers used for instantiating "primitive arrays",
- * arrays that contain non-object java primitive types.
- */
-public class PrimitiveArrayDeserializers
-{
-    HashMap<JavaType,JsonDeserializer<Object>> _allDeserializers;
-
-    final static PrimitiveArrayDeserializers instance = new PrimitiveArrayDeserializers();
-
-    protected PrimitiveArrayDeserializers()
-    {
-        _allDeserializers = new HashMap<JavaType,JsonDeserializer<Object>>();
-        // note: we'll use component type as key, not array type
-        add(boolean.class, new BooleanDeser());
-
-        /* ByteDeser is bit special, as it has 2 separate modes of operation;
-         * one for String input (-> base64 input), the other for
-         * numeric input
-         */
-        add(byte.class, new ByteDeser());
-        add(short.class, new ShortDeser());
-        add(int.class, new IntDeser());
-        add(long.class, new LongDeser());
-
-        add(float.class, new FloatDeser());
-        add(double.class, new DoubleDeser());
-
-        add(String.class, new StringDeser());
-        /* also: char[] is most likely only used with Strings; doesn't
-         * seem to make sense to transfer as numbers
-         */
-        add(char.class, new CharDeser());
-    }
-
-    public static HashMap<JavaType,JsonDeserializer<Object>> getAll()
-    {
-        return instance._allDeserializers;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void add(Class<?> cls, JsonDeserializer<?> deser)
-    {
-        /* Not super clean to use default TypeFactory in general, but
-         * since primitive array types can't be modified for anything
-         * useful, this should be ok:
-         */
-        _allDeserializers.put(TypeFactory.defaultInstance().constructType(cls),
-                (JsonDeserializer<Object>) deser);
-    }
-
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        /* Should there be separate handling for base64 stuff?
-         * for now this should be enough:
-         */
-        return typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-    }
-
-    /*
-    /********************************************************
-    /* Intermediate base class
-    /********************************************************
-     */
-    
-    /**
-     * Intermediate base class for primitive array deserializers
-     */
-    static abstract class Base<T> extends StdDeserializer<T>
-    {
-        private static final long serialVersionUID = 1L;
-
-        protected Base(Class<T> cls) {
-            super(cls);
-        }
-
-        @Override
-        public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-            throws IOException, JsonProcessingException
-        {
-            return typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-        }
-    }
-    
-    /*
-    /********************************************************
-    /* Actual deserializers: efficient String[], char[] deserializers
-    /********************************************************
-    */
-
-    @JacksonStdImpl
-    final static class StringDeser
-        extends Base<String[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public StringDeser() { super(String[].class); }
-
-        @Override
-        public String[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // Ok: must point to START_ARRAY (or equivalent)
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            final ObjectBuffer buffer = ctxt.leaseObjectBuffer();
-            Object[] chunk = buffer.resetAndStart();
-            int ix = 0;
-            JsonToken t;
-            
-            while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-                // Ok: no need to convert Strings, but must recognize nulls
-                String value = (t == JsonToken.VALUE_NULL) ? null : _parseString(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = buffer.appendCompletedChunk(chunk);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            String[] result = buffer.completeAndClearBuffer(chunk, ix, String.class);
-            ctxt.returnObjectBuffer(buffer);
-            return result;
-        }
-    
-        private final String[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-526]: implicit arrays from single values?
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                // [JACKSON-620] Empty String can become null...
-                if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                        && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                    String str = jp.getText();
-                    if (str.length() == 0) {
-                        return null;
-                    }
-                }
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new String[] { (jp.getCurrentToken() == JsonToken.VALUE_NULL) ? null : _parseString(jp, ctxt) };
-        }
-    }
-    
-    @JacksonStdImpl
-    final static class CharDeser
-        extends Base<char[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public CharDeser() { super(char[].class); }
-
-        @Override
-        public char[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            /* Won't take arrays, must get a String (could also
-             * convert other tokens to Strings... but let's not bother
-             * yet, doesn't seem to make sense)
-             */
-            JsonToken t = jp.getCurrentToken();
-            if (t == JsonToken.VALUE_STRING) {
-                // note: can NOT return shared internal buffer, must copy:
-                char[] buffer = jp.getTextCharacters();
-                int offset = jp.getTextOffset();
-                int len = jp.getTextLength();
-    
-                char[] result = new char[len];
-                System.arraycopy(buffer, offset, result, 0, len);
-                return result;
-            }
-            if (jp.isExpectedStartArrayToken()) {
-                // Let's actually build as a String, then get chars
-                StringBuilder sb = new StringBuilder(64);
-                while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-                    if (t != JsonToken.VALUE_STRING) {
-                        throw ctxt.mappingException(Character.TYPE);
-                    }
-                    String str = jp.getText();
-                    if (str.length() != 1) {
-                        throw JsonMappingException.from(jp, "Can not convert a JSON String of length "+str.length()+" into a char element of char array");
-                    }
-                    sb.append(str.charAt(0));
-                }
-                return sb.toString().toCharArray();
-            }
-            // or, maybe an embedded object?
-            if (t == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                Object ob = jp.getEmbeddedObject();
-                if (ob == null) return null;
-                if (ob instanceof char[]) {
-                    return (char[]) ob;
-                }
-                if (ob instanceof String) {
-                    return ((String) ob).toCharArray();
-                }
-                // 04-Feb-2011, tatu: byte[] can be converted; assuming base64 is wanted
-                if (ob instanceof byte[]) {
-                    return Base64Variants.getDefaultVariant().encode((byte[]) ob, false).toCharArray();
-                }
-                // not recognized, just fall through
-            }
-            throw ctxt.mappingException(_valueClass);
-        }
-    }
-
-    /*
-    /********************************************************
-    /* Actual deserializers: primivate array desers
-    /********************************************************
-    */
-
-    @JacksonStdImpl
-    final static class BooleanDeser
-        extends Base<boolean[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public BooleanDeser() { super(boolean[].class); }
-
-        @Override
-        public boolean[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.BooleanBuilder builder = ctxt.getArrayBuilders().getBooleanBuilder();
-            boolean[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                // whether we should allow truncating conversions?
-                boolean value = _parseBooleanPrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final boolean[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new boolean[] { _parseBooleanPrimitive(jp, ctxt) };
-        }
-    }
-
-    /**
-     * When dealing with byte arrays we have one more alternative (compared
-     * to int/long/shorts): base64 encoded data.
-     */
-    @JacksonStdImpl
-    final static class ByteDeser
-        extends Base<byte[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public ByteDeser() { super(byte[].class); }
-
-        @Override
-        public byte[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            JsonToken t = jp.getCurrentToken();
-            
-            // Most likely case: base64 encoded String?
-            if (t == JsonToken.VALUE_STRING) {
-                return jp.getBinaryValue(ctxt.getBase64Variant());
-            }
-            // 31-Dec-2009, tatu: Also may be hidden as embedded Object
-            if (t == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                Object ob = jp.getEmbeddedObject();
-                if (ob == null) return null;
-                if (ob instanceof byte[]) {
-                    return (byte[]) ob;
-                }
-            }
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.ByteBuilder builder = ctxt.getArrayBuilders().getByteBuilder();
-            byte[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-                // whether we should allow truncating conversions?
-                byte value;
-                if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
-                    // should we catch overflow exceptions?
-                    value = jp.getByteValue();
-                } else {
-                    // [JACKSON-79]: should probably accept nulls as 0
-                    if (t != JsonToken.VALUE_NULL) {
-                        throw ctxt.mappingException(_valueClass.getComponentType());
-                    }
-                    value = (byte) 0;
-                }
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final byte[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            byte value;
-            JsonToken t = jp.getCurrentToken();
-            if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
-                // should we catch overflow exceptions?
-                value = jp.getByteValue();
-            } else {
-                // [JACKSON-79]: should probably accept nulls as 'false'
-                if (t != JsonToken.VALUE_NULL) {
-                    throw ctxt.mappingException(_valueClass.getComponentType());
-                }
-                value = (byte) 0;
-            }
-            return new byte[] { value };
-        }
-    }
-
-    @JacksonStdImpl
-    final static class ShortDeser
-        extends Base<short[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public ShortDeser() { super(short[].class); }
-
-        @Override
-        public short[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.ShortBuilder builder = ctxt.getArrayBuilders().getShortBuilder();
-            short[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                short value = _parseShortPrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final short[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new short[] { _parseShortPrimitive(jp, ctxt) };
-        }
-    }
-
-    @JacksonStdImpl
-    final static class IntDeser
-        extends Base<int[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public IntDeser() { super(int[].class); }
-
-        @Override
-        public int[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.IntBuilder builder = ctxt.getArrayBuilders().getIntBuilder();
-            int[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                // whether we should allow truncating conversions?
-                int value = _parseIntPrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final int[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new int[] { _parseIntPrimitive(jp, ctxt) };
-        }
-    }
-
-    @JacksonStdImpl
-    final static class LongDeser
-        extends Base<long[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public LongDeser() { super(long[].class); }
-
-        @Override
-        public long[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.LongBuilder builder = ctxt.getArrayBuilders().getLongBuilder();
-            long[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                long value = _parseLongPrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final long[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new long[] { _parseLongPrimitive(jp, ctxt) };
-        }
-    }
-
-    @JacksonStdImpl
-    final static class FloatDeser
-        extends Base<float[]>
-    {
-        private static final long serialVersionUID = 1L;
-
-        public FloatDeser() { super(float[].class); }
-
-        @Override
-        public float[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.FloatBuilder builder = ctxt.getArrayBuilders().getFloatBuilder();
-            float[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                // whether we should allow truncating conversions?
-                float value = _parseFloatPrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final float[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new float[] { _parseFloatPrimitive(jp, ctxt) };
-        }
-    }
-
-    @JacksonStdImpl
-    final static class DoubleDeser
-        extends Base<double[]>
-    {
-        private static final long serialVersionUID = 1L;
-        
-        public DoubleDeser() { super(double[].class); }
-
-        @Override
-        public double[] deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (!jp.isExpectedStartArrayToken()) {
-                return handleNonArray(jp, ctxt);
-            }
-            ArrayBuilders.DoubleBuilder builder = ctxt.getArrayBuilders().getDoubleBuilder();
-            double[] chunk = builder.resetAndStart();
-            int ix = 0;
-
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                double value = _parseDoublePrimitive(jp, ctxt);
-                if (ix >= chunk.length) {
-                    chunk = builder.appendCompletedChunk(chunk, ix);
-                    ix = 0;
-                }
-                chunk[ix++] = value;
-            }
-            return builder.completeAndClearBuffer(chunk, ix);
-        }
-
-        private final double[] handleNonArray(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            // [JACKSON-620] Empty String can become null...
-            if ((jp.getCurrentToken() == JsonToken.VALUE_STRING)
-                    && ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
-                if (jp.getText().length() == 0) {
-                    return null;
-                }
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-                throw ctxt.mappingException(_valueClass);
-            }
-            return new double[] { _parseDoublePrimitive(jp, ctxt) };
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java
deleted file mode 100644
index 0db871b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.Converter;
-
-/**
- * Deserializer implementation where given Java type is first deserialized
- * by a standard Jackson deserializer into a delegate type; and then
- * this delegate type is converted using a configured
- * {@link Converter} into desired target type.
- * Common delegate types to use are {@link java.util.Map}
- * and {@link com.fasterxml.jackson.databind.JsonNode}.
- *<p>
- * Note that although types (delegate, target) may be related, they must not be same; trying
- * to do this will result in an exception.
- * 
- * @param <T> Target type to convert to, from delegate type
- * 
- * @since 2.1
- */
-public class StdDelegatingDeserializer<T>
-    extends StdDeserializer<T>
-    implements ContextualDeserializer
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final Converter<Object,T> _converter;
-    
-    /**
-     * Fully resolved delegate type, with generic information if any available.
-     */
-    protected final JavaType _delegateType;
-    
-    /**
-     * Underlying serializer for type <code>T<.code>.
-     */
-    protected final JsonDeserializer<Object> _delegateDeserializer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    @SuppressWarnings("unchecked")
-    public StdDelegatingDeserializer(Converter<?,T> converter)
-    {
-        super(Object.class);
-        _converter = (Converter<Object,T>)converter;
-        _delegateType = null;
-        _delegateDeserializer = null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected StdDelegatingDeserializer(Converter<Object,T> converter,
-            JavaType delegateType, JsonDeserializer<?> delegateDeserializer)
-    {
-        super(delegateType);
-        _converter = converter;
-        _delegateType = delegateType;
-        _delegateDeserializer = (JsonDeserializer<Object>) delegateDeserializer;
-    }
-
-    /**
-     * Method used for creating resolved contextual instances. Must be
-     * overridden when sub-classing.
-     */
-    protected StdDelegatingDeserializer<T> withDelegate(Converter<Object,T> converter,
-            JavaType delegateType, JsonDeserializer<?> delegateDeserializer)
-    {
-        if (getClass() != StdDelegatingDeserializer.class) {
-            throw new IllegalStateException("Sub-class "+getClass().getName()+" must override 'withDelegate'");
-        }
-        return new StdDelegatingDeserializer<T>(converter, delegateType, delegateDeserializer);
-    }
-
-    /*
-    /**********************************************************
-    /* Contextualization
-    /**********************************************************
-     */
-    
-
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
-        throws JsonMappingException
-    {
-        // First: figure out what is the fully generic delegate type:
-        TypeFactory tf = ctxt.getTypeFactory();
-        JavaType implType = tf.constructType(_converter.getClass());
-        JavaType[] params = tf.findTypeParameters(implType, Converter.class);
-        if (params == null || params.length != 2) {
-            throw new JsonMappingException("Could not determine Converter parameterization for "
-                    +implType);
-        }
-        // and then we can find serializer to delegate to, construct a new instance:
-        JavaType delegateType = params[0];
-        return withDelegate(_converter, delegateType,
-                ctxt.findContextualValueDeserializer(delegateType, property));
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    @Override
-    public JsonDeserializer<?> getDelegatee() {
-        return _delegateDeserializer;
-    }
-
-    /*
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public T deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        Object delegateValue = _delegateDeserializer.deserialize(jp, ctxt);
-        if (delegateValue == null) {
-            return null;
-        }
-        return convertValue(delegateValue);
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        /* 03-Oct-2012, tatu: This is actually unlikely to work ok... but for now,
-         *    let's give it a chance?
-         */
-        Object delegateValue = _delegateDeserializer.deserializeWithType(jp, ctxt,
-                typeDeserializer);
-        if (delegateValue == null) {
-            return null;
-        }
-        return convertValue(delegateValue);
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called to convert from "delegate value" (which was deserialized
-     * from JSON using standard Jackson deserializer for delegate type)
-     * into desired target type.
-     *<P>
-     * The default implementation uses configured {@link Converter} to do
-     * conversion.
-     * 
-     * @param delegateValue
-     * @return
-     */
-    protected T convertValue(Object delegateValue) {
-        return _converter.convert(delegateValue);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
deleted file mode 100644
index 8173886..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
+++ /dev/null
@@ -1,679 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.JsonParser.NumberType;
-import com.fasterxml.jackson.core.io.NumberInput;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Base class for common deserializers. Contains shared
- * base functionality for dealing with primitive values, such
- * as (re)parsing from String.
- */
-public abstract class StdDeserializer<T>
-    extends JsonDeserializer<T>
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Type of values this deserializer handles: sometimes
-     * exact types, other time most specific supertype of
-     * types deserializer handles (which may be as generic
-     * as {@link Object} in some case)
-     */
-    final protected Class<?> _valueClass;
-
-    protected StdDeserializer(Class<?> vc) {
-        _valueClass = vc;
-    }
-
-    protected StdDeserializer(JavaType valueType) {
-        _valueClass = (valueType == null) ? null : valueType.getRawClass();
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    public Class<?> getValueClass() { return _valueClass; }
-
-    /**
-     * Exact structured type deserializer handles, if known.
-     *<p>
-     * Default implementation just returns null.
-     */
-    public JavaType getValueType() { return null; }
-
-    /**
-     * Method that can be called to determine if given deserializer is the default
-     * deserializer Jackson uses; as opposed to a custom deserializer installed by
-     * a module or calling application. Determination is done using
-     * {@link JacksonStdImpl} annotation on deserializer class.
-     */
-    protected boolean isDefaultDeserializer(JsonDeserializer<?> deserializer) {
-        return (deserializer != null && deserializer.getClass().getAnnotation(JacksonStdImpl.class) != null);
-    }
-
-    protected boolean isDefaultKeyDeserializer(KeyDeserializer keyDeser) {
-        return (keyDeser != null && keyDeser.getClass().getAnnotation(JacksonStdImpl.class) != null);
-    }
-    
-    /*
-    /**********************************************************
-    /* Partial JsonDeserializer implementation 
-    /**********************************************************
-     */
-    
-    /**
-     * Base implementation that does not assume specific type
-     * inclusion mechanism. Sub-classes are expected to override
-     * this method if they are to handle type information.
-     */
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        return typeDeserializer.deserializeTypedFromAny(jp, ctxt);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods for sub-classes, parsing: while mostly
-    /* useful for numeric types, can be also useful for dealing
-    /* with things serialized as numbers (such as Dates).
-    /**********************************************************
-     */
-
-    protected final boolean _parseBooleanPrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_TRUE) {
-            return true;
-        }
-        if (t == JsonToken.VALUE_FALSE) {
-            return false;
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return false;
-        }
-        // [JACKSON-78]: should accept ints too, (0 == false, otherwise true)
-        if (t == JsonToken.VALUE_NUMBER_INT) {
-            // 11-Jan-2012, tatus: May be outside of int...
-            if (jp.getNumberType() == NumberType.INT) {
-                return (jp.getIntValue() != 0);
-            }
-            return _parseBooleanFromNumber(jp, ctxt);
-        }
-        // And finally, let's allow Strings to be converted too
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if ("true".equals(text)) {
-                return true;
-            }
-            if ("false".equals(text) || text.length() == 0) {
-                return Boolean.FALSE;
-            }
-            throw ctxt.weirdStringException(text, _valueClass, "only \"true\" or \"false\" recognized");
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final Boolean _parseBoolean(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_TRUE) {
-            return Boolean.TRUE;
-        }
-        if (t == JsonToken.VALUE_FALSE) {
-            return Boolean.FALSE;
-        }
-        // [JACKSON-78]: should accept ints too, (0 == false, otherwise true)
-        if (t == JsonToken.VALUE_NUMBER_INT) {
-            // 11-Jan-2012, tatus: May be outside of int...
-            if (jp.getNumberType() == NumberType.INT) {
-                return (jp.getIntValue() == 0) ? Boolean.FALSE : Boolean.TRUE;
-            }
-            return Boolean.valueOf(_parseBooleanFromNumber(jp, ctxt));
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Boolean) getNullValue();
-        }
-        // And finally, let's allow Strings to be converted too
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if ("true".equals(text)) {
-                return Boolean.TRUE;
-            }
-            if ("false".equals(text)) {
-                return Boolean.FALSE;
-            }
-            if (text.length() == 0) {
-                return (Boolean) getEmptyValue();
-            }
-            throw ctxt.weirdStringException(text, _valueClass, "only \"true\" or \"false\" recognized");
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final boolean _parseBooleanFromNumber(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-    {
-        if (jp.getNumberType() == NumberType.LONG) {
-            return (jp.getLongValue() == 0L) ? Boolean.FALSE : Boolean.TRUE;
-        }
-        // no really good logic; let's actually resort to textual comparison
-        String str = jp.getText();
-        if ("0.0".equals(str) || "0".equals(str)) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
-
-    protected Byte _parseByte(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getByteValue();
-        }
-        if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-            String text = jp.getText().trim();
-            int value;
-            try {
-                int len = text.length();
-                if (len == 0) {
-                    return (Byte) getEmptyValue();
-                }
-                value = NumberInput.parseInt(text);
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(text, _valueClass, "not a valid Byte value");
-            }
-            // So far so good: but does it fit?
-            // as per [JACKSON-804], allow range up to 255, inclusive
-            if (value < Byte.MIN_VALUE || value > 255) {
-                throw ctxt.weirdStringException(text, _valueClass, "overflow, value can not be represented as 8-bit value");
-            }
-            return Byte.valueOf((byte) value);
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Byte) getNullValue();
-        }
-        throw ctxt.mappingException(_valueClass, t);
-    }
-    
-    protected Short _parseShort(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getShortValue();
-        }
-        if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-            String text = jp.getText().trim();
-            int value;
-            try {
-                int len = text.length();
-                if (len == 0) {
-                    return (Short) getEmptyValue();
-                }
-                value = NumberInput.parseInt(text);
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(text, _valueClass, "not a valid Short value");
-            }
-            // So far so good: but does it fit?
-            if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
-                throw ctxt.weirdStringException(text, _valueClass, "overflow, value can not be represented as 16-bit value");
-            }
-            return Short.valueOf((short) value);
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Short) getNullValue();
-        }
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final short _parseShortPrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        int value = _parseIntPrimitive(jp, ctxt);
-        // So far so good: but does it fit?
-        if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
-            throw ctxt.weirdStringException(String.valueOf(value),
-                    _valueClass, "overflow, value can not be represented as 16-bit value");
-        }
-        return (short) value;
-    }
-    
-    protected final int _parseIntPrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-
-        // Int works as is, coercing fine as well
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getIntValue();
-        }
-        if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-            /* 31-Dec-2009, tatus: Should improve handling of overflow
-             *   values... but this'll have to do for now
-             */
-            String text = jp.getText().trim();
-            try {
-                int len = text.length();
-                if (len > 9) {
-                    long l = Long.parseLong(text);
-                    if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
-                        throw ctxt.weirdStringException(text, _valueClass,
-                            "Overflow: numeric value ("+text+") out of range of int ("+Integer.MIN_VALUE+" - "+Integer.MAX_VALUE+")");
-                    }
-                    return (int) l;
-                }
-                if (len == 0) {
-                    return 0;
-                }
-                return NumberInput.parseInt(text);
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(text, _valueClass, "not a valid int value");
-            }
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return 0;
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final Integer _parseInteger(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return Integer.valueOf(jp.getIntValue());
-        }
-        if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
-            String text = jp.getText().trim();
-            try {
-                int len = text.length();
-                if (len > 9) {
-                    long l = Long.parseLong(text);
-                    if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
-                        throw ctxt.weirdStringException(text, _valueClass,
-                            "Overflow: numeric value ("+text+") out of range of Integer ("+Integer.MIN_VALUE+" - "+Integer.MAX_VALUE+")");
-                    }
-                    return Integer.valueOf((int) l);
-                }
-                if (len == 0) {
-                    return (Integer) getEmptyValue();
-                }
-                return Integer.valueOf(NumberInput.parseInt(text));
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(text, _valueClass, "not a valid Integer value");
-            }
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Integer) getNullValue();
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final Long _parseLong(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-    
-        // it should be ok to coerce (although may fail, too)
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
-            return jp.getLongValue();
-        }
-        // let's allow Strings to be converted too
-        if (t == JsonToken.VALUE_STRING) {
-            // !!! 05-Jan-2009, tatu: Should we try to limit value space, JDK is too lenient?
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return (Long) getEmptyValue();
-            }
-            try {
-                return Long.valueOf(NumberInput.parseLong(text));
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid Long value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Long) getNullValue();
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final long _parseLongPrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) {
-            return jp.getLongValue();
-        }
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return 0L;
-            }
-            try {
-                return NumberInput.parseLong(text);
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid long value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return 0L;
-        }
-        throw ctxt.mappingException(_valueClass, t);
-    }
-    
-    protected final Float _parseFloat(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // We accept couple of different types; obvious ones first:
-        JsonToken t = jp.getCurrentToken();
-        
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getFloatValue();
-        }
-        // And finally, let's allow Strings to be converted too
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return (Float) getEmptyValue();
-            }
-            switch (text.charAt(0)) {
-            case 'I':
-                if ("Infinity".equals(text) || "INF".equals(text)) {
-                    return Float.POSITIVE_INFINITY;
-                }
-                break;
-            case 'N':
-                if ("NaN".equals(text)) {
-                    return Float.NaN;
-                }
-                break;
-            case '-':
-                if ("-Infinity".equals(text) || "-INF".equals(text)) {
-                    return Float.NEGATIVE_INFINITY;
-                }
-                break;
-            }
-            try {
-                return Float.parseFloat(text);
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid Float value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Float) getNullValue();
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final float _parseFloatPrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getFloatValue();
-        }
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return 0.0f;
-            }
-            switch (text.charAt(0)) {
-            case 'I':
-                if ("Infinity".equals(text) || "INF".equals(text)) {
-                    return Float.POSITIVE_INFINITY;
-                }
-                break;
-            case 'N':
-                if ("NaN".equals(text)) {
-                    return Float.NaN;
-                }
-                break;
-            case '-':
-                if ("-Infinity".equals(text) || "-INF".equals(text)) {
-                    return Float.NEGATIVE_INFINITY;
-                }
-                break;
-            }
-            try {
-                return Float.parseFloat(text);
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid float value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return 0.0f;
-        }
-        // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final Double _parseDouble(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getDoubleValue();
-        }
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return (Double) getEmptyValue();
-            }
-            switch (text.charAt(0)) {
-            case 'I':
-                if ("Infinity".equals(text) || "INF".equals(text)) {
-                    return Double.POSITIVE_INFINITY;
-                }
-                break;
-            case 'N':
-                if ("NaN".equals(text)) {
-                    return Double.NaN;
-                }
-                break;
-            case '-':
-                if ("-Infinity".equals(text) || "-INF".equals(text)) {
-                    return Double.NEGATIVE_INFINITY;
-                }
-                break;
-            }
-            try {
-                return parseDouble(text);
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid Double value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (Double) getNullValue();
-        }
-            // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected final double _parseDoublePrimitive(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // We accept couple of different types; obvious ones first:
-        JsonToken t = jp.getCurrentToken();
-        
-        if (t == JsonToken.VALUE_NUMBER_INT || t == JsonToken.VALUE_NUMBER_FLOAT) { // coercing should work too
-            return jp.getDoubleValue();
-        }
-        // And finally, let's allow Strings to be converted too
-        if (t == JsonToken.VALUE_STRING) {
-            String text = jp.getText().trim();
-            if (text.length() == 0) {
-                return 0.0;
-            }
-            switch (text.charAt(0)) {
-            case 'I':
-                if ("Infinity".equals(text) || "INF".equals(text)) {
-                    return Double.POSITIVE_INFINITY;
-                }
-                break;
-            case 'N':
-                if ("NaN".equals(text)) {
-                    return Double.NaN;
-                }
-                break;
-            case '-':
-                if ("-Infinity".equals(text) || "-INF".equals(text)) {
-                    return Double.NEGATIVE_INFINITY;
-                }
-                break;
-            }
-            try {
-                return parseDouble(text);
-            } catch (IllegalArgumentException iae) { }
-            throw ctxt.weirdStringException(text, _valueClass, "not a valid double value");
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return 0.0;
-        }
-            // Otherwise, no can do:
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    protected java.util.Date _parseDate(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.VALUE_NUMBER_INT) {
-            return new java.util.Date(jp.getLongValue());
-        }
-        if (t == JsonToken.VALUE_NULL) {
-            return (java.util.Date) getNullValue();
-        }
-        if (t == JsonToken.VALUE_STRING) {
-            String value = null;
-            try {
-                // As per [JACKSON-203], take empty Strings to mean
-                value = jp.getText().trim();
-                if (value.length() == 0) {
-                    return (Date) getEmptyValue();
-                }
-                return ctxt.parseDate(value);
-            } catch (IllegalArgumentException iae) {
-                throw ctxt.weirdStringException(value, _valueClass,
-                        "not a valid representation (error: "+iae.getMessage()+")");
-            }
-        }
-        throw ctxt.mappingException(_valueClass, t);
-    }
-
-    /**
-     * Helper method for encapsulating calls to low-level double value parsing; single place
-     * just because we need a work-around that must be applied to all calls.
-     */
-    protected final static double parseDouble(String numStr) throws NumberFormatException
-    {
-        // [JACKSON-486]: avoid some nasty float representations... but should it be MIN_NORMAL or MIN_VALUE?
-        // for now, MIN_VALUE, since MIN_NORMAL is JDK 1.6
-        if (NumberInput.NASTY_SMALL_DOUBLE.equals(numStr)) {
-            return Double.MIN_VALUE;
-        }
-        return Double.parseDouble(numStr);
-    }
-    
-    /**
-     * Helper method used for accessing String value, if possible, doing
-     * necessary conversion or throwing exception as necessary.
-     * 
-     * @since 2.1
-     */
-    protected final String _parseString(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        String value = jp.getValueAsString();
-        if (value != null) {
-            return value;
-        }
-        throw ctxt.mappingException(String.class, jp.getCurrentToken());
-    }
-    
-    /*
-    /****************************************************
-    /* Helper methods for sub-classes, resolving dependencies
-    /****************************************************
-     */
-
-    /**
-     * Helper method used to locate deserializers for properties the
-     * type this deserializer handles contains (usually for properties of
-     * bean types)
-     * 
-     * @param type Type of property to deserialize
-     * @param property Actual property object (field, method, constuctor parameter) used
-     *     for passing deserialized values; provided so deserializer can be contextualized if necessary (since 1.7)
-     */
-    protected JsonDeserializer<Object> findDeserializer(DeserializationContext ctxt,
-            JavaType type, BeanProperty property)
-        throws JsonMappingException
-    {
-        return ctxt.findContextualValueDeserializer(type, property);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for sub-classes, problem reporting
-    /**********************************************************
-     */
-
-    /**
-     * Method called to deal with a property that did not map to a known
-     * Bean property. Method can deal with the problem as it sees fit (ignore,
-     * throw exception); but if it does return, it has to skip the matching
-     * Json content parser has.
-     *<p>
-     * NOTE: method signature was changed in version 1.5; explicit JsonParser
-     * <b>must</b> be passed since it may be something other than what
-     * context has. Prior versions did not include the first parameter.
-     *
-     * @param jp Parser that points to value of the unknown property
-     * @param ctxt Context for deserialization; allows access to the parser,
-     *    error reporting functionality
-     * @param instanceOrClass Instance that is being populated by this
-     *   deserializer, or if not known, Class that would be instantiated.
-     *   If null, will assume type is what {@link #getValueClass} returns.
-     * @param propName Name of the property that can not be mapped
-     */
-    protected void handleUnknownProperty(JsonParser jp, DeserializationContext ctxt,
-            Object instanceOrClass, String propName)
-        throws IOException, JsonProcessingException
-    {
-        if (instanceOrClass == null) {
-            instanceOrClass = getValueClass();
-        }
-        // Maybe we have configured handler(s) to take care of it?
-        if (ctxt.handleUnknownProperty(jp, this, instanceOrClass, propName)) {
-            return;
-        }
-        // Nope, not handled. Potentially that's a problem...
-        ctxt.reportUnknownProperty(instanceOrClass, propName, this);
-
-        /* But if we do get this far, need to skip whatever value we
-         * are pointing to now.
-         */
-        jp.skipChildren();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java
deleted file mode 100644
index 2c38ac3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java
+++ /dev/null
@@ -1,411 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Locale;
-import java.util.UUID;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.io.NumberInput;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.EnumResolver;
-
-/**
- * Base class for simple key deserializers.
- */
-public abstract class StdKeyDeserializer
-    extends KeyDeserializer
-{
-    final protected Class<?> _keyClass;
-
-    protected StdKeyDeserializer(Class<?> cls) { _keyClass = cls; }
-
-    @Override
-    public final Object deserializeKey(String key, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (key == null) { // is this even legal call?
-            return null;
-        }
-        try {
-            Object result = _parse(key, ctxt);
-            if (result != null) {
-                return result;
-            }
-        } catch (Exception re) {
-            throw ctxt.weirdKeyException(_keyClass, key, "not a valid representation: "+re.getMessage());
-        }
-        if (_keyClass.isEnum() && ctxt.getConfig().isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-        	return null;
-        }
-        throw ctxt.weirdKeyException(_keyClass, key, "not a valid representation");
-    }
-
-    public Class<?> getKeyClass() { return _keyClass; }
-
-    protected abstract Object _parse(String key, DeserializationContext ctxt) throws Exception;
-
-    /*
-    /**********************************************************
-    /* Helper methods for sub-classes
-    /**********************************************************
-     */
-
-    protected int _parseInt(String key) throws IllegalArgumentException
-    {
-        return Integer.parseInt(key);
-    }
-
-    protected long _parseLong(String key) throws IllegalArgumentException
-    {
-        return Long.parseLong(key);
-    }
-
-    protected double _parseDouble(String key) throws IllegalArgumentException
-    {
-        return NumberInput.parseDouble(key);
-    }
-
-    /*
-    /**********************************************************
-    /* First: the standard "String as String" deserializer
-    /**********************************************************
-     */
-
-    @JacksonStdImpl
-    final static class StringKD extends StdKeyDeserializer
-    {
-        private final static StringKD sString = new StringKD(String.class);
-        private final static StringKD sObject = new StringKD(Object.class);
-        
-        private StringKD(Class<?> nominalType) { super(nominalType); }
-
-        public static StringKD forType(Class<?> nominalType)
-        {
-            if (nominalType == String.class) {
-                return sString;
-            }
-            if (nominalType == Object.class) {
-                return sObject;
-            }
-            return new StringKD(nominalType);
-        }
-        
-        @Override
-        public String _parse(String key, DeserializationContext ctxt) throws JsonMappingException {
-            return key;
-        }
-    }    
-    
-    /*
-    /**********************************************************
-    /* Key deserializer implementations; wrappers
-    /**********************************************************
-     */
-
-    @JacksonStdImpl
-    final static class BoolKD extends StdKeyDeserializer
-    {
-        BoolKD() { super(Boolean.class); }
-
-        @Override
-        public Boolean _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            if ("true".equals(key)) {
-                return Boolean.TRUE;
-            }
-            if ("false".equals(key)) {
-                return Boolean.FALSE;
-            }
-            throw ctxt.weirdKeyException(_keyClass, key, "value not 'true' or 'false'");
-        }
-    }
-
-    @JacksonStdImpl
-    final static class ByteKD extends StdKeyDeserializer
-    {
-        ByteKD() { super(Byte.class); }
-
-        @Override
-		public Byte _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            int value = _parseInt(key);
-            // as per [JACKSON-804], allow range up to 255, inclusive
-            if (value < Byte.MIN_VALUE || value > 255) {
-                throw ctxt.weirdKeyException(_keyClass, key, "overflow, value can not be represented as 8-bit value");
-            }
-            return Byte.valueOf((byte) value);
-        }
-    }
-
-    @JacksonStdImpl
-    final static class ShortKD extends StdKeyDeserializer
-    {
-        ShortKD() { super(Integer.class); }
-
-        @Override
-		public Short _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            int value = _parseInt(key);
-            if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
-                throw ctxt.weirdKeyException(_keyClass, key, "overflow, value can not be represented as 16-bit value");
-            }
-            return Short.valueOf((short) value);
-        }
-    }
-
-    /**
-     * Dealing with Characters is bit trickier: let's assume it must be a String, and that
-     * Unicode numeric value is never used.
-     */
-    @JacksonStdImpl
-    final static class CharKD extends StdKeyDeserializer
-    {
-        CharKD() { super(Character.class); }
-
-        @Override
-		public Character _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            if (key.length() == 1) {
-                return Character.valueOf(key.charAt(0));
-            }
-            throw ctxt.weirdKeyException(_keyClass, key, "can only convert 1-character Strings");
-        }
-    }
-
-    @JacksonStdImpl
-    final static class IntKD extends StdKeyDeserializer
-    {
-        IntKD() { super(Integer.class); }
-
-        @Override
-		public Integer _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            return _parseInt(key);
-        }
-    }
-
-    @JacksonStdImpl
-    final static class LongKD extends StdKeyDeserializer
-    {
-        LongKD() { super(Long.class); }
-
-        @Override
-        public Long _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            return _parseLong(key);
-        }
-    }
-
-    @JacksonStdImpl
-    final static class DoubleKD extends StdKeyDeserializer
-    {
-        DoubleKD() { super(Double.class); }
-
-        @Override
-        public Double _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            return _parseDouble(key);
-        }
-    }
-
-    @JacksonStdImpl
-    final static class FloatKD extends StdKeyDeserializer
-    {
-        FloatKD() { super(Float.class); }
-
-        @Override
-        public Float _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            /* 22-Jan-2009, tatu: Bounds/range checks would be tricky
-             *   here, so let's not bother even trying...
-             */
-            return Float.valueOf((float) _parseDouble(key));
-        }
-    }
-
-    @JacksonStdImpl
-    final static class LocaleKD extends StdKeyDeserializer {
-        protected JdkDeserializers.LocaleDeserializer _localeDeserializer;
-
-        LocaleKD() { super(Locale.class); _localeDeserializer = new JdkDeserializers.LocaleDeserializer();}
-
-        @Override
-        protected Locale _parse(String key, DeserializationContext ctxt) throws JsonMappingException {
-            try {
-                return _localeDeserializer._deserialize(key,ctxt);
-            } catch (IOException e) {
-                throw ctxt.weirdKeyException(_keyClass, key, "unable to parse key as locale");
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Key deserializer implementations; other
-    /**********************************************************
-     */
-
-    /**
-     * Key deserializer that wraps a "regular" deserializer (but one
-     * that must recognize FIELD_NAMEs as text!) to reuse existing
-     * handlers as key handlers.
-     */
-    final static class DelegatingKD extends KeyDeserializer // note: NOT the std one
-    {
-        final protected Class<?> _keyClass;
-
-        protected final JsonDeserializer<?> _delegate;
-        
-        protected DelegatingKD(Class<?> cls, JsonDeserializer<?> deser) {
-            _keyClass = cls;
-            _delegate = deser;
-        }
-
-        @Override
-        public final Object deserializeKey(String key, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            if (key == null) { // is this even legal call?
-                return null;
-            }
-            try {
-                // Ugh... should not have to give parser which may or may not be correct one...
-                Object result = _delegate.deserialize(ctxt.getParser(), ctxt);
-                if (result != null) {
-                    return result;
-                }
-            } catch (Exception re) {
-                throw ctxt.weirdKeyException(_keyClass, key, "not a valid representation: "+re.getMessage());
-            }
-            throw ctxt.weirdKeyException(_keyClass, key, "not a valid representation");
-        }
-
-        public Class<?> getKeyClass() { return _keyClass; }
-    }
-     
-    @JacksonStdImpl
-    final static class EnumKD extends StdKeyDeserializer
-    {
-        protected final EnumResolver<?> _resolver;
-
-        protected final AnnotatedMethod _factory;
-
-        protected EnumKD(EnumResolver<?> er, AnnotatedMethod factory) {
-            super(er.getEnumClass());
-            _resolver = er;
-            _factory = factory;
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt) throws JsonMappingException
-        {
-            if (_factory != null) {
-                try {
-                    return _factory.call1(key);
-                } catch (Exception e) {
-                    ClassUtil.unwrapAndThrowAsIAE(e);
-                }
-            }
-            Enum<?> e = _resolver.findEnum(key);
-            if (e == null && !ctxt.getConfig().isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                throw ctxt.weirdKeyException(_keyClass, key, "not one of values for Enum class");
-            }
-            return e;
-        }
-    }
-    
-    /**
-     * Key deserializer that calls a single-string-arg constructor
-     * to instantiate desired key type.
-     */
-    final static class StringCtorKeyDeserializer extends StdKeyDeserializer
-    {
-        protected final Constructor<?> _ctor;
-
-        public StringCtorKeyDeserializer(Constructor<?> ctor) {
-            super(ctor.getDeclaringClass());
-            _ctor = ctor;
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt) throws Exception
-        {
-            return _ctor.newInstance(key);
-        }
-    }
-
-    /**
-     * Key deserializer that calls a static no-args factory method
-     * to instantiate desired key type.
-     */
-    final static class StringFactoryKeyDeserializer extends StdKeyDeserializer
-    {
-        final Method _factoryMethod;
-
-        public StringFactoryKeyDeserializer(Method fm) {
-            super(fm.getDeclaringClass());
-            _factoryMethod = fm;
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt) throws Exception
-        {
-            return _factoryMethod.invoke(null, key);
-        }
-    }
-
-    // as per [JACKSON-657]
-    @JacksonStdImpl
-    final static class DateKD extends StdKeyDeserializer
-    {
-        protected DateKD() {
-            super(java.util.Date.class);
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt)
-            throws IllegalArgumentException, JsonMappingException
-        {
-            return ctxt.parseDate(key);
-        }
-    }
-        
-    // as per [JACKSON-657]
-    @JacksonStdImpl
-    final static class CalendarKD extends StdKeyDeserializer
-    {
-        protected CalendarKD() {
-            super(java.util.Calendar.class);
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt)
-            throws IllegalArgumentException, JsonMappingException
-        {
-            java.util.Date date = ctxt.parseDate(key);
-            return (date == null)  ? null : ctxt.constructCalendar(date);
-        }
-    }
-
-    // as per [JACKSON-726]
-    @JacksonStdImpl
-    final static class UuidKD extends StdKeyDeserializer
-    {
-        protected UuidKD() {
-            super(UUID.class);
-        }
-
-        @Override
-        public Object _parse(String key, DeserializationContext ctxt)
-            throws IllegalArgumentException, JsonMappingException
-        {
-            return UUID.fromString(key);
-        }
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.java
deleted file mode 100644
index 7540953..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializers.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.EnumResolver;
-
-/**
- * Helper class used to contain simple/well-known key deserializers.
- * Following kinds of Objects can be handled currently:
- *<ul>
- * <li>Primitive wrappers (Boolean, Byte, Char, Short, Integer, Float, Long, Double)</li>
- * <li>Enums (usually not needed, since EnumMap doesn't call us)</li>
- * <li>{@link java.util.Date}</li>
- * <li>{@link java.util.Calendar}</li>
- * <li>{@link java.util.UUID}</li>
- * <li>{@link java.util.Locale}</li>
- * <li>Anything with constructor that takes a single String arg
- *   (if not explicitly @JsonIgnore'd)</li>
- * <li>Anything with {@code static T valueOf(String)} factory method
- *   (if not explicitly @JsonIgnore'd)</li>
- *</ul>
- */
-public class StdKeyDeserializers
-{
-    protected final HashMap<JavaType, KeyDeserializer> _keyDeserializers = new HashMap<JavaType, KeyDeserializer>();
-
-    protected StdKeyDeserializers()
-    {
-        add(new StdKeyDeserializer.BoolKD());
-        add(new StdKeyDeserializer.ByteKD());
-        add(new StdKeyDeserializer.CharKD());
-        add(new StdKeyDeserializer.ShortKD());
-        add(new StdKeyDeserializer.IntKD());
-        add(new StdKeyDeserializer.LongKD());
-        add(new StdKeyDeserializer.FloatKD());
-        add(new StdKeyDeserializer.DoubleKD());
-        add(new StdKeyDeserializer.DateKD());
-        add(new StdKeyDeserializer.CalendarKD());
-        add(new StdKeyDeserializer.UuidKD());
-        add(new StdKeyDeserializer.LocaleKD());
-    }
-
-    private void add(StdKeyDeserializer kdeser)
-    {
-        Class<?> keyClass = kdeser.getKeyClass();
-        /* As with other cases involving primitive types, we can use
-         * default TypeFactory ok, even if it's not our first choice:
-         */
-        _keyDeserializers.put(TypeFactory.defaultInstance().constructType(keyClass), kdeser);
-    }
-
-    public static HashMap<JavaType, KeyDeserializer> constructAll()
-    {
-        return new StdKeyDeserializers()._keyDeserializers;
-    }
-
-    /*
-    /**********************************************************
-    /* Dynamic factory methods
-    /**********************************************************
-     */
-
-    public static KeyDeserializer constructStringKeyDeserializer(DeserializationConfig config, JavaType type) {
-        return StdKeyDeserializer.StringKD.forType(type.getRawClass());
-    }
-    
-    public static KeyDeserializer constructEnumKeyDeserializer(EnumResolver<?> enumResolver) {
-        return new StdKeyDeserializer.EnumKD(enumResolver, null);
-    }
-
-    public static KeyDeserializer constructEnumKeyDeserializer(EnumResolver<?> enumResolver,
-            AnnotatedMethod factory) {
-        return new StdKeyDeserializer.EnumKD(enumResolver, factory);
-    }
-    
-    public static KeyDeserializer constructDelegatingKeyDeserializer(DeserializationConfig config,
-            JavaType type, JsonDeserializer<?> deser)
-    {
-        return new StdKeyDeserializer.DelegatingKD(type.getRawClass(), deser);
-    }
-    
-    public static KeyDeserializer findStringBasedKeyDeserializer(DeserializationConfig config, JavaType type)
-    {
-        /* We don't need full deserialization information, just need to
-         * know creators.
-         */
-        BeanDescription beanDesc = config.introspect(type);
-        // Ok, so: can we find T(String) constructor?
-        Constructor<?> ctor = beanDesc.findSingleArgConstructor(String.class);
-        if (ctor != null) {
-            if (config.canOverrideAccessModifiers()) {
-                ClassUtil.checkAndFixAccess(ctor);
-            }
-            return new StdKeyDeserializer.StringCtorKeyDeserializer(ctor);
-        }
-        /* or if not, "static T valueOf(String)" (or equivalent marked
-         * with @JsonCreator annotation?)
-         */
-        Method m = beanDesc.findFactoryMethod(String.class);
-        if (m != null){
-            if (config.canOverrideAccessModifiers()) {
-                ClassUtil.checkAndFixAccess(m);
-            }
-            return new StdKeyDeserializer.StringFactoryKeyDeserializer(m);
-        }
-        // nope, no such luck...
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdScalarDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdScalarDeserializer.java
deleted file mode 100644
index 0e50b0e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdScalarDeserializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Base class for deserializers that handle types that are serialized
- * as JSON scalars (non-structured, i.e. non-Object, non-Array, values).
- */
-public abstract class StdScalarDeserializer<T> extends StdDeserializer<T>
-{
-    private static final long serialVersionUID = 1L;
-
-    protected StdScalarDeserializer(Class<?> vc) {
-        super(vc);
-    }
-
-    protected StdScalarDeserializer(JavaType valueType) {
-        super(valueType);
-    }
-    
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        return typeDeserializer.deserializeTypedFromScalar(jp, ctxt);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.java
deleted file mode 100644
index 73a5615..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StdValueInstantiator.java
+++ /dev/null
@@ -1,438 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.CreatorProperty;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.introspect.AnnotatedWithParams;
-
-
-/**
- * Default {@link ValueInstantiator} implementation, which supports
- * Creator methods that can be indicated by standard Jackson
- * annotations.
- */
-public class StdValueInstantiator
-    extends ValueInstantiator
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Type of values that are instantiated; used
-     * for error reporting purposes.
-     */
-    protected final String _valueTypeDesc;
-
-    /**
-     * Are we allowed to convert empty Strings to null objects?
-     */
-    protected final boolean _cfgEmptyStringsAsObjects;
-    
-    // // // Default (no-args) construction
-
-    /**
-     * Default (no-argument) constructor to use for instantiation
-     * (with {@link #createUsingDefault})
-     */
-    protected AnnotatedWithParams _defaultCreator;
-
-    // // // With-args (property-based) construction
-
-    protected AnnotatedWithParams _withArgsCreator;
-    protected CreatorProperty[] _constructorArguments;
-
-    // // // Delegate construction
-    
-    protected JavaType _delegateType;
-    protected AnnotatedWithParams _delegateCreator;
-    protected CreatorProperty[] _delegateArguments;
-    
-    // // // Scalar construction
-
-    protected AnnotatedWithParams _fromStringCreator;
-    protected AnnotatedWithParams _fromIntCreator;
-    protected AnnotatedWithParams _fromLongCreator;
-    protected AnnotatedWithParams _fromDoubleCreator;
-    protected AnnotatedWithParams _fromBooleanCreator;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public StdValueInstantiator(DeserializationConfig config, Class<?> valueType)
-    {
-        _cfgEmptyStringsAsObjects = (config == null) ? false
-                : config.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-        _valueTypeDesc = (valueType == null) ? "UNKNOWN TYPE" : valueType.getName();
-    }
-    
-    public StdValueInstantiator(DeserializationConfig config, JavaType valueType)
-    {
-        _cfgEmptyStringsAsObjects = (config == null) ? false
-                : config.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-        _valueTypeDesc = (valueType == null) ? "UNKNOWN TYPE" : valueType.toString();
-    }
-    
-    /**
-     * Copy-constructor that sub-classes can use when creating new instances
-     * by fluent-style construction
-     */
-    protected StdValueInstantiator(StdValueInstantiator src)
-    {
-        _cfgEmptyStringsAsObjects = src._cfgEmptyStringsAsObjects;
-        _valueTypeDesc = src._valueTypeDesc;
-
-        _defaultCreator = src._defaultCreator;
-
-        _constructorArguments = src._constructorArguments;
-        _withArgsCreator = src._withArgsCreator;
-
-        _delegateType = src._delegateType;
-        _delegateCreator = src._delegateCreator;
-        _delegateArguments = src._delegateArguments;
-        
-        _fromStringCreator = src._fromStringCreator;
-        _fromIntCreator = src._fromIntCreator;
-        _fromLongCreator = src._fromLongCreator;
-        _fromDoubleCreator = src._fromDoubleCreator;
-        _fromBooleanCreator = src._fromBooleanCreator;
-    }
-
-    /**
-     * Method for setting properties related to instantiating values
-     * from JSON Object. We will choose basically only one approach (out of possible
-     * three), and clear other properties
-     */
-    public void configureFromObjectSettings(AnnotatedWithParams defaultCreator,
-            AnnotatedWithParams delegateCreator, JavaType delegateType, CreatorProperty[] delegateArgs,
-            AnnotatedWithParams withArgsCreator, CreatorProperty[] constructorArgs)
-    {
-        _defaultCreator = defaultCreator;
-        _delegateCreator = delegateCreator;
-        _delegateType = delegateType;
-        _delegateArguments = delegateArgs;
-        _withArgsCreator = withArgsCreator;
-        _constructorArguments = constructorArgs;
-    }
-
-    public void configureFromStringCreator(AnnotatedWithParams creator) {
-        _fromStringCreator = creator;
-    }
-
-    public void configureFromIntCreator(AnnotatedWithParams creator) {
-        _fromIntCreator = creator;
-    }
-
-    public void configureFromLongCreator(AnnotatedWithParams creator) {
-        _fromLongCreator = creator;
-    }
-
-    public void configureFromDoubleCreator(AnnotatedWithParams creator) {
-        _fromDoubleCreator = creator;
-    }
-
-    public void configureFromBooleanCreator(AnnotatedWithParams creator) {
-        _fromBooleanCreator = creator;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API implementation; metadata
-    /**********************************************************
-     */
-
-    @Override
-    public String getValueTypeDesc() {
-        return _valueTypeDesc;
-    }
-    
-    @Override
-    public boolean canCreateFromString() {
-        return (_fromStringCreator != null);
-    }
-
-    @Override
-    public boolean canCreateFromInt() {
-        return (_fromIntCreator != null);
-    }
-
-    @Override
-    public boolean canCreateFromLong() {
-        return (_fromLongCreator != null);
-    }
-
-    @Override
-    public boolean canCreateFromDouble() {
-        return (_fromDoubleCreator != null);
-    }
-
-    @Override
-    public boolean canCreateFromBoolean() {
-        return (_fromBooleanCreator != null);
-    }
-    
-    @Override
-    public boolean canCreateUsingDefault() {
-        return (_defaultCreator != null);
-    }
-
-    @Override
-    public boolean canCreateUsingDelegate() {
-        return _delegateType != null;
-    }
-    
-    @Override
-    public boolean canCreateFromObjectWith() {
-        return (_withArgsCreator != null);
-    }
-
-    @Override
-    public JavaType getDelegateType(DeserializationConfig config) {
-        return _delegateType;
-    }
-
-    @Override
-    public SettableBeanProperty[] getFromObjectArguments(DeserializationConfig config) {
-        return _constructorArguments;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API implementation; instantiation from JSON Object
-    /**********************************************************
-     */
-    
-    @Override
-    public Object createUsingDefault(DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_defaultCreator == null) { // sanity-check; caller should check
-            throw new IllegalStateException("No default constructor for "+getValueTypeDesc());
-        }
-        try {
-            return _defaultCreator.call();
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        } catch (Exception e) {
-            throw wrapException(e);
-        }
-    }
-    
-    @Override
-    public Object createFromObjectWith(DeserializationContext ctxt, Object[] args)
-        throws IOException, JsonProcessingException
-    {
-        if (_withArgsCreator == null) { // sanity-check; caller should check
-            throw new IllegalStateException("No with-args constructor for "+getValueTypeDesc());
-        }
-        try {
-            return _withArgsCreator.call(args);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        } catch (Exception e) {
-            throw wrapException(e);
-        }
-    }
-
-    @Override
-    public Object createUsingDelegate(DeserializationContext ctxt, Object delegate)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateCreator == null) { // sanity-check; caller should check
-            throw new IllegalStateException("No delegate constructor for "+getValueTypeDesc());
-        }
-        try {
-            // First simple case: just delegate, no injectables
-            if (_delegateArguments == null) {
-                return _delegateCreator.call1(delegate);
-            }
-            // And then the case with at least one injectable...
-            final int len = _delegateArguments.length;
-            Object[] args = new Object[len];
-            for (int i = 0; i < len; ++i) {
-                CreatorProperty prop = _delegateArguments[i];
-                if (prop == null) { // delegate
-                    args[i] = delegate;
-                } else { // nope, injectable:
-                    args[i] = ctxt.findInjectableValue(prop.getInjectableValueId(), prop, null);
-                }
-            }
-            // and then try calling with full set of arguments
-            return _delegateCreator.call(args);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        } catch (Exception e) {
-            throw wrapException(e);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API implementation; instantiation from JSON scalars
-    /**********************************************************
-     */
-    
-    @Override
-    public Object createFromString(DeserializationContext ctxt, String value)
-            throws IOException, JsonProcessingException
-    {
-        if (_fromStringCreator != null) {
-            try {
-                return _fromStringCreator.call1(value);
-            } catch (Exception e) {
-                throw wrapException(e);
-            } catch (ExceptionInInitializerError e) {
-                throw wrapException(e);
-            }
-        }
-        return _createFromStringFallbacks(ctxt, value);
-    }
-    
-    @Override
-    public Object createFromInt(DeserializationContext ctxt, int value)
-            throws IOException, JsonProcessingException
-    {
-        try {
-            // First: "native" int methods work best:
-            if (_fromIntCreator != null) {
-                return _fromIntCreator.call1(Integer.valueOf(value));
-            }
-            // but if not, can do widening conversion
-            if (_fromLongCreator != null) {
-                return _fromLongCreator.call1(Long.valueOf(value));
-            }
-        } catch (Exception e) {
-            throw wrapException(e);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        }
-        throw new JsonMappingException("Can not instantiate value of type "+getValueTypeDesc()
-                +" from Integral number; no single-int-arg constructor/factory method");
-    }
-
-    @Override
-    public Object createFromLong(DeserializationContext ctxt, long value)
-            throws IOException, JsonProcessingException
-    {
-        try {
-            if (_fromLongCreator != null) {
-                return _fromLongCreator.call1(Long.valueOf(value));
-            }
-        } catch (Exception e) {
-            throw wrapException(e);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        }
-        throw new JsonMappingException("Can not instantiate value of type "+getValueTypeDesc()
-                +" from Long integral number; no single-long-arg constructor/factory method");
-    }
-
-    @Override
-    public Object createFromDouble(DeserializationContext ctxt, double value)
-            throws IOException, JsonProcessingException
-    {
-        try {
-            if (_fromDoubleCreator != null) {
-                return _fromDoubleCreator.call1(Double.valueOf(value));
-            }
-        } catch (Exception e) {
-            throw wrapException(e);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        }
-        throw new JsonMappingException("Can not instantiate value of type "+getValueTypeDesc()
-                +" from Floating-point number; no one-double/Double-arg constructor/factory method");
-    }
-
-    @Override
-    public Object createFromBoolean(DeserializationContext ctxt, boolean value)
-            throws IOException, JsonProcessingException
-    {
-        try {
-            if (_fromBooleanCreator != null) {
-                return _fromBooleanCreator.call1(Boolean.valueOf(value));
-            }
-        } catch (Exception e) {
-            throw wrapException(e);
-        } catch (ExceptionInInitializerError e) {
-            throw wrapException(e);
-        }
-        throw new JsonMappingException("Can not instantiate value of type "+getValueTypeDesc()
-                +" from Boolean value; no single-boolean/Boolean-arg constructor/factory method");
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API: configuration mutators, accessors
-    /**********************************************************
-     */
-
-    @Override
-    public AnnotatedWithParams getDelegateCreator() {
-        return _delegateCreator;
-    }
-
-    @Override
-    public AnnotatedWithParams getDefaultCreator() {
-        return _defaultCreator;
-    }
-
-    @Override
-    public AnnotatedWithParams getWithArgsCreator() {
-        return _withArgsCreator;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected Object _createFromStringFallbacks(DeserializationContext ctxt, String value)
-            throws IOException, JsonProcessingException
-    {
-        /* 28-Sep-2011, tatu: Ok this is not clean at all; but since there are legacy
-         *   systems that expect conversions in some cases, let's just add a minimal
-         *   patch (note: same could conceivably be used for numbers too).
-         */
-        if (_fromBooleanCreator != null) {
-            String str = value.trim();
-            if ("true".equals(str)) {
-                return createFromBoolean(ctxt, true);
-            }
-            if ("false".equals(str)) {
-                return createFromBoolean(ctxt, false);
-            }
-        }
-        
-        // and finally, empty Strings might be accepted as null Object...
-        if (_cfgEmptyStringsAsObjects && value.length() == 0) {
-            return null;
-        }
-        throw new JsonMappingException("Can not instantiate value of type "+getValueTypeDesc()
-                +" from String value; no single-String constructor/factory method");
-    }
-    
-    protected JsonMappingException wrapException(Throwable t)
-    {
-        while (t.getCause() != null) {
-            t = t.getCause();
-        }
-        if (t instanceof JsonMappingException) {
-            return (JsonMappingException) t;
-        }
-        return new JsonMappingException("Instantiation of "+getValueTypeDesc()+" value failed: "+t.getMessage(), t);
-    }
-}
-
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.java
deleted file mode 100644
index a20dd89..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.introspect.AnnotatedWithParams;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-/**
- * Specifically optimized version for {@link java.util.Collection}s
- * that contain String values; reason is that this is a very common
- * type and we can make use of the fact that Strings are final.
- */
-@JacksonStdImpl
-public final class StringCollectionDeserializer
-    extends ContainerDeserializerBase<Collection<String>>
-    implements ContextualDeserializer
-{
-    private static final long serialVersionUID = 1L;
-
-    // // Configuration
-
-    protected final JavaType _collectionType;
-    
-    /**
-     * Value deserializer to use, if NOT the standard one
-     * (if it is, will be null).
-     */
-    protected final JsonDeserializer<String> _valueDeserializer;
-
-    // // Instance construction settings:
-    
-    /**
-     * Instantiator used in case custom handling is needed for creation.
-     */
-    protected final ValueInstantiator _valueInstantiator;
-
-    /**
-     * Deserializer that is used iff delegate-based creator is
-     * to be used for deserializing from JSON Object.
-     */
-    protected final JsonDeserializer<Object> _delegateDeserializer;
-
-    // NOTE: no PropertyBasedCreator, as JSON Arrays have no properties
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public StringCollectionDeserializer(JavaType collectionType,
-            JsonDeserializer<?> valueDeser, ValueInstantiator valueInstantiator)
-    {
-        this(collectionType, valueInstantiator, null, valueDeser);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected StringCollectionDeserializer(JavaType collectionType,
-            ValueInstantiator valueInstantiator, JsonDeserializer<?> delegateDeser,
-            JsonDeserializer<?> valueDeser)
-    {
-        super(collectionType.getRawClass());
-        _collectionType = collectionType;
-        _valueDeserializer = (JsonDeserializer<String>) valueDeser;
-        _valueInstantiator = valueInstantiator;
-        _delegateDeserializer = (JsonDeserializer<Object>) delegateDeser;
-    }
-
-    protected StringCollectionDeserializer withResolved(JsonDeserializer<?> delegateDeser,
-            JsonDeserializer<?> valueDeser)
-    {
-        if ((_valueDeserializer == valueDeser) && (_delegateDeserializer == delegateDeser)) {
-            return this;
-        }
-        return new StringCollectionDeserializer(_collectionType,
-                _valueInstantiator, delegateDeser, valueDeser);
-    }
-    
-    /*
-    /**********************************************************
-    /* Validation, post-processing
-    /**********************************************************
-     */
-
-//    @Override
-    @SuppressWarnings("unchecked")
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
-            BeanProperty property) throws JsonMappingException
-    {
-        // May need to resolve types for delegate-based creators:
-        JsonDeserializer<Object> delegate = null;
-        if (_valueInstantiator != null) {
-            AnnotatedWithParams delegateCreator = _valueInstantiator.getDelegateCreator();
-            if (delegateCreator != null) {
-                JavaType delegateType = _valueInstantiator.getDelegateType(ctxt.getConfig());
-                delegate = findDeserializer(ctxt, delegateType, property);
-            }
-        }
-        JsonDeserializer<?> valueDeser = _valueDeserializer;
-        if (valueDeser == null) {
-            // And we may also need to get deserializer for String
-            JsonDeserializer<?> deser = ctxt.findContextualValueDeserializer(
-                    _collectionType.getContentType(), property);
-            valueDeser = (JsonDeserializer<String>) deser;
-        } else { // if directly assigned, probably not yet contextual, so:
-            if (valueDeser instanceof ContextualDeserializer) {
-                valueDeser = ((ContextualDeserializer) valueDeser).createContextual(ctxt, property);
-            }
-        } 
-        if (isDefaultDeserializer(valueDeser)) {
-            valueDeser = null;
-        }
-        return withResolved(delegate, valueDeser);
-    }
-    
-    /*
-    /**********************************************************
-    /* ContainerDeserializerBase API
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return _collectionType.getContentType();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public JsonDeserializer<Object> getContentDeserializer() {
-        JsonDeserializer<?> deser = _valueDeserializer;
-        return (JsonDeserializer<Object>) deser;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonDeserializer API
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public Collection<String> deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_delegateDeserializer != null) {
-            return (Collection<String>) _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        final Collection<String> result = (Collection<String>) _valueInstantiator.createUsingDefault(ctxt);
-        return deserialize(jp, ctxt, result);
-    }
-
-    @Override
-    public Collection<String> deserialize(JsonParser jp, DeserializationContext ctxt,
-                                          Collection<String> result)
-        throws IOException, JsonProcessingException
-    {
-        // Ok: must point to START_ARRAY
-        if (!jp.isExpectedStartArrayToken()) {
-            return handleNonArray(jp, ctxt, result);
-        }
-
-        if (_valueDeserializer != null) {
-            return deserializeUsingCustom(jp, ctxt, result, _valueDeserializer);
-        }
-        JsonToken t;
-
-        while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-            result.add((t == JsonToken.VALUE_NULL) ? null : _parseString(jp, ctxt));
-        }
-        return result;
-    }
-    
-    private Collection<String> deserializeUsingCustom(JsonParser jp, DeserializationContext ctxt,
-            Collection<String> result, final JsonDeserializer<String> deser)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t;
-        while ((t = jp.nextToken()) != JsonToken.END_ARRAY) {
-            String value;
-
-            if (t == JsonToken.VALUE_NULL) {
-                value = null;
-            } else {
-                value = deser.deserialize(jp, ctxt);
-            }
-            result.add(value);
-        }
-        return result;
-    }
-    
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        // In future could check current token... for now this should be enough:
-        return typeDeserializer.deserializeTypedFromArray(jp, ctxt);
-    }
-
-    /**
-     * Helper method called when current token is no START_ARRAY. Will either
-     * throw an exception, or try to handle value as if member of implicit
-     * array, depending on configuration.
-     */
-    private final Collection<String> handleNonArray(JsonParser jp, DeserializationContext ctxt,
-            Collection<String> result)
-        throws IOException, JsonProcessingException
-    {
-        // [JACKSON-526]: implicit arrays from single values?
-        if (!ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
-            throw ctxt.mappingException(_collectionType.getRawClass());
-        }
-        // Strings are one of "native" (intrinsic) types, so there's never type deserializer involved
-        JsonDeserializer<String> valueDes = _valueDeserializer;
-        JsonToken t = jp.getCurrentToken();
-
-        String value;
-        
-        if (t == JsonToken.VALUE_NULL) {
-            value = null;
-        } else {
-            value = (valueDes == null) ? _parseString(jp, ctxt) : valueDes.deserialize(jp, ctxt);
-        }
-        result.add(value);
-        return result;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java
deleted file mode 100644
index 5a5c95c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/StringDeserializer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-
-@JacksonStdImpl
-public final class StringDeserializer
-    extends StdScalarDeserializer<String>
-{
-    private static final long serialVersionUID = 1L;
-
-    public StringDeserializer() { super(String.class); }
-
-    @Override
-    public String deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // 22-Sep-2012, tatu: For 2.1, use this new method, may force coercion:
-        String text = jp.getValueAsString();
-        if (text != null) {
-            return text;
-        }
-        // [JACKSON-330]: need to gracefully handle byte[] data, as base64
-        JsonToken curr = jp.getCurrentToken();
-        if (curr == JsonToken.VALUE_EMBEDDED_OBJECT) {
-            Object ob = jp.getEmbeddedObject();
-            if (ob == null) {
-                return null;
-            }
-            if (ob instanceof byte[]) {
-                return Base64Variants.getDefaultVariant().encode((byte[]) ob, false);
-            }
-            // otherwise, try conversion using toString()...
-            return ob.toString();
-        }
-        throw ctxt.mappingException(_valueClass, curr);
-    }
-
-    // 1.6: since we can never have type info ("natural type"; String, Boolean, Integer, Double):
-    // (is it an error to even call this version?)
-    @Override
-    public String deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        return deserialize(jp, ctxt);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.java
deleted file mode 100644
index c7faa5c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/ThrowableDeserializer.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.BeanDeserializer;
-import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Deserializer that builds on basic {@link BeanDeserializer} but
- * override some aspects like instance construction.
- */
-public class ThrowableDeserializer
-    extends BeanDeserializer
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final static String PROP_NAME_MESSAGE = "message";
-
-    /*
-    /************************************************************
-    /* Construction
-    /************************************************************
-     */
-
-    public ThrowableDeserializer(BeanDeserializer baseDeserializer)
-    {
-        super(baseDeserializer);
-        // need to disable this, since we do post-processing
-        _vanillaProcessing = false;
-    }
-
-    /**
-     * Alternative constructor used when creating "unwrapping" deserializers
-     */
-    protected ThrowableDeserializer(BeanDeserializer src, NameTransformer unwrapper)
-    {
-        super(src, unwrapper);
-    }
-    
-    @Override
-    public JsonDeserializer<Object> unwrappingDeserializer(NameTransformer unwrapper)
-    {
-        if (getClass() != ThrowableDeserializer.class) {
-            return this;
-        }
-        /* main thing really is to just enforce ignoring of unknown
-         * properties; since there may be multiple unwrapped values
-         * and properties for all may be interleaved...
-         */
-        return new ThrowableDeserializer(this, unwrapper);
-    }
-
-    
-    /*
-    /************************************************************
-    /* Overridden methods
-    /************************************************************
-     */
-
-    @Override
-    public Object deserializeFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // 30-Sep-2010, tatu: Need to allow use of @JsonCreator, so:
-        if (_propertyBasedCreator != null) { // proper @JsonCreator
-            return _deserializeUsingPropertyBased(jp, ctxt);
-        }
-        if (_delegateDeserializer != null) {
-            return _valueInstantiator.createUsingDelegate(ctxt,
-                    _delegateDeserializer.deserialize(jp, ctxt));
-        }
-        if (_beanType.isAbstract()) { // for good measure, check this too
-            throw JsonMappingException.from(jp, "Can not instantiate abstract type "+_beanType
-                    +" (need to add/enable type information?)");
-        }
-        boolean hasStringCreator = _valueInstantiator.canCreateFromString();
-        boolean hasDefaultCtor = _valueInstantiator.canCreateUsingDefault();
-        // and finally, verify we do have single-String arg constructor (if no @JsonCreator)
-        if (!hasStringCreator && !hasDefaultCtor) {
-            throw new JsonMappingException("Can not deserialize Throwable of type "+_beanType
-                    +" without having a default contructor, a single-String-arg constructor; or explicit @JsonCreator");
-        }
-        
-        Object throwable = null;
-        Object[] pending = null;
-        int pendingIx = 0;
-
-        for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
-            String propName = jp.getCurrentName();
-            SettableBeanProperty prop = _beanProperties.find(propName);
-            jp.nextToken(); // to point to field value
-
-            if (prop != null) { // normal case
-                if (throwable != null) {
-                    prop.deserializeAndSet(jp, ctxt, throwable);
-                    continue;
-                }
-                // nope; need to defer
-                if (pending == null) {
-                    int len = _beanProperties.size();
-                    pending = new Object[len + len];
-                }
-                pending[pendingIx++] = prop;
-                pending[pendingIx++] = prop.deserialize(jp, ctxt);
-                continue;
-            }
-
-            // Maybe it's "message"?
-            if (PROP_NAME_MESSAGE.equals(propName)) {
-                if (hasStringCreator) {
-                    throwable = _valueInstantiator.createFromString(ctxt, jp.getText());
-                    // any pending values?
-                    if (pending != null) {
-                        for (int i = 0, len = pendingIx; i < len; i += 2) {
-                            prop = (SettableBeanProperty)pending[i];
-                            prop.set(throwable, pending[i+1]);
-                        }
-                        pending = null;
-                    }
-                    continue;
-                }
-            }
-            /* As per [JACKSON-313], things marked as ignorable should not be
-             * passed to any setter
-             */
-            if (_ignorableProps != null && _ignorableProps.contains(propName)) {
-                jp.skipChildren();
-                continue;
-            }
-            if (_anySetter != null) {
-                _anySetter.deserializeAndSet(jp, ctxt, throwable, propName);
-                continue;
-            }
-            // Unknown: let's call handler method
-            handleUnknownProperty(jp, ctxt, throwable, propName);
-        }
-        // Sanity check: did we find "message"?
-        if (throwable == null) {
-            /* 15-Oct-2010, tatu: Can't assume missing message is an error, since it may be
-             *   suppressed during serialization, as per [JACKSON-388].
-             *   
-             *   Should probably allow use of default constructor, too...
-             */
-            //throw new JsonMappingException("No 'message' property found: could not deserialize "+_beanType);
-            if (hasStringCreator) {
-                throwable = _valueInstantiator.createFromString(ctxt, null);
-            } else {
-                throwable = _valueInstantiator.createUsingDefault(ctxt);
-            }
-            // any pending values?
-            if (pending != null) {
-                for (int i = 0, len = pendingIx; i < len; i += 2) {
-                    SettableBeanProperty prop = (SettableBeanProperty)pending[i];
-                    prop.set(throwable, pending[i+1]);
-                }
-            }
-        }
-        return throwable;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
deleted file mode 100644
index 140f15d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.fasterxml.jackson.databind.deser.std;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.ObjectBuffer;
-
-/**
- * Deserializer implementation that is used if it is necessary to bind content of
- * "unknown" type; something declared as basic {@link java.lang.Object}
- * (either explicitly, or due to type erasure).
- * If so, "natural" mapping is used to convert JSON values to their natural
- * Java object matches: JSON arrays to Java {@link java.util.List}s (or, if configured,
- * Object[]), JSON objects to {@link java.util.Map}s, numbers to
- * {@link java.lang.Number}s, booleans to {@link java.lang.Boolean}s and
- * strings to {@link java.lang.String} (and nulls to nulls).
- */
-@JacksonStdImpl
-public class UntypedObjectDeserializer
-    extends StdDeserializer<Object>
-{
-    private final static Object[] NO_OBJECTS = new Object[0];
-    
-    public UntypedObjectDeserializer() { super(Object.class); }
-
-    /*
-    /**********************************************************
-    /* Deserializer API
-    /**********************************************************
-     */
-    
-    @Override
-    public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getCurrentToken()) {
-        case START_OBJECT:
-            return mapObject(jp, ctxt);
-        case END_OBJECT: // invalid
-            break;
-        case START_ARRAY:
-            return mapArray(jp, ctxt);
-        case END_ARRAY: // invalid
-            break;
-        case FIELD_NAME:
-            return mapObject(jp, ctxt);
-        case VALUE_EMBEDDED_OBJECT:
-            return jp.getEmbeddedObject();
-        case VALUE_STRING:
-            return jp.getText();
-
-        case VALUE_NUMBER_INT:
-            /* [JACKSON-100]: caller may want to get all integral values
-             * returned as BigInteger, for consistency
-             */
-            if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-                return jp.getBigIntegerValue(); // should be optimal, whatever it is
-            }
-            return jp.getNumberValue(); // should be optimal, whatever it is
-
-        case VALUE_NUMBER_FLOAT:
-            /* [JACKSON-72]: need to allow overriding the behavior regarding
-             *   which type to use
-             */
-            if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-                return jp.getDecimalValue();
-            }
-            return Double.valueOf(jp.getDoubleValue());
-
-        case VALUE_TRUE:
-            return Boolean.TRUE;
-        case VALUE_FALSE:
-            return Boolean.FALSE;
-
-        case VALUE_NULL: // should not get this but...
-            return null;
-            
-         }
-
-        throw ctxt.mappingException(Object.class);
-    }
-
-    @Override
-    public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
-            TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        switch (t) {
-        // First: does it look like we had type id wrapping of some kind?
-        case START_ARRAY:
-        case START_OBJECT:
-        case FIELD_NAME:
-            /* Output can be as JSON Object, Array or scalar: no way to know
-             * a this point:
-             */
-            return typeDeserializer.deserializeTypedFromAny(jp, ctxt);
-
-        /* Otherwise we probably got a "native" type (ones that map
-         * naturally and thus do not need or use type ids)
-         */
-        case VALUE_STRING:
-            return jp.getText();
-
-        case VALUE_NUMBER_INT:
-            // For [JACKSON-100], see above:
-            if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-                return jp.getBigIntegerValue();
-            }
-            /* and as per [JACKSON-839], allow "upgrade" to bigger types: out-of-range
-             * entries can not be produced without type, so this should "just work",
-             * even if it is bit unclean
-             */
-            return jp.getNumberValue();
-
-        case VALUE_NUMBER_FLOAT:
-            // For [JACKSON-72], see above
-            if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-                return jp.getDecimalValue();
-            }
-            return Double.valueOf(jp.getDoubleValue());
-
-        case VALUE_TRUE:
-            return Boolean.TRUE;
-        case VALUE_FALSE:
-            return Boolean.FALSE;
-        case VALUE_EMBEDDED_OBJECT:
-            return jp.getEmbeddedObject();
-
-        case VALUE_NULL: // should not get this far really but...
-            return null;
-        }
-        throw ctxt.mappingException(Object.class);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to map a JSON Array into a Java value.
-     */
-    protected Object mapArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (ctxt.isEnabled(DeserializationFeature.USE_JAVA_ARRAY_FOR_JSON_ARRAY)) {
-            return mapArrayToArray(jp, ctxt);
-        }
-        // Minor optimization to handle small lists (default size for ArrayList is 10)
-        if (jp.nextToken()  == JsonToken.END_ARRAY) {
-            return new ArrayList<Object>(4);
-        }
-        ObjectBuffer buffer = ctxt.leaseObjectBuffer();
-        Object[] values = buffer.resetAndStart();
-        int ptr = 0;
-        int totalSize = 0;
-        do {
-            Object value = deserialize(jp, ctxt);
-            ++totalSize;
-            if (ptr >= values.length) {
-                values = buffer.appendCompletedChunk(values);
-                ptr = 0;
-            }
-            values[ptr++] = value;
-        } while (jp.nextToken() != JsonToken.END_ARRAY);
-        // let's create almost full array, with 1/8 slack
-        ArrayList<Object> result = new ArrayList<Object>(totalSize + (totalSize >> 3) + 1);
-        buffer.completeAndClearBuffer(values, ptr, result);
-        return result;
-    }
-
-    /**
-     * Method called to map a JSON Object into a Java value.
-     */
-    protected Object mapObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        }
-        // 1.6: minor optimization; let's handle 1 and 2 entry cases separately
-        if (t != JsonToken.FIELD_NAME) { // and empty one too
-            // empty map might work; but caller may want to modify... so better just give small modifiable
-            return new LinkedHashMap<String,Object>(4);
-        }
-        String field1 = jp.getText();
-        jp.nextToken();
-        Object value1 = deserialize(jp, ctxt);
-        if (jp.nextToken() != JsonToken.FIELD_NAME) { // single entry; but we want modifiable
-            LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>(4);
-            result.put(field1, value1);
-            return result;
-        }
-        String field2 = jp.getText();
-        jp.nextToken();
-        Object value2 = deserialize(jp, ctxt);
-        if (jp.nextToken() != JsonToken.FIELD_NAME) {
-            LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>(4);
-            result.put(field1, value1);
-            result.put(field2, value2);
-            return result;
-        }
-        // And then the general case; default map size is 16
-        LinkedHashMap<String, Object> result = new LinkedHashMap<String, Object>();
-        result.put(field1, value1);
-        result.put(field2, value2);
-        do {
-            String fieldName = jp.getText();
-            jp.nextToken();
-            result.put(fieldName, deserialize(jp, ctxt));
-        } while (jp.nextToken() != JsonToken.END_OBJECT);
-        return result;
-    }
-
-    /**
-     * Method called to map a JSON Array into a Java Object array (Object[]).
-     */
-    protected Object[] mapArrayToArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // Minor optimization to handle small lists (default size for ArrayList is 10)
-        if (jp.nextToken()  == JsonToken.END_ARRAY) {
-            return NO_OBJECTS;
-        }
-        ObjectBuffer buffer = ctxt.leaseObjectBuffer();
-        Object[] values = buffer.resetAndStart();
-        int ptr = 0;
-        do {
-            Object value = deserialize(jp, ctxt);
-            if (ptr >= values.length) {
-                values = buffer.appendCompletedChunk(values);
-                ptr = 0;
-            }
-            values[ptr++] = value;
-        } while (jp.nextToken() != JsonToken.END_ARRAY);
-        return buffer.completeAndClearBuffer(values, ptr);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/package-info.java
deleted file mode 100644
index 0ac0149..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/deser/std/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Contains public standard implementations of abstraction that
- * Jackson uses. This means that they are not merely implementation
- * details, but part of semi-public interface where project
- * tries to maintain backwards compatibility at higher level
- * than for 'impl' types (although less so than with fully
- * public interfaces).
- *<p>
- * Note that since this package was only added relatively late
- * in development cycle, not all classes that belong here are
- * included. Plan is to move more classes over time.
- */
-package com.fasterxml.jackson.databind.deser.std;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/exc/InvalidFormatException.java b/showkeyHelper/src/com/fasterxml/jackson/databind/exc/InvalidFormatException.java
deleted file mode 100644
index b0ba8f2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/exc/InvalidFormatException.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.fasterxml.jackson.databind.exc;
-
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-/**
- * Specialized sub-class of {@link JsonMappingException}
- * that is used when the underlying problem appears to be that
- * of bad formatting of a value to deserialize.
- * 
- * @since 2.1
- */
-public class InvalidFormatException extends JsonMappingException
-{
-    private static final long serialVersionUID = 1L; // silly Eclipse, warnings
-
-    /**
-     * Underlying value that could not be deserialized into
-     * target type, if available.
-     */
-    protected final Object _value;
-
-    /**
-     * Intended target type (type-erased class) that value could not
-     * be deserialized into, if known.
-     */
-    protected final Class<?> _targetType;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public InvalidFormatException(String msg,
-            Object value, Class<?> targetType)
-    {
-        super(msg);
-        _value = value;
-        _targetType = targetType;
-    }
-
-    public InvalidFormatException(String msg, JsonLocation loc,
-            Object value, Class<?> targetType)
-    {
-        super(msg, loc);
-        _value = value;
-        _targetType = targetType;
-    }
-    
-    public static InvalidFormatException from(JsonParser jp, String msg,
-            Object value, Class<?> targetType)
-    {
-        return new InvalidFormatException(msg, jp.getTokenLocation(),
-                value, targetType);
-    }
-
-    /*
-    /**********************************************************
-    /* Additional accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for checking source value (String, Number usually) that could not
-     * be deserialized into target type ({@link #getTargetType}).
-     * Note that value may not be available, depending on who throws the exception
-     * and when.
-     */
-    public Object getValue() {
-        return _value;
-    }
-
-    /**
-     * Accessor for checking target type of value ({@link #getValue} that failed
-     * to deserialize.
-     * Note that type may not be available, depending on who throws the exception
-     * and when.
-     */
-    public Class<?> getTargetType() {
-        return _targetType;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java b/showkeyHelper/src/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java
deleted file mode 100644
index 2f964d6..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.fasterxml.jackson.databind.exc;
-
-import java.util.*;
-
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-/**
- * Specialized {@link JsonMappingException} sub-class specifically used
- * to indicate problems due to encountering a JSON property that could
- * not be mapped to an Object property (via getter, constructor argument
- * or field).
- */
-public class UnrecognizedPropertyException
-    extends JsonMappingException
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Class that does not contain mapping for the unrecognized property.
-     */
-    protected final Class<?> _referringClass;
-    
-    /**
-     *<p>
-     * Note: redundant information since it is also included in the
-     * reference path.
-     */
-    protected final String _unrecognizedPropertyName;
-    
-    /**
-     * Set of ids of properties that are known for the type, if this
-     * can be statically determined.
-     */
-    protected final Collection<Object> _propertyIds;
-
-    /**
-     * Lazily constructed description of known properties, used for
-     * constructing actual message if and as needed.
-     */
-    protected transient String _propertiesAsString;
-    
-    public UnrecognizedPropertyException(String msg, JsonLocation loc,
-            Class<?> referringClass, String propName,
-            Collection<Object> propertyIds)
-    {
-        
-        super(msg, loc);
-        _referringClass = referringClass;
-        _unrecognizedPropertyName = propName;
-        _propertyIds = propertyIds;
-    }
-
-    /**
-     * Factory method used for constructing instances of this exception type.
-     * 
-     * @param jp Underlying parser used for reading input being used for data-binding
-     * @param fromObjectOrClass Reference to either instance of problematic type (
-     *    if available), or if not, type itself
-     * @param propertyName Name of unrecognized property
-     * @param propertyIds (optional, null if not available) Set of properties that
-     *    type would recognize, if completely known: null if set can not be determined.
-     */
-    public static UnrecognizedPropertyException from(JsonParser jp,
-            Object fromObjectOrClass, String propertyName,
-            Collection<Object> propertyIds)
-    {
-        if (fromObjectOrClass == null) {
-            throw new IllegalArgumentException();
-        }
-        Class<?> ref;
-        if (fromObjectOrClass instanceof Class<?>) {
-            ref = (Class<?>) fromObjectOrClass;
-        } else {
-            ref = fromObjectOrClass.getClass();
-        }
-        String msg = "Unrecognized field \""+propertyName+"\" (class "+ref.getName()+"), not marked as ignorable";
-        UnrecognizedPropertyException e = new UnrecognizedPropertyException(msg,
-                jp.getCurrentLocation(), ref, propertyName, propertyIds);
-        // but let's also ensure path includes this last (missing) segment
-        e.prependPath(fromObjectOrClass, propertyName);
-        return e;
-    }
-
-    /*
-    /**********************************************************
-    /* Overrides
-    /**********************************************************
-     */
-
-    private final static int MAX_DESC_LENGTH = 200;
-    
-    @Override
-    public String getMessageSuffix()
-    {
-        String suffix = _propertiesAsString;
-        if (suffix == null && _propertyIds != null) {
-            StringBuilder sb = new StringBuilder(100);
-            int len = _propertyIds.size();
-            if (len == 1) {
-                sb.append(" (one known property: \"");
-                sb.append(String.valueOf(_propertyIds.iterator().next()));
-                sb.append('"');
-            } else {
-                sb.append(" (").append(len).append(" known properties: ");
-                Iterator<Object> it = _propertyIds.iterator();
-                while (it.hasNext()) {
-                    sb.append(", \"");
-                    sb.append(String.valueOf(it.next()));
-                    sb.append('"');
-                    // one other thing: limit max length
-                    if (sb.length() > MAX_DESC_LENGTH) {
-                        sb.append(" [truncated]");
-                        break;
-                    }
-                }
-            }
-            sb.append("])");
-            _propertiesAsString = suffix = sb.toString();
-        }
-        return suffix;
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing type (class) that is missing definition to allow
-     * binding of the unrecognized property.
-     */
-    public Class<?> getReferringClass() {
-        return _referringClass;
-    }
-    
-    /**
-     * Convenience method for accessing logical property name that could
-     * not be mapped. Note that it is the last path reference in the
-     * underlying path.
-     */
-    public String getUnrecognizedPropertyName() {
-        return _unrecognizedPropertyName;
-    }    
-    
-    public Collection<Object> getKnownPropertyIds()
-    {
-        if (_propertyIds == null) {
-            return null;
-        }
-        return Collections.unmodifiableCollection(_propertyIds);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java
deleted file mode 100644
index 7e4ee3c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.fasterxml.jackson.databind.ext;
-
-import java.io.IOException;
-import java.util.*;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
-import com.fasterxml.jackson.databind.util.Provider;
-
-/**
- * Container deserializers that handle "core" XML types: ones included in standard
- * JDK 1.5. Types are directly needed by JAXB, and are thus supported within core
- * mapper package, not in "xc" package.
- */
-public class CoreXMLDeserializers
-    implements Provider<StdDeserializer<?>>
-{
-    /**
-     * Data type factories are thread-safe after instantiation (and
-     * configuration, if any); and since instantion (esp. implementation
-     * introspection) can be expensive we better reuse the instance.
-     */
-    final static DatatypeFactory _dataTypeFactory;
-    static {
-        try {
-            _dataTypeFactory = DatatypeFactory.newInstance();
-        } catch (DatatypeConfigurationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Provider implementation
-    /**********************************************************
-     */
-
-    /**
-     * Method called by {@link com.fasterxml.jackson.databind.deser.BasicDeserializerFactory}
-     * to register deserializers this class provides.
-     */
-//    @Override
-    public Collection<StdDeserializer<?>> provide()
-    {
-        return Arrays.asList(new StdDeserializer<?>[] {
-            new DurationDeserializer()
-            ,new GregorianCalendarDeserializer()
-            ,new QNameDeserializer()
-        });
-    }
-    
-    /*
-    /**********************************************************
-    /* Concrete deserializers
-    /**********************************************************
-     */
-
-    public static class DurationDeserializer
-        extends FromStringDeserializer<Duration>
-    {
-        public DurationDeserializer() { super(Duration.class); }
-    
-        @Override
-        protected Duration _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            return _dataTypeFactory.newDuration(value);
-        }
-    }
-
-    public static class GregorianCalendarDeserializer
-        extends StdScalarDeserializer<XMLGregorianCalendar>
-    {
-        public GregorianCalendarDeserializer() { super(XMLGregorianCalendar.class); }
-        
-        @Override
-        public XMLGregorianCalendar deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            Date d = _parseDate(jp, ctxt);
-            if (d == null) {
-                return null;
-            }
-            GregorianCalendar calendar = new GregorianCalendar();
-            calendar.setTime(d);
-            return _dataTypeFactory.newXMLGregorianCalendar(calendar);
-        }
-    }
-
-    public static class QNameDeserializer
-        extends FromStringDeserializer<QName>
-    {
-        public QNameDeserializer() { super(QName.class); }
-        
-        @Override
-        protected QName _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            return QName.valueOf(value);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.java
deleted file mode 100644
index a4d6d7b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/CoreXMLSerializers.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.fasterxml.jackson.databind.ext;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.ser.std.CalendarSerializer;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.fasterxml.jackson.databind.util.Provider;
-
-/**
- * Provider for serializers of XML types that are part of full JDK 1.5, but
- * that some alleged 1.5 platforms are missing (Android, GAE).
- * And for this reason these are added using more dynamic mechanism.
- *<p>
- * Note: since many of classes defined are abstract, caller must take
- * care not to just use straight equivalency check but rather consider
- * subclassing as well.
- */
-public class CoreXMLSerializers
-    implements Provider<Map.Entry<Class<?>,JsonSerializer<?>>>
-{
-    final static HashMap<Class<?>,JsonSerializer<?>> _serializers = new HashMap<Class<?>,JsonSerializer<?>>();
-    /**
-     * We will construct instances statically, during class loading, to try to
-     * make things fail-fast, i.e. to catch problems as soon as possible.
-     */
-    static {
-        ToStringSerializer tss = ToStringSerializer.instance;
-        _serializers.put(Duration.class, tss);
-        _serializers.put(XMLGregorianCalendar.class, new XMLGregorianCalendarSerializer());
-        _serializers.put(QName.class, tss);
-    }
-    
-//    @Override
-    public Collection<Map.Entry<Class<?>,JsonSerializer<?>>> provide() {
-        return _serializers.entrySet();
-    }
-
-    public static class XMLGregorianCalendarSerializer extends StdSerializer<XMLGregorianCalendar>
-    {
-        public XMLGregorianCalendarSerializer() {
-            super(XMLGregorianCalendar.class);
-        }
-
-        @Override
-        public void serialize(XMLGregorianCalendar value, JsonGenerator jgen, SerializerProvider provider)
-                throws IOException, JsonGenerationException {
-            CalendarSerializer.instance.serialize(value.toGregorianCalendar(), jgen, provider);
-        }
-        
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint) throws JsonMappingException {
-            return CalendarSerializer.instance.getSchema(provider, typeHint);
-        }
-
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) {
-            CalendarSerializer.instance.acceptJsonFormatVisitor(visitor, null);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMDeserializer.java
deleted file mode 100644
index 3c85afc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMDeserializer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.fasterxml.jackson.databind.ext;
-
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.FromStringDeserializer;
-
-/**
- * Base for serializers that allows parsing DOM Documents from JSON Strings.
- * Nominal type can be either {@link org.w3c.dom.Node} or
- * {@link org.w3c.dom.Document}.
- */
-public abstract class DOMDeserializer<T> extends FromStringDeserializer<T>
-{
-    final static DocumentBuilderFactory _parserFactory;
-    static {
-        _parserFactory = DocumentBuilderFactory.newInstance();
-        // yup, only cave men do XML without recognizing namespaces...
-        _parserFactory.setNamespaceAware(true);
-    }
-
-    protected DOMDeserializer(Class<T> cls) { super(cls); }
-
-    @Override
-    public abstract T _deserialize(String value, DeserializationContext ctxt);
-
-    protected final Document parse(String value) throws IllegalArgumentException
-    {
-        try {
-            return _parserFactory.newDocumentBuilder().parse(new InputSource(new StringReader(value)));
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Failed to parse JSON String as XML: "+e.getMessage(), e);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Concrete deserializers
-    /**********************************************************
-     */
-    
-    public static class NodeDeserializer extends DOMDeserializer<Node>
-    {
-        public NodeDeserializer() { super(Node.class); }
-        @Override
-        public Node _deserialize(String value, DeserializationContext ctxt) throws IllegalArgumentException {
-            return parse(value);
-        }
-    }    
-
-    public static class DocumentDeserializer extends DOMDeserializer<Document>
-    {
-        public DocumentDeserializer() { super(Document.class); }
-        @Override
-        public Document _deserialize(String value, DeserializationContext ctxt) throws IllegalArgumentException {
-            return parse(value);
-        }
-    }    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMSerializer.java
deleted file mode 100644
index 6e62b65..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/DOMSerializer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.fasterxml.jackson.databind.ext;
-/*
-import java.io.IOException;
-import org.w3c.dom.Node;
-import  org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import  org.w3c.dom.ls.DOMImplementationLS;
-import  org.w3c.dom.ls.LSSerializer;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-public class DOMSerializer
-    extends StdSerializer<Node>
-{
-    protected final DOMImplementationLS _domImpl;
-
-    public DOMSerializer()
-    {
-        super(Node.class);
-       DOMImplementationRegistry registry;
-        try {
-         registry = DOMImplementationRegistry.newInstance();
-        } catch (Exception e) {
-            throw new IllegalStateException("Could not instantiate DOMImplementationRegistry: "+e.getMessage(), e);
-        }
-       _domImpl = (DOMImplementationLS)registry.getDOMImplementation("LS");
-    }
-    
-    @Override
-    public void serialize(Node value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_domImpl == null) throw new IllegalStateException("Could not find DOM LS");    	
-        LSSerializer writer = _domImpl.createLSSerializer();
-        jgen.writeString(writer.writeToString(value));
-    }
-
-	@Override
-    public JsonNode getSchema(SerializerProvider provider, java.lang.reflect.Type typeHint)
-    {
-        // Well... it is serialized as String
-        return createSchemaNode("string", true);
-    }
-
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        visitor.expectAnyFormat(typeHint);
-    }
-}
-*/
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java
deleted file mode 100644
index d095676..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/OptionalHandlerFactory.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.fasterxml.jackson.databind.ext;
-
-import java.util.Collection;
-import java.util.Map;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.util.Provider;
-
-/**
- * Helper class used for isolating details of handling optional+external types
- * (javax.xml classes) from standard factories that offer them.
- * 
- * @author tatu
- */
-public class OptionalHandlerFactory
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = -7103336512296456640L;
-
-    /* 1.6.1+ To make 2 main "optional" handler groups (javax.xml.stream)
-     * more dynamic, we better only figure out handlers completely dynamically, if and
-     * when they are needed. To do this we need to assume package prefixes.
-     */
-    private final static String PACKAGE_PREFIX_JAVAX_XML = "javax.xml.";
-
-    private final static String SERIALIZERS_FOR_JAVAX_XML = "com.fasterxml.jackson.databind.ext.CoreXMLSerializers";
-    private final static String DESERIALIZERS_FOR_JAVAX_XML = "com.fasterxml.jackson.databind.ext.CoreXMLDeserializers";
-
-    // Plus we also have a single serializer for DOM Node:
-    private final static String CLASS_NAME_DOM_NODE = "org.w3c.dom.Node";
-    private final static String CLASS_NAME_DOM_DOCUMENT = "org.w3c.dom.Node";
-    private final static String SERIALIZER_FOR_DOM_NODE = "com.fasterxml.jackson.databind.ext.DOMSerializer";
-    private final static String DESERIALIZER_FOR_DOM_DOCUMENT = "com.fasterxml.jackson.databind.ext.DOMDeserializer$DocumentDeserializer";
-    private final static String DESERIALIZER_FOR_DOM_NODE = "com.fasterxml.jackson.databind.ext.DOMDeserializer$NodeDeserializer";
-    
-    public final static OptionalHandlerFactory instance = new OptionalHandlerFactory();
-    
-    protected OptionalHandlerFactory() { }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-    
-    public JsonSerializer<?> findSerializer(SerializationConfig config, JavaType type)
-    {
-        Class<?> rawType = type.getRawClass();
-        String className = rawType.getName();
-        String factoryName;
-        
-        if (className.startsWith(PACKAGE_PREFIX_JAVAX_XML)
-                || hasSupertypeStartingWith(rawType, PACKAGE_PREFIX_JAVAX_XML)) {
-            factoryName = SERIALIZERS_FOR_JAVAX_XML;
-        } else if (doesImplement(rawType, CLASS_NAME_DOM_NODE)) {
-            return (JsonSerializer<?>) instantiate(SERIALIZER_FOR_DOM_NODE);
-        } else {
-            return null;
-        }
-
-        Object ob = instantiate(factoryName);
-        if (ob == null) { // could warn, if we had logging system (j.u.l?)
-            return null;
-        }
-        @SuppressWarnings("unchecked")
-        Provider<Map.Entry<Class<?>,JsonSerializer<?>>> prov = (Provider<Map.Entry<Class<?>,JsonSerializer<?>>>) ob;
-        Collection<Map.Entry<Class<?>,JsonSerializer<?>>> entries = prov.provide();
-
-        // first, check for exact match (concrete)
-        for (Map.Entry<Class<?>,JsonSerializer<?>> entry : entries) {
-            if (rawType == entry.getKey()) {
-                return entry.getValue();
-            }
-        }
-        // if no match, check super-type match
-        for (Map.Entry<Class<?>,JsonSerializer<?>> entry : entries) {
-            if (entry.getKey().isAssignableFrom(rawType)) {
-                return entry.getValue();
-            }
-        }
-        // but maybe there's just no match to be found?
-        return null;
-    }
-
-    public JsonDeserializer<?> findDeserializer(JavaType type, DeserializationConfig config)
-    {
-        Class<?> rawType = type.getRawClass();
-        String className = rawType.getName();
-        String factoryName;
-        
-        if (className.startsWith(PACKAGE_PREFIX_JAVAX_XML)
-                || hasSupertypeStartingWith(rawType, PACKAGE_PREFIX_JAVAX_XML)) {
-            factoryName = DESERIALIZERS_FOR_JAVAX_XML;
-        } else if (doesImplement(rawType, CLASS_NAME_DOM_DOCUMENT)) {
-            return (JsonDeserializer<?>) instantiate(DESERIALIZER_FOR_DOM_DOCUMENT);
-        } else if (doesImplement(rawType, CLASS_NAME_DOM_NODE)) {
-            return (JsonDeserializer<?>) instantiate(DESERIALIZER_FOR_DOM_NODE);
-        } else {
-            return null;
-        }
-        Object ob = instantiate(factoryName);
-        if (ob == null) { // could warn, if we had logging system (j.u.l?)
-            return null;
-        }
-        @SuppressWarnings("unchecked")
-        Provider<StdDeserializer<?>> prov = (Provider<StdDeserializer<?>>) ob;
-        Collection<StdDeserializer<?>> entries = prov.provide();
-
-        // first, check for exact match (concrete)
-        for (StdDeserializer<?> deser : entries) {
-            if (rawType == deser.getValueClass()) {
-                return deser;
-            }
-        }
-        // if no match, check super-type match
-        for (StdDeserializer<?> deser : entries) {
-            if (deser.getValueClass().isAssignableFrom(rawType)) {
-                return deser;
-            }
-        }
-        // but maybe there's just no match to be found?
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal helper methods
-    /**********************************************************
-     */
-
-    private Object instantiate(String className)
-    {
-        try {
-            return Class.forName(className).newInstance();
-        }
-        catch (LinkageError e) { }
-        // too many different kinds to enumerate here:
-        catch (Exception e) { }
-        return null;
-    }
-    
-    private boolean doesImplement(Class<?> actualType, String classNameToImplement)
-    {
-        for (Class<?> type = actualType; type != null; type = type.getSuperclass()) {
-            if (type.getName().equals(classNameToImplement)) {
-                return true;
-            }
-            // or maybe one of super-interfaces
-            if (hasInterface(type, classNameToImplement)) {
-                return true;
-            }
-        }
-        return false;
-    }
-        
-    private boolean hasInterface(Class<?> type, String interfaceToImplement)
-    {
-        Class<?>[] interfaces = type.getInterfaces();
-        for (Class<?> iface : interfaces) {
-            if (iface.getName().equals(interfaceToImplement)) {
-                return true;
-            }
-        }
-        // maybe super-interface?
-        for (Class<?> iface : interfaces) {
-            if (hasInterface(iface, interfaceToImplement)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean hasSupertypeStartingWith(Class<?> rawType, String prefix)
-    {
-        // first, superclasses
-        for (Class<?> supertype = rawType.getSuperclass(); supertype != null; supertype = supertype.getSuperclass()) {
-            if (supertype.getName().startsWith(prefix)) {
-                return true;
-            }
-        }
-        // then interfaces
-        for (Class<?> cls = rawType; cls != null; cls = cls.getSuperclass()) {
-            if (hasInterfaceStartingWith(cls, prefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean hasInterfaceStartingWith(Class<?> type, String prefix)
-    {
-        Class<?>[] interfaces = type.getInterfaces();
-        for (Class<?> iface : interfaces) {
-            if (iface.getName().startsWith(prefix)) {
-                return true;
-            }
-        }
-        // maybe super-interface?
-        for (Class<?> iface : interfaces) {
-            if (hasInterfaceStartingWith(iface, prefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ext/package-info.java
deleted file mode 100644
index 05c2989..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ext/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
-Contains extended support for "external" packages: things that
-may or may not be present in runtime environment, but that are
-commonly enough used so that explicit support can be added.
-<p>
-Currently supported extensions include:
-<ul>
- <li>Support for Java 1.5 core XML datatypes: the reason these are
-considered "external" is that some platforms that claim to be 1.5 conformant
-are only partially so (Google Android, GAE) and do not included these
- types.
-  </li>
- <li>Joda time. This package has superior date/time handling functionality,
-and is thus supported. However, to minimize forced dependencies this
-support is added as extension so that Joda is not needed by Jackson
-itself: but if it is present, its core types are supported to some
-degree
-  </li>
-</ul>
-
-*/
-
-package com.fasterxml.jackson.databind.ext;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/Annotated.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/Annotated.java
deleted file mode 100644
index 34dd247..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/Annotated.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-
-/**
- * Shared base class used for anything on which annotations (included
- * within a {@link AnnotationMap}).
- */
-public abstract class Annotated
-{
-    protected Annotated() { }
-    
-    public abstract <A extends Annotation> A getAnnotation(Class<A> acls);
-
-    public final <A extends Annotation> boolean hasAnnotation(Class<A> acls)
-    {
-        return getAnnotation(acls) != null;
-    }
-
-    /**
-     * Fluent factory method that will construct a new instance that uses specified
-     * instance annotations instead of currently configured ones.
-     */
-    public abstract Annotated withAnnotations(AnnotationMap fallback);
-
-    /**
-     * Fluent factory method that will construct a new instance that uses
-     * annotations from specified {@link Annotated} as fallback annotations
-     */
-    public final Annotated withFallBackAnnotationsFrom(Annotated annotated) {
-        return withAnnotations(AnnotationMap.merge(getAllAnnotations(), annotated.getAllAnnotations()));
-    }
-    
-    /**
-     * Method that can be used to find actual JDK element that this instance
-     * represents. It is non-null, except for method/constructor parameters
-     * which do not have a JDK counterpart.
-     */
-    public abstract AnnotatedElement getAnnotated();
-
-    protected abstract int getModifiers();
-
-    public final boolean isPublic() {
-        return Modifier.isPublic(getModifiers());
-    }
-
-    public abstract String getName();
-
-    /**
-     * Full generic type of the annotated element; definition
-     * of what exactly this means depends on sub-class.
-     */
-    public JavaType getType(TypeBindings context) {
-        return context.resolveType(getGenericType());
-    }
-
-    /**
-     * Full generic type of the annotated element; definition
-     * of what exactly this means depends on sub-class.
-     */
-    public abstract Type getGenericType();
-
-    /**
-     * "Raw" type (type-erased class) of the annotated element; definition
-     * of what exactly this means depends on sub-class.
-     */
-    public abstract Class<?> getRawType();
-
-    protected abstract AnnotationMap getAllAnnotations();
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java
deleted file mode 100644
index e238907..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java
+++ /dev/null
@@ -1,1018 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
-import com.fasterxml.jackson.databind.util.Annotations;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-public final class AnnotatedClass
-    extends Annotated
-{
-    private final static AnnotationMap[] NO_ANNOTATION_MAPS = new AnnotationMap[0];
-    
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Class for which annotations apply, and that owns other
-     * components (constructors, methods)
-     */
-    final protected Class<?> _class;
-
-    /**
-     * Ordered set of super classes and interfaces of the
-     * class itself: included in order of precedence
-     */
-    final protected List<Class<?>> _superTypes;
-
-    /**
-     * Filter used to determine which annotations to gather; used
-     * to optimize things so that unnecessary annotations are
-     * ignored.
-     */
-    final protected AnnotationIntrospector _annotationIntrospector;
-
-    /**
-     * Object that knows mapping of mix-in classes (ones that contain
-     * annotations to add) with their target classes (ones that
-     * get these additional annotations "mixed in").
-     */
-    final protected MixInResolver _mixInResolver;
-
-    /**
-     * Primary mix-in class; one to use for the annotated class
-     * itself. Can be null.
-     */
-    final protected Class<?> _primaryMixIn;
-
-    /*
-    /**********************************************************
-    /* Gathered information
-    /**********************************************************
-     */
-
-    /**
-     * Combined list of Jackson annotations that the class has,
-     * including inheritable ones from super classes and interfaces
-     */
-    protected AnnotationMap _classAnnotations;
-
-    /**
-     * Flag to indicate whether creator information has been resolved
-     * or not.
-     */
-    protected boolean _creatorsResolved = false;
-    
-    /**
-     * Default constructor of the annotated class, if it has one.
-     */
-    protected AnnotatedConstructor _defaultConstructor;
-
-    /**
-     * Single argument constructors the class has, if any.
-     */
-    protected List<AnnotatedConstructor> _constructors;
-
-    /**
-     * Single argument static methods that might be usable
-     * as factory methods
-     */
-    protected List<AnnotatedMethod> _creatorMethods;
-
-    /**
-     * Member methods of interest; for now ones with 0 or 1 arguments
-     * (just optimization, since others won't be used now)
-     */
-    protected AnnotatedMethodMap  _memberMethods;
-
-    /**
-     * Member fields of interest: ones that are either public,
-     * or have at least one annotation.
-     */
-    protected List<AnnotatedField> _fields;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * Constructor will not do any initializations, to allow for
-     * configuring instances differently depending on use cases
-     */
-    private AnnotatedClass(Class<?> cls, List<Class<?>> superTypes,
-            AnnotationIntrospector aintr, MixInResolver mir,
-            AnnotationMap classAnnotations)
-    {
-        _class = cls;
-        _superTypes = superTypes;
-        _annotationIntrospector = aintr;
-        _mixInResolver = mir;
-        _primaryMixIn = (_mixInResolver == null) ? null
-            : _mixInResolver.findMixInClassFor(_class);
-        _classAnnotations = classAnnotations;
-    }
-
-    @Override
-    public AnnotatedClass withAnnotations(AnnotationMap ann) {
-        return new AnnotatedClass(_class, _superTypes,
-                _annotationIntrospector, _mixInResolver, ann);
-    }
-    
-    /**
-     * Factory method that instantiates an instance. Returned instance
-     * will only be initialized with class annotations, but not with
-     * any method information.
-     */
-    public static AnnotatedClass construct(Class<?> cls,
-            AnnotationIntrospector aintr, MixInResolver mir)
-    {
-        return new AnnotatedClass(cls,
-                ClassUtil.findSuperTypes(cls, null), aintr, mir, null);
-    }
-
-    /**
-     * Method similar to {@link #construct}, but that will NOT include
-     * information from supertypes; only class itself and any direct
-     * mix-ins it may have.
-     */
-    public static AnnotatedClass constructWithoutSuperTypes(Class<?> cls,
-            AnnotationIntrospector aintr, MixInResolver mir)
-    {
-        return new AnnotatedClass(cls,
-                Collections.<Class<?>>emptyList(), aintr, mir, null);
-    }
-    
-    /*
-    /**********************************************************
-    /* Annotated impl 
-    /**********************************************************
-     */
-
-    @Override
-    public Class<?> getAnnotated() { return _class; }
-
-    @Override
-    public int getModifiers() { return _class.getModifiers(); }
-
-    @Override
-    public String getName() { return _class.getName(); }
-
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls)
-    {
-        if (_classAnnotations == null) {
-            resolveClassAnnotations();
-        }
-        return _classAnnotations.get(acls);
-    }
-
-    @Override
-    public Type getGenericType() {
-        return _class;
-    }
-
-    @Override
-    public Class<?> getRawType() {
-        return _class;
-    }
-
-    @Override
-    protected AnnotationMap getAllAnnotations() {
-        if (_classAnnotations == null) {
-            resolveClassAnnotations();
-        }
-        return _classAnnotations;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, generic accessors
-    /**********************************************************
-     */
-
-    public Annotations getAnnotations() {
-        if (_classAnnotations == null) {
-            resolveClassAnnotations();
-        }
-        return _classAnnotations;
-    }
-    
-    public boolean hasAnnotations() {
-        if (_classAnnotations == null) {
-            resolveClassAnnotations();
-        }
-        return _classAnnotations.size() > 0;
-    }
-
-    public AnnotatedConstructor getDefaultConstructor()
-    {
-        if (!_creatorsResolved) {
-            resolveCreators();
-        }
-        return _defaultConstructor;
-    }
-
-    public List<AnnotatedConstructor> getConstructors()
-    {
-        if (!_creatorsResolved) {
-            resolveCreators();
-        }
-        return _constructors;
-    }
-
-    public List<AnnotatedMethod> getStaticMethods()
-    {
-        if (!_creatorsResolved) {
-            resolveCreators();
-        }
-        return _creatorMethods;
-    }
-
-    public Iterable<AnnotatedMethod> memberMethods()
-    {
-        if (_memberMethods == null) {
-            resolveMemberMethods();
-        }
-        return _memberMethods;
-    }
-
-    public int getMemberMethodCount()
-    {
-        if (_memberMethods == null) {
-            resolveMemberMethods();
-        }
-        return _memberMethods.size();
-    }
-
-    public AnnotatedMethod findMethod(String name, Class<?>[] paramTypes)
-    {
-        if (_memberMethods == null) {
-            resolveMemberMethods();
-        }
-        return _memberMethods.find(name, paramTypes);
-    }
-
-    public int getFieldCount() {
-        if (_fields == null) {
-            resolveFields();
-        }
-        return _fields.size();
-    }
-
-    public Iterable<AnnotatedField> fields()
-    {
-        if (_fields == null) {
-            resolveFields();
-        }
-        return _fields;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, main-level resolution methods
-    /**********************************************************
-     */
-
-    /**
-     * Initialization method that will recursively collect Jackson
-     * annotations for this class and all super classes and
-     * interfaces.
-     */
-    private void resolveClassAnnotations()
-    {
-        _classAnnotations = new AnnotationMap();
-        // [JACKSON-659] Should skip processing if annotation processing disabled
-        if (_annotationIntrospector != null) {
-            // add mix-in annotations first (overrides)
-            if (_primaryMixIn != null) {
-                _addClassMixIns(_classAnnotations, _class, _primaryMixIn);
-            }
-            // first, annotations from the class itself:
-            _addAnnotationsIfNotPresent(_classAnnotations, _class.getDeclaredAnnotations());
-    
-            // and then from super types
-            for (Class<?> cls : _superTypes) {
-                // and mix mix-in annotations in-between
-                _addClassMixIns(_classAnnotations, cls);
-                _addAnnotationsIfNotPresent(_classAnnotations, cls.getDeclaredAnnotations());
-            }
-            /* and finally... any annotations there might be for plain
-             * old Object.class: separate because for all other purposes
-             * it is just ignored (not included in super types)
-             */
-            /* 12-Jul-2009, tatu: Should this be done for interfaces too?
-             *   For now, yes, seems useful for some cases, and not harmful for any?
-             */
-            _addClassMixIns(_classAnnotations, Object.class);
-        }
-    }
-    
-    /**
-     * Initialization method that will find out all constructors
-     * and potential static factory methods the class has.
-     */
-    private void resolveCreators()
-    {
-        // Then see which constructors we have
-        List<AnnotatedConstructor> constructors = null;
-        Constructor<?>[] declaredCtors = _class.getDeclaredConstructors();
-        for (Constructor<?> ctor : declaredCtors) {
-            if (ctor.getParameterTypes().length == 0) {
-                _defaultConstructor = _constructConstructor(ctor, true);
-            } else {
-                if (constructors == null) {
-                    constructors = new ArrayList<AnnotatedConstructor>(Math.max(10, declaredCtors.length));
-                }
-                constructors.add(_constructConstructor(ctor, false));
-            }
-        }
-        if (constructors == null) {
-            _constructors = Collections.emptyList();
-        } else {
-            _constructors = constructors;
-        }
-        // and if need be, augment with mix-ins
-        if (_primaryMixIn != null) {
-            if (_defaultConstructor != null || !_constructors.isEmpty()) {
-                _addConstructorMixIns(_primaryMixIn);
-            }
-        }
-
-
-        /* And then... let's remove all constructors that are deemed
-         * ignorable after all annotations have been properly collapsed.
-         */
-        // 14-Feb-2011, tatu: AnnotationIntrospector is null if annotations not enabled; if so, can skip:
-        if (_annotationIntrospector != null) {
-            if (_defaultConstructor != null) {
-                if (_annotationIntrospector.hasIgnoreMarker(_defaultConstructor)) {
-                    _defaultConstructor = null;
-                }
-            }
-            if (_constructors != null) {
-                // count down to allow safe removal
-                for (int i = _constructors.size(); --i >= 0; ) {
-                    if (_annotationIntrospector.hasIgnoreMarker(_constructors.get(i))) {
-                        _constructors.remove(i);
-                    }
-                }
-            }
-        }
-        List<AnnotatedMethod> creatorMethods = null;
-        
-        // Then static methods which are potential factory methods
-        for (Method m : _class.getDeclaredMethods()) {
-            if (!Modifier.isStatic(m.getModifiers())) {
-                continue;
-            }
-            // all factory methods are fine, as per [JACKSON-850]
-            //int argCount = m.getParameterTypes().length;
-            if (creatorMethods == null) {
-                creatorMethods = new ArrayList<AnnotatedMethod>(8);
-            }
-            creatorMethods.add(_constructCreatorMethod(m));
-        }
-        if (creatorMethods == null) {
-            _creatorMethods = Collections.emptyList();
-        } else {
-            _creatorMethods = creatorMethods;
-            // mix-ins to mix in?
-            if (_primaryMixIn != null) {
-                _addFactoryMixIns(_primaryMixIn);
-            }
-            // anything to ignore at this point?
-            if (_annotationIntrospector != null) {
-                // count down to allow safe removal
-                for (int i = _creatorMethods.size(); --i >= 0; ) {
-                    if (_annotationIntrospector.hasIgnoreMarker(_creatorMethods.get(i))) {
-                        _creatorMethods.remove(i);
-                    }
-                }
-            }
-        }
-        _creatorsResolved = true;
-    }
-    
-    /**
-     * Method for resolving member method information: aggregating all non-static methods
-     * and combining annotations (to implement method-annotation inheritance)
-     * 
-     * @param methodFilter Filter used to determine which methods to include
-     */
-    private void resolveMemberMethods()
-    {
-        _memberMethods = new AnnotatedMethodMap();
-        AnnotatedMethodMap mixins = new AnnotatedMethodMap();
-        // first: methods from the class itself
-        _addMemberMethods(_class, _memberMethods, _primaryMixIn, mixins);
-
-        // and then augment these with annotations from super-types:
-        for (Class<?> cls : _superTypes) {
-            Class<?> mixin = (_mixInResolver == null) ? null : _mixInResolver.findMixInClassFor(cls);         
-            _addMemberMethods(cls, _memberMethods, mixin, mixins);
-        }
-        // Special case: mix-ins for Object.class? (to apply to ALL classes)
-        if (_mixInResolver != null) {
-            Class<?> mixin = _mixInResolver.findMixInClassFor(Object.class);
-            if (mixin != null) {
-                _addMethodMixIns(_class, _memberMethods, mixin, mixins);
-            }
-        }
-
-        /* Any unmatched mix-ins? Most likely error cases (not matching
-         * any method); but there is one possible real use case:
-         * exposing Object#hashCode (alas, Object#getClass can NOT be
-         * exposed, see [JACKSON-140])
-         */
-        // 14-Feb-2011, tatu: AnnotationIntrospector is null if annotations not enabled; if so, can skip:
-        if (_annotationIntrospector != null) {
-            if (!mixins.isEmpty()) {
-                Iterator<AnnotatedMethod> it = mixins.iterator();
-                while (it.hasNext()) {
-                    AnnotatedMethod mixIn = it.next();
-                    try {
-                        Method m = Object.class.getDeclaredMethod(mixIn.getName(), mixIn.getRawParameterTypes());
-                        if (m != null) {
-                            AnnotatedMethod am = _constructMethod(m);
-                            _addMixOvers(mixIn.getAnnotated(), am, false);
-                            _memberMethods.add(am);
-                        }
-                    } catch (Exception e) { }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Method that will collect all member (non-static) fields
-     * that are either public, or have at least a single annotation
-     * associated with them.
-     */
-    private void resolveFields()
-    {
-        Map<String,AnnotatedField> foundFields = _findFields(_class, null);
-        if (foundFields == null || foundFields.size() == 0) {
-            _fields = Collections.emptyList();
-        } else {
-            _fields = new ArrayList<AnnotatedField>(foundFields.size());
-            _fields.addAll(foundFields.values());
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods for resolving class annotations
-    /* (resolution consisting of inheritance, overrides,
-    /* and injection of mix-ins as necessary)
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method for adding any mix-in annotations specified
-     * class might have.
-     */
-    protected void _addClassMixIns(AnnotationMap annotations, Class<?> toMask)
-    {
-        if (_mixInResolver != null) {
-            _addClassMixIns(annotations, toMask, _mixInResolver.findMixInClassFor(toMask));
-        }
-    }
-
-    protected void _addClassMixIns(AnnotationMap annotations, Class<?> toMask,
-                                   Class<?> mixin)
-    {
-        if (mixin == null) {
-            return;
-        }
-        // Ok, first: annotations from mix-in class itself:
-        _addAnnotationsIfNotPresent(annotations, mixin.getDeclaredAnnotations());
-
-        /* And then from its supertypes, if any. But note that we will
-         * only consider super-types up until reaching the masked
-         * class (if found); this because often mix-in class
-         * is a sub-class (for convenience reasons). And if so, we
-         * absolutely must NOT include super types of masked class,
-         * as that would inverse precedence of annotations.
-         */
-        for (Class<?> parent : ClassUtil.findSuperTypes(mixin, toMask)) {
-            _addAnnotationsIfNotPresent(annotations, parent.getDeclaredAnnotations());
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for populating creator (ctor, factory) information
-    /**********************************************************
-     */
-
-    protected void _addConstructorMixIns(Class<?> mixin)
-    {
-        MemberKey[] ctorKeys = null;
-        int ctorCount = (_constructors == null) ? 0 : _constructors.size();
-        for (Constructor<?> ctor : mixin.getDeclaredConstructors()) {
-            if (ctor.getParameterTypes().length == 0) {
-                if (_defaultConstructor != null) {
-                    _addMixOvers(ctor, _defaultConstructor, false);
-                }
-            } else {
-                if (ctorKeys == null) {
-                    ctorKeys = new MemberKey[ctorCount];
-                    for (int i = 0; i < ctorCount; ++i) {
-                        ctorKeys[i] = new MemberKey(_constructors.get(i).getAnnotated());
-                    }
-                }
-                MemberKey key = new MemberKey(ctor);
-
-                for (int i = 0; i < ctorCount; ++i) {
-                    if (!key.equals(ctorKeys[i])) {
-                        continue;
-                    }
-                    _addMixOvers(ctor, _constructors.get(i), true);
-                    break;
-                }
-            }
-        }
-    }
-
-    protected void _addFactoryMixIns(Class<?> mixin)
-    {
-        MemberKey[] methodKeys = null;
-        int methodCount = _creatorMethods.size();
-
-        for (Method m : mixin.getDeclaredMethods()) {
-            if (!Modifier.isStatic(m.getModifiers())) {
-                continue;
-            }
-            if (m.getParameterTypes().length == 0) {
-                continue;
-            }
-            if (methodKeys == null) {
-                methodKeys = new MemberKey[methodCount];
-                for (int i = 0; i < methodCount; ++i) {
-                    methodKeys[i] = new MemberKey(_creatorMethods.get(i).getAnnotated());
-                }
-            }
-            MemberKey key = new MemberKey(m);
-            for (int i = 0; i < methodCount; ++i) {
-                if (!key.equals(methodKeys[i])) {
-                    continue;
-                }
-                _addMixOvers(m, _creatorMethods.get(i), true);
-                break;
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for populating method information
-    /**********************************************************
-     */
-
-    protected void _addMemberMethods(Class<?> cls, AnnotatedMethodMap methods,
-            Class<?> mixInCls, AnnotatedMethodMap mixIns)
-    {
-        // first, mixIns, since they have higher priority then class methods
-        if (mixInCls != null) {
-            _addMethodMixIns(cls, methods, mixInCls, mixIns);
-        }        
-        if (cls == null) { // just so caller need not check when passing super-class
-            return;
-        }
-
-        // then methods from the class itself
-        for (Method m : cls.getDeclaredMethods()) {
-            if (!_isIncludableMemberMethod(m)) {
-                continue;
-            }
-            AnnotatedMethod old = methods.find(m);
-            if (old == null) {
-                AnnotatedMethod newM = _constructMethod(m);
-                methods.add(newM);
-                // Ok, but is there a mix-in to connect now?
-                old = mixIns.remove(m);
-                if (old != null) {
-                    _addMixOvers(old.getAnnotated(), newM, false);
-                }
-            } else {
-                /* If sub-class already has the method, we only want to augment
-                 * annotations with entries that are not masked by sub-class.
-                 */
-                _addMixUnders(m, old);
-
-                /* 06-Jan-2010, tatu: [JACKSON-450] Except that if method we saw first is
-                 *   from an interface, and we now find a non-interface definition, we should
-                 *   use this method, but with combination of annotations.
-                 *   This helps (or rather, is essential) with JAXB annotations and
-                 *   may also result in faster method calls (interface calls are slightly
-                 *   costlier than regular method calls)
-                 */
-                if (old.getDeclaringClass().isInterface() && !m.getDeclaringClass().isInterface()) {
-                    methods.add(old.withMethod(m));
-                }
-            }
-        }
-    }
-
-    protected void _addMethodMixIns(Class<?> targetClass, AnnotatedMethodMap methods,
-            Class<?> mixInCls, AnnotatedMethodMap mixIns)
-    {
-        List<Class<?>> parents = new ArrayList<Class<?>>();
-        parents.add(mixInCls);
-        ClassUtil.findSuperTypes(mixInCls, targetClass, parents);
-        for (Class<?> mixin : parents) {
-            for (Method m : mixin.getDeclaredMethods()) {
-                if (!_isIncludableMemberMethod(m)) {
-                    continue;
-                }
-                AnnotatedMethod am = methods.find(m);
-                /* Do we already have a method to augment (from sub-class
-                 * that will mask this mixIn)? If so, add if visible
-                 * without masking (no such annotation)
-                 */
-                if (am != null) {
-                    _addMixUnders(m, am);
-                    /* Otherwise will have precedence, but must wait
-                     * until we find the real method (mixIn methods are
-                     * just placeholder, can't be called)
-                     */
-                } else {
-                    mixIns.add(_constructMethod(m));
-                }
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for populating field information
-    /**********************************************************
-     */
-
-    protected Map<String,AnnotatedField> _findFields(Class<?> c, Map<String,AnnotatedField> fields)
-    {
-        /* First, a quick test: we only care for regular classes (not
-         * interfaces, primitive types etc), except for Object.class.
-         * A simple check to rule out other cases is to see if there
-         * is a super class or not.
-         */
-        Class<?> parent = c.getSuperclass();
-        if (parent != null) {
-            // Let's add super-class' fields first, then ours.
-            /* 21-Feb-2010, tatu: Need to handle masking: as per [JACKSON-226]
-             *    we otherwise get into trouble...
-             */
-            fields = _findFields(parent, fields);
-            for (Field f : c.getDeclaredFields()) {
-                // static fields not included, nor transient
-                if (!_isIncludableField(f)) {
-                    continue;
-                }
-                /* Ok now: we can (and need) not filter out ignorable fields
-                 * at this point; partly because mix-ins haven't been
-                 * added, and partly because logic can be done when
-                 * determining get/settability of the field.
-                 */
-                if (fields == null) {
-                    fields = new LinkedHashMap<String,AnnotatedField>();
-                }
-                fields.put(f.getName(), _constructField(f));
-            }
-            // And then... any mix-in overrides?
-            if (_mixInResolver != null) {
-                Class<?> mixin = _mixInResolver.findMixInClassFor(c);
-                if (mixin != null) {
-                    _addFieldMixIns(parent, mixin, fields);
-                }
-            }
-        }
-        return fields;
-    }
-
-    /**
-     * Method called to add field mix-ins from given mix-in class (and its fields)
-     * into already collected actual fields (from introspected classes and their
-     * super-classes)
-     */
-    protected void _addFieldMixIns(Class<?> targetClass, Class<?> mixInCls,
-            Map<String,AnnotatedField> fields)
-    {
-        List<Class<?>> parents = new ArrayList<Class<?>>();
-        parents.add(mixInCls);
-        ClassUtil.findSuperTypes(mixInCls, targetClass, parents);
-        for (Class<?> mixin : parents) {
-            for (Field mixinField : mixin.getDeclaredFields()) {
-                // there are some dummy things (static, synthetic); better ignore
-                if (!_isIncludableField(mixinField)) {
-                    continue;
-                }
-                String name = mixinField.getName();
-                // anything to mask? (if not, quietly ignore)
-                AnnotatedField maskedField = fields.get(name);
-                if (maskedField != null) {
-                    _addOrOverrideAnnotations(maskedField, mixinField.getDeclaredAnnotations());
-                }
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, constructing value types
-    /**********************************************************
-     */
-
-    protected AnnotatedMethod _constructMethod(Method m)
-    {
-        /* note: parameter annotations not used for regular (getter, setter)
-         * methods; only for creator methods (static factory methods)
-         * -- at least not yet!
-         */
-        if (_annotationIntrospector == null) { // when annotation processing is disabled
-            return new AnnotatedMethod(m, _emptyAnnotationMap(), null);
-        }
-        return new AnnotatedMethod(m, _collectRelevantAnnotations(m.getDeclaredAnnotations()), null);
-    }
-
-    protected AnnotatedConstructor _constructConstructor(Constructor<?> ctor, boolean defaultCtor)
-    {
-        if (_annotationIntrospector == null) { // when annotation processing is disabled
-            return new AnnotatedConstructor(ctor, _emptyAnnotationMap(), _emptyAnnotationMaps(ctor.getParameterTypes().length));
-        }
-        if (defaultCtor) {
-            return new AnnotatedConstructor(ctor, _collectRelevantAnnotations(ctor.getDeclaredAnnotations()), null);
-        }
-        Annotation[][] paramAnns = ctor.getParameterAnnotations();
-        int paramCount = ctor.getParameterTypes().length;
-        /* [JACKSON-701]: Looks like JDK has discrepancy, whereas annotations for implicit 'this'
-         * (for non-static inner classes) are NOT included, but type is? Strange, sounds like
-         * a bug. Alas, we can't really fix that...
-         */
-        // Also: [JACKSON-757] (enum value constructors)
-        AnnotationMap[] resolvedAnnotations = null;
-        if (paramCount != paramAnns.length) {
-            // Limits of the work-around (to avoid hiding real errors):
-            // first, only applicable for member classes and then either:
-
-            Class<?> dc = ctor.getDeclaringClass();
-            // (a) is enum, which have two extra hidden params (name, index)
-            if (dc.isEnum() && (paramCount == paramAnns.length + 2)) {
-                Annotation[][] old = paramAnns;
-                paramAnns = new Annotation[old.length+2][];
-                System.arraycopy(old, 0, paramAnns, 2, old.length);
-                resolvedAnnotations = _collectRelevantAnnotations(paramAnns);
-            } else if (dc.isMemberClass()) {
-                // (b) non-static inner classes, get implicit 'this' for parameter, not  annotation
-                if (paramCount == (paramAnns.length + 1)) {
-                    // hack attack: prepend a null entry to make things match
-                    Annotation[][] old = paramAnns;
-                    paramAnns = new Annotation[old.length+1][];
-                    System.arraycopy(old, 0, paramAnns, 1, old.length);
-                    resolvedAnnotations = _collectRelevantAnnotations(paramAnns);
-                }
-            }
-            if (resolvedAnnotations == null) {
-                throw new IllegalStateException("Internal error: constructor for "+ctor.getDeclaringClass().getName()
-                        +" has mismatch: "+paramCount+" parameters; "+paramAnns.length+" sets of annotations");
-            }
-        } else {
-            resolvedAnnotations = _collectRelevantAnnotations(paramAnns);
-        }
-        return new AnnotatedConstructor(ctor, _collectRelevantAnnotations(ctor.getDeclaredAnnotations()),
-                resolvedAnnotations);
-    }
-
-    protected AnnotatedMethod _constructCreatorMethod(Method m)
-    {
-        if (_annotationIntrospector == null) { // when annotation processing is disabled
-            return new AnnotatedMethod(m, _emptyAnnotationMap(), _emptyAnnotationMaps(m.getParameterTypes().length));
-        }
-        return new AnnotatedMethod(m, _collectRelevantAnnotations(m.getDeclaredAnnotations()),
-                                   _collectRelevantAnnotations(m.getParameterAnnotations()));
-    }
-
-    protected AnnotatedField _constructField(Field f)
-    {
-        if (_annotationIntrospector == null) { // when annotation processing is disabled
-            return new AnnotatedField(f, _emptyAnnotationMap());
-        }
-        return new AnnotatedField(f, _collectRelevantAnnotations(f.getDeclaredAnnotations()));
-    }
- 
-    private AnnotationMap _emptyAnnotationMap() {
-        return new AnnotationMap();
-    }
-
-    private AnnotationMap[] _emptyAnnotationMaps(int count) {
-        if (count == 0) {
-            return NO_ANNOTATION_MAPS;
-        }
-        AnnotationMap[] maps = new AnnotationMap[count];
-        for (int i = 0; i < count; ++i) {
-            maps[i] = _emptyAnnotationMap();
-        }
-        return maps;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods, inclusion filtering
-    /**********************************************************
-     */
-
-    protected boolean _isIncludableMemberMethod(Method m)
-    {
-        if (Modifier.isStatic(m.getModifiers())) {
-            return false;
-        }
-        /* 07-Apr-2009, tatu: Looks like generics can introduce hidden
-         *   bridge and/or synthetic methods. I don't think we want to
-         *   consider those...
-         */
-        if (m.isSynthetic() || m.isBridge()) {
-            return false;
-        }
-        // also, for now we have no use for methods with 2 or more arguments:
-        int pcount = m.getParameterTypes().length;
-        return (pcount <= 2);
-    }
-
-    private boolean _isIncludableField(Field f)
-    {
-        /* I'm pretty sure synthetic fields are to be skipped...
-         * (methods definitely are)
-         */
-        if (f.isSynthetic()) {
-            return false;
-        }
-        // Static fields are never included, nor transient
-        int mods = f.getModifiers();
-        if (Modifier.isStatic(mods) || Modifier.isTransient(mods)) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, attaching annotations
-    /**********************************************************
-     */
-
-    protected AnnotationMap[] _collectRelevantAnnotations(Annotation[][] anns)
-    {
-        int len = anns.length;
-        AnnotationMap[] result = new AnnotationMap[len];
-        for (int i = 0; i < len; ++i) {
-            result[i] = _collectRelevantAnnotations(anns[i]);
-        }
-        return result;
-    }
-
-    protected AnnotationMap _collectRelevantAnnotations(Annotation[] anns)
-    {
-        AnnotationMap annMap = new AnnotationMap();
-        _addAnnotationsIfNotPresent(annMap, anns);
-        return annMap;
-    }
-    
-    /* Helper method used to add all applicable annotations from given set.
-     * Takes into account possible "annotation bundles" (meta-annotations to
-     * include instead of main-level annotation)
-     */
-    private void _addAnnotationsIfNotPresent(AnnotationMap result, Annotation[] anns)
-    {
-        if (anns != null) {
-            List<Annotation[]> bundles = null;
-            for (Annotation ann : anns) { // first: direct annotations
-                if (_isAnnotationBundle(ann)) {
-                    if (bundles == null) {
-                        bundles = new LinkedList<Annotation[]>();
-                    }
-                    bundles.add(ann.annotationType().getDeclaredAnnotations());
-                } else { // note: we will NOT filter out non-Jackson anns any more
-                    result.addIfNotPresent(ann);
-                }
-            }
-            if (bundles != null) { // and secondarily handle bundles, if any found: precedence important
-                for (Annotation[] annotations : bundles) {
-                    _addAnnotationsIfNotPresent(result, annotations);
-                }
-            }
-        }
-    }
-
-    private void _addAnnotationsIfNotPresent(AnnotatedMember target, Annotation[] anns)
-    {
-        if (anns != null) {
-            List<Annotation[]> bundles = null;
-            for (Annotation ann : anns) { // first: direct annotations
-                if (_isAnnotationBundle(ann)) {
-                    if (bundles == null) {
-                        bundles = new LinkedList<Annotation[]>();
-                    }
-                    bundles.add(ann.annotationType().getDeclaredAnnotations());
-                } else { // note: we will NOT filter out non-Jackson anns any more
-                    target.addIfNotPresent(ann);
-                }
-            }
-            if (bundles != null) { // and secondarily handle bundles, if any found: precedence important
-                for (Annotation[] annotations : bundles) {
-                    _addAnnotationsIfNotPresent(target, annotations);
-                }
-            }
-        }
-    }
-    
-    private void _addOrOverrideAnnotations(AnnotatedMember target, Annotation[] anns)
-    {
-        if (anns != null) {
-            List<Annotation[]> bundles = null;
-            for (Annotation ann : anns) { // first: direct annotations
-                if (_isAnnotationBundle(ann)) {
-                    if (bundles == null) {
-                        bundles = new LinkedList<Annotation[]>();
-                    }
-                    bundles.add(ann.annotationType().getDeclaredAnnotations());
-                } else { // note: no filtering by jackson-annotations
-                    target.addOrOverride(ann);
-                }
-            }
-            if (bundles != null) { // and then bundles, if any: important for precedence
-                for (Annotation[] annotations : bundles) {
-                    _addOrOverrideAnnotations(target, annotations);
-                }
-            }
-        }
-    }
-    
-    /**
-     * @param addParamAnnotations Whether parameter annotations are to be
-     *   added as well
-     */
-    protected void _addMixOvers(Constructor<?> mixin, AnnotatedConstructor target,
-            boolean addParamAnnotations)
-    {
-        _addOrOverrideAnnotations(target, mixin.getDeclaredAnnotations());
-        if (addParamAnnotations) {
-            Annotation[][] pa = mixin.getParameterAnnotations();
-            for (int i = 0, len = pa.length; i < len; ++i) {
-                for (Annotation a : pa[i]) {
-                    target.addOrOverrideParam(i, a);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param addParamAnnotations Whether parameter annotations are to be
-     *   added as well
-     */
-    protected void _addMixOvers(Method mixin, AnnotatedMethod target,
-            boolean addParamAnnotations)
-    {
-        _addOrOverrideAnnotations(target, mixin.getDeclaredAnnotations());
-        if (addParamAnnotations) {
-            Annotation[][] pa = mixin.getParameterAnnotations();
-            for (int i = 0, len = pa.length; i < len; ++i) {
-                for (Annotation a : pa[i]) {
-                    target.addOrOverrideParam(i, a);
-                }
-            }
-        }
-    }
-
-    /**
-     * Method that will add annotations from specified source method to target method,
-     * but only if target does not yet have them.
-     */
-    protected void _addMixUnders(Method src, AnnotatedMethod target) {
-        _addAnnotationsIfNotPresent(target, src.getDeclaredAnnotations());
-    }
-
-   private final boolean _isAnnotationBundle(Annotation ann)
-   {
-       return (_annotationIntrospector != null) && _annotationIntrospector.isAnnotationBundle(ann);
-   }
-   
-    /*
-    /**********************************************************
-    /* Other methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[AnnotedClass "+_class.getName()+"]";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.java
deleted file mode 100644
index d94c091..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.*;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-public final class AnnotatedConstructor
-    extends AnnotatedWithParams
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final Constructor<?> _constructor;
-
-    /**
-     * Field that is used to make JDK serialization work with this
-     * object.
-     * 
-     * @since 2.1
-     */
-    protected Serialization _serialization;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public AnnotatedConstructor(Constructor<?> constructor,
-            AnnotationMap classAnn, AnnotationMap[] paramAnn)
-    {
-        super(classAnn, paramAnn);
-        if (constructor == null) {
-            throw new IllegalArgumentException("Null constructor not allowed");
-        }
-        _constructor = constructor;
-    }
-
-    /**
-     * Method used for JDK serialization support
-     * @since 2.1
-     */
-    protected AnnotatedConstructor(Serialization ser)
-    {
-        super(null, null);
-        _constructor = null;
-        _serialization = ser;
-    }
-    
-    @Override
-    public AnnotatedConstructor withAnnotations(AnnotationMap ann) {
-        return new AnnotatedConstructor(_constructor, ann, _paramAnnotations);
-    }
-    
-    /*
-    /**********************************************************
-    /* Annotated impl
-    /**********************************************************
-     */
-
-    @Override
-    public Constructor<?> getAnnotated() { return _constructor; }
-
-    @Override
-    public int getModifiers() { return _constructor.getModifiers(); }
-
-    @Override
-    public String getName() { return _constructor.getName(); }
-
-    @Override
-    public Type getGenericType() {
-        return getRawType();
-    }
-
-    @Override
-    public Class<?> getRawType() {
-        return _constructor.getDeclaringClass();
-    }
-
-    // note: copied verbatim from AnnotatedMethod; hard to generalize
-    /**
-     * As per [JACKSON-468], we need to also allow declaration of local
-     * type bindings; mostly it will allow defining bounds.
-     */
-    @Override
-    public JavaType getType(TypeBindings bindings)
-    {
-        return getType(bindings, _constructor.getTypeParameters());
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    @Override
-    public int getParameterCount() {
-        return _constructor.getParameterTypes().length;
-    }
-
-    @Override
-    public Class<?> getRawParameterType(int index)
-    {
-        Class<?>[] types = _constructor.getParameterTypes();
-        return (index >= types.length) ? null : types[index];
-    }
-
-    @Override
-    public Type getGenericParameterType(int index)
-    {
-        Type[] types = _constructor.getGenericParameterTypes();
-        return (index >= types.length) ? null : types[index];
-    }
-
-    @Override
-    public final Object call() throws Exception {
-        return _constructor.newInstance();
-    }
-
-    @Override
-    public final Object call(Object[] args) throws Exception {
-        return _constructor.newInstance(args);
-    }
-
-    @Override
-    public final Object call1(Object arg) throws Exception {
-        return _constructor.newInstance(arg);
-    }
-    
-    /*
-    /**********************************************************
-    /* AnnotatedMember impl
-    /**********************************************************
-     */
-
-    @Override
-    public Class<?> getDeclaringClass() { return _constructor.getDeclaringClass(); }
-
-    @Override
-    public Member getMember() { return _constructor; }
-
-    @Override
-    public void setValue(Object pojo, Object value)
-        throws UnsupportedOperationException
-    {
-        throw new UnsupportedOperationException("Cannot call setValue() on constructor of "
-                +getDeclaringClass().getName());
-    }
-
-    @Override
-    public Object getValue(Object pojo)
-        throws UnsupportedOperationException
-    {
-        throw new UnsupportedOperationException("Cannot call getValue() on constructor of "
-                +getDeclaringClass().getName());
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API, specific annotations
-    /**********************************************************
-     */
-
-    @Override
-    public String toString() {
-        return "[constructor for "+getName()+", annotations: "+_annotations+"]";
-    }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object writeReplace() {
-        return new AnnotatedConstructor(new Serialization(_constructor));
-    }
-
-    Object readResolve() {
-        Class<?> clazz = _serialization.clazz;
-        try {
-            Constructor<?> ctor = clazz.getDeclaredConstructor(_serialization.args);
-            // 06-Oct-2012, tatu: Has "lost" its security override, must force back
-            if (!ctor.isAccessible()) {
-                ClassUtil.checkAndFixAccess(ctor);
-            }
-            return new AnnotatedConstructor(ctor, null, null);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Could not find constructor with "
-                    +_serialization.args.length+" args from Class '"+clazz.getName());
-        }
-    }
-    
-    /**
-     * Helper class that is used as the workaround to persist
-     * Field references. It basically just stores declaring class
-     * and field name.
-     */
-    private final static class Serialization
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-        protected Class<?> clazz;
-        protected Class<?>[] args;
-
-        public Serialization(Constructor<?> ctor) {
-            clazz = ctor.getDeclaringClass();
-            args = ctor.getParameterTypes();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedField.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedField.java
deleted file mode 100644
index 9fdd0f8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedField.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Object that represents non-static (and usually non-transient/volatile)
- * fields of a class.
- */
-public final class AnnotatedField
-    extends AnnotatedMember
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 7364428299211355871L;
-
-    /**
-     * Actual {@link Field} used for access.
-     *<p>
-     * Transient since it can not be persisted directly using
-     * JDK serialization
-     */
-    protected final transient Field _field;
-
-    /**
-     * Temporary field required for JDK serialization support
-     */
-    protected Serialization _serialization;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public AnnotatedField(Field field, AnnotationMap annMap)
-    {
-        super(annMap);
-        _field = field;
-    }
-    
-    @Override
-    public AnnotatedField withAnnotations(AnnotationMap ann) {
-        return new AnnotatedField(_field, ann);
-    }
-
-    /**
-     * Method used for JDK serialization support
-     */
-    protected AnnotatedField(Serialization ser)
-    {
-        super(null);
-        _field = null;
-        _serialization = ser;
-    }
-    
-    /*
-    /**********************************************************
-    /* Annotated impl
-    /**********************************************************
-     */
-
-    @Override
-    public Field getAnnotated() { return _field; }
-
-    @Override
-    public int getModifiers() { return _field.getModifiers(); }
-
-    @Override
-    public String getName() { return _field.getName(); }
-
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls)
-    {
-        return _annotations.get(acls);
-    }
-
-    @Override
-    public Type getGenericType() {
-        return _field.getGenericType();
-    }
-
-    @Override
-    public Class<?> getRawType() {
-        return _field.getType();
-    }
-    
-    /*
-    /**********************************************************
-    /* AnnotatedMember impl
-    /**********************************************************
-     */
-
-    @Override
-    public Class<?> getDeclaringClass() { return _field.getDeclaringClass(); }
-
-    @Override
-    public Member getMember() { return _field; }
-
-    @Override
-    public void setValue(Object pojo, Object value) throws IllegalArgumentException
-    {
-        try {
-            _field.set(pojo, value);
-        } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Failed to setValue() for field "
-                    +getFullName()+": "+e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Object getValue(Object pojo) throws IllegalArgumentException
-    {
-        try {
-            return _field.get(pojo);
-        } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Failed to getValue() for field "
-                    +getFullName()+": "+e.getMessage(), e);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API, generic
-    /**********************************************************
-     */
-
-    public String getFullName() {
-        return getDeclaringClass().getName() + "#" + getName();
-    }
-
-    public int getAnnotationCount() { return _annotations.size(); }
-
-    @Override
-    public String toString()
-    {
-        return "[field "+getFullName()+"]";
-    }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object writeReplace() {
-        return new AnnotatedField(new Serialization(_field));
-    }
-
-    Object readResolve() {
-        Class<?> clazz = _serialization.clazz;
-        try {
-            Field f = clazz.getDeclaredField(_serialization.name);
-            // 06-Oct-2012, tatu: Has "lost" its security override, may need to force back
-            if (!f.isAccessible()) {
-                ClassUtil.checkAndFixAccess(f);
-            }
-            return new AnnotatedField(f, null);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Could not find method '"+_serialization.name
-                        +"' from Class '"+clazz.getName());
-        }
-    }
-    
-    /**
-     * Helper class that is used as the workaround to persist
-     * Field references. It basically just stores declaring class
-     * and field name.
-     */
-    private final static class Serialization
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-        protected Class<?> clazz;
-        protected String name;
-
-        public Serialization(Field f) {
-            clazz = f.getDeclaringClass();
-            name = f.getName();
-            
-        }
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java
deleted file mode 100644
index 0a4ef3f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Intermediate base class for annotated entities that are members of
- * a class; fields, methods and constructors. This is a superset
- * of things that can represent logical properties as it contains
- * constructors in addition to fields and methods.
- * 
- * @author tatu
- */
-public abstract class AnnotatedMember
-    extends Annotated
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 7364428299211355871L;
-
-    // Transient since information not needed after construction, so
-    // no need to persist
-    protected final transient AnnotationMap _annotations;
-
-    protected AnnotatedMember(AnnotationMap annotations) {
-        super();
-        _annotations = annotations;
-    }
-
-    public abstract Class<?> getDeclaringClass();
-
-    public abstract Member getMember();
-
-    @Override
-    protected AnnotationMap getAllAnnotations() {
-        return _annotations;
-    }
-
-    /**
-     * Method called to override an annotation, usually due to a mix-in
-     * annotation masking or overriding an annotation 'real' constructor
-     * has.
-     */
-    public final void addOrOverride(Annotation a) {
-        _annotations.add(a);
-    }
-
-    /**
-     * Method called to augment annotations, by adding specified
-     * annotation if and only if it is not yet present in the
-     * annotation map we have.
-     */
-    public final void addIfNotPresent(Annotation a) {
-        _annotations.addIfNotPresent(a);
-    }
-    
-    /**
-     * Method that can be called to modify access rights, by calling
-     * {@link java.lang.reflect.AccessibleObject#setAccessible} on
-     * the underlying annotated element.
-     */
-    public final void fixAccess() {
-        ClassUtil.checkAndFixAccess(getMember());
-    }
-
-    /**
-     * Optional method that can be used to assign value of
-     * this member on given object, if this is a supported
-     * operation for member type.
-     *<p>
-     * This is implemented for fields and single-argument
-     * member methods; but not for constructor parameters or
-     * other types of methods (like static methods)
-     */
-    public abstract void setValue(Object pojo, Object value)
-        throws UnsupportedOperationException, IllegalArgumentException;
-
-    /**
-     * Optional method that can be used to access the value of
-     * this member on given object, if this is a supported
-     * operation for member type.
-     *<p>
-     * This is implemented for fields and no-argument
-     * member methods; but not for constructor parameters or
-     * other types of methods (like static methods)
-     */
-    public abstract Object getValue(Object pojo)
-        throws UnsupportedOperationException, IllegalArgumentException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java
deleted file mode 100644
index c37eef5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-public final class AnnotatedMethod
-    extends AnnotatedWithParams
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    final protected transient Method _method;
-
-    // // Simple lazy-caching:
-
-    protected Class<?>[] _paramClasses;
-
-    /**
-     * Field that is used to make JDK serialization work with this
-     * object.
-     * 
-     * @since 2.1
-     */
-    protected Serialization _serialization;
-    
-    /*
-    /*****************************************************
-    /* Life-cycle
-    /*****************************************************
-     */
-
-    public AnnotatedMethod(Method method, AnnotationMap classAnn, AnnotationMap[] paramAnnotations)
-    {
-        super(classAnn, paramAnnotations);
-        if (method == null) {
-            throw new IllegalArgumentException("Can not construct AnnotatedMethod with null Method");
-        }
-        _method = method;
-    }
-
-    /**
-     * Method used for JDK serialization support
-     * @since 2.1
-     */
-    protected AnnotatedMethod(Serialization ser)
-    {
-        super(null, null);
-        _method = null;
-        _serialization = ser;
-    }
-    
-    /**
-     * Method that constructs a new instance with settings (annotations, parameter annotations)
-     * of this instance, but with different physical {@link Method}.
-     */
-    public AnnotatedMethod withMethod(Method m)
-    {
-        return new AnnotatedMethod(m, _annotations, _paramAnnotations);
-    }
-    
-    @Override
-    public AnnotatedMethod withAnnotations(AnnotationMap ann) {
-        return new AnnotatedMethod(_method, ann, _paramAnnotations);
-    }
-
-    /*
-    /*****************************************************
-    /* Annotated impl
-    /*****************************************************
-     */
-
-    @Override
-    public Method getAnnotated() { return _method; }
-
-    @Override
-    public int getModifiers() { return _method.getModifiers(); }
-
-    @Override
-    public String getName() { return _method.getName(); }
-
-    /**
-     * For methods, this returns declared return type, which is only
-     * useful with getters (setters do not return anything; hence "void"
-     * type is returned here)
-     */
-    @Override
-    public Type getGenericType() {
-        return _method.getGenericReturnType();
-    }
-
-    /**
-     * For methods, this returns declared return type, which is only
-     * useful with getters (setters do not usually return anything;
-     * hence "void" type is returned here)
-     */
-    @Override
-    public Class<?> getRawType() {
-        return _method.getReturnType();
-    }
-
-    /**
-     * As per [JACKSON-468], we need to also allow declaration of local
-     * type bindings; mostly it will allow defining bounds.
-     */
-    @Override
-    public JavaType getType(TypeBindings bindings) {
-        return getType(bindings, _method.getTypeParameters());
-    }
-
-    @Override
-    public final Object call() throws Exception {
-        return _method.invoke(null);
-    }
-
-    @Override
-    public final Object call(Object[] args) throws Exception {
-        return _method.invoke(null, args);
-    }
-
-    @Override
-    public final Object call1(Object arg) throws Exception {
-        return _method.invoke(null, arg);
-    }
-    
-    /*
-    /********************************************************
-    /* AnnotatedMember impl
-    /********************************************************
-     */
-
-    @Override
-    public Class<?> getDeclaringClass() { return _method.getDeclaringClass(); }
-
-    @Override
-    public Method getMember() { return _method; }
-
-    @Override
-    public void setValue(Object pojo, Object value)
-        throws IllegalArgumentException
-    {
-        try {
-            _method.invoke(pojo, value);
-        } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Failed to setValue() with method "
-                    +getFullName()+": "+e.getMessage(), e);
-        } catch (InvocationTargetException e) {
-            throw new IllegalArgumentException("Failed to setValue() with method "
-                    +getFullName()+": "+e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Object getValue(Object pojo) throws IllegalArgumentException
-    {
-        try {
-            return _method.invoke(pojo);
-        } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Failed to getValue() with method "
-                    +getFullName()+": "+e.getMessage(), e);
-        } catch (InvocationTargetException e) {
-            throw new IllegalArgumentException("Failed to getValue() with method "
-                    +getFullName()+": "+e.getMessage(), e);
-        }
-    }
-    
-    /*
-    /*****************************************************
-    /* Extended API, generic
-    /*****************************************************
-     */
-
-    @Override
-    public int getParameterCount() {
-        return getRawParameterTypes().length;
-    }
-
-    public String getFullName() {
-        return getDeclaringClass().getName() + "#" + getName() + "("
-            +getParameterCount()+" params)";
-    }
-    
-    public Class<?>[] getRawParameterTypes()
-    {
-        if (_paramClasses == null) {
-            _paramClasses = _method.getParameterTypes();
-        }
-        return _paramClasses;
-    }
-    
-    public Type[] getGenericParameterTypes() {
-        return _method.getGenericParameterTypes();
-    }
-
-    @Override
-    public Class<?> getRawParameterType(int index)
-    {
-        Class<?>[] types = getRawParameterTypes();
-        return (index >= types.length) ? null : types[index];
-    }
-
-    @Override
-    public Type getGenericParameterType(int index)
-    {
-        Type[] types = _method.getGenericParameterTypes();
-        return (index >= types.length) ? null : types[index];
-    }
-
-    public Class<?> getRawReturnType() {
-        return _method.getReturnType();
-    }
-    
-    public Type getGenericReturnType() {
-        return _method.getGenericReturnType();
-    }
-
-    /*
-    /********************************************************
-    /* Other
-    /********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[method "+getFullName()+"]";
-    }
-
-    /*
-    /**********************************************************
-    /* JDK serialization handling
-    /**********************************************************
-     */
-
-    Object writeReplace() {
-        return new AnnotatedMethod(new Serialization(_method));
-    }
-
-    Object readResolve() {
-        Class<?> clazz = _serialization.clazz;
-        try {
-            Method m = clazz.getDeclaredMethod(_serialization.name,
-                    _serialization.args);
-            // 06-Oct-2012, tatu: Has "lost" its security override, may need to force back
-            if (!m.isAccessible()) {
-                ClassUtil.checkAndFixAccess(m);
-            }
-            return new AnnotatedMethod(m, null, null);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Could not find method '"+_serialization.name
-                        +"' from Class '"+clazz.getName());
-        }
-    }
-    
-    /**
-     * Helper class that is used as the workaround to persist
-     * Field references. It basically just stores declaring class
-     * and field name.
-     */
-    private final static class Serialization
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-        protected Class<?> clazz;
-        protected String name;
-        protected Class<?>[] args;
-
-        public Serialization(Method setter) {
-            clazz = setter.getDeclaringClass();
-            name = setter.getName();
-            args = setter.getParameterTypes();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.java
deleted file mode 100644
index 40bea65..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedMethodMap.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * Simple helper class used to keep track of collection of
- * {@link AnnotatedMethod}s, accessible by lookup. Lookup
- * is usually needed for augmenting and overriding annotations.
- */
-public final class AnnotatedMethodMap
-    implements Iterable<AnnotatedMethod>
-{
-    protected LinkedHashMap<MemberKey,AnnotatedMethod> _methods;
-
-    public AnnotatedMethodMap() { }
-
-    /**
-     * Method called to add specified annotated method in the Map.
-     */
-    public void add(AnnotatedMethod am)
-    {
-        if (_methods == null) {
-            _methods = new LinkedHashMap<MemberKey,AnnotatedMethod>();
-        }
-        _methods.put(new MemberKey(am.getAnnotated()), am);
-    }
-
-    /**
-     * Method called to remove specified method, assuming
-     * it exists in the Map
-     */
-    public AnnotatedMethod remove(AnnotatedMethod am)
-    {
-        return remove(am.getAnnotated());
-    }
-
-    public AnnotatedMethod remove(Method m)
-    {
-        if (_methods != null) {
-            return _methods.remove(new MemberKey(m));
-        }
-        return null;
-    }
-
-    public boolean isEmpty() {
-        return (_methods == null || _methods.size() == 0);
-    }
-
-    public int size() {
-        return (_methods == null) ? 0 : _methods.size();
-    }
-
-    public AnnotatedMethod find(String name, Class<?>[] paramTypes)
-    {
-        if (_methods == null) {
-            return null;
-        }
-        return _methods.get(new MemberKey(name, paramTypes));
-    }
-
-    public AnnotatedMethod find(Method m)
-    {
-        if (_methods == null) {
-            return null;
-        }
-        return _methods.get(new MemberKey(m));
-    }
-
-    /*
-    /**********************************************************
-    /* Iterable implementation (for iterating over values)
-    /**********************************************************
-     */
-
-//  @Override
-    public Iterator<AnnotatedMethod> iterator()
-    {
-        if (_methods != null) {
-            return _methods.values().iterator();
-        }
-        List<AnnotatedMethod> empty = Collections.emptyList();
-        return empty.iterator();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.java
deleted file mode 100644
index ca8168a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Object that represents method parameters, mostly so that associated
- * annotations can be processed conveniently. Note that many of accessors
- * can not return meaningful values since parameters do not have stand-alone
- * JDK objects associated; so access should mostly be limited to checking
- * annotation values which are properly aggregated and included.
- *<p>
- * Note: as of version 1.7, this type extends {@link AnnotatedMember}, since
- * it behaves like a member for the most part, but earlier it just extended
- * {@link Annotated}
- */
-public final class AnnotatedParameter
-    extends AnnotatedMember
-{
-    /**
-     * Member (method, constructor) that this parameter belongs to
-     */
-    protected final AnnotatedWithParams _owner;
-    
-    /**
-     * JDK type of the parameter, possibly contains generic type information
-     */
-    protected final Type _type;
-    
-    /**
-     * Index of the parameter within argument list
-     */
-    protected final int _index;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public AnnotatedParameter(AnnotatedWithParams owner, Type type,  AnnotationMap annotations,
-            int index)
-    {
-        super(annotations);
-        _owner = owner;
-        _type = type;
-        _index = index;
-    }
-
-    @Override
-    public AnnotatedParameter withAnnotations(AnnotationMap ann) {
-        if (ann == _annotations) {
-            return this;
-        }
-        return _owner.replaceParameterAnnotations(_index, ann);
-    }
-
-    /*
-    /**********************************************************
-    /* Annotated impl
-    /**********************************************************
-     */
-
-    /**
-     * Since there is no matching JDK element, this method will
-     * always return null
-     */
-    @Override
-    public AnnotatedElement getAnnotated() { return null; }
-
-    /**
-     * Returns modifiers of the constructor, as parameters do not
-     * have independent modifiers.
-     */
-    @Override
-    public int getModifiers() { return _owner.getModifiers(); }
-
-    /**
-     * Parameters have no names in bytecode (unlike in source code),
-     * will always return empty String ("").
-     */
-    @Override
-    public String getName() { return ""; }
-
-    /**
-     * Accessor for annotations; all annotations associated with parameters
-     * are properly passed and accessible.
-     */
-    @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls)
-    {
-        return (_annotations == null) ? null : _annotations.get(acls);
-    }
-
-    @Override
-    public Type getGenericType() {
-        return _type;
-    }
-
-    @Override
-    public Class<?> getRawType()
-    {
-        if (_type instanceof Class<?>) {
-            return (Class<?>) _type;
-        }
-        // 14-Mar-2011, tatu: Not optimal, but has to do for now...
-        JavaType t = TypeFactory.defaultInstance().constructType(_type);
-        return t.getRawClass();
-    }
-
-    /*
-    /**********************************************************
-    /* AnnotatedMember extras
-    /**********************************************************
-     */
-
-    @Override
-    public Class<?> getDeclaringClass() {
-        return _owner.getDeclaringClass();
-    }
-
-    @Override
-    public Member getMember() {
-        /* This is bit tricky: since there is no JDK equivalent; can either
-         * return null or owner... let's do latter, for now.
-         */
-        return _owner.getMember();
-    }
-
-    @Override
-    public void setValue(Object pojo, Object value) throws UnsupportedOperationException
-    {
-        throw new UnsupportedOperationException("Cannot call setValue() on constructor parameter of "
-                +getDeclaringClass().getName());
-    }
-
-    @Override
-    public Object getValue(Object pojo) throws UnsupportedOperationException
-    {
-        throw new UnsupportedOperationException("Cannot call getValue() on constructor parameter of "
-                +getDeclaringClass().getName());
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    public Type getParameterType() { return _type; }
-
-    /**
-     * Accessor for 'owner' of this parameter; method or constructor that
-     * has this parameter as member of its argument list.
-     * 
-     * @return Owner (member or creator) object of this parameter
-     */
-    public AnnotatedWithParams getOwner() { return _owner; }
-    
-    /**
-     * Accessor for index of this parameter within argument list
-     * 
-     * @return Index of this parameter within argument list
-     */
-    public int getIndex() { return _index; }
-
-    /*
-    /********************************************************
-    /* Other
-    /********************************************************
-     */
-    
-    @Override
-    public String toString()
-    {
-        return "[parameter #"+getIndex()+", annotations: "+_annotations+"]";
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.java
deleted file mode 100644
index e4d1397..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotatedWithParams.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Intermediate base class that encapsulates features that
- * constructors and methods share.
- */
-public abstract class AnnotatedWithParams
-    extends AnnotatedMember
-{
-    /**
-     * Annotations associated with parameters of the annotated
-     * entity (method or constructor parameters)
-     */
-    protected final AnnotationMap[] _paramAnnotations;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected AnnotatedWithParams(AnnotationMap annotations, AnnotationMap[] paramAnnotations)
-    {
-        super(annotations);
-        _paramAnnotations = paramAnnotations;
-    }
-
-    /**
-     * Method called to override a method parameter annotation,
-     * usually due to a mix-in
-     * annotation masking or overriding an annotation 'real' method
-     * has.
-     */
-    public final void addOrOverrideParam(int paramIndex, Annotation a)
-    {
-        AnnotationMap old = _paramAnnotations[paramIndex];
-        if (old == null) {
-            old = new AnnotationMap();
-            _paramAnnotations[paramIndex] = old;
-        }
-        old.add(a);
-    }
-
-    /**
-     * Method called by parameter object when an augmented instance is created;
-     * needs to replace parameter with new instance
-     */
-    protected AnnotatedParameter replaceParameterAnnotations(int index, AnnotationMap ann)
-    {
-        _paramAnnotations[index] = ann;
-        return getParameter(index);
-    }    
-
-    /*
-    /**********************************************************
-    /* Helper methods for subclasses
-    /**********************************************************
-     */
-
-    protected JavaType getType(TypeBindings bindings, TypeVariable<?>[] typeParams)
-    {
-        // [JACKSON-468] Need to consider local type binding declarations too...
-        if (typeParams != null && typeParams.length > 0) {
-            bindings = bindings.childInstance();
-            for (TypeVariable<?> var : typeParams) {
-                String name = var.getName();
-                // to prevent infinite loops, need to first add placeholder ("<T extends Enum<T>>" etc)
-                bindings._addPlaceholder(name);
-                // About only useful piece of information is the lower bound (which is at least Object.class)
-                Type lowerBound = var.getBounds()[0];
-                JavaType type = (lowerBound == null) ? TypeFactory.unknownType()
-                        : bindings.resolveType(lowerBound);
-                bindings.addBinding(var.getName(), type);
-            }
-        }
-        return bindings.resolveType(getGenericType());
-    }
-
-    /*
-    /**********************************************************
-    /* Partial Annotated impl
-    /**********************************************************
-     */
-
-    @Override
-    public final <A extends Annotation> A getAnnotation(Class<A> acls)
-    {
-        return _annotations.get(acls);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    public final AnnotationMap getParameterAnnotations(int index)
-    {
-        if (_paramAnnotations != null) {
-            if (index >= 0 && index <= _paramAnnotations.length) {
-                return _paramAnnotations[index];
-            }
-        }
-        return null;
-    }
-
-    public final AnnotatedParameter getParameter(int index) {
-        return new AnnotatedParameter(this, getGenericParameterType(index),
-                getParameterAnnotations(index), index);
-    }
-
-    public abstract int getParameterCount();
-
-    public abstract Class<?> getRawParameterType(int index);
-
-    public abstract Type getGenericParameterType(int index);
-
-    /**
-     * Method called to fully resolve type of one of parameters, given
-     * specified type variable bindings.
-     */
-    public final JavaType resolveParameterType(int index, TypeBindings bindings) {
-        return bindings.resolveType(getGenericParameterType(index));
-    }
-    
-    public final int getAnnotationCount() { return _annotations.size(); }
-
-    /**
-     * Method that can be used to (try to) call this object without arguments.
-     * This may succeed or fail, depending on expected number
-     * of arguments: caller needs to take care to pass correct number.
-     * Exceptions are thrown directly from actual low-level call.
-     *<p>
-     * Note: only works for constructors and static methods.
-     */
-    public abstract Object call() throws Exception;
-
-    /**
-     * Method that can be used to (try to) call this object with specified arguments.
-     * This may succeed or fail, depending on expected number
-     * of arguments: caller needs to take care to pass correct number.
-     * Exceptions are thrown directly from actual low-level call.
-     *<p>
-     * Note: only works for constructors and static methods.
-     */
-    public abstract Object call(Object[] args) throws Exception;
-
-    /**
-     * Method that can be used to (try to) call this object with single arguments.
-     * This may succeed or fail, depending on expected number
-     * of arguments: caller needs to take care to pass correct number.
-     * Exceptions are thrown directly from actual low-level call.
-     *<p>
-     * Note: only works for constructors and static methods.
-     */
-    public abstract Object call1(Object arg) throws Exception;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
deleted file mode 100644
index c008815..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java
+++ /dev/null
@@ -1,737 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Helper class that allows using 2 introspectors such that one
- * introspector acts as the primary one to use; and second one
- * as a fallback used if the primary does not provide conclusive
- * or useful result for a method.
- *<p>
- * An obvious consequence of priority is that it is easy to construct
- * longer chains of introspectors by linking multiple pairs.
- * Currently most likely combination is that of using the default
- * Jackson provider, along with JAXB annotation introspector.
- *<p>
- * Note: up until 2.0, this class was an inner class of
- * {@link AnnotationIntrospector}; moved here for convenience.
- * 
- * @since 2.1
- */
-public class AnnotationIntrospectorPair
-    extends AnnotationIntrospector
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final AnnotationIntrospector _primary, _secondary;
-
-    public AnnotationIntrospectorPair(AnnotationIntrospector p, AnnotationIntrospector s)
-    {
-        _primary = p;
-        _secondary = s;
-    }
-
-    @Override
-    public Version version() {
-        return _primary.version();
-    }
-
-    /**
-     * Helper method for constructing a Pair from two given introspectors (if
-     * neither is null); or returning non-null introspector if one is null
-     * (and return just null if both are null)
-     */
-    public static AnnotationIntrospector create(AnnotationIntrospector primary,
-            AnnotationIntrospector secondary)
-    {
-        if (primary == null) {
-            return secondary;
-        }
-        if (secondary == null) {
-            return primary;
-        }
-        return new AnnotationIntrospectorPair(primary, secondary);
-    }
-
-    @Override
-    public Collection<AnnotationIntrospector> allIntrospectors() {
-        return allIntrospectors(new ArrayList<AnnotationIntrospector>());
-    }
-
-    @Override
-    public Collection<AnnotationIntrospector> allIntrospectors(Collection<AnnotationIntrospector> result)
-    {
-        _primary.allIntrospectors(result);
-        _secondary.allIntrospectors(result);
-        return result;
-    }
-    
-    // // // Generic annotation properties, lookup
-    
-    @Override
-    public boolean isAnnotationBundle(Annotation ann) {
-        return _primary.isAnnotationBundle(ann) || _secondary.isAnnotationBundle(ann);
-    }
-    
-    /*
-    /******************************************************
-    /* General class annotations
-    /******************************************************
-     */
-
-    @Override
-    public PropertyName findRootName(AnnotatedClass ac)
-    {
-        PropertyName name1 = _primary.findRootName(ac);
-        if (name1 == null) {
-            return _secondary.findRootName(ac);
-        }
-        if (name1.hasSimpleName()) {
-            return name1;
-        }
-        // name1 is empty; how about secondary?
-        PropertyName name2 = _secondary.findRootName(ac);
-        return (name2 == null) ? name1 : name2;
-    }
-
-    @Override
-    public String[] findPropertiesToIgnore(Annotated ac)
-    {
-        String[] result = _primary.findPropertiesToIgnore(ac);
-        if (result == null) {
-            result = _secondary.findPropertiesToIgnore(ac);
-        }
-        return result;            
-    }
-
-    @Override
-    public Boolean findIgnoreUnknownProperties(AnnotatedClass ac)
-    {
-        Boolean result = _primary.findIgnoreUnknownProperties(ac);
-        if (result == null) {
-            result = _secondary.findIgnoreUnknownProperties(ac);
-        }
-        return result;
-    }        
-
-    @Override
-    public Boolean isIgnorableType(AnnotatedClass ac)
-    {
-        Boolean result = _primary.isIgnorableType(ac);
-        if (result == null) {
-            result = _secondary.isIgnorableType(ac);
-        }
-        return result;
-    }
-
-    @Override
-    public Object findFilterId(AnnotatedClass ac)
-    {
-        Object id = _primary.findFilterId(ac);
-        if (id == null) {
-            id = _secondary.findFilterId(ac);
-        }
-        return id;
-    }
-
-    @Override
-    public Object findNamingStrategy(AnnotatedClass ac)
-    {
-        Object str = _primary.findNamingStrategy(ac);
-        if (str == null) {
-            str = _secondary.findNamingStrategy(ac);
-        }
-        return str;
-    }
-
-    /*
-    /******************************************************
-    /* Property auto-detection
-    /******************************************************
-    */
-    
-    @Override
-    public VisibilityChecker<?> findAutoDetectVisibility(AnnotatedClass ac,
-        VisibilityChecker<?> checker)
-    {
-        /* Note: to have proper priorities, we must actually call delegatees
-         * in reverse order:
-         */
-        checker = _secondary.findAutoDetectVisibility(ac, checker);
-        return _primary.findAutoDetectVisibility(ac, checker);
-    }
-
-    /*
-    /******************************************************
-    /* Type handling
-    /******************************************************
-    */
-    
-    @Override
-    public TypeResolverBuilder<?> findTypeResolver(MapperConfig<?> config,
-            AnnotatedClass ac, JavaType baseType)
-    {
-        TypeResolverBuilder<?> b = _primary.findTypeResolver(config, ac, baseType);
-        if (b == null) {
-            b = _secondary.findTypeResolver(config, ac, baseType);
-        }
-        return b;
-    }
-
-    @Override
-    public TypeResolverBuilder<?> findPropertyTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType baseType)
-    {
-        TypeResolverBuilder<?> b = _primary.findPropertyTypeResolver(config, am, baseType);
-        if (b == null) {
-            b = _secondary.findPropertyTypeResolver(config, am, baseType);
-        }
-        return b;
-    }
-
-    @Override
-    public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType baseType)
-    {
-        TypeResolverBuilder<?> b = _primary.findPropertyContentTypeResolver(config, am, baseType);
-        if (b == null) {
-            b = _secondary.findPropertyContentTypeResolver(config, am, baseType);
-        }
-        return b;
-    }
-    
-    @Override
-    public List<NamedType> findSubtypes(Annotated a)
-    {
-        List<NamedType> types1 = _primary.findSubtypes(a);
-        List<NamedType> types2 = _secondary.findSubtypes(a);
-        if (types1 == null || types1.isEmpty()) return types2;
-        if (types2 == null || types2.isEmpty()) return types1;
-        ArrayList<NamedType> result = new ArrayList<NamedType>(types1.size() + types2.size());
-        result.addAll(types1);
-        result.addAll(types2);
-        return result;
-    }
-
-    @Override
-    public String findTypeName(AnnotatedClass ac)
-    {
-        String name = _primary.findTypeName(ac);
-        if (name == null || name.length() == 0) {
-            name = _secondary.findTypeName(ac);                
-        }
-        return name;
-    }
-    
-    // // // General member (field, method/constructor) annotations
-    
-    @Override        
-    public ReferenceProperty findReferenceType(AnnotatedMember member)
-    {
-        ReferenceProperty ref = _primary.findReferenceType(member);
-        if (ref == null) {
-            ref = _secondary.findReferenceType(member);
-        }
-        return ref; 
-    }
-
-    @Override        
-    public NameTransformer findUnwrappingNameTransformer(AnnotatedMember member)
-    {
-        NameTransformer value = _primary.findUnwrappingNameTransformer(member);
-        if (value == null) {
-            value = _secondary.findUnwrappingNameTransformer(member);
-        }
-        return value;
-    }
-
-    @Override
-    public Object findInjectableValueId(AnnotatedMember m)
-    {
-        Object value = _primary.findInjectableValueId(m);
-        if (value == null) {
-            value = _secondary.findInjectableValueId(m);
-        }
-        return value;
-    }
-
-    @Override
-    public boolean hasIgnoreMarker(AnnotatedMember m) {
-        return _primary.hasIgnoreMarker(m) || _secondary.hasIgnoreMarker(m);
-    }
-    
-    @Override
-    public Boolean hasRequiredMarker(AnnotatedMember m)
-    {
-        Boolean value = _primary.hasRequiredMarker(m);
-        if (value == null) {
-            value = _secondary.hasRequiredMarker(m);
-        }
-        return value;
-    }
-    
-    // // // Serialization: general annotations
-
-    @Override
-    public Object findSerializer(Annotated am)
-    {
-        Object result = _primary.findSerializer(am);
-        if (result == null) {
-            result = _secondary.findSerializer(am);
-        }
-        return result;
-    }
-    
-    @Override
-    public Object findKeySerializer(Annotated a)
-    {
-        Object result = _primary.findKeySerializer(a);
-        if (result == null || result == JsonSerializer.None.class || result == NoClass.class) {
-            result = _secondary.findKeySerializer(a);
-        }
-        return result;
-    }
-
-    @Override
-    public Object findContentSerializer(Annotated a)
-    {
-        Object result = _primary.findContentSerializer(a);
-        if (result == null || result == JsonSerializer.None.class || result == NoClass.class) {
-            result = _secondary.findContentSerializer(a);
-        }
-        return result;
-    }
-    
-    @Override
-    public JsonInclude.Include findSerializationInclusion(Annotated a,
-            JsonInclude.Include defValue)
-    {
-        /* This is bit trickier: need to combine results in a meaningful
-         * way. Seems like it should be a disjoint; that is, most
-         * restrictive value should be returned.
-         * For enumerations, comparison is done by indexes, which
-         * works: largest value is the last one, which is the most
-         * restrictive value as well.
-         */
-        /* 09-Mar-2010, tatu: Actually, as per [JACKSON-256], it is probably better to just
-         *    use strict overriding. Simpler, easier to understand.
-         */
-        // note: call secondary first, to give lower priority
-        defValue = _secondary.findSerializationInclusion(a, defValue);
-        defValue = _primary.findSerializationInclusion(a, defValue);
-        return defValue;
-    }
-    
-    @Override
-    public Class<?> findSerializationType(Annotated a)
-    {
-        Class<?> result = _primary.findSerializationType(a);
-        if (result == null) {
-            result = _secondary.findSerializationType(a);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findSerializationKeyType(Annotated am, JavaType baseType)
-    {
-        Class<?> result = _primary.findSerializationKeyType(am, baseType);
-        if (result == null) {
-            result = _secondary.findSerializationKeyType(am, baseType);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findSerializationContentType(Annotated am, JavaType baseType)
-    {
-        Class<?> result = _primary.findSerializationContentType(am, baseType);
-        if (result == null) {
-            result = _secondary.findSerializationContentType(am, baseType);
-        }
-        return result;
-    }
-    
-    @Override
-    public JsonSerialize.Typing findSerializationTyping(Annotated a)
-    {
-        JsonSerialize.Typing result = _primary.findSerializationTyping(a);
-        if (result == null) {
-            result = _secondary.findSerializationTyping(a);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?>[] findViews(Annotated a)
-    {
-        /* Theoretically this could be trickier, if multiple introspectors
-         * return non-null entries. For now, though, we'll just consider
-         * first one to return non-null to win.
-         */
-        Class<?>[] result = _primary.findViews(a);
-        if (result == null) {
-            result = _secondary.findViews(a);
-        }
-        return result;
-    }
-
-    @Override
-    public Boolean isTypeId(AnnotatedMember member) {
-        Boolean b = _primary.isTypeId(member);
-        if (b == null) {
-            b = _secondary.isTypeId(member);
-        }
-        return b;
-    }
-
-    @Override
-    public ObjectIdInfo findObjectIdInfo(Annotated ann) {
-        ObjectIdInfo result = _primary.findObjectIdInfo(ann);
-        if (result == null) {
-            result = _secondary.findObjectIdInfo(ann);
-        }
-        return result;
-    }
-
-    @Override
-    public ObjectIdInfo findObjectReferenceInfo(Annotated ann, ObjectIdInfo objectIdInfo) {
-        // to give precedence for primary, must start with secondary:
-        objectIdInfo = _secondary.findObjectReferenceInfo(ann, objectIdInfo);
-        objectIdInfo = _primary.findObjectReferenceInfo(ann, objectIdInfo);
-        return objectIdInfo;
-    }
-    
-    @Override
-    public JsonFormat.Value findFormat(Annotated ann) {
-        JsonFormat.Value result = _primary.findFormat(ann);
-        if (result == null) {
-            result = _secondary.findFormat(ann);
-        }
-        return result;
-    }
-
-    @Override
-    public PropertyName findWrapperName(Annotated ann) {
-        PropertyName name = _primary.findWrapperName(ann);
-        if (name == null) {
-            name = _secondary.findWrapperName(ann);
-        } else if (name == PropertyName.USE_DEFAULT) {
-            // does the other introspector have a better idea?
-            PropertyName name2 = _secondary.findWrapperName(ann);
-            if (name2 != null) {
-                name = name2;
-            }
-        }
-        return name;
-    }
-    
-    // // // Serialization: class annotations
-
-    @Override
-    public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
-        String[] result = _primary.findSerializationPropertyOrder(ac);
-        if (result == null) {
-            result = _secondary.findSerializationPropertyOrder(ac);
-        }
-        return result;            
-    }
-
-    /**
-     * Method for checking whether an annotation indicates that serialized properties
-     * for which no explicit is defined should be alphabetically (lexicograpically)
-     * ordered
-     */
-    @Override
-    public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
-        Boolean result = _primary.findSerializationSortAlphabetically(ac);
-        if (result == null) {
-            result = _secondary.findSerializationSortAlphabetically(ac);
-        }
-        return result;            
-    }
-
-    // // // Serialization: property annotations
-    
-    @Override
-    public PropertyName findNameForSerialization(Annotated a) {
-        PropertyName n = _primary.findNameForSerialization(a);
-        // note: "use default" should not block explicit answer, so:
-        if (n == null) {
-            n = _secondary.findNameForSerialization(a);
-        } else if (n == PropertyName.USE_DEFAULT) {
-            PropertyName n2 = _secondary.findNameForSerialization(a);
-            if (n2 != null) {
-                n = n2;
-            }
-        }
-        return n;
-    }
-    
-    @Override
-    public boolean hasAsValueAnnotation(AnnotatedMethod am)
-    {
-        return _primary.hasAsValueAnnotation(am) || _secondary.hasAsValueAnnotation(am);
-    }
-    
-    @Override
-    public String findEnumValue(Enum<?> value)
-    {
-        String result = _primary.findEnumValue(value);
-        if (result == null) {
-            result = _secondary.findEnumValue(value);
-        }
-        return result;
-    }        
-
-    // // // Deserialization: general annotations
-
-    @Override
-    public Object findDeserializer(Annotated am)
-    {
-        Object result = _primary.findDeserializer(am);
-        if (result == null) {
-            result = _secondary.findDeserializer(am);
-        }
-        return result;
-    }
-    
-    @Override
-    public Object findKeyDeserializer(Annotated am)
-    {
-        Object result = _primary.findKeyDeserializer(am);
-        if (result == null || result == KeyDeserializer.None.class || result == NoClass.class) {
-            result = _secondary.findKeyDeserializer(am);
-        }
-        return result;
-    }
-
-    @Override
-    public Object findContentDeserializer(Annotated am)
-    {
-        Object result = _primary.findContentDeserializer(am);
-        if (result == null || result == JsonDeserializer.None.class || result == NoClass.class) {
-            result = _secondary.findContentDeserializer(am);
-        }
-        return result;
-    }
-    
-    @Override
-    public Class<?> findDeserializationType(Annotated am, JavaType baseType)
-    {
-        Class<?> result = _primary.findDeserializationType(am, baseType);
-        if (result == null) {
-            result = _secondary.findDeserializationType(am, baseType);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findDeserializationKeyType(Annotated am, JavaType baseKeyType)
-    {
-        Class<?> result = _primary.findDeserializationKeyType(am, baseKeyType);
-        if (result == null) {
-            result = _secondary.findDeserializationKeyType(am, baseKeyType);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findDeserializationContentType(Annotated am, JavaType baseContentType)
-    {
-        Class<?> result = _primary.findDeserializationContentType(am, baseContentType);
-        if (result == null) {
-            result = _secondary.findDeserializationContentType(am, baseContentType);
-        }
-        return result;
-    }
-
-    // // // Deserialization: class annotations
-
-    @Override
-    public Object findValueInstantiator(AnnotatedClass ac)
-    {
-        Object result = _primary.findValueInstantiator(ac);
-        if (result == null) {
-            result = _secondary.findValueInstantiator(ac);
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findPOJOBuilder(AnnotatedClass ac)
-    {
-            Class<?> result = _primary.findPOJOBuilder(ac);
-            if (result == null) {
-                    result = _secondary.findPOJOBuilder(ac);
-            }
-            return result;
-    }
-
-    @Override
-    public JsonPOJOBuilder.Value findPOJOBuilderConfig(AnnotatedClass ac)
-    {
-        JsonPOJOBuilder.Value result = _primary.findPOJOBuilderConfig(ac);
-        if (result == null) {
-            result = _secondary.findPOJOBuilderConfig(ac);
-        }
-        return result;
-    }
-    
-    // // // Deserialization: method annotations
-
-    @Override
-    public PropertyName findNameForDeserialization(Annotated a)
-    {
-        // note: "use default" should not block explicit answer, so:
-        PropertyName n = _primary.findNameForDeserialization(a);
-        if (n == null) {
-            n = _secondary.findNameForDeserialization(a);
-        } else if (n == PropertyName.USE_DEFAULT) {
-            PropertyName n2 = _secondary.findNameForDeserialization(a);
-            if (n2 != null) {
-                n = n2;
-            }
-        }
-        return n;
-    }
-    
-    @Override
-    public boolean hasAnySetterAnnotation(AnnotatedMethod am)
-    {
-        return _primary.hasAnySetterAnnotation(am) || _secondary.hasAnySetterAnnotation(am);
-    }
-
-    @Override
-    public boolean hasAnyGetterAnnotation(AnnotatedMethod am)
-    {
-        return _primary.hasAnyGetterAnnotation(am) || _secondary.hasAnyGetterAnnotation(am);
-    }
-    
-    @Override
-    public boolean hasCreatorAnnotation(Annotated a)
-    {
-        return _primary.hasCreatorAnnotation(a) || _secondary.hasCreatorAnnotation(a);
-    }
- 
-    /*
-    /******************************************************
-    /* Deprecated methods
-    /******************************************************
-     */
-    
-    @Deprecated
-    @Override
-    public boolean isHandled(Annotation ann) {
-        return _primary.isHandled(ann) || _secondary.isHandled(ann);
-    }
-
-    // // // Deserialization: property annotations
-
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedMethod am)
-    {
-        String result = _primary.findDeserializationName(am);
-        if (result == null) {
-            result = _secondary.findDeserializationName(am);
-        } else if (result.length() == 0) {
-            /* Empty String is a default; can be overridden by
-             * more explicit answer from secondary entry
-             */
-            String str2 = _secondary.findDeserializationName(am);
-            if (str2 != null) {
-                result = str2;
-            }
-        }
-        return result;
-    }
-    
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedField af)
-    {
-        String result = _primary.findDeserializationName(af);
-        if (result == null) {
-            result = _secondary.findDeserializationName(af);
-        } else if (result.length() == 0) {
-            /* Empty String is a default; can be overridden by
-             * more explicit answer from secondary entry
-             */
-            String str2 = _secondary.findDeserializationName(af);
-            if (str2 != null) {
-                result = str2;
-            }
-        }
-        return result;
-    }
-
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedParameter param)
-    {
-        String result = _primary.findDeserializationName(param);
-        if (result == null) {
-            result = _secondary.findDeserializationName(param);
-        }
-        return result;
-    }
-
-    // // // Serialization: property annotations
-    
-    @Deprecated
-    @Override
-    public String findSerializationName(AnnotatedMethod am)
-    {
-        String result = _primary.findSerializationName(am);
-        if (result == null) {
-            result = _secondary.findSerializationName(am);
-        } else if (result.length() == 0) {
-            /* Empty String is a default; can be overridden by
-             * more explicit answer from secondary entry
-             */
-            String str2 = _secondary.findSerializationName(am);
-            if (str2 != null) {
-                result = str2;
-            }
-        }
-        return result;
-    }
-
-    @Deprecated
-    @Override
-    public String findSerializationName(AnnotatedField af)
-    {
-        String result = _primary.findSerializationName(af);
-        if (result == null) {
-            result = _secondary.findSerializationName(af);
-        } else if (result.length() == 0) {
-            /* Empty String is a default; can be overridden by
-             * more explicit answer from secondary entry
-             */
-            String str2 = _secondary.findSerializationName(af);
-            if (str2 != null) {
-                result = str2;
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationMap.java
deleted file mode 100644
index 139901f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/AnnotationMap.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Simple helper class used to keep track of collection of
- * Jackson Annotations associated with annotatable things
- * (methods, constructors, classes).
- * Note that only Jackson-owned annotations are tracked (for now?).
- */
-public final class AnnotationMap implements Annotations
-{
-    protected HashMap<Class<? extends Annotation>,Annotation> _annotations;
-
-    public AnnotationMap() { }
-    private AnnotationMap(HashMap<Class<? extends Annotation>,Annotation> a) {
-        _annotations = a;
-    }
-
-    @SuppressWarnings("unchecked")
-//  @Override
-    public <A extends Annotation> A get(Class<A> cls)
-    {
-        if (_annotations == null) {
-            return null;
-        }
-        return (A) _annotations.get(cls);
-    }
-
-    public static AnnotationMap merge(AnnotationMap primary, AnnotationMap secondary)
-    {
-        if (primary == null || primary._annotations == null || primary._annotations.isEmpty()) {
-            return secondary;
-        }
-        if (secondary == null || secondary._annotations == null || secondary._annotations.isEmpty()) {
-            return primary;
-        }
-        HashMap<Class<? extends Annotation>,Annotation> annotations
-            = new HashMap<Class<? extends Annotation>,Annotation>();
-        // add secondary ones first
-        for (Annotation ann : secondary._annotations.values()) {
-            annotations.put(ann.annotationType(), ann);
-        }
-        // to be overridden by primary ones
-        for (Annotation ann : primary._annotations.values()) {
-            annotations.put(ann.annotationType(), ann);
-        }
-        return new AnnotationMap(annotations);
-    }
-    
-//  @Override
-    public int size() {
-        return (_annotations == null) ? 0 : _annotations.size();
-    }
-
-    /**
-     * Method called to add specified annotation in the Map, but
-     * only if it didn't yet exist.
-     */
-    public void addIfNotPresent(Annotation ann)
-    {
-        if (_annotations == null || !_annotations.containsKey(ann.annotationType())) {
-            _add(ann);
-        }
-    }
-
-    /**
-     * Method called to add specified annotation in the Map.
-     */
-    public void add(Annotation ann) {
-        _add(ann);
-    }
-
-    @Override
-    public String toString()
-    {
-        if (_annotations == null) {
-            return "[null]";
-        }
-        return _annotations.toString();
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    protected final void _add(Annotation ann)
-    {
-        if (_annotations == null) {
-            _annotations = new HashMap<Class<? extends Annotation>,Annotation>();
-        }
-        _annotations.put(ann.annotationType(), ann);
-    }
-}
-
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.java
deleted file mode 100644
index 3161805..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicBeanDescription.java
+++ /dev/null
@@ -1,546 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.type.TypeBindings;
-import com.fasterxml.jackson.databind.util.Annotations;
-
-/**
- * Default {@link BeanDescription} implementation.
- * Can theoretically be subclassed to customize
- * some aspects of property introspection.
- */
-public class BasicBeanDescription extends BeanDescription
-{
-    /*
-    /**********************************************************
-    /* General configuration
-    /**********************************************************
-     */
-
-    final protected MapperConfig<?> _config;
-
-    final protected AnnotationIntrospector _annotationIntrospector;
-    
-    /**
-     * Information collected about the class introspected.
-     */
-    final protected AnnotatedClass _classInfo;
-    
-    /**
-     * We may need type bindings for the bean type. If so, we'll
-     * construct it lazily
-     */
-    protected TypeBindings _bindings;
-
-    /*
-    /**********************************************************
-    /* Member information
-    /**********************************************************
-     */
-
-    /**
-     * Properties collected for the POJO.
-     */
-    protected final List<BeanPropertyDefinition> _properties;
-
-    /**
-     * Details of Object Id to include, if any
-     */
-    protected ObjectIdInfo _objectIdInfo;
-    
-    // // for deserialization
-    
-    protected AnnotatedMethod _anySetterMethod;
-
-    protected Map<Object, AnnotatedMember> _injectables;
-    
-    /**
-     * Set of properties that can be ignored during deserialization, due
-     * to being marked as ignored.
-     */
-    protected Set<String> _ignoredPropertyNames;
-
-    // // for serialization
-    
-    protected AnnotatedMethod _jsonValueMethod;
-
-    protected AnnotatedMember _anyGetter;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected BasicBeanDescription(MapperConfig<?> config,
-            JavaType type, AnnotatedClass classDef,
-            List<BeanPropertyDefinition> props)
-    {
-        super(type);
-        _config = config;
-        _annotationIntrospector = (config == null) ? null : config.getAnnotationIntrospector();
-        _classInfo = classDef;
-        _properties = props;
-    }
-    
-    protected BasicBeanDescription(POJOPropertiesCollector coll)
-    {
-        this(coll.getConfig(), coll.getType(), coll.getClassDef(), coll.getProperties());
-    	_objectIdInfo = coll.getObjectIdInfo();
-    }
-
-    /**
-     * Factory method to use for constructing an instance to use for building
-     * deserializers.
-     */
-    public static BasicBeanDescription forDeserialization(POJOPropertiesCollector coll)
-    {
-        BasicBeanDescription desc = new BasicBeanDescription(coll);
-        desc._anySetterMethod = coll.getAnySetterMethod();
-        desc._ignoredPropertyNames = coll.getIgnoredPropertyNames();
-        desc._injectables = coll.getInjectables();
-        desc._jsonValueMethod = coll.getJsonValueMethod();
-        return desc;
-    }
-
-    /**
-     * Factory method to use for constructing an instance to use for building
-     * serializers.
-     */
-    public static BasicBeanDescription forSerialization(POJOPropertiesCollector coll)
-    {
-        BasicBeanDescription desc = new BasicBeanDescription(coll);
-        desc._jsonValueMethod = coll.getJsonValueMethod();
-        desc._anyGetter = coll.getAnyGetter();
-        return desc;
-    }
-
-    /**
-     * Factory method to use for constructing an instance to use for purposes
-     * other than building serializers or deserializers; will only have information
-     * on class, not on properties.
-     */
-    public static BasicBeanDescription forOtherUse(MapperConfig<?> config,
-            JavaType type, AnnotatedClass ac)
-    {
-        return new BasicBeanDescription(config, type,
-                ac, Collections.<BeanPropertyDefinition>emptyList());
-    }
-
-    /*
-    /**********************************************************
-    /* Limited modifications by core databind functionality
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to prune unwanted properties, during
-     * construction of serializers and deserializers.
-     * Use with utmost care, if at all...
-     * 
-     * @since 2.1
-     */
-    public boolean removeProperty(String propName)
-    {
-        Iterator<BeanPropertyDefinition> it = _properties.iterator();
-        while (it.hasNext()) {
-            BeanPropertyDefinition prop = it.next();
-            if (prop.getName().equals(propName)) {
-                it.remove();
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /*
-    /**********************************************************
-    /* Simple accessors from BeanDescription
-    /**********************************************************
-     */
-
-    @Override
-    public AnnotatedClass getClassInfo() { return _classInfo; }
-
-    @Override
-    public ObjectIdInfo getObjectIdInfo() { return  _objectIdInfo; }
-    
-    @Override
-    public List<BeanPropertyDefinition> findProperties() {
-        return _properties;
-    }
-
-    @Override
-    public AnnotatedMethod findJsonValueMethod() {
-        return _jsonValueMethod;
-    }
-
-    @Override
-    public Set<String> getIgnoredPropertyNames() {
-        if (_ignoredPropertyNames == null) {
-            return Collections.emptySet();
-        }
-        return _ignoredPropertyNames;
-    }
-    
-    @Override
-    public boolean hasKnownClassAnnotations() {
-        return _classInfo.hasAnnotations();
-    }
-
-    @Override
-    public Annotations getClassAnnotations() {
-        return _classInfo.getAnnotations();
-    }
-
-    @Override
-    public TypeBindings bindingsForBeanType()
-    {
-        if (_bindings == null) {
-            _bindings = new TypeBindings(_config.getTypeFactory(), _type);
-        }
-        return _bindings;
-    }
-
-    @Override
-    public JavaType resolveType(java.lang.reflect.Type jdkType) {
-        if (jdkType == null) {
-            return null;
-        }
-        return bindingsForBeanType().resolveType(jdkType);
-    }
-
-    @Override
-    public AnnotatedConstructor findDefaultConstructor() {
-        return _classInfo.getDefaultConstructor();
-    }
-
-    @Override
-    public AnnotatedMethod findAnySetter() throws IllegalArgumentException
-    {
-        if (_anySetterMethod != null) {
-            /* Also, let's be somewhat strict on how field name is to be
-             * passed; String, Object make sense, others not
-             * so much.
-             */
-            /* !!! 18-May-2009, tatu: how about enums? Can add support if
-             *  requested; easy enough for devs to add support within
-             *  method.
-             */
-            Class<?> type = _anySetterMethod.getRawParameterType(0);
-            if (type != String.class && type != Object.class) {
-                throw new IllegalArgumentException("Invalid 'any-setter' annotation on method "+_anySetterMethod.getName()+"(): first argument not of type String or Object, but "+type.getName());
-            }
-        }
-        return _anySetterMethod;
-    }
-
-    @Override
-    public Map<Object, AnnotatedMember> findInjectables() {
-        return _injectables;
-    }
-
-    @Override
-    public List<AnnotatedConstructor> getConstructors() {
-        return _classInfo.getConstructors();
-    }
-
-    @Override
-    public Object instantiateBean(boolean fixAccess)
-    {
-        AnnotatedConstructor ac = _classInfo.getDefaultConstructor();
-        if (ac == null) {
-            return null;
-        }
-        if (fixAccess) {
-            ac.fixAccess();
-        }
-        try {
-            return ac.getAnnotated().newInstance();
-        } catch (Exception e) {
-            Throwable t = e;
-            while (t.getCause() != null) {
-                t = t.getCause();
-            }
-            if (t instanceof Error) throw (Error) t;
-            if (t instanceof RuntimeException) throw (RuntimeException) t;
-            throw new IllegalArgumentException("Failed to instantiate bean of type "+_classInfo.getAnnotated().getName()+": ("+t.getClass().getName()+") "+t.getMessage(), t);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Simple accessors, extended
-    /**********************************************************
-     */
-
-    @Override
-    public AnnotatedMethod findMethod(String name, Class<?>[] paramTypes) {
-        return _classInfo.findMethod(name, paramTypes);
-    }
-
-    /*
-    /**********************************************************
-    /* General per-class annotation introspection
-    /**********************************************************
-     */
-
-    @Override
-    public JsonFormat.Value findExpectedFormat(JsonFormat.Value defValue)
-    {
-        if (_annotationIntrospector != null) {
-            JsonFormat.Value v = _annotationIntrospector.findFormat(_classInfo);
-            if (v != null) {
-                return v;
-            }
-        }
-        return defValue;
-    }
-    
-    /*
-    /**********************************************************
-    /* Introspection for serialization, factories
-    /**********************************************************
-     */
-
-    @Override
-    public List<AnnotatedMethod> getFactoryMethods()
-    {
-        // must filter out anything that clearly is not a factory method
-        List<AnnotatedMethod> candidates = _classInfo.getStaticMethods();
-        if (candidates.isEmpty()) {
-            return candidates;
-        }
-        ArrayList<AnnotatedMethod> result = new ArrayList<AnnotatedMethod>();
-        for (AnnotatedMethod am : candidates) {
-            if (isFactoryMethod(am)) {
-                result.add(am);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public Constructor<?> findSingleArgConstructor(Class<?>... argTypes)
-    {
-        for (AnnotatedConstructor ac : _classInfo.getConstructors()) {
-            // This list is already filtered to only include accessible
-            /* (note: for now this is a redundant check; but in future
-             * that may change; thus leaving here for now)
-             */
-            if (ac.getParameterCount() == 1) {
-                Class<?> actArg = ac.getRawParameterType(0);
-                for (Class<?> expArg : argTypes) {
-                    if (expArg == actArg) {
-                        return ac.getAnnotated();
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Method findFactoryMethod(Class<?>... expArgTypes)
-    {
-        // So, of all single-arg static methods:
-        for (AnnotatedMethod am : _classInfo.getStaticMethods()) {
-            if (isFactoryMethod(am)) {
-                // And must take one of expected arg types (or supertype)
-                Class<?> actualArgType = am.getRawParameterType(0);
-                for (Class<?> expArgType : expArgTypes) {
-                    // And one that matches what we would pass in
-                    if (actualArgType.isAssignableFrom(expArgType)) {
-                        return am.getAnnotated();
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    protected boolean isFactoryMethod(AnnotatedMethod am)
-    {
-        /* First: return type must be compatible with the introspected class
-         * (i.e. allowed to be sub-class, although usually is the same
-         * class)
-         */
-        Class<?> rt = am.getRawReturnType();
-        if (!getBeanClass().isAssignableFrom(rt)) {
-            return false;
-        }
-
-        /* Also: must be a recognized factory method, meaning:
-         * (a) marked with @JsonCreator annotation, or
-         * (a) "valueOf" (at this point, need not be public)
-         */
-        if (_annotationIntrospector.hasCreatorAnnotation(am)) {
-            return true;
-        }
-        if ("valueOf".equals(am.getName())) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Method for getting ordered list of named Creator properties.
-     * Returns an empty list is none found. If multiple Creator
-     * methods are defined, order between properties from different
-     * methods is undefined; however, properties for each such
-     * Creator are ordered properly relative to each other. For the
-     * usual case of just a single Creator, named properties are
-     * thus properly ordered.
-     */
-    public List<String> findCreatorPropertyNames()
-    {
-        List<String> names = null;
-
-        for (int i = 0; i < 2; ++i) {
-            List<? extends AnnotatedWithParams> l = (i == 0)
-                ? getConstructors() : getFactoryMethods();
-            for (AnnotatedWithParams creator : l) {
-                int argCount = creator.getParameterCount();
-                if (argCount < 1) continue;
-                PropertyName name = _annotationIntrospector.findNameForDeserialization(creator.getParameter(0));
-                if (name == null) {
-                    continue;
-                }
-                if (names == null) {
-                    names = new ArrayList<String>();
-                }
-                names.add(name.getSimpleName());
-                for (int p = 1; p < argCount; ++p) {
-                    name = _annotationIntrospector.findNameForDeserialization(creator.getParameter(p));
-                    names.add((name == null) ? null : name.getSimpleName());
-                }
-            }
-        }
-        if (names == null) {
-            return Collections.emptyList();
-        }
-        return names;
-    }
-    
-    /*
-    /**********************************************************
-    /* Introspection for serialization, other
-    /**********************************************************
-     */
-
-    /**
-     * Method for determining whether null properties should be written
-     * out for a Bean of introspected type. This is based on global
-     * feature (lowest priority, passed as argument)
-     * and per-class annotation (highest priority).
-     */
-    @Override
-    public JsonInclude.Include findSerializationInclusion(JsonInclude.Include defValue)
-    {
-        if (_annotationIntrospector == null) {
-            return defValue;
-        }
-        return _annotationIntrospector.findSerializationInclusion(_classInfo, defValue);
-    }
-    
-    /**
-     * Method used to locate the method of introspected class that
-     * implements {@link com.fasterxml.jackson.annotation.JsonAnyGetter}.
-     * If no such method exists null is returned.
-     * If more than one are found, an exception is thrown.
-     */
-    @Override
-    public AnnotatedMember findAnyGetter() throws IllegalArgumentException
-    {
-        if (_anyGetter != null) {
-            /* For now let's require a Map; in future can add support for other
-             * types like perhaps Iterable<Map.Entry>?
-             */
-            Class<?> type = _anyGetter.getRawType();
-            if (!Map.class.isAssignableFrom(type)) {
-                throw new IllegalArgumentException("Invalid 'any-getter' annotation on method "+_anyGetter.getName()+"(): return type is not instance of java.util.Map");
-            }
-        }
-        return _anyGetter;
-    }
-    
-    @Override
-    public Map<String,AnnotatedMember> findBackReferenceProperties()
-    {
-        HashMap<String,AnnotatedMember> result = null;
-        for (BeanPropertyDefinition property : _properties) {
-            AnnotatedMember am = property.getMutator();
-            if (am == null) {
-                continue;
-            }
-            AnnotationIntrospector.ReferenceProperty refDef = _annotationIntrospector.findReferenceType(am);
-            if (refDef != null && refDef.isBackReference()) {
-                if (result == null) {
-                    result = new HashMap<String,AnnotatedMember>();
-                }
-                String refName = refDef.getName();
-                if (result.put(refName, am) != null) {
-                    throw new IllegalArgumentException("Multiple back-reference properties with name '"+refName+"'");
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public Class<?> findPOJOBuilder()
-    {
-    	return (_annotationIntrospector == null) ?
-    			null : _annotationIntrospector.findPOJOBuilder(_classInfo);
-    }
-
-    @Override
-    public JsonPOJOBuilder.Value findPOJOBuilderConfig()
-    {
-        return (_annotationIntrospector == null) ?
-                null : _annotationIntrospector.findPOJOBuilderConfig(_classInfo);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods for field introspection
-    /**********************************************************
-     */
-
-    /**
-     * @param ignoredProperties (optional) names of properties to ignore;
-     *   any fields that would be recognized as one of these properties
-     *   is ignored.
-     * @param forSerialization If true, will collect serializable property
-     *    fields; if false, deserializable
-     *
-     * @return Ordered Map with logical property name as key, and
-     *    matching field as value.
-     */
-    public LinkedHashMap<String,AnnotatedField> _findPropertyFields(
-            Collection<String> ignoredProperties, boolean forSerialization)
-    {
-        LinkedHashMap<String,AnnotatedField> results = new LinkedHashMap<String,AnnotatedField>();
-        for (BeanPropertyDefinition property : _properties) {
-            AnnotatedField f = property.getField();
-            if (f != null) {
-                String name = property.getName();
-                if (ignoredProperties != null) {
-                    if (ignoredProperties.contains(name)) {
-                        continue;
-                    }
-                }
-                results.put(name, f);
-            }
-        }
-        return results;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java
deleted file mode 100644
index bbb0a12..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BasicClassIntrospector.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.type.SimpleType;
-
-public class BasicClassIntrospector
-    extends ClassIntrospector
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /* We keep a small set of pre-constructed descriptions to use for
-     * common non-structured values, such as Numbers and Strings.
-     * This is strictly performance optimization to reduce what is
-     * usually one-time cost, but seems useful for some cases considering
-     * simplicity.
-     */
-    
-    protected final static BasicBeanDescription STRING_DESC;
-    static {
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(String.class, null, null);
-        STRING_DESC = BasicBeanDescription.forOtherUse(null, SimpleType.constructUnsafe(String.class), ac);
-    }
-    protected final static BasicBeanDescription BOOLEAN_DESC;
-    static {
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(Boolean.TYPE, null, null);
-        BOOLEAN_DESC = BasicBeanDescription.forOtherUse(null, SimpleType.constructUnsafe(Boolean.TYPE), ac);
-    }
-    protected final static BasicBeanDescription INT_DESC;
-    static {
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(Integer.TYPE, null, null);
-        INT_DESC = BasicBeanDescription.forOtherUse(null, SimpleType.constructUnsafe(Integer.TYPE), ac);
-    }
-    protected final static BasicBeanDescription LONG_DESC;
-    static {
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(Long.TYPE, null, null);
-        LONG_DESC = BasicBeanDescription.forOtherUse(null, SimpleType.constructUnsafe(Long.TYPE), ac);
-    }
-    
-    /*
-    /**********************************************************
-    /* Life cycle
-    /**********************************************************
-     */
-
-    public final static BasicClassIntrospector instance = new BasicClassIntrospector();
-
-    public BasicClassIntrospector() { }
-    
-    /*
-    /**********************************************************
-    /* Factory method impls
-    /**********************************************************
-     */
-
-    @Override
-    public BasicBeanDescription forSerialization(SerializationConfig cfg,
-            JavaType type, MixInResolver r)
-    {
-        // minor optimization: for JDK types do minimal introspection
-        BasicBeanDescription desc = _findCachedDesc(type);
-        if (desc == null) {
-            desc = BasicBeanDescription.forSerialization(collectProperties(cfg,
-            		type, r, true, "set"));
-        }
-        return desc;
-    }
-
-    @Override
-    public BasicBeanDescription forDeserialization(DeserializationConfig cfg,
-            JavaType type, MixInResolver r)
-    {
-        // minor optimization: for JDK types do minimal introspection
-        BasicBeanDescription desc = _findCachedDesc(type);
-        if (desc == null) {
-            desc = BasicBeanDescription.forDeserialization(collectProperties(cfg,
-            		type, r, false, "set"));
-        }
-        return desc;
-    }
-
-    @Override
-    public BasicBeanDescription forDeserializationWithBuilder(DeserializationConfig cfg,
-            JavaType type, MixInResolver r)
-    {
-    	// no caching for Builders (no standard JDK builder types):
-    	return BasicBeanDescription.forDeserialization(collectPropertiesWithBuilder(cfg,
-            		type, r, false));
-    }
-    
-    @Override
-    public BasicBeanDescription forCreation(DeserializationConfig cfg,
-            JavaType type, MixInResolver r)
-    {
-        BasicBeanDescription desc = _findCachedDesc(type);
-        if (desc == null) {
-            desc = BasicBeanDescription.forDeserialization(
-            		collectProperties(cfg, type, r, false, "set"));
-        }
-        return desc;
-    }
-
-    @Override
-    public BasicBeanDescription forClassAnnotations(MapperConfig<?> cfg,
-            JavaType type, MixInResolver r)
-    {
-        boolean useAnnotations = cfg.isAnnotationProcessingEnabled();
-        AnnotatedClass ac = AnnotatedClass.construct(type.getRawClass(),
-                (useAnnotations ? cfg.getAnnotationIntrospector() : null), r);
-        return BasicBeanDescription.forOtherUse(cfg, type, ac);
-    }
-
-    @Override
-    public BasicBeanDescription forDirectClassAnnotations(MapperConfig<?> cfg,
-            JavaType type, MixInResolver r)
-    {
-        boolean useAnnotations = cfg.isAnnotationProcessingEnabled();
-        AnnotationIntrospector ai =  cfg.getAnnotationIntrospector();
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(type.getRawClass(),
-                (useAnnotations ? ai : null), r);
-        return BasicBeanDescription.forOtherUse(cfg, type, ac);
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable helper methods
-    /**********************************************************
-     */
-
-    protected POJOPropertiesCollector collectProperties(MapperConfig<?> config,
-            JavaType type, MixInResolver r, boolean forSerialization,
-            String mutatorPrefix)
-    {
-        boolean useAnnotations = config.isAnnotationProcessingEnabled();
-        AnnotatedClass ac = AnnotatedClass.construct(type.getRawClass(),
-                (useAnnotations ? config.getAnnotationIntrospector() : null), r);
-        return constructPropertyCollector(config, ac, type, forSerialization, mutatorPrefix).collect();
-    }
-    
-    protected POJOPropertiesCollector collectPropertiesWithBuilder(MapperConfig<?> config,
-            JavaType type, MixInResolver r, boolean forSerialization)
-    {
-        boolean useAnnotations = config.isAnnotationProcessingEnabled();
-        AnnotationIntrospector ai = useAnnotations ? config.getAnnotationIntrospector() : null;
-        AnnotatedClass ac = AnnotatedClass.construct(type.getRawClass(), ai, r);
-        JsonPOJOBuilder.Value builderConfig = (ai == null) ? null : ai.findPOJOBuilderConfig(ac);
-        String mutatorPrefix = (builderConfig == null) ? "with" : builderConfig.withPrefix;
-        return constructPropertyCollector(config, ac, type, forSerialization, mutatorPrefix).collect();
-    }
-
-    /**
-     * Overridable method called for creating {@link POJOPropertiesCollector} instance
-     * to use; override is needed if a custom sub-class is to be used.
-     */
-    protected POJOPropertiesCollector constructPropertyCollector(MapperConfig<?> config,
-            AnnotatedClass ac, JavaType type,
-            boolean forSerialization, String mutatorPrefix)
-    {
-        return new POJOPropertiesCollector(config, forSerialization, type, ac, mutatorPrefix);
-    }
-    
-    /**
-     * Method called to see if type is one of core JDK types
-     * that we have cached for efficiency.
-     */
-    protected BasicBeanDescription _findCachedDesc(JavaType type)
-    {
-        Class<?> cls = type.getRawClass();
-        if (cls == String.class) {
-            return STRING_DESC;
-        }
-        if (cls == Boolean.TYPE) {
-            return BOOLEAN_DESC;
-        }
-        if (cls == Integer.TYPE) {
-            return INT_DESC;
-        }
-        if (cls == Long.TYPE) {
-            return LONG_DESC;
-        }
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.java
deleted file mode 100644
index 4b10ac5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.util.Named;
-
-/**
- * Simple value classes that contain definitions of properties,
- * used during introspection of properties to use for
- * serialization and deserialization purposes.
- * These instances are created before actual {@link BeanProperty}
- * instances are created, i.e. they are used earlier in the process
- * flow, and are typically use to construct actual
- * {@link BeanProperty} instances.
- */
-public abstract class BeanPropertyDefinition
-    implements Named
-{
-    /*
-    /**********************************************************
-    /* Fluent factory methods for creating modified copies
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to create a definition with
-     * same settings as this one, but with different
-     * (external) name; that is, one for which
-     * {@link #getName()} would return <code>newName</code>.
-     */
-    public abstract BeanPropertyDefinition withName(String newName);
-    
-    /*
-    /**********************************************************
-    /* Basic property information, name, type
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for name used for external representation (in JSON).
-     */
-//  @Override // from Named
-    public abstract String getName();
-
-    /**
-     * Accessor that can be used to determine implicit name from underlying
-     * element(s) before possible renaming. This is the "internal"
-     * name derived from accessor ("x" from "getX"), and is not based on
-     * annotations or naming strategy.
-     */
-    public abstract String getInternalName();
-
-    /**
-     * Accessor that can be called to check whether property was included
-     * due to an explicit marker (usually annotation), or just by naming
-     * convention.
-     * 
-     * @return True if property was explicitly included (usually by having
-     *   one of components being annotated); false if inclusion was purely
-     *   due to naming or visibility definitions (that is, implicit)
-     */
-    public abstract boolean isExplicitlyIncluded();
-    
-    /*
-    /**********************************************************
-    /* Capabilities
-    /**********************************************************
-     */
-
-    public boolean couldDeserialize() {
-        return getMutator() != null;
-    }
-    public boolean couldSerialize() {
-        return getAccessor() != null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Access to accessors (fields, methods etc)
-    /**********************************************************
-     */
-    
-    public abstract boolean hasGetter();
-    public abstract boolean hasSetter();
-    public abstract boolean hasField();
-    public abstract boolean hasConstructorParameter();
-    
-    public abstract AnnotatedMethod getGetter();
-    public abstract AnnotatedMethod getSetter();
-    public abstract AnnotatedField getField();
-    public abstract AnnotatedParameter getConstructorParameter();
-
-    /**
-     * Method used to find accessor (getter, field to access) to use for accessing
-     * value of the property.
-     * Null if no such member exists.
-     */
-    public abstract AnnotatedMember getAccessor();
-
-    /**
-     * Method used to find mutator (constructor parameter, setter, field) to use for
-     * changing value of the property.
-     * Null if no such member exists.
-     */
-    public abstract AnnotatedMember getMutator();
-
-    /**
-     * Method used to find the property member (getter, setter, field) that has
-     * the highest precedence in current context (getter method when serializing,
-     * if available, and so forth), if any.
-     * 
-     * @since 2.1
-     */
-    public AnnotatedMember getPrimaryMember() {
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* More refined access to configuration features
-    /* (usually based on annotations)
-    /* Since most trivial implementations do not support
-    /* these methods, they are implemented as no-ops.
-    /**********************************************************
-     */
-    
-    /**
-     * Method used to find View-inclusion definitions for the property.
-     */
-    public Class<?>[] findViews() { return null; }
-
-    /**
-     * Method used to find whether property is part of a bi-directional
-     * reference.
-     */
-    public AnnotationIntrospector.ReferenceProperty findReferenceType() {
-        return null;
-    }
-
-    /**
-     * Method used to check whether this logical property has a marker
-     * to indicate it should be used as the type id for polymorphic type
-     * handling.
-     */
-    public boolean isTypeId() {
-        return false;
-    }
-
-    /**
-     * Method used to check whether this logical property indicates that
-     * value POJOs should be written using additional Object Identifier
-     * (or, when multiple references exist, all but first AS Object Identifier).
-     */
-    public ObjectIdInfo findObjectIdInfo() {
-        return null;
-    }
-    
-    /**
-     * Method used to check if this property is expected to have a value;
-     * and if none found, should either be considered invalid (and most likely
-     * fail deserialization), or handled by other means (by providing default
-     * value)
-     */
-    public boolean isRequired() {
-        return false;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ClassIntrospector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ClassIntrospector.java
deleted file mode 100644
index df664ac..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ClassIntrospector.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-
-
-/**
- * Helper class used to introspect features of POJO value classes
- * used with Jackson. The main use is for finding out
- * POJO construction (creator) and value access (getters, setters)
- * methods and annotations that define configuration of using
- * those methods.
- */
-public abstract class ClassIntrospector
-{
-    /*
-    /**********************************************************
-    /* Helper interfaces
-    /**********************************************************
-     */
-
-    /**
-     * Interface used for decoupling details of how mix-in annotation
-     * definitions are accessed (via this interface), and how
-     * they are stored (defined by classes that implement the interface)
-     */
-    public interface MixInResolver
-    {
-        /**
-         * Method that will check if there are "mix-in" classes (with mix-in
-         * annotations) for given class
-         */
-        public Class<?> findMixInClassFor(Class<?> cls);
-    }
-
-    protected ClassIntrospector() { }
-	
-    /*
-    /**********************************************************
-    /* Public API: factory methods
-    /**********************************************************
-     */
-    
-    /**
-     * Factory method that constructs an introspector that has all
-     * information needed for serialization purposes.
-     */
-    public abstract BeanDescription forSerialization(SerializationConfig cfg,
-    		JavaType type, MixInResolver r);
-
-    /**
-     * Factory method that constructs an introspector that has all
-     * information needed for deserialization purposes.
-     */
-    public abstract BeanDescription forDeserialization(DeserializationConfig cfg,
-    		JavaType type, MixInResolver r);
-
-    /**
-     * Factory method that constructs an introspector that has all
-     * information needed for constructing deserializers that use
-     * intermediate Builder objects.
-     */
-    public abstract BeanDescription forDeserializationWithBuilder(DeserializationConfig cfg,
-    		JavaType type, MixInResolver r);
-    
-    /**
-     * Factory method that constructs an introspector that has
-     * information necessary for creating instances of given
-     * class ("creator"), as well as class annotations, but
-     * no information on member methods
-     */
-    public abstract BeanDescription forCreation(DeserializationConfig cfg, JavaType type,
-            MixInResolver r);
-
-    /**
-     * Factory method that constructs an introspector that only has
-     * information regarding annotations class itself (or its supertypes) has,
-     * but nothing on methods or constructors.
-     */
-    public abstract BeanDescription forClassAnnotations(MapperConfig<?> cfg, JavaType type,
-            MixInResolver r);
-
-    /**
-     * Factory method that constructs an introspector that only has
-     * information regarding annotations class itself has (but NOT including
-     * its supertypes), but nothing on methods or constructors.
-     */
-    public abstract BeanDescription forDirectClassAnnotations(MapperConfig<?> cfg, JavaType type,
-            MixInResolver r);
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
deleted file mode 100644
index 1812546..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
+++ /dev/null
@@ -1,856 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.*;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.*;
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
-import com.fasterxml.jackson.databind.ser.std.RawSerializer;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * {@link AnnotationIntrospector} implementation that handles standard
- * Jackson annotations.
- */
-public class JacksonAnnotationIntrospector
-    extends AnnotationIntrospector
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    public JacksonAnnotationIntrospector() { }
-
-    @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* General annotation properties
-    /**********************************************************
-     */
-
-    // TODO: remove in 2.2
-    @Override
-    @Deprecated
-    public boolean isHandled(Annotation ann)
-    {
-        Class<? extends Annotation> acls = ann.annotationType();
-        return acls.getAnnotation(JacksonAnnotation.class) != null;
-    }
-
-    /**
-     * Annotations with meta-annotation {@link JacksonAnnotationsInside}
-     * are considered bundles.
-     */
-    @Override
-    public boolean isAnnotationBundle(Annotation ann)
-    {
-        return ann.annotationType().getAnnotation(JacksonAnnotationsInside.class) != null;
-    }
-    
-    /*
-    /**********************************************************
-    /* General annotations
-    /**********************************************************
-     */
-
-    @Override
-    public String findEnumValue(Enum<?> value)
-    {
-        return value.name();
-    }
-    
-    /*
-    /**********************************************************
-    /* General class annotations
-    /**********************************************************
-     */
-
-    @Override
-    public PropertyName findRootName(AnnotatedClass ac)
-    {
-        JsonRootName ann = ac.getAnnotation(JsonRootName.class);
-        if (ann == null) {
-            return null;
-        }
-        return new PropertyName(ann.value());
-    }
-
-    @Override
-    public String[] findPropertiesToIgnore(Annotated ac) {
-        JsonIgnoreProperties ignore = ac.getAnnotation(JsonIgnoreProperties.class);
-        return (ignore == null) ? null : ignore.value();
-    }
-
-    @Override
-    public Boolean findIgnoreUnknownProperties(AnnotatedClass ac) {
-        JsonIgnoreProperties ignore = ac.getAnnotation(JsonIgnoreProperties.class);
-        return (ignore == null) ? null : ignore.ignoreUnknown();
-    }
-
-    @Override
-    public Boolean isIgnorableType(AnnotatedClass ac) {
-        JsonIgnoreType ignore = ac.getAnnotation(JsonIgnoreType.class);
-        return (ignore == null) ? null : ignore.value();
-    }
-
-    @Override
-    public Object findFilterId(AnnotatedClass ac)
-    {
-        JsonFilter ann = ac.getAnnotation(JsonFilter.class);
-        if (ann != null) {
-            String id = ann.value();
-            // Empty String is same as not having annotation, to allow overrides
-            if (id.length() > 0) {
-                return id;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Object findNamingStrategy(AnnotatedClass ac)
-    {
-        JsonNaming ann = ac.getAnnotation(JsonNaming.class);
-        return (ann == null) ? null : ann.value();
-    } 
-
-    /*
-    /**********************************************************
-    /* Property auto-detection
-    /**********************************************************
-     */
-    
-    @Override
-    public VisibilityChecker<?> findAutoDetectVisibility(AnnotatedClass ac,
-        VisibilityChecker<?> checker)
-    {
-        JsonAutoDetect ann = ac.getAnnotation(JsonAutoDetect.class);
-        return (ann == null) ? checker : checker.with(ann);
-    }
-
-    /*
-    /**********************************************************
-    /* General member (field, method/constructor) annotations
-    /**********************************************************
-     */
-
-    @Override        
-    public ReferenceProperty findReferenceType(AnnotatedMember member)
-    {
-        JsonManagedReference ref1 = member.getAnnotation(JsonManagedReference.class);
-        if (ref1 != null) {
-            return AnnotationIntrospector.ReferenceProperty.managed(ref1.value());
-        }
-        JsonBackReference ref2 = member.getAnnotation(JsonBackReference.class);
-        if (ref2 != null) {
-            return AnnotationIntrospector.ReferenceProperty.back(ref2.value());
-        }
-        return null;
-    }
-
-    @Override
-    public NameTransformer findUnwrappingNameTransformer(AnnotatedMember member)
-    {
-        JsonUnwrapped ann = member.getAnnotation(JsonUnwrapped.class);
-        // if not enabled, just means annotation is not enabled; not necessarily
-        // that unwrapping should not be done (relevant when using chained introspectors)
-        if (ann == null || !ann.enabled()) {
-            return null;
-        }
-        String prefix = ann.prefix();
-        String suffix = ann.suffix();
-        return NameTransformer.simpleTransformer(prefix, suffix);
-    }
-
-    @Override
-    public boolean hasIgnoreMarker(AnnotatedMember m) {
-        return _isIgnorable(m);
-    }
-
-    @Override
-    public Boolean hasRequiredMarker(AnnotatedMember m)
-    {
-        JsonProperty ann = m.getAnnotation(JsonProperty.class);
-        if (ann != null) {
-            return ann.required();
-        }
-        return null;
-    }
-    
-    @Override
-    public Object findInjectableValueId(AnnotatedMember m)
-    {
-        JacksonInject ann = m.getAnnotation(JacksonInject.class);
-        if (ann == null) {
-            return null;
-        }
-        /* Empty String means that we should use name of declared
-         * value class.
-         */
-        String id = ann.value();
-        if (id.length() == 0) {
-            // slight complication; for setters, type 
-            if (!(m instanceof AnnotatedMethod)) {
-                return m.getRawType().getName();
-            }
-            AnnotatedMethod am = (AnnotatedMethod) m;
-            if (am.getParameterCount() == 0) {
-                return m.getRawType().getName();
-            }
-            return am.getRawParameterType(0).getName();
-        }
-        return id;
-    }
-    
-    /*
-    /**********************************************************
-    /* Class annotations for PM type handling (1.5+)
-    /**********************************************************
-     */
-
-    @Override
-    public TypeResolverBuilder<?> findTypeResolver(MapperConfig<?> config,
-            AnnotatedClass ac, JavaType baseType)
-    {
-        return _findTypeResolver(config, ac, baseType);
-    }
-
-    @Override
-    public TypeResolverBuilder<?> findPropertyTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType baseType)
-    {
-        /* As per definition of @JsonTypeInfo, should only apply to contents of container
-         * (collection, map) types, not container types themselves:
-         */
-        if (baseType.isContainerType()) return null;
-        // No per-member type overrides (yet)
-        return _findTypeResolver(config, am, baseType);
-    }
-
-    @Override
-    public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> config,
-            AnnotatedMember am, JavaType containerType)
-    {
-        /* First: let's ensure property is a container type: caller should have
-         * verified but just to be sure
-         */
-        if (!containerType.isContainerType()) {
-            throw new IllegalArgumentException("Must call method with a container type (got "+containerType+")");
-        }
-        return _findTypeResolver(config, am, containerType);
-    }
-    
-    @Override
-    public List<NamedType> findSubtypes(Annotated a)
-    {
-        JsonSubTypes t = a.getAnnotation(JsonSubTypes.class);
-        if (t == null) return null;
-        JsonSubTypes.Type[] types = t.value();
-        ArrayList<NamedType> result = new ArrayList<NamedType>(types.length);
-        for (JsonSubTypes.Type type : types) {
-            result.add(new NamedType(type.value(), type.name()));
-        }
-        return result;
-    }
-
-    @Override        
-    public String findTypeName(AnnotatedClass ac)
-    {
-        JsonTypeName tn = ac.getAnnotation(JsonTypeName.class);
-        return (tn == null) ? null : tn.value();
-    }
-
-    /*
-    /**********************************************************
-    /* Serialization: general annotations
-    /**********************************************************
-    */
-
-    @Override
-    public Object findSerializer(Annotated a)
-    {
-        JsonSerialize ann = a.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<? extends JsonSerializer<?>> serClass = ann.using();
-            if (serClass != JsonSerializer.None.class) {
-                return serClass;
-            }
-        }
-        
-        /* 18-Oct-2010, tatu: [JACKSON-351] @JsonRawValue handled just here, for now;
-         *  if we need to get raw indicator from other sources need to add
-         *  separate accessor within {@link AnnotationIntrospector} interface.
-         */
-        JsonRawValue annRaw =  a.getAnnotation(JsonRawValue.class);
-        if ((annRaw != null) && annRaw.value()) {
-            // let's construct instance with nominal type:
-            Class<?> cls = a.getRawType();
-            return new RawSerializer<Object>(cls);
-        }       
-        return null;
-    }
-
-    @Override
-    public Class<? extends JsonSerializer<?>> findKeySerializer(Annotated a)
-    {
-        JsonSerialize ann = a.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<? extends JsonSerializer<?>> serClass = ann.keyUsing();
-            if (serClass != JsonSerializer.None.class) {
-                return serClass;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<? extends JsonSerializer<?>> findContentSerializer(Annotated a)
-    {
-        JsonSerialize ann = a.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<? extends JsonSerializer<?>> serClass = ann.contentUsing();
-            if (serClass != JsonSerializer.None.class) {
-                return serClass;
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public JsonInclude.Include findSerializationInclusion(Annotated a, JsonInclude.Include defValue)
-    {
-        JsonInclude inc = a.getAnnotation(JsonInclude.class);
-        if (inc != null) {
-            return inc.value();
-        }
-        JsonSerialize ann = a.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            @SuppressWarnings("deprecation")
-            JsonSerialize.Inclusion i2 = ann.include();
-            switch (i2) {
-            case ALWAYS:
-                return JsonInclude.Include.ALWAYS;
-            case NON_NULL:
-                return JsonInclude.Include.NON_NULL;
-            case NON_DEFAULT:
-                return JsonInclude.Include.NON_DEFAULT;
-            case NON_EMPTY:
-                return JsonInclude.Include.NON_EMPTY;
-            }
-        }
-        return defValue;
-    }
-
-    @Override
-    public Class<?> findSerializationType(Annotated am)
-    {
-        JsonSerialize ann = am.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.as();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<?> findSerializationKeyType(Annotated am, JavaType baseType)
-    {
-        JsonSerialize ann = am.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.keyAs();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<?> findSerializationContentType(Annotated am, JavaType baseType)
-    {
-        JsonSerialize ann = am.getAnnotation(JsonSerialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.contentAs();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public JsonSerialize.Typing findSerializationTyping(Annotated a)
-    {
-        JsonSerialize ann = a.getAnnotation(JsonSerialize.class);
-        return (ann == null) ? null : ann.typing();
-    }
-
-    @Override
-    public Class<?>[] findViews(Annotated a)
-    {
-        JsonView ann = a.getAnnotation(JsonView.class);
-        return (ann == null) ? null : ann.value();
-    }
-
-    @Override
-    public Boolean isTypeId(AnnotatedMember member) {
-        return member.hasAnnotation(JsonTypeId.class);
-    }
-
-    @Override
-    public ObjectIdInfo findObjectIdInfo(Annotated ann) {
-        JsonIdentityInfo info = ann.getAnnotation(JsonIdentityInfo.class);
-        if (info == null || info.generator() == ObjectIdGenerators.None.class) {
-            return null;
-        }
-        return new ObjectIdInfo(info.property(), info.scope(), info.generator());
-    }
-
-    @Override
-    public ObjectIdInfo findObjectReferenceInfo(Annotated ann, ObjectIdInfo objectIdInfo) {
-        JsonIdentityReference ref = ann.getAnnotation(JsonIdentityReference.class);
-        if (ref != null) {
-            objectIdInfo = objectIdInfo.withAlwaysAsId(ref.alwaysAsId());
-        }
-        return objectIdInfo;
-    }
-    
-    @Override
-    public JsonFormat.Value findFormat(AnnotatedMember member) {
-        return findFormat(member);
-    }
-    
-    @Override
-    public JsonFormat.Value findFormat(Annotated annotated) {
-        JsonFormat ann = annotated.getAnnotation(JsonFormat.class);
-        return (ann == null)  ? null : new JsonFormat.Value(ann);
-    }
-
-    /*
-    /**********************************************************
-    /* Serialization: class annotations
-    /**********************************************************
-     */
-
-    @Override
-    public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
-        JsonPropertyOrder order = ac.getAnnotation(JsonPropertyOrder.class);
-        return (order == null) ? null : order.value();
-    }
-
-    @Override
-    public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
-        JsonPropertyOrder order = ac.getAnnotation(JsonPropertyOrder.class);
-        return (order == null) ? null : order.alphabetic();
-    }
-
-    /*
-    /**********************************************************
-    /* Serialization: property annotations
-    /**********************************************************
-     */
-
-    @Override
-    public PropertyName findNameForSerialization(Annotated a)
-    {
-        // [Issue#69], need bit of delegation 
-        // !!! TODO: in 2.2, remove old methods?
-        String name;
-        if (a instanceof AnnotatedField) {
-            name = findSerializationName((AnnotatedField) a);
-        } else if (a instanceof AnnotatedMethod) {
-            name = findSerializationName((AnnotatedMethod) a);
-        } else {
-            name = null;
-        }
-        if (name != null) {
-            if (name.length() == 0) { // empty String means 'default'
-                return PropertyName.USE_DEFAULT;
-            }
-            return new PropertyName(name);
-        }
-        return null;
-    }
-    
-    @Override
-    public String findSerializationName(AnnotatedField af)
-    {
-        JsonProperty pann = af.getAnnotation(JsonProperty.class);
-        if (pann != null) {
-            return pann.value();
-        }
-        // Also: having JsonSerialize implies it is such a property
-        // 09-Apr-2010, tatu: Ditto for JsonView
-        if (af.hasAnnotation(JsonSerialize.class) || af.hasAnnotation(JsonView.class)) {
-            return "";
-        }
-        return null;
-    }
-    
-    @Override
-    public String findSerializationName(AnnotatedMethod am)
-    {
-        // @JsonGetter is most specific, has precedence
-        JsonGetter ann = am.getAnnotation(JsonGetter.class);
-        if (ann != null) {
-            return ann.value();
-        }
-        JsonProperty pann = am.getAnnotation(JsonProperty.class);
-        if (pann != null) {
-            return pann.value();
-        }
-        /* 22-May-2009, tatu: And finally, JsonSerialize implies
-         *   that there is a property, although doesn't define name
-         */
-        // 09-Apr-2010, tatu: Ditto for JsonView
-        if (am.hasAnnotation(JsonSerialize.class) || am.hasAnnotation(JsonView.class)) {
-            return "";
-        }
-        return null;
-    }
-
-    @Override
-    public boolean hasAsValueAnnotation(AnnotatedMethod am)
-    {
-        JsonValue ann = am.getAnnotation(JsonValue.class);
-        // value of 'false' means disabled...
-        return (ann != null && ann.value());
-    }
-
-    /*
-    /**********************************************************
-    /* Deserialization: general annotations
-    /**********************************************************
-     */
-
-    @Override
-    public Class<? extends JsonDeserializer<?>> findDeserializer(Annotated a)
-    {
-        JsonDeserialize ann = a.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<? extends JsonDeserializer<?>> deserClass = ann.using();
-            if (deserClass != JsonDeserializer.None.class) {
-                return deserClass;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<? extends KeyDeserializer> findKeyDeserializer(Annotated a)
-    {
-        JsonDeserialize ann = a.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<? extends KeyDeserializer> deserClass = ann.keyUsing();
-            if (deserClass != KeyDeserializer.None.class) {
-                return deserClass;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<? extends JsonDeserializer<?>> findContentDeserializer(Annotated a)
-    {
-        JsonDeserialize ann = a.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<? extends JsonDeserializer<?>> deserClass = ann.contentUsing();
-            if (deserClass != JsonDeserializer.None.class) {
-                return deserClass;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<?> findDeserializationType(Annotated am, JavaType baseType)
-    {
-        // Primary annotation, JsonDeserialize
-        JsonDeserialize ann = am.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.as();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<?> findDeserializationKeyType(Annotated am, JavaType baseKeyType)
-    {
-        // Primary annotation, JsonDeserialize
-        JsonDeserialize ann = am.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.keyAs();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Class<?> findDeserializationContentType(Annotated am, JavaType baseContentType)
-    {
-        // Primary annotation, JsonDeserialize
-        JsonDeserialize ann = am.getAnnotation(JsonDeserialize.class);
-        if (ann != null) {
-            Class<?> cls = ann.contentAs();
-            if (cls != NoClass.class) {
-                return cls;
-            }
-        }
-        /* 30-Jun-2011, tatu: Here we used to have support for @JsonContentClass;
-         *    removed in 1.9
-         */
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Deserialization: Class annotations
-    /**********************************************************
-     */
-    
-    @Override
-    public Object findValueInstantiator(AnnotatedClass ac)
-    {
-        JsonValueInstantiator ann = ac.getAnnotation(JsonValueInstantiator.class);
-        // no 'null' marker yet, so:
-        return (ann == null) ? null : ann.value();
-    }
-
-    @Override
-    public Class<?> findPOJOBuilder(AnnotatedClass ac)
-    {
-    	JsonDeserialize ann = ac.getAnnotation(JsonDeserialize.class);
-    	return ((ann == null) || (ann.builder() == NoClass.class)) ?
-    			null : ann.builder();
-    }
-
-    @Override
-    public JsonPOJOBuilder.Value findPOJOBuilderConfig(AnnotatedClass ac)
-    {
-        JsonPOJOBuilder ann = ac.getAnnotation(JsonPOJOBuilder.class);
-        return (ann == null) ? null : new JsonPOJOBuilder.Value(ann);
-    }
-    
-    /*
-    /**********************************************************
-    /* Deserialization: property annotations
-    /**********************************************************
-     */
-
-    @Override
-    public PropertyName findNameForDeserialization(Annotated a)
-    {
-        // [Issue#69], need bit of delegation 
-        // !!! TODO: in 2.2, remove old methods?
-        String name;
-        if (a instanceof AnnotatedField) {
-            name = findDeserializationName((AnnotatedField) a);
-        } else if (a instanceof AnnotatedMethod) {
-            name = findDeserializationName((AnnotatedMethod) a);
-        } else if (a instanceof AnnotatedParameter) {
-            name = findDeserializationName((AnnotatedParameter) a);
-        } else {
-            name = null;
-        }
-        if (name != null) {
-            if (name.length() == 0) { // empty String means 'default'
-                return PropertyName.USE_DEFAULT;
-            }
-            return new PropertyName(name);
-        }
-        return null;
-    }
-    
-    @Override
-    public String findDeserializationName(AnnotatedMethod am)
-    {
-        // @JsonSetter has precedence over @JsonProperty, being more specific
-        JsonSetter ann = am.getAnnotation(JsonSetter.class);
-        if (ann != null) {
-            return ann.value();
-        }
-        JsonProperty pann = am.getAnnotation(JsonProperty.class);
-        if (pann != null) {
-            return pann.value();
-        }
-        // @JsonSerialize implies that there is a property, but no name
-        // 09-Apr-2010, tatu: Ditto for JsonView
-        // 19-Oct-2011, tatu: And JsonBackReference/JsonManagedReference
-    	if (am.hasAnnotation(JsonDeserialize.class)
-    	        || am.hasAnnotation(JsonView.class)
-                || am.hasAnnotation(JsonBackReference.class)
-                || am.hasAnnotation(JsonManagedReference.class)
-    	        ) {
-            return "";
-        }
-        return null;
-    }
-
-    @Override
-    public String findDeserializationName(AnnotatedField af)
-    {
-        JsonProperty pann = af.getAnnotation(JsonProperty.class);
-        if (pann != null) {
-            return pann.value();
-        }
-        // Also: having JsonDeserialize implies it is such a property
-        // 09-Apr-2010, tatu: Ditto for JsonView
-        if (af.hasAnnotation(JsonDeserialize.class)
-                || af.hasAnnotation(JsonView.class)
-                || af.hasAnnotation(JsonBackReference.class)
-                || af.hasAnnotation(JsonManagedReference.class)
-                ) {
-            return "";
-        }
-        return null;
-    }
-    @Override
-    public String findDeserializationName(AnnotatedParameter param)
-    {
-        if (param != null) {
-            JsonProperty pann = param.getAnnotation(JsonProperty.class);
-            if (pann != null) {
-                return pann.value();
-            }
-            /* And can not use JsonDeserialize as we can not use
-             * name auto-detection (names of local variables including
-             * parameters are not necessarily preserved in bytecode)
-             */
-        }
-        return null;
-    }
-    
-    @Override
-    public boolean hasAnySetterAnnotation(AnnotatedMethod am)
-    {
-        /* No dedicated disabling; regular @JsonIgnore used
-         * if needs to be ignored (and if so, is handled prior
-         * to this method getting called)
-         */
-        return am.hasAnnotation(JsonAnySetter.class);
-    }
-
-    @Override
-    public boolean hasAnyGetterAnnotation(AnnotatedMethod am)
-    {
-        /* No dedicated disabling; regular @JsonIgnore used
-         * if needs to be ignored (handled separately
-         */
-        return am.hasAnnotation(JsonAnyGetter.class);
-    }
-    
-    @Override
-    public boolean hasCreatorAnnotation(Annotated a)
-    {
-        /* No dedicated disabling; regular @JsonIgnore used
-         * if needs to be ignored (and if so, is handled prior
-         * to this method getting called)
-         */
-        return a.hasAnnotation(JsonCreator.class);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    protected boolean _isIgnorable(Annotated a)
-    {
-        JsonIgnore ann = a.getAnnotation(JsonIgnore.class);
-        return (ann != null && ann.value());
-    }
-
-    /**
-     * Helper method called to construct and initialize instance of {@link TypeResolverBuilder}
-     * if given annotated element indicates one is needed.
-     */
-    protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config,
-            Annotated ann, JavaType baseType)
-    {
-        // First: maybe we have explicit type resolver?
-        TypeResolverBuilder<?> b;
-        JsonTypeInfo info = ann.getAnnotation(JsonTypeInfo.class);
-        JsonTypeResolver resAnn = ann.getAnnotation(JsonTypeResolver.class);
-        
-        if (resAnn != null) {
-            if (info == null) {
-                return null;
-            }
-            /* let's not try to force access override (would need to pass
-             * settings through if we did, since that's not doable on some
-             * platforms)
-             */
-            b = config.typeResolverBuilderInstance(ann, resAnn.value());
-        } else { // if not, use standard one, if indicated by annotations
-            if (info == null) {
-                return null;
-            }
-            // bit special; must return 'marker' to block use of default typing:
-            if (info.use() == JsonTypeInfo.Id.NONE) {
-                return _constructNoTypeResolverBuilder();
-            }
-            b = _constructStdTypeResolverBuilder();
-        }
-        // Does it define a custom type id resolver?
-        JsonTypeIdResolver idResInfo = ann.getAnnotation(JsonTypeIdResolver.class);
-        TypeIdResolver idRes = (idResInfo == null) ? null
-                : config.typeIdResolverInstance(ann, idResInfo.value());
-        if (idRes != null) { // [JACKSON-359]
-            idRes.init(baseType);
-        }
-        b = b.init(info.use(), idRes);
-        /* 13-Aug-2011, tatu: One complication wrt [JACKSON-453]; external id
-         *   only works for properties; so if declared for a Class, we will need
-         *   to map it to "PROPERTY" instead of "EXTERNAL_PROPERTY"
-         */
-        JsonTypeInfo.As inclusion = info.include();
-        if (inclusion == JsonTypeInfo.As.EXTERNAL_PROPERTY && (ann instanceof AnnotatedClass)) {
-            inclusion = JsonTypeInfo.As.PROPERTY;
-        }
-        b = b.inclusion(inclusion);
-        b = b.typeProperty(info.property());
-        Class<?> defaultImpl = info.defaultImpl();
-        if (defaultImpl != JsonTypeInfo.None.class) {
-            b = b.defaultImpl(defaultImpl);
-        }
-        b = b.typeIdVisibility(info.visible());
-        return b;
-    }
-
-    /**
-     * Helper method for constructing standard {@link TypeResolverBuilder}
-     * implementation.
-     */
-    protected StdTypeResolverBuilder _constructStdTypeResolverBuilder() {
-        return new StdTypeResolverBuilder();
-    }
-
-    /**
-     * Helper method for dealing with "no type info" marker; can't be null
-     * (as it'd be replaced by default typing)
-     */
-    protected StdTypeResolverBuilder _constructNoTypeResolverBuilder() {
-        return StdTypeResolverBuilder.noTypeInfoBuilder();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/MemberKey.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/MemberKey.java
deleted file mode 100644
index b8ee086..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/MemberKey.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-/**
- * Helper class needed to be able to efficiently access class
- * member functions ({@link Method}s and {@link Constructor}s)
- * in {@link java.util.Map}s.
- */
-public final class MemberKey
-{
-    final static Class<?>[] NO_CLASSES = new Class<?>[0];
-
-    final String _name;
-    final Class<?>[] _argTypes;
-
-    public MemberKey(Method m)
-    {
-        this(m.getName(), m.getParameterTypes());
-    }
-
-    public MemberKey(Constructor<?> ctor)
-    {
-        this("", ctor.getParameterTypes());
-    }
-
-    public MemberKey(String name, Class<?>[] argTypes)
-    {
-        _name = name;
-        _argTypes = (argTypes == null) ? NO_CLASSES : argTypes;
-    }
-
-    @Override
-    public String toString() {
-        return _name + "(" + _argTypes.length+"-args)";
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return _name.hashCode() + _argTypes.length;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) {
-            return false;
-        }
-        MemberKey other = (MemberKey) o;
-        if (!_name.equals(other._name)) {
-            return false;
-        }
-        Class<?>[] otherArgs = other._argTypes;
-        int len = _argTypes.length;
-        if (otherArgs.length != len) {
-            return false;
-        }
-        for (int i = 0; i < len; ++i) {
-            Class<?> type1 = otherArgs[i];
-            Class<?> type2 = _argTypes[i];
-            if (type1 == type2) {
-                continue;
-            }
-            /* 23-Feb-2009, tatu: Are there any cases where we would have to
-             *   consider some narrowing conversions or such? For now let's
-             *   assume exact type match is enough
-             */
-            /* 07-Apr-2009, tatu: Indeed there are (see [JACKSON-97]).
-             *    This happens with generics when a bound is specified.
-             *    I hope this works; check here must be transitive
-             */
-            if (type1.isAssignableFrom(type2) || type2.isAssignableFrom(type1)) {
-                continue;
-            }
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/NopAnnotationIntrospector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/NopAnnotationIntrospector.java
deleted file mode 100644
index e2eb062..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/NopAnnotationIntrospector.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-
-/**
- * Dummy, "no-operation" implementation of {@link AnnotationIntrospector}.
- * Can be used as is to suppress handling of annotations; or as a basis
- * for simple configuration overrides (whether based on annotations or not).
- */
-public abstract class NopAnnotationIntrospector
-    extends AnnotationIntrospector
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Static immutable and shareable instance that can be used as
-     * "null" introspector: one that never finds any annotation
-     * information.
-     */
-    public final static NopAnnotationIntrospector instance = new NopAnnotationIntrospector() {
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public Version version() {
-            return DatabindVersion.instance.version();
-        }
-    };
-
-    @Override
-    public Version version() {
-        return Version.unknownVersion();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ObjectIdInfo.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ObjectIdInfo.java
deleted file mode 100644
index 8eb6de2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/ObjectIdInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-
-/**
- * Container object that encapsulates information usually
- * derived from {@link JsonIdentityInfo} annotation or its
- * custom alternatives
- */
-public class ObjectIdInfo
-{
-    protected final String _propertyName;
-    protected final Class<? extends ObjectIdGenerator<?>> _generator;
-    protected final Class<?> _scope;
-    protected final boolean _alwaysAsId;
-
-    public ObjectIdInfo(String prop, Class<?> scope, Class<? extends ObjectIdGenerator<?>> gen) {
-        this(prop, scope, gen, false);
-    }
-
-    protected ObjectIdInfo(String prop, Class<?> scope, Class<? extends ObjectIdGenerator<?>> gen,
-            boolean alwaysAsId)
-    {
-        _propertyName = prop;
-        _scope = scope;
-        _generator = gen;
-        _alwaysAsId = alwaysAsId;
-    }
-
-    public ObjectIdInfo withAlwaysAsId(boolean state) {
-        if (_alwaysAsId == state) {
-            return this;
-        }
-        return new ObjectIdInfo(_propertyName, _scope, _generator, state);
-    }
-    
-    public String getPropertyName() { return _propertyName; }
-    public Class<?> getScope() { return _scope; }
-    public Class<? extends ObjectIdGenerator<?>> getGeneratorType() { return _generator; }
-    public boolean getAlwaysAsId() { return _alwaysAsId; }
-
-    @Override
-    public String toString() {
-        return "ObjectIdInfo: propName="+_propertyName
-                +", scope="+(_scope == null ? "null" : _scope.getName())
-                +", generatorType="+(_generator == null ? "null" : _generator.getName())
-                +", alwaysAsId="+_alwaysAsId;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
deleted file mode 100644
index d0f0580..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java
+++ /dev/null
@@ -1,807 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.util.BeanUtil;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Helper class used for aggregating information about all possible
- * properties of a POJO.
- */
-public class POJOPropertiesCollector
-{
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-    
-    /**
-     * Configuration settings
-     */
-    protected final MapperConfig<?> _config;
-
-    /**
-     * True if introspection is done for serialization (giving
-     *   precedence for serialization annotations), or not (false, deserialization)
-     */
-    protected final boolean _forSerialization;
-    
-    /**
-     * Type of POJO for which properties are being collected.
-     */
-    protected final JavaType _type;
-
-    /**
-     * Low-level introspected class information (methods, fields etc)
-     */
-    protected final AnnotatedClass _classDef;
-
-    protected final VisibilityChecker<?> _visibilityChecker;
-
-    protected final AnnotationIntrospector _annotationIntrospector;
-
-    /**
-     * Prefix used by auto-detected mutators ("setters"): usually "set",
-     * but differs for builder objects ("with" by default).
-     */
-    protected final String _mutatorPrefix;
-    
-    /*
-    /**********************************************************
-    /* Collected property information
-    /**********************************************************
-     */
-
-    /**
-     * Set of logical property information collected so far
-     */
-    protected final LinkedHashMap<String, POJOPropertyBuilder> _properties
-        = new LinkedHashMap<String, POJOPropertyBuilder>();
-
-    protected LinkedList<POJOPropertyBuilder> _creatorProperties = null;
-    
-    protected LinkedList<AnnotatedMember> _anyGetters = null;
-
-    protected LinkedList<AnnotatedMethod> _anySetters = null;
-
-    /**
-     * Method(s) marked with 'JsonValue' annotation
-     */
-    protected LinkedList<AnnotatedMethod> _jsonValueGetters = null;
-
-    /**
-     * Lazily collected list of properties that can be implicitly
-     * ignored during serialization; only updated when collecting
-     * information for deserialization purposes
-     */
-    protected HashSet<String> _ignoredPropertyNames;
-
-    /**
-     * Lazily collected list of members that were annotated to
-     * indicate that they represent mutators for deserializer
-     * value injection.
-     */
-    protected LinkedHashMap<Object, AnnotatedMember> _injectables;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected POJOPropertiesCollector(MapperConfig<?> config, boolean forSerialization,
-            JavaType type, AnnotatedClass classDef, String mutatorPrefix)
-    {
-        _config = config;
-        _forSerialization = forSerialization;
-        _type = type;
-        _classDef = classDef;
-        _mutatorPrefix = (mutatorPrefix == null) ? "set" : mutatorPrefix;
-        _annotationIntrospector = config.isAnnotationProcessingEnabled() ?
-                _config.getAnnotationIntrospector() : null;
-        if (_annotationIntrospector == null) {
-            _visibilityChecker = _config.getDefaultVisibilityChecker();
-        } else {
-            _visibilityChecker = _annotationIntrospector.findAutoDetectVisibility(classDef,
-                    _config.getDefaultVisibilityChecker());
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    public MapperConfig<?> getConfig() {
-        return _config;
-    }
-
-    public JavaType getType() {
-        return _type;
-    }
-    
-    public AnnotatedClass getClassDef() {
-        return _classDef;
-    }
-
-    public AnnotationIntrospector getAnnotationIntrospector() {
-        return _annotationIntrospector;
-    }
-    
-    public List<BeanPropertyDefinition> getProperties() {
-        // make sure we return a copy, so caller can remove entries if need be:
-        return new ArrayList<BeanPropertyDefinition>(_properties.values());
-    }
-
-    public Map<Object, AnnotatedMember> getInjectables() {
-        return _injectables;
-    }
-    
-    public AnnotatedMethod getJsonValueMethod()
-    {
-        // If @JsonValue defined, must have a single one
-        if (_jsonValueGetters != null) {
-            if (_jsonValueGetters.size() > 1) {
-                reportProblem("Multiple value properties defined ("+_jsonValueGetters.get(0)+" vs "
-                        +_jsonValueGetters.get(1)+")");
-            }
-            // otherwise we won't greatly care
-            return _jsonValueGetters.get(0);
-        }
-        return null;
-    }
-
-    public AnnotatedMember getAnyGetter()
-    {
-        if (_anyGetters != null) {
-            if (_anyGetters.size() > 1) {
-                reportProblem("Multiple 'any-getters' defined ("+_anyGetters.get(0)+" vs "
-                        +_anyGetters.get(1)+")");
-            }
-            return _anyGetters.getFirst();
-        }        
-        return null;
-    }
-
-    public AnnotatedMethod getAnySetterMethod()
-    {
-        if (_anySetters != null) {
-            if (_anySetters.size() > 1) {
-                reportProblem("Multiple 'any-setters' defined ("+_anySetters.get(0)+" vs "
-                        +_anySetters.get(1)+")");
-            }
-            return _anySetters.getFirst();
-        }
-        return null;
-    }
-
-    public Set<String> getIgnoredPropertyNames() {
-        return _ignoredPropertyNames;
-    }
-
-    /**
-     * Accessor to find out whether type specified requires inclusion
-     * of Object Identifier.
-     */
-    public ObjectIdInfo getObjectIdInfo() {
-        if (_annotationIntrospector == null) {
-            return null;
-        }
-        ObjectIdInfo info = _annotationIntrospector.findObjectIdInfo(_classDef);
-        if (info != null) { // 2.1: may also have different defaults for refs:
-            info = _annotationIntrospector.findObjectReferenceInfo(_classDef, info);
-        }
-        return info;
-    }
-
-    /**
-     * Method for finding Class to use as POJO builder, if any.
-     */
-    public Class<?> findPOJOBuilderClass()
-    {
-    	return _annotationIntrospector.findPOJOBuilder(_classDef);
-    }
-    
-    // for unit tests:
-    protected Map<String, POJOPropertyBuilder> getPropertyMap() {
-        return _properties;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API: main-level collection
-    /**********************************************************
-     */
-
-    /**
-     * Method that orchestrates collection activities, and needs to be called
-     * after creating the instance.
-     */
-    public POJOPropertiesCollector collect()
-    {
-        _properties.clear();
-        
-        // First: gather basic data
-        _addFields();
-        _addMethods();
-        _addCreators();
-        _addInjectables();
-
-        // Remove ignored properties, individual entries
-        _removeUnwantedProperties();
-
-        // Rename remaining properties
-        _renameProperties();
-        // And use custom naming strategy, if applicable...
-        PropertyNamingStrategy naming = _findNamingStrategy();
-        if (naming != null) {
-            _renameUsing(naming);
-        }
-
-        /* Sort by visibility (explicit over implicit); drop all but first
-         * of member type (getter, setter etc) if there is visibility
-         * difference
-         */
-        for (POJOPropertyBuilder property : _properties.values()) {
-            property.trimByVisibility();
-        }
-
-        // and then "merge" annotations
-        for (POJOPropertyBuilder property : _properties.values()) {
-            property.mergeAnnotations(_forSerialization);
-        }
-
-        /* and, if required, apply wrapper name: note, MUST be done after
-         * annotations are merged.
-         */
-        if (_config.isEnabled(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)) {
-            _renameWithWrappers();
-        }
-        
-        // well, almost last: there's still ordering...
-        _sortProperties();
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable internal methods, sorting, other stuff
-    /**********************************************************
-     */
-    
-    /* First, order by [JACKSON-90] (explicit ordering and/or alphabetic)
-     * and then for [JACKSON-170] (implicitly order creator properties before others)
-     */
-    protected void _sortProperties()
-    {
-        // Then how about explicit ordering?
-        AnnotationIntrospector intr = _annotationIntrospector;
-        boolean sort;
-        Boolean alpha = (intr == null) ? null : intr.findSerializationSortAlphabetically(_classDef);
-        
-        if (alpha == null) {
-            sort = _config.shouldSortPropertiesAlphabetically();
-        } else {
-            sort = alpha.booleanValue();
-        }
-        String[] propertyOrder = (intr == null) ? null : intr.findSerializationPropertyOrder(_classDef);
-        
-        // no sorting? no need to shuffle, then
-        if (!sort && (_creatorProperties == null) && (propertyOrder == null)) {
-            return;
-        }
-        int size = _properties.size();
-        Map<String, POJOPropertyBuilder> all;
-        // Need to (re)sort alphabetically?
-        if (sort) {
-            all = new TreeMap<String,POJOPropertyBuilder>();
-        } else {
-            all = new LinkedHashMap<String,POJOPropertyBuilder>(size+size);
-        }
-
-        for (POJOPropertyBuilder prop : _properties.values()) {
-            all.put(prop.getName(), prop);
-        }
-        Map<String,POJOPropertyBuilder> ordered = new LinkedHashMap<String,POJOPropertyBuilder>(size+size);
-        // Ok: primarily by explicit order
-        if (propertyOrder != null) {
-            for (String name : propertyOrder) {
-                POJOPropertyBuilder w = all.get(name);
-                if (w == null) { // also, as per [JACKSON-268], we will allow use of "implicit" names
-                    for (POJOPropertyBuilder prop : _properties.values()) {
-                        if (name.equals(prop.getInternalName())) {
-                            w = prop;
-                            // plus re-map to external name, to avoid dups:
-                            name = prop.getName();
-                            break;
-                        }
-                    }
-                }
-                if (w != null) {
-                    ordered.put(name, w);
-                }
-            }
-        }
-        // And secondly by sorting Creator properties before other unordered properties
-        if (_creatorProperties != null) {
-            for (POJOPropertyBuilder prop : _creatorProperties) {
-                ordered.put(prop.getName(), prop);
-            }
-        }
-        // And finally whatever is left (trying to put again will not change ordering)
-        ordered.putAll(all);
-        
-        _properties.clear();
-        _properties.putAll(ordered);
-    }        
-    
-    /*
-    /**********************************************************
-    /* Overridable internal methods, adding members
-    /**********************************************************
-     */
-    
-    /**
-     * Method for collecting basic information on all fields found
-     */
-    protected void _addFields()
-    {
-        final AnnotationIntrospector ai = _annotationIntrospector;
-        
-        for (AnnotatedField f : _classDef.fields()) {
-            String implName = f.getName();
-
-            String explName;
-            if (ai == null) {
-                explName = null;
-            } else if (_forSerialization) {
-                /* 18-Aug-2011, tatu: As per existing unit tests, we should only
-                 *   use serialization annotation (@JsonSerializer) when serializing
-                 *   fields, and similarly for deserialize-only annotations... so
-                 *   no fallbacks in this particular case.
-                 */
-                PropertyName pn = ai.findNameForSerialization(f);
-                explName = (pn == null) ? null : pn.getSimpleName();
-            } else {
-                PropertyName pn = ai.findNameForDeserialization(f);
-                explName = (pn == null) ? null : pn.getSimpleName();
-            }
-            if ("".equals(explName)) { // empty String meaning "use default name", here just means "same as field name"
-                explName = implName;
-            }
-            // having explicit name means that field is visible; otherwise need to check the rules
-            boolean visible = (explName != null);
-            if (!visible) {
-                visible = _visibilityChecker.isFieldVisible(f);
-            }
-            // and finally, may also have explicit ignoral
-            boolean ignored = (ai != null) && ai.hasIgnoreMarker(f);
-            _property(implName).addField(f, explName, visible, ignored);
-        }
-    }
-
-    /**
-     * Method for collecting basic information on constructor(s) found
-     */
-    protected void _addCreators()
-    {
-        final AnnotationIntrospector ai = _annotationIntrospector;
-        // can be null if annotation processing is disabled...
-        if (ai == null) {
-            return;
-        }
-        for (AnnotatedConstructor ctor : _classDef.getConstructors()) {
-            if (_creatorProperties == null) {
-                _creatorProperties = new LinkedList<POJOPropertyBuilder>();
-            }
-            for (int i = 0, len = ctor.getParameterCount(); i < len; ++i) {
-                AnnotatedParameter param = ctor.getParameter(i);
-                PropertyName pn = ai.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
-                // is it legal not to have name?
-                if (name != null) {
-                    // shouldn't need to worry about @JsonIgnore (no real point, so)
-                    POJOPropertyBuilder prop = _property(name);
-                    prop.addCtor(param, name, true, false);
-                    _creatorProperties.add(prop);
-                }
-            }
-        }
-        for (AnnotatedMethod factory : _classDef.getStaticMethods()) {
-            if (_creatorProperties == null) {
-                _creatorProperties = new LinkedList<POJOPropertyBuilder>();
-            }
-            for (int i = 0, len = factory.getParameterCount(); i < len; ++i) {
-                AnnotatedParameter param = factory.getParameter(i);
-                PropertyName pn = ai.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
-                // is it legal not to have name?
-                if (name != null) {
-                    // shouldn't need to worry about @JsonIgnore (no real point, so)
-                    POJOPropertyBuilder prop = _property(name);
-                    prop.addCtor(param, name, true, false);
-                    _creatorProperties.add(prop);
-                }
-            }
-        }
-    }
-
-    /**
-     * Method for collecting basic information on all fields found
-     */
-    protected void _addMethods()
-    {
-        final AnnotationIntrospector ai = _annotationIntrospector;
-        
-        for (AnnotatedMethod m : _classDef.memberMethods()) {
-            /* For methods, handling differs between getters and setters; and
-             * we will also only consider entries that either follow the bean
-             * naming convention or are explicitly marked: just being visible
-             * is not enough (unlike with fields)
-             */
-            int argCount = m.getParameterCount();
-            if (argCount == 0) { // getters (including 'any getter')
-            	_addGetterMethod(m, ai);
-            } else if (argCount == 1) { // setters
-            	_addSetterMethod(m, ai);
-            } else if (argCount == 2) { // any getter?
-                if (ai != null  && ai.hasAnySetterAnnotation(m)) {
-                    if (_anySetters == null) {
-                        _anySetters = new LinkedList<AnnotatedMethod>();
-                    }
-                    _anySetters.add(m);
-                }
-            }
-        }
-    }
-
-    protected void _addGetterMethod(AnnotatedMethod m, AnnotationIntrospector ai)
-    {
-        // any getter?
-        if (ai != null) {
-            if (ai.hasAnyGetterAnnotation(m)) {
-                if (_anyGetters == null) {
-                    _anyGetters = new LinkedList<AnnotatedMember>();
-                }
-                _anyGetters.add(m);
-                return;
-            }
-            // @JsonValue?
-            if (ai.hasAsValueAnnotation(m)) {
-                if (_jsonValueGetters == null) {
-                    _jsonValueGetters = new LinkedList<AnnotatedMethod>();
-                }
-                _jsonValueGetters.add(m);
-                return;
-            }
-        }
-        String implName; // from naming convention
-        boolean visible;
-        
-        PropertyName pn = (ai == null) ? null : ai.findNameForSerialization(m);
-        String explName = (pn == null) ? null : pn.getSimpleName();
-        if (explName == null) { // no explicit name; must follow naming convention
-            implName = BeanUtil.okNameForRegularGetter(m, m.getName());
-            if (implName == null) { // if not, must skip
-                implName = BeanUtil.okNameForIsGetter(m, m.getName());
-                if (implName == null) {
-                    return;
-                }
-                visible = _visibilityChecker.isIsGetterVisible(m);
-            } else {
-                visible = _visibilityChecker.isGetterVisible(m);
-            }
-        } else { // explicit indication of inclusion, but may be empty
-            // we still need implicit name to link with other pieces
-            implName = BeanUtil.okNameForGetter(m);
-            // if not regular getter name, use method name as is
-            if (implName == null) {
-                implName = m.getName();
-            }
-            if (explName.length() == 0) {
-                explName = implName;
-            }
-            visible = true;
-        }
-        boolean ignore = (ai == null) ? false : ai.hasIgnoreMarker(m);
-        _property(implName).addGetter(m, explName, visible, ignore);
-    }
-
-    protected void _addSetterMethod(AnnotatedMethod m, AnnotationIntrospector ai)
-    {
-        String implName; // from naming convention
-        boolean visible;
-        PropertyName pn = (ai == null) ? null : ai.findNameForDeserialization(m);
-        String explName = (pn == null) ? null : pn.getSimpleName();
-        if (explName == null) { // no explicit name; must follow naming convention
-            implName = BeanUtil.okNameForMutator(m, _mutatorPrefix);
-            if (implName == null) { // if not, must skip
-            	return;
-            }
-            visible = _visibilityChecker.isSetterVisible(m);
-        } else { // explicit indication of inclusion, but may be empty
-            // we still need implicit name to link with other pieces
-            implName = BeanUtil.okNameForMutator(m, _mutatorPrefix);
-            // if not regular getter name, use method name as is
-            if (implName == null) {
-                implName = m.getName();
-            }
-            if (explName.length() == 0) { 
-                explName = implName;
-            }
-            visible = true;
-        }
-        boolean ignore = (ai == null) ? false : ai.hasIgnoreMarker(m);
-        _property(implName).addSetter(m, explName, visible, ignore);
-    }
-    
-    protected void _addInjectables()
-    {
-        final AnnotationIntrospector ai = _annotationIntrospector;
-        if (ai == null) {
-            return;
-        }
-        
-        // first fields, then methods
-        for (AnnotatedField f : _classDef.fields()) {
-            _doAddInjectable(ai.findInjectableValueId(f), f);
-        }
-        
-        for (AnnotatedMethod m : _classDef.memberMethods()) {
-            /* for now, only allow injection of a single arg
-             * (to be changed in future)
-             */
-            if (m.getParameterCount() != 1) {
-                continue;
-            }
-            _doAddInjectable(ai.findInjectableValueId(m), m);
-        }
-    }
-
-    protected void _doAddInjectable(Object id, AnnotatedMember m)
-    {
-        if (id == null) {
-            return;
-        }
-        if (_injectables == null) {
-            _injectables = new LinkedHashMap<Object, AnnotatedMember>();
-        }
-        AnnotatedMember prev = _injectables.put(id, m);
-        if (prev != null) {
-            String type = (id == null) ? "[null]" : id.getClass().getName();
-            throw new IllegalArgumentException("Duplicate injectable value with id '"
-                    +String.valueOf(id)+"' (of type "+type+")");
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods; removing ignored properties
-    /**********************************************************
-     */
-
-    /**
-     * Method called to get rid of candidate properties that are marked
-     * as ignored, or that are not visible.
-     */
-    protected void _removeUnwantedProperties()
-    {
-        Iterator<Map.Entry<String,POJOPropertyBuilder>> it = _properties.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry<String, POJOPropertyBuilder> entry = it.next();
-            POJOPropertyBuilder prop = entry.getValue();
-
-            // First: if nothing visible, just remove altogether
-            if (!prop.anyVisible()) {
-                it.remove();
-                continue;
-            }
-            // Otherwise, check ignorals
-            if (prop.anyIgnorals()) {
-                // first: if one or more ignorals, and no explicit markers, remove the whole thing
-                if (!prop.isExplicitlyIncluded()) {
-                    it.remove();
-                    _addIgnored(prop.getName());
-                    continue;
-                }
-                // otherwise just remove ones marked to be ignored
-                prop.removeIgnored();
-                if (!_forSerialization && !prop.couldDeserialize()) {
-                    _addIgnored(prop.getName());
-                }
-            }
-            // and finally, handle removal of individual non-visible elements
-            prop.removeNonVisible();
-        }
-    }
-    
-    private void _addIgnored(String name)
-    {
-        if (!_forSerialization) {
-            if (_ignoredPropertyNames == null) {
-                _ignoredPropertyNames = new HashSet<String>();
-            }
-            _ignoredPropertyNames.add(name);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods; renaming properties
-    /**********************************************************
-     */
-
-    protected void _renameProperties()
-    {
-        // With renaming need to do in phases: first, find properties to rename
-        Iterator<Map.Entry<String,POJOPropertyBuilder>> it = _properties.entrySet().iterator();
-        LinkedList<POJOPropertyBuilder> renamed = null;
-        while (it.hasNext()) {
-            Map.Entry<String, POJOPropertyBuilder> entry = it.next();
-            POJOPropertyBuilder prop = entry.getValue();
-            String newName = prop.findNewName();
-            if (newName != null) {
-                if (renamed == null) {
-                    renamed = new LinkedList<POJOPropertyBuilder>();
-                }
-                prop = prop.withName(newName);
-                renamed.add(prop);
-                it.remove();
-            }
-        }
-        
-        // and if any were renamed, merge back in...
-        if (renamed != null) {
-            for (POJOPropertyBuilder prop : renamed) {
-                String name = prop.getName();
-                POJOPropertyBuilder old = _properties.get(name);
-                if (old == null) {
-                    _properties.put(name, prop);
-                } else {
-                    old.addAll(prop);
-                }
-            }
-        }
-    }
-
-    protected void _renameUsing(PropertyNamingStrategy naming)
-    {
-        POJOPropertyBuilder[] props = _properties.values().toArray(new POJOPropertyBuilder[_properties.size()]);
-        _properties.clear();
-        for (POJOPropertyBuilder prop : props) {
-            String name = prop.getName();
-            if (_forSerialization) {
-                if (prop.hasGetter()) {
-                    name = naming.nameForGetterMethod(_config, prop.getGetter(), name);
-                } else if (prop.hasField()) {
-                    name = naming.nameForField(_config, prop.getField(), name);
-                }
-            } else {
-                if (prop.hasSetter()) {
-                    name = naming.nameForSetterMethod(_config, prop.getSetter(), name);
-                } else if (prop.hasConstructorParameter()) {
-                    name = naming.nameForConstructorParameter(_config, prop.getConstructorParameter(), name);
-                } else if (prop.hasField()) {
-                    name = naming.nameForField(_config, prop.getField(), name);
-                } else if (prop.hasGetter()) {
-                    /* Plus, when getter-as-setter is used, need to convert that too..
-                     * (should we verify that's enabled? For now, assume it's ok always)
-                     */
-                    name = naming.nameForGetterMethod(_config, prop.getGetter(), name);
-                }
-            }
-            if (!name.equals(prop.getName())) {
-                prop = prop.withName(name);
-            }
-            /* As per [JACKSON-687], need to consider case where there may already be
-             * something in there...
-             */
-            POJOPropertyBuilder old = _properties.get(name);
-            if (old == null) {
-                _properties.put(name, prop);
-            } else {
-                old.addAll(prop);
-            }
-        }
-    }
-
-    protected void _renameWithWrappers()
-    {
-        /* 11-Sep-2012, tatu: To support 'MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME',
-         *   need another round of renaming...
-         */
-        Iterator<Map.Entry<String,POJOPropertyBuilder>> it = _properties.entrySet().iterator();
-        LinkedList<POJOPropertyBuilder> renamed = null;
-        while (it.hasNext()) {
-            Map.Entry<String, POJOPropertyBuilder> entry = it.next();
-            POJOPropertyBuilder prop = entry.getValue();
-            AnnotatedMember member = prop.getPrimaryMember();
-            if (member == null) {
-                continue;
-            }
-            PropertyName wrapperName = _annotationIntrospector.findWrapperName(member);
-            if (wrapperName == null || !wrapperName.hasSimpleName()) {
-                continue;
-            }
-            String name = wrapperName.getSimpleName();
-            if (!name.equals(prop.getName())) {
-                if (renamed == null) {
-                    renamed = new LinkedList<POJOPropertyBuilder>();
-                }
-                prop = prop.withName(name);
-                renamed.add(prop);
-                it.remove();
-            }
-        }
-        // and if any were renamed, merge back in...
-        if (renamed != null) {
-            for (POJOPropertyBuilder prop : renamed) {
-                String name = prop.getName();
-                POJOPropertyBuilder old = _properties.get(name);
-                if (old == null) {
-                    _properties.put(name, prop);
-                } else {
-                    old.addAll(prop);
-                }
-            }
-        }
-    }
-    
-    
-    /*
-    /**********************************************************
-    /* Internal methods; helpers
-    /**********************************************************
-     */
-
-    protected void reportProblem(String msg) {
-        throw new IllegalArgumentException("Problem with definition of "+_classDef+": "+msg);
-    }
-    
-    protected POJOPropertyBuilder _property(String implName)
-    {
-        POJOPropertyBuilder prop = _properties.get(implName);
-        if (prop == null) {
-            prop = new POJOPropertyBuilder(implName, _annotationIntrospector,
-                    _forSerialization);
-            _properties.put(implName, prop);
-        }
-        return prop;
-    }
-
-    private PropertyNamingStrategy _findNamingStrategy()
-    {
-        Object namingDef = (_annotationIntrospector == null)? null
-                : _annotationIntrospector.findNamingStrategy(_classDef);
-        if (namingDef == null) {
-            return _config.getPropertyNamingStrategy();
-        }
-        if (namingDef instanceof PropertyNamingStrategy) {
-            return (PropertyNamingStrategy) namingDef;
-        }
-        /* Alas, there's no way to force return type of "either class
-         * X or Y" -- need to throw an exception after the fact
-         */
-        if (!(namingDef instanceof Class)) {
-            throw new IllegalStateException("AnnotationIntrospector returned PropertyNamingStrategy definition of type "
-                    +namingDef.getClass().getName()+"; expected type PropertyNamingStrategy or Class<PropertyNamingStrategy> instead");
-        }
-        Class<?> namingClass = (Class<?>)namingDef;
-        if (!PropertyNamingStrategy.class.isAssignableFrom(namingClass)) {
-            throw new IllegalStateException("AnnotationIntrospector returned Class "
-                    +namingClass.getName()+"; expected Class<PropertyNamingStrategy>");
-        }
-        HandlerInstantiator hi = _config.getHandlerInstantiator();
-        if (hi != null) {
-            return hi.namingStrategyInstance(_config, _classDef, namingClass);
-        }
-        return (PropertyNamingStrategy) ClassUtil.createInstance(namingClass,
-                    _config.canOverrideAccessModifiers());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
deleted file mode 100644
index 213edd1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
+++ /dev/null
@@ -1,755 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-
-/**
- * Helper class used for aggregating information about a single
- * potential POJO property.
- */
-public class POJOPropertyBuilder
-    extends BeanPropertyDefinition
-    implements Comparable<POJOPropertyBuilder>
-{
-    /**
-     * Whether property is being composed for serialization
-     * (true) or deserialization (false)
-     */
-    protected final boolean _forSerialization;
-
-    protected final AnnotationIntrospector _annotationIntrospector;
-    
-    /**
-     * External name of logical property; may change with
-     * renaming (by new instance being constructed using
-     * a new name)
-     */
-    protected final String _name;
-
-    /**
-     * Original internal name, derived from accessor, of this
-     * property. Will not be changed by renaming.
-     */
-    protected final String _internalName;
-
-    protected Linked<AnnotatedField> _fields;
-    
-    protected Linked<AnnotatedParameter> _ctorParameters;
-    
-    protected Linked<AnnotatedMethod> _getters;
-
-    protected Linked<AnnotatedMethod> _setters;
-    
-    public POJOPropertyBuilder(String internalName,
-            AnnotationIntrospector annotationIntrospector, boolean forSerialization)
-    {
-        _internalName = internalName;
-        _name = internalName;
-        _annotationIntrospector = annotationIntrospector;
-        _forSerialization = forSerialization;
-    }
-
-    public POJOPropertyBuilder(POJOPropertyBuilder src, String newName)
-    {
-        _internalName = src._internalName;
-        _name = newName;
-        _annotationIntrospector = src._annotationIntrospector;
-        _fields = src._fields;
-        _ctorParameters = src._ctorParameters;
-        _getters = src._getters;
-        _setters = src._setters;
-        _forSerialization = src._forSerialization;
-    }
-    
-    /*
-    /**********************************************************
-    /* Fluent factory methods
-    /**********************************************************
-     */
-
-    @Override
-    public POJOPropertyBuilder withName(String newName) {
-        return new POJOPropertyBuilder(this, newName);
-    }
-    
-    /*
-    /**********************************************************
-    /* Comparable implementation: sort alphabetically, except
-    /* that properties with constructor parameters sorted
-    /* before other properties
-    /**********************************************************
-     */
-
-//    @Override
-    public int compareTo(POJOPropertyBuilder other)
-    {
-        // first, if one has ctor params, that should come first:
-        if (_ctorParameters != null) {
-            if (other._ctorParameters == null) {
-                return -1;
-            }
-        } else if (other._ctorParameters != null) {
-            return 1;
-        }
-        /* otherwise sort by external name (including sorting of
-         * ctor parameters)
-         */
-        return getName().compareTo(other.getName());
-    }
-    
-    /*
-    /**********************************************************
-    /* BeanPropertyDefinition implementation
-    /**********************************************************
-     */
-
-    @Override
-    public String getName() { return _name; }
-
-    @Override
-    public String getInternalName() { return _internalName; }
-
-    @Override
-    public boolean isExplicitlyIncluded() {
-        return _anyExplicitNames(_fields)
-                || _anyExplicitNames(_getters)
-                || _anyExplicitNames(_setters)
-                || _anyExplicitNames(_ctorParameters)
-                ;
-    }
-
-    
-    @Override
-    public boolean hasGetter() { return _getters != null; }
-
-    @Override
-    public boolean hasSetter() { return _setters != null; }
-
-    @Override
-    public boolean hasField() { return _fields != null; }
-
-    @Override
-    public boolean hasConstructorParameter() { return _ctorParameters != null; }
-
-    @Override
-    public boolean couldSerialize() {
-        return (_getters != null) || (_fields != null);
-    }
-
-    @Override
-    public AnnotatedMethod getGetter()
-    {
-        if (_getters == null) {
-            return null;
-        }
-        // If multiple, verify that they do not conflict...
-        AnnotatedMethod getter = _getters.value;
-        Linked<AnnotatedMethod> next = _getters.next;
-        for (; next != null; next = next.next) {
-            /* [JACKSON-255] Allow masking, i.e. report exception only if
-             *   declarations in same class, or there's no inheritance relationship
-             *   (sibling interfaces etc)
-             */
-            AnnotatedMethod nextGetter = next.value;
-            Class<?> getterClass = getter.getDeclaringClass();
-            Class<?> nextClass = nextGetter.getDeclaringClass();
-            if (getterClass != nextClass) {
-                if (getterClass.isAssignableFrom(nextClass)) { // next is more specific
-                    getter = nextGetter;
-                    continue;
-                }
-                if (nextClass.isAssignableFrom(getterClass)) { // getter more specific
-                    continue;
-                }
-            }
-            throw new IllegalArgumentException("Conflicting getter definitions for property \""+getName()+"\": "
-                    +getter.getFullName()+" vs "+nextGetter.getFullName());
-        }
-        return getter;
-    }
-
-    @Override
-    public AnnotatedMethod getSetter()
-    {
-        if (_setters == null) {
-            return null;
-        }
-        // If multiple, verify that they do not conflict...
-        AnnotatedMethod setter = _setters.value;
-        Linked<AnnotatedMethod> next = _setters.next;
-        for (; next != null; next = next.next) {
-            /* [JACKSON-255] Allow masking, i.e. report exception only if
-             *   declarations in same class, or there's no inheritance relationship
-             *   (sibling interfaces etc)
-             */
-            AnnotatedMethod nextSetter = next.value;
-            Class<?> setterClass = setter.getDeclaringClass();
-            Class<?> nextClass = nextSetter.getDeclaringClass();
-            if (setterClass != nextClass) {
-                if (setterClass.isAssignableFrom(nextClass)) { // next is more specific
-                    setter = nextSetter;
-                    continue;
-                }
-                if (nextClass.isAssignableFrom(setterClass)) { // getter more specific
-                    continue;
-                }
-            }
-            throw new IllegalArgumentException("Conflicting setter definitions for property \""+getName()+"\": "
-                    +setter.getFullName()+" vs "+nextSetter.getFullName());
-        }
-        return setter;
-    }
-
-    @Override
-    public AnnotatedField getField()
-    {
-        if (_fields == null) {
-            return null;
-        }
-        // If multiple, verify that they do not conflict...
-        AnnotatedField field = _fields.value;
-        Linked<AnnotatedField> next = _fields.next;
-        for (; next != null; next = next.next) {
-            AnnotatedField nextField = next.value;
-            Class<?> fieldClass = field.getDeclaringClass();
-            Class<?> nextClass = nextField.getDeclaringClass();
-            if (fieldClass != nextClass) {
-                if (fieldClass.isAssignableFrom(nextClass)) { // next is more specific
-                    field = nextField;
-                    continue;
-                }
-                if (nextClass.isAssignableFrom(fieldClass)) { // getter more specific
-                    continue;
-                }
-            }
-            throw new IllegalArgumentException("Multiple fields representing property \""+getName()+"\": "
-                    +field.getFullName()+" vs "+nextField.getFullName());
-        }
-        return field;
-    }
-
-    @Override
-    public AnnotatedParameter getConstructorParameter()
-    {
-        if (_ctorParameters == null) {
-            return null;
-        }
-        /* Hmmh. Checking for constructor parameters is trickier; for one,
-         * we must allow creator and factory method annotations.
-         * If this is the case, constructor parameter has the precedence.
-         * 
-         * So, for now, just try finding the first constructor parameter;
-         * if none, first factory method. And don't check for dups, if we must,
-         * can start checking for them later on.
-         */
-        Linked<AnnotatedParameter> curr = _ctorParameters;
-        do {
-            if (curr.value.getOwner() instanceof AnnotatedConstructor) {
-                return curr.value;
-            }
-            curr = curr.next;
-        } while (curr != null);
-        return _ctorParameters.value;
-    }
-    
-    @Override
-    public AnnotatedMember getAccessor()
-    {
-        AnnotatedMember m = getGetter();
-        if (m == null) {
-            m = getField();
-        }
-        return m;
-    }
-
-    @Override
-    public AnnotatedMember getMutator()
-    {
-        AnnotatedMember m = getConstructorParameter();
-        if (m == null) {
-            m = getSetter();
-            if (m == null) {
-                m = getField();
-            }
-        }
-        return m;
-    }
-    
-    @Override
-    public AnnotatedMember getPrimaryMember() {
-        if (_forSerialization) {
-            return getAccessor();
-        }
-        return getMutator();
-    }
-
-    /*
-    /**********************************************************
-    /* Implementations of refinement accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public Class<?>[] findViews() {
-        return fromMemberAnnotations(new WithMember<Class<?>[]>() {
-            public Class<?>[] withMember(AnnotatedMember member) {
-                return _annotationIntrospector.findViews(member);
-            }
-        });
-    }
-
-    @Override
-    public AnnotationIntrospector.ReferenceProperty findReferenceType() {
-        return fromMemberAnnotations(new WithMember<AnnotationIntrospector.ReferenceProperty>() {
-            public AnnotationIntrospector.ReferenceProperty withMember(AnnotatedMember member) {
-                return _annotationIntrospector.findReferenceType(member);
-            }
-        });
-    }
-
-    @Override
-    public boolean isTypeId() {
-        Boolean b = fromMemberAnnotations(new WithMember<Boolean>() {
-            public Boolean withMember(AnnotatedMember member) {
-                return _annotationIntrospector.isTypeId(member);
-            }
-        });
-        return (b != null) && b.booleanValue();
-    }
-
-    @Override
-    public boolean isRequired() {
-        Boolean b = fromMemberAnnotations(new WithMember<Boolean>() {
-            public Boolean withMember(AnnotatedMember member) {
-                return _annotationIntrospector.hasRequiredMarker(member);
-            }
-        });
-        return (b != null) && b.booleanValue();
-    }
-    
-    @Override
-    public ObjectIdInfo findObjectIdInfo() {
-        return fromMemberAnnotations(new WithMember<ObjectIdInfo>() {
-            public ObjectIdInfo withMember(AnnotatedMember member) {
-                ObjectIdInfo info = _annotationIntrospector.findObjectIdInfo(member);
-                if (info != null) {
-                    info = _annotationIntrospector.findObjectReferenceInfo(member, info);
-                }
-                return info;
-            }
-        });
-    }
-    
-    /*
-    /**********************************************************
-    /* Data aggregation
-    /**********************************************************
-     */
-    
-    public void addField(AnnotatedField a, String ename, boolean visible, boolean ignored) {
-        _fields = new Linked<AnnotatedField>(a, _fields, ename, visible, ignored);
-    }
-
-    public void addCtor(AnnotatedParameter a, String ename, boolean visible, boolean ignored) {
-        _ctorParameters = new Linked<AnnotatedParameter>(a, _ctorParameters, ename, visible, ignored);
-    }
-
-    public void addGetter(AnnotatedMethod a, String ename, boolean visible, boolean ignored) {
-        _getters = new Linked<AnnotatedMethod>(a, _getters, ename, visible, ignored);
-    }
-
-    public void addSetter(AnnotatedMethod a, String ename, boolean visible, boolean ignored) {
-        _setters = new Linked<AnnotatedMethod>(a, _setters, ename, visible, ignored);
-    }
-
-    /**
-     * Method for adding all property members from specified collector into
-     * this collector.
-     */
-    public void addAll(POJOPropertyBuilder src)
-    {
-        _fields = merge(_fields, src._fields);
-        _ctorParameters = merge(_ctorParameters, src._ctorParameters);
-        _getters= merge(_getters, src._getters);
-        _setters = merge(_setters, src._setters);
-    }
-
-    private static <T> Linked<T> merge(Linked<T> chain1, Linked<T> chain2)
-    {
-        if (chain1 == null) {
-            return chain2;
-        }
-        if (chain2 == null) {
-            return chain1;
-        }
-        return chain1.append(chain2);
-    }
-    
-    /*
-    /**********************************************************
-    /* Modifications
-    /**********************************************************
-     */
-
-    /**
-     * Method called to remove all entries that are marked as
-     * ignored.
-     */
-    public void removeIgnored()
-    {
-        _fields = _removeIgnored(_fields);
-        _getters = _removeIgnored(_getters);
-        _setters = _removeIgnored(_setters);
-        _ctorParameters = _removeIgnored(_ctorParameters);
-    }
-
-    public void removeNonVisible()
-    {
-        /* 21-Aug-2011, tatu: This is tricky part -- if and when allow
-         *   non-visible property elements to be "pulled in" by visible
-         *   counterparts?
-         *   For now, we will only do this to pull in setter or field used
-         *   as setter, if an explicit getter is found.
-         */
-        _getters = _removeNonVisible(_getters);
-        _ctorParameters = _removeNonVisible(_ctorParameters);
-
-        if (_getters == null) {
-            _fields = _removeNonVisible(_fields);
-            _setters = _removeNonVisible(_setters);
-        }
-    }
-
-    /**
-     * Method called to trim unnecessary entries, such as implicit
-     * getter if there is an explict one available. This is important
-     * for later stages, to avoid unnecessary conflicts.
-     */
-    public void trimByVisibility()
-    {
-        _fields = _trimByVisibility(_fields);
-        _getters = _trimByVisibility(_getters);
-        _setters = _trimByVisibility(_setters);
-        _ctorParameters = _trimByVisibility(_ctorParameters);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void mergeAnnotations(boolean forSerialization)
-    {
-        if (forSerialization) {
-            if (_getters != null) {
-                AnnotationMap ann = _mergeAnnotations(0, _getters, _fields, _ctorParameters, _setters);
-                _getters = _getters.withValue(_getters.value.withAnnotations(ann));
-            } else if (_fields != null) {
-                AnnotationMap ann = _mergeAnnotations(0, _fields, _ctorParameters, _setters);
-                _fields = _fields.withValue(_fields.value.withAnnotations(ann));
-            }
-        } else {
-            if (_ctorParameters != null) {
-                AnnotationMap ann = _mergeAnnotations(0, _ctorParameters, _setters, _fields, _getters);
-                _ctorParameters = _ctorParameters.withValue(_ctorParameters.value.withAnnotations(ann));
-            } else if (_setters != null) {
-                AnnotationMap ann = _mergeAnnotations(0, _setters, _fields, _getters);
-                _setters = _setters.withValue(_setters.value.withAnnotations(ann));
-            } else if (_fields != null) {
-                AnnotationMap ann = _mergeAnnotations(0, _fields, _getters);
-                _fields = _fields.withValue(_fields.value.withAnnotations(ann));
-            }
-        }
-    }
-
-    private AnnotationMap _mergeAnnotations(int index, Linked<? extends AnnotatedMember>... nodes)
-    {
-        AnnotationMap ann = nodes[index].value.getAllAnnotations();
-        ++index;
-        for (; index < nodes.length; ++index) {
-            if (nodes[index] != null) {
-              return AnnotationMap.merge(ann, _mergeAnnotations(index, nodes));
-            }
-        }
-        return ann;
-    }
-    
-    private <T> Linked<T> _removeIgnored(Linked<T> node)
-    {
-        if (node == null) {
-            return node;
-        }
-        return node.withoutIgnored();
-    }
-
-    private <T> Linked<T> _removeNonVisible(Linked<T> node)
-    {
-        if (node == null) {
-            return node;
-        }
-        return node.withoutNonVisible();
-    }
-
-    private <T> Linked<T> _trimByVisibility(Linked<T> node)
-    {
-        if (node == null) {
-            return node;
-        }
-        return node.trimByVisibility();
-    }
-        
-    /*
-    /**********************************************************
-    /* Accessors for aggregate information
-    /**********************************************************
-     */
-
-    private <T> boolean _anyExplicitNames(Linked<T> n)
-    {
-        for (; n != null; n = n.next) {
-            if (n.explicitName != null && n.explicitName.length() > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean anyVisible() {
-        return _anyVisible(_fields)
-            || _anyVisible(_getters)
-            || _anyVisible(_setters)
-            || _anyVisible(_ctorParameters)
-        ;
-    }
-
-    private <T> boolean _anyVisible(Linked<T> n)
-    {
-        for (; n != null; n = n.next) {
-            if (n.isVisible) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public boolean anyIgnorals() {
-        return _anyIgnorals(_fields)
-            || _anyIgnorals(_getters)
-            || _anyIgnorals(_setters)
-            || _anyIgnorals(_ctorParameters)
-        ;
-    }
-
-    private <T> boolean _anyIgnorals(Linked<T> n)
-    {
-        for (; n != null; n = n.next) {
-            if (n.isMarkedIgnored) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Method called to check whether property represented by this collector
-     * should be renamed from the implicit name; and also verify that there
-     * are no conflicting rename definitions.
-     */
-    public String findNewName()
-    {
-        Linked<? extends AnnotatedMember> renamed = null;
-        renamed = findRenamed(_fields, renamed);
-        renamed = findRenamed(_getters, renamed);
-        renamed = findRenamed(_setters, renamed);
-        renamed = findRenamed(_ctorParameters, renamed);
-        return (renamed == null) ? null : renamed.explicitName;
-    }
-
-    private Linked<? extends AnnotatedMember> findRenamed(Linked<? extends AnnotatedMember> node,
-            Linked<? extends AnnotatedMember> renamed)
-    {
-        for (; node != null; node = node.next) {
-            String explName = node.explicitName;
-            if (explName == null) {
-                continue;
-            }
-            // different from default name?
-            if (explName.equals(_name)) { // nope, skip
-                continue;
-            }
-            if (renamed == null) {
-                renamed = node;
-            } else {
-                // different from an earlier renaming? problem
-                if (!explName.equals(renamed.explicitName)) {
-                    throw new IllegalStateException("Conflicting property name definitions: '"
-                            +renamed.explicitName+"' (for "+renamed.value+") vs '"
-                            +node.explicitName+"' (for "+node.value+")");
-                }
-            }
-        }
-        return renamed;
-    }
-    
-    // For trouble-shooting
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[Property '").append(_name)
-          .append("'; ctors: ").append(_ctorParameters)
-          .append(", field(s): ").append(_fields)
-          .append(", getter(s): ").append(_getters)
-          .append(", setter(s): ").append(_setters)
-          ;
-        sb.append("]");
-        return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /**
-     * Helper method used for finding annotation values, from accessors
-     * relevant to current usage (deserialization, serialization)
-     */
-    protected <T> T fromMemberAnnotations(WithMember<T> func)
-    {
-        T result = null;
-        if (_annotationIntrospector != null) {
-            if (_forSerialization) {
-                if (_getters != null) {
-                    result = func.withMember(_getters.value);
-                }
-            } else {
-                if (_ctorParameters != null) {
-                    result = func.withMember(_ctorParameters.value);
-                }
-                if (result == null && _setters != null) {
-                    result = func.withMember(_setters.value);
-                }
-            }
-            if (result == null && _fields != null) {
-                result = func.withMember(_fields.value);
-            }
-        }
-        return result;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    private interface WithMember<T>
-    {
-        public T withMember(AnnotatedMember member);
-    }
-    
-    /**
-     * Node used for creating simple linked lists to efficiently store small sets
-     * of things.
-     */
-    private final static class Linked<T>
-    {
-        public final T value;
-        public final Linked<T> next;
-
-        public final String explicitName;
-        public final boolean isVisible;
-        public final boolean isMarkedIgnored;
-        
-        public Linked(T v, Linked<T> n,
-                String explName, boolean visible, boolean ignored)
-        {
-            value = v;
-            next = n;
-            // ensure that we'll never have missing names
-            if (explName == null) {
-                explicitName = null;
-            } else {
-                explicitName = (explName.length() == 0) ? null : explName;
-            }
-            isVisible = visible;
-            isMarkedIgnored = ignored;
-        }
-
-        public Linked<T> withValue(T newValue)
-        {
-            if (newValue == value) {
-                return this;
-            }
-            return new Linked<T>(newValue, next, explicitName, isVisible, isMarkedIgnored);
-        }
-        
-        public Linked<T> withNext(Linked<T> newNext) {
-            if (newNext == next) {
-                return this;
-            }
-            return new Linked<T>(value, newNext, explicitName, isVisible, isMarkedIgnored);
-        }
-        
-        public Linked<T> withoutIgnored()
-        {
-            if (isMarkedIgnored) {
-                return (next == null) ? null : next.withoutIgnored();
-            }
-            if (next != null) {
-                Linked<T> newNext = next.withoutIgnored();
-                if (newNext != next) {
-                    return withNext(newNext);
-                }
-            }
-            return this;
-        }
-        
-        public Linked<T> withoutNonVisible()
-        {
-            Linked<T> newNext = (next == null) ? null : next.withoutNonVisible();
-            return isVisible ? withNext(newNext) : newNext;
-        }
-
-        /**
-         * Method called to append given node(s) at the end of this
-         * node chain.
-         */
-        private Linked<T> append(Linked<T> appendable) 
-        {
-            if (next == null) {
-                return withNext(appendable);
-            }
-            return withNext(next.append(appendable));
-        }
-        
-        public Linked<T> trimByVisibility()
-        {
-            if (next == null) {
-                return this;
-            }
-            Linked<T> newNext = next.trimByVisibility();
-            if (explicitName != null) { // this already has highest; how about next one?
-                if (newNext.explicitName == null) { // next one not, drop it
-                    return withNext(null);
-                }
-                //  both have it, keep
-                return withNext(newNext);
-            }
-            if (newNext.explicitName != null) { // next one has higher, return it...
-                return newNext;
-            }
-            // neither has explicit name; how about visibility?
-            if (isVisible == newNext.isVisible) { // same; keep both in current order
-                return withNext(newNext);
-            }
-            return isVisible ? withNext(null) : newNext;
-        }
-        
-        @Override
-        public String toString() {
-            String msg = value.toString()+"[visible="+isVisible+"]";
-            if (next != null) {
-                msg = msg + ", "+next.toString();
-            }
-            return msg;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/VisibilityChecker.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/VisibilityChecker.java
deleted file mode 100644
index 77c4dbd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/VisibilityChecker.java
+++ /dev/null
@@ -1,393 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-
-/**
- * Interface for object used for determine which property elements
- * (methods, fields, constructors) can be auto-detected, with respect
- * to their visibility modifiers.
- *<p>
- * Note on type declaration: funky recursive type is necessary to
- * support builder/fluent pattern.
- * 
- * @author tatu
- */
-public interface VisibilityChecker<T extends VisibilityChecker<T>>
-{
-    // // Builder methods
-
-    /**
-     * Builder method that will return an instance that has same
-     * settings as this instance has, except for values that
-     * given annotation overrides.
-     */
-    public T with(JsonAutoDetect ann);
-
-    /**
-     * Builder method that will create and return an instance that has specified
-     * {@link Visibility} value to use for all property elements.
-     * Typical usage would be something like:
-     *<pre>
-     *  mapper.setVisibilityChecker(
-     *     mapper.getVisibilityChecker().with(Visibility.NONE));
-     *</pre>
-     * (which would basically disable all auto-detection)
-     */
-    public T with(Visibility v);
-
-    /**
-     * Builder method that will create and return an instance that has specified
-     * {@link Visibility} value to use for specified property.
-     * Typical usage would be:
-     *<pre>
-     *  mapper.setVisibilityChecker(
-     *     mapper.getVisibilityChecker().withVisibility(JsonMethod.FIELD, Visibility.ANY));
-     *</pre>
-     * (which would basically enable auto-detection for all member fields)
-     */
-    public T withVisibility(PropertyAccessor method, Visibility v);
-    
-    /**
-     * Builder method that will return a checker instance that has
-     * specified minimum visibility level for regular ("getXxx") getters.
-     */
-    public T withGetterVisibility(Visibility v);
-
-    /**
-     * Builder method that will return a checker instance that has
-     * specified minimum visibility level for "is-getters" ("isXxx").
-     */
-    public T withIsGetterVisibility(Visibility v);
-    
-    /**
-     * Builder method that will return a checker instance that has
-     * specified minimum visibility level for setters.
-     */
-    public T withSetterVisibility(Visibility v);
-
-    /**
-     * Builder method that will return a checker instance that has
-     * specified minimum visibility level for creator methods
-     * (constructors, factory methods)
-     */
-    public T withCreatorVisibility(Visibility v);
-
-    /**
-     * Builder method that will return a checker instance that has
-     * specified minimum visibility level for fields.
-     */
-    public T withFieldVisibility(Visibility v);
-	
-    // // Accessors
-	
-    /**
-     * Method for checking whether given method is auto-detectable
-     * as regular getter, with respect to its visibility (not considering
-     * method signature or name, just visibility)
-     */
-    public boolean isGetterVisible(Method m);
-    public boolean isGetterVisible(AnnotatedMethod m);
-
-    /**
-     * Method for checking whether given method is auto-detectable
-     * as is-getter, with respect to its visibility (not considering
-     * method signature or name, just visibility)
-     */
-    public boolean isIsGetterVisible(Method m);
-    public boolean isIsGetterVisible(AnnotatedMethod m);
-    
-    /**
-     * Method for checking whether given method is auto-detectable
-     * as setter, with respect to its visibility (not considering
-     * method signature or name, just visibility)
-     */
-    public boolean isSetterVisible(Method m);
-    public boolean isSetterVisible(AnnotatedMethod m);
-
-    /**
-     * Method for checking whether given method is auto-detectable
-     * as Creator, with respect to its visibility (not considering
-     * method signature or name, just visibility)
-     */
-    public boolean isCreatorVisible(Member m);
-    public boolean isCreatorVisible(AnnotatedMember m);
-
-    /**
-     * Method for checking whether given field is auto-detectable
-     * as property, with respect to its visibility (not considering
-     * method signature or name, just visibility)
-     */
-    public boolean isFieldVisible(Field f);
-    public boolean isFieldVisible(AnnotatedField f);
-
-    /*
-    /********************************************************
-    /* Standard implementation suitable for basic use
-    /********************************************************
-    */
-
-   /**
-    * Default standard implementation is purely based on visibility
-    * modifier of given class members, and its configured minimum
-    * levels.
-    * Implemented using "builder" (aka "Fluid") pattern, whereas instances
-    * are immutable, and configuration is achieved by chainable factory
-    * methods. As a result, type is declared is funky recursive generic
-    * type, to allow for sub-classing of build methods with property type
-    * co-variance.
-    *<p>
-    * Note on <code>JsonAutoDetect</code> annotation: it is used to
-    * access default minimum visibility access definitions.
-    */
-    @JsonAutoDetect(
-        getterVisibility = Visibility.PUBLIC_ONLY,
-        isGetterVisibility = Visibility.PUBLIC_ONLY,
-        setterVisibility = Visibility.ANY,
-        /**
-         * By default, all matching single-arg constructed are found,
-         * regardless of visibility. Does not apply to factory methods,
-         * they can not be auto-detected; ditto for multiple-argument
-         * constructors.
-         */
-        creatorVisibility = Visibility.ANY,
-        fieldVisibility = Visibility.PUBLIC_ONLY
-    )
-    public static class Std
-        implements VisibilityChecker<Std>,
-            java.io.Serializable
-    {
-        private static final long serialVersionUID = -7073939237187922755L;
-
-        /**
-         * This is the canonical base instance, configured with default
-         * visibility values
-         */
-        protected final static Std DEFAULT = new Std(Std.class.getAnnotation(JsonAutoDetect.class));
-        
-        protected final Visibility _getterMinLevel;
-        protected final Visibility _isGetterMinLevel;
-        protected final Visibility _setterMinLevel;
-        protected final Visibility _creatorMinLevel;
-        protected final Visibility _fieldMinLevel;
-		
-        public static Std defaultInstance() { return DEFAULT; }
-        
-        /**
-         * Constructor used for building instance that has minumum visibility
-         * levels as indicated by given annotation instance
-         * 
-         * @param ann Annotations to use for determining minimum visibility levels
-         */
-	public Std(JsonAutoDetect ann)
-	{
-	    // let's combine checks for enabled/disabled, with minimimum level checks:
-	    _getterMinLevel = ann.getterVisibility();
-            _isGetterMinLevel = ann.isGetterVisibility();
-            _setterMinLevel = ann.setterVisibility();
-            _creatorMinLevel = ann.creatorVisibility();
-            _fieldMinLevel = ann.fieldVisibility();
-	}
-
-	/**
-	 * Constructor that allows directly specifying minimum visibility levels to use
-	 */
-	public Std(Visibility getter, Visibility isGetter, Visibility setter, Visibility creator, Visibility field)
-        {
-	    _getterMinLevel = getter;
-	    _isGetterMinLevel = isGetter;
-	    _setterMinLevel = setter;
-	    _creatorMinLevel = creator;
-	    _fieldMinLevel = field;
-        }
-		
-	/**
-	 * Costructor that will assign given visibility value for all
-	 * properties.
-	 * 
-	 * @param v level to use for all property types
-	 */
-        public Std(Visibility v)
-        {
-            // typically we shouldn't get this value; but let's handle it if we do:
-            if (v == Visibility.DEFAULT) {
-                _getterMinLevel = DEFAULT._getterMinLevel;
-                _isGetterMinLevel = DEFAULT._isGetterMinLevel;
-                _setterMinLevel = DEFAULT._setterMinLevel;
-                _creatorMinLevel = DEFAULT._creatorMinLevel;
-                _fieldMinLevel = DEFAULT._fieldMinLevel;
-            } else {
-                _getterMinLevel = v;
-                _isGetterMinLevel = v;
-                _setterMinLevel = v;
-                _creatorMinLevel = v;
-                _fieldMinLevel = v;
-            }
-        }
-
-	/*
-        /********************************************************
-	/* Builder/fluent methods for instantiating configured
-	/* instances
-	/********************************************************
-	 */
-
-//      @Override
-	public Std with(JsonAutoDetect ann)
-	{
-            Std curr = this;
-	    if (ann != null) {
-    	    curr = curr.withGetterVisibility(ann.getterVisibility());
-    	    curr = curr.withIsGetterVisibility(ann.isGetterVisibility());
-                curr  = curr.withSetterVisibility(ann.setterVisibility());
-                curr = curr.withCreatorVisibility(ann.creatorVisibility());
-                curr = curr.withFieldVisibility(ann.fieldVisibility());
-	    }
-	    return curr;
-	}
-
-//      @Override
-	public Std with(Visibility v)
-	{
-	    if (v == Visibility.DEFAULT) {
-	        return DEFAULT;
-	    }
-	    return new Std(v);
-	}
-
-//      @Override
-	public Std withVisibility(PropertyAccessor method, Visibility v)
-	{
-	    switch (method) {
-	    case GETTER:
-	        return withGetterVisibility(v);
-	    case SETTER:
-	        return withSetterVisibility(v);
-	    case CREATOR:
-	        return withCreatorVisibility(v);
-	    case FIELD:
-	        return withFieldVisibility(v);
-	    case IS_GETTER:
-	        return withIsGetterVisibility(v);
-            case ALL:
-                return with(v);
-            //case NONE:
-            // break;
-	    }
-            return this;
-	}
-	
-//      @Override
-	public Std withGetterVisibility(Visibility v) {
-	    if (v == Visibility.DEFAULT)  v = DEFAULT._getterMinLevel;
-            if (_getterMinLevel == v) return this;
-	    return new Std(v, _isGetterMinLevel, _setterMinLevel, _creatorMinLevel, _fieldMinLevel);
-	}
-
-//      @Override
-        public Std withIsGetterVisibility(Visibility v) {
-            if (v == Visibility.DEFAULT)  v = DEFAULT._isGetterMinLevel;
-            if (_isGetterMinLevel == v) return this;
-            return new Std(_getterMinLevel, v, _setterMinLevel, _creatorMinLevel, _fieldMinLevel);
-        }
-		
-//      @Override
-	public Std withSetterVisibility(Visibility v) {
-            if (v == Visibility.DEFAULT)  v = DEFAULT._setterMinLevel;
-            if (_setterMinLevel == v) return this;
-            return new Std(_getterMinLevel, _isGetterMinLevel, v, _creatorMinLevel, _fieldMinLevel);
-	}
-
-//      @Override
-	public Std withCreatorVisibility(Visibility v) {
-            if (v == Visibility.DEFAULT)  v = DEFAULT._creatorMinLevel;
-            if (_creatorMinLevel == v) return this;
-	    return new Std(_getterMinLevel, _isGetterMinLevel, _setterMinLevel, v, _fieldMinLevel);
-	}
-
-//      @Override
-	public Std withFieldVisibility(Visibility v) {
-            if (v == Visibility.DEFAULT)  v = DEFAULT._fieldMinLevel;
-            if (_fieldMinLevel == v) return this;
-	    return new Std(_getterMinLevel, _isGetterMinLevel, _setterMinLevel, _creatorMinLevel, v);
-	}
-		
-        /*
-        /********************************************************
-        /* Public API impl
-        /********************************************************
-         */
-
-//	@Override
-	public boolean isCreatorVisible(Member m) {
-	    return _creatorMinLevel.isVisible(m);
-    	}
-    
-//      @Override
-    	public boolean isCreatorVisible(AnnotatedMember m) {
-    	    return isCreatorVisible(m.getMember());
-    	}
-    
-//      @Override
-    	public boolean isFieldVisible(Field f) {
-    	    return _fieldMinLevel.isVisible(f);
-    	}
-    
-//      @Override
-    	public boolean isFieldVisible(AnnotatedField f) {
-    	    return isFieldVisible(f.getAnnotated());
-    	}
-    
-//      @Override
-    	public boolean isGetterVisible(Method m) {
-    	    return _getterMinLevel.isVisible(m);
-    	}    
-
-//      @Override
-        public boolean isGetterVisible(AnnotatedMethod m) {
-    	    return isGetterVisible(m.getAnnotated());
-    	}
-
-//      @Override
-        public boolean isIsGetterVisible(Method m) {
-            return _isGetterMinLevel.isVisible(m);
-        }    
-
-//      @Override
-        public boolean isIsGetterVisible(AnnotatedMethod m) {
-            return isIsGetterVisible(m.getAnnotated());
-        }
-
-//      @Override
-        public boolean isSetterVisible(Method m) {
-            return _setterMinLevel.isVisible(m);
-        }
-    
-//      @Override
-        public boolean isSetterVisible(AnnotatedMethod m) {
-            return isSetterVisible(m.getAnnotated());
-        }
-
-        /*
-        /********************************************************
-        /* Standard methods
-        /********************************************************
-         */
-        @Override
-        public String toString() {
-            return new StringBuilder("[Visibility:")
-                .append(" getter: ").append(_getterMinLevel)
-                .append(", isGetter: ").append(_isGetterMinLevel)
-                .append(", setter: ").append(_setterMinLevel)
-                .append(", creator: ").append(_creatorMinLevel)
-                .append(", field: ").append(_fieldMinLevel)
-                .append("]").toString();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/WithMember.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/WithMember.java
deleted file mode 100644
index 2118a57..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/WithMember.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.fasterxml.jackson.databind.introspect;
-
-public interface WithMember<T>
-{
-    public T withMember(AnnotatedMember member);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/package-info.java
deleted file mode 100644
index 17f8567..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/introspect/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Functionality needed for Bean introspection, required for detecting
- * accessors and mutators for Beans, as well as locating and handling
- * method annotations.
- *<p>
- * Beyond collecting annotations, additional "method annotation inheritance"
- * is also supported: whereas regular JDK classes do not add annotations
- * from overridden methods in any situation. But code in this package does.
- * Similarly class-annotations are inherited properly from interfaces, in
- * addition to abstract and concrete classes.
- */
-package com.fasterxml.jackson.databind.introspect;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor.java
deleted file mode 100644
index 612b2d3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonAnyFormatVisitor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-public interface JsonAnyFormatVisitor {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java
deleted file mode 100644
index d40d451..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-public interface JsonArrayFormatVisitor extends JsonFormatVisitorWithSerializerProvider {
-
-	void itemsFormat(JavaType contentType);
-
-	void itemsFormat(JsonFormatTypes format);
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor.java
deleted file mode 100644
index 5002eb1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonBooleanFormatVisitor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-public interface JsonBooleanFormatVisitor extends JsonValueFormatVisitor {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatTypes.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatTypes.java
deleted file mode 100644
index 5290e9f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatTypes.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-public enum JsonFormatTypes {
-	
-	STRING,
-	NUMBER,
-	INTEGER,
-	BOOLEAN,
-	OBJECT,
-	ARRAY,
-	NULL,
-	ANY;
-	
-	
-	@JsonValue
-	public String value() {
-		return this.name().toLowerCase();
-	}
-	
-	@JsonCreator
-	public static JsonFormatTypes forValue(String s) {
-		return valueOf(s.toUpperCase());
-	}
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitable.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitable.java
deleted file mode 100644
index c2b17d5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-/**
- * Marker interface for schema-aware serializers.
- */
-public interface JsonFormatVisitable
-{
-    /**
-     * Get the representation of the schema to which this serializer will conform.
-     * @param typeHint Type of element (entity like property) being visited
-     *
-     * @returns <a href="http://json-schema.org/">Json-schema</a> for this serializer.
-     */
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java
deleted file mode 100644
index b8f437f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * 
- */
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-/**
- * @author jphelan
- */
-public interface JsonFormatVisitorWithSerializerProvider {
-    public SerializerProvider getProvider();
-    public abstract void setProvider(SerializerProvider provider);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java
deleted file mode 100644
index d31fc2b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerializerProvider
-{
-    public JsonObjectFormatVisitor expectObjectFormat(JavaType convertedType);
-    public JsonArrayFormatVisitor expectArrayFormat(JavaType convertedType);
-    public JsonStringFormatVisitor expectStringFormat(JavaType convertedType);
-    public JsonNumberFormatVisitor expectNumberFormat(JavaType convertedType);
-    public JsonIntegerFormatVisitor expectIntegerFormat(JavaType convertedType);
-    public JsonBooleanFormatVisitor expectBooleanFormat(JavaType convertedType);
-    public JsonNullFormatVisitor expectNullFormat(JavaType convertedType);
-    public JsonAnyFormatVisitor expectAnyFormat(JavaType convertedType);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor.java
deleted file mode 100644
index cc5781e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonIntegerFormatVisitor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-public interface JsonIntegerFormatVisitor extends JsonValueFormatVisitor {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor.java
deleted file mode 100644
index 8df98d8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNullFormatVisitor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-public interface JsonNullFormatVisitor {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor.java
deleted file mode 100644
index 77f25c8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonNumberFormatVisitor.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-
-public interface JsonNumberFormatVisitor extends JsonValueFormatVisitor{
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java
deleted file mode 100644
index 8cf6fe4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-
-public interface JsonObjectFormatVisitor extends JsonFormatVisitorWithSerializerProvider {
-
-	public void property(BeanProperty writer);
-
-	public void optionalProperty(BeanProperty writer);
-
-	public void property(String name, JsonFormatVisitable handler, JavaType propertyTypeHint);
-
-	public void optionalProperty(String name, JsonFormatVisitable handler,
-			JavaType propertyTypeHint);
-
-	public void property(String name);
-	
-	public void optionalProperty(String name);
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor.java
deleted file mode 100644
index 3fea32d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonStringFormatVisitor.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-public interface JsonStringFormatVisitor extends JsonValueFormatVisitor {
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormat.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormat.java
deleted file mode 100644
index b7bcfde..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormat.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-/**
- * This enum represents the encoded format for a jsonSchema value type
- * @author jphelan
- *
- */
-public enum JsonValueFormat {
-	/**
-	 * This SHOULD be a date in ISO 8601 format of YYYY-MM-
-      DDThh:mm:ssZ in UTC time.  This is the recommended form of date/
-      timestamp.
-	 */
-	DATE_TIME {
-		@Override
-		public String toString() { return "date-time"; }
-	},
-	
-	/**
-	 * This SHOULD be a date in the format of YYYY-MM-DD.  It is
-      recommended that you use the "date-time" format instead of "date"
-      unless you need to transfer only the date part.
-	 */
-	DATE {
-		@Override
-		public String toString() { return "date"; }
-	},
-	
-	/**
-	 * This SHOULD be a time in the format of hh:mm:ss.  It is
-      recommended that you use the "date-time" format instead of "time"
-      unless you need to transfer only the time part.
-	 */
-	TIME {
-		@Override
-		public String toString() { return "time"; }
-	},
-	
-	/**
-	 * This SHOULD be the difference, measured in
-      milliseconds, between the specified time and midnight, 00:00 of
-      January 1, 1970 UTC.  The value SHOULD be a number (integer or
-      float).
-	 */
-	UTC_MILLISEC {
-		@Override
-		public String toString() { return "utc-millisec"; }
-	},
-	
-	/**
-	 * A regular expression, following the regular expression
-  	  specification from ECMA 262/Perl 5.
-	 */
-	REGEX {
-		@Override
-		public String toString() { return "regex"; }
-	},
-	
-	/**
-	 * This is a CSS color (like "#FF0000" or "red"), based on CSS
-  		2.1 [W3C.CR-CSS21-20070719].
-	 */
-	COLOR {
-		@Override
-		public String toString() { return "color"; }
-	},
-	
-	/**
-	 * This is a CSS style definition (like "color: red; background-
-  		color:#FFF"), based on CSS 2.1 [W3C.CR-CSS21-20070719].
-	 */
-	STYLE {
-		@Override
-		public String toString() { return "style"; }
-	},
-	
-	/**
-	 * This SHOULD be a phone number (format MAY follow E.123).
-	 */
-	PHONE {
-		@Override
-		public String toString() { return "phone"; }
-	},
-	
-	/**
-	 * This value SHOULD be a URI..
-	 */
-	URI {
-		@Override
-		public String toString() { return "uri"; }
-	},
-	
-	/**
-	 * This SHOULD be an email address.
-	 */
-	EMAIL {
-		@Override
-		public String toString() { return "email"; }
-	},
-	/**
-	 * This SHOULD be an ip version 4 address.
-	 */
-	IP_ADDRESS {
-		@Override
-		public String toString() { return "ip-address"; }
-	},
-	
-	/**
-	 * This SHOULD be an ip version 6 address.
-	 */
-	IPV6 {
-		@Override
-		public String toString() { return "ipv6"; }
-	},
-	
-	/**
-	 * This SHOULD be a host-name.
-	 */
-	HOST_NAME {
-		@Override
-		public String toString() { return "host-name"; }
-	}
-	
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormatVisitor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormatVisitor.java
deleted file mode 100644
index fe6d3aa..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonValueFormatVisitor.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.fasterxml.jackson.databind.jsonFormatVisitors;
-
-import java.util.Set;
-
-public interface JsonValueFormatVisitor {
-
-	void format(JsonValueFormat format);
-
-	void enumTypes(Set<String> enums);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java
deleted file mode 100644
index e79a68a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.fasterxml.jackson.databind.jsonschema;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * Container for a logical JSON Schema instance.
- * Internally schema data is stored as a JSON Tree
- * (instance of {@link JsonNode} is the root
- * of schema document)
- *
- * @author Ryan Heaton
- * @see <a href="http://json-schema.org/">JSON Schema</a>
- */
-public class JsonSchema
-{
-    private final ObjectNode schema;
-
-    /**
-     * Main constructor for schema instances.
-     *<p>
-     * This is the creator constructor used by Jackson itself when
-     * deserializing instances. It is so-called delegating creator, 
-     * meaning that its argument will be bound by Jackson before
-     * constructor gets called.
-     */
-    @JsonCreator
-    public JsonSchema(ObjectNode schema)
-    {
-        this.schema = schema;
-    }
-
-    /**
-     * Method for accessing root JSON object of the contained schema.
-     *<p>
-     * Note: this method is specified with {@link JsonValue} annotation
-     * to represent serialization to use; same as if explicitly
-     * serializing returned object.
-     *
-     * @return Root node of the schema tree
-     */
-    @JsonValue
-    public ObjectNode getSchemaNode()
-    {
-        return schema;
-    }
-
-    @Override
-    public String toString()
-    {
-        return this.schema.toString();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (!(o instanceof JsonSchema)) return false;
-
-        JsonSchema other = (JsonSchema) o;
-        if (schema == null) {
-            return other.schema == null;
-        }
-        return schema.equals(other.schema);
-    }
-
-    /**
-     * Get the default schema node.
-     *
-     * @return The default schema node.
-     */
-    public static JsonNode getDefaultSchemaNode()
-    {
-        ObjectNode objectNode = JsonNodeFactory.instance.objectNode();
-        objectNode.put("type", "any");
-        // "required" is false by default, no need to include
-        //objectNode.put("required", false);
-        return objectNode;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSerializableSchema.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSerializableSchema.java
deleted file mode 100644
index 553206e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/JsonSerializableSchema.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.fasterxml.jackson.databind.jsonschema;
-
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-import com.fasterxml.jackson.annotation.JacksonAnnotation;
-
-/**
- * Annotation that can be used to define JSON Schema definition for
- * the annotated class.
- *<p>
- * Note that annotation is often not needed: for example, regular
- * Jackson beans that Jackson can introspect can be used without
- * annotations, to produce JSON schema definition.
- * 
- * @author Ryan Heaton
- * @author Tatu Saloranta
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotation
-public @interface JsonSerializableSchema
-{
-    /**
-     * Marker value used to indicate that property has "no value";
-     * needed because annotations can not have null as default
-     * value.
-     */
-    public final static String NO_VALUE = "##irrelevant";
-
-    /**
-     * Property that can be used to indicate id of the type when
-     * generating JSON Schema; empty String indicates that no id
-     * is defined.
-     */
-    public String id() default "";
-    
-    /**
-     * The schema type for this JsonSerializable instance.
-     * Possible values: "string", "number", "boolean", "object", "array", "null", "any"
-     *
-     * @return The schema type for this JsonSerializable instance.
-     */
-    public String schemaType() default "any";
-
-    /**
-     * If the schema type is "object", JSON definition of properties of the object as
-     * a String.
-     *
-     * @return The node representing the schema properties, or "##irrelevant" if irrelevant.
-     * 
-     * @deprecated (since 2.1) -- support will be dropped in future, since JSON-as-String is
-     *   fundamentally bad way for customizing anything. No direct replacements offered.
-     */
-    @Deprecated
-    public String schemaObjectPropertiesDefinition() default NO_VALUE;
-
-    /**
-     * If the schema type if "array", JSON definition of the schema for item types contained.
-     *
-     * @return The schema for the items in the array, or "##irrelevant" if irrelevant.
-     * 
-     * @deprecated (since 2.1) -- support will be dropped in future, since JSON-as-String is
-     *   fundamentally bad way for customizing anything. No direct replacements offered.
-     */
-    @Deprecated
-    public String schemaItemDefinition() default NO_VALUE;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/SchemaAware.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/SchemaAware.java
deleted file mode 100644
index f3505cd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/SchemaAware.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.fasterxml.jackson.databind.jsonschema;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.lang.reflect.Type;
-
-/**
- * Marker interface for schema-aware serializers.
- */
-public interface SchemaAware
-{
-    /**
-     * Get the representation of the schema to which this serializer will conform.
-     *
-     * @param provider The serializer provider.
-     * @param typeHint A hint about the type.
-     * @return <a href="http://json-schema.org/">Json-schema</a> for this serializer.
-     */
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException;
-    
-    /**
-     * Get the representation of the schema to which this serializer will conform.
-     *
-     * @param provider The serializer provider.
-     * @param isOptional Is the type optional
-     * @param typeHint A hint about the type.
-     * @return <a href="http://json-schema.org/">Json-schema</a> for this serializer.
-     */
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint, boolean isOptional)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/package-info.java
deleted file mode 100644
index 443dcf4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsonschema/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Classes needed for JSON schema support (currently just ability
- * to generate schemas using serialization part of data mapping)
- */
-package com.fasterxml.jackson.databind.jsonschema;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/NamedType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/NamedType.java
deleted file mode 100644
index eeb7ad0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/NamedType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-/**
- * Simple container class for types with optional logical name, used
- * as external identifier
- * 
- * @author tatu
- */
-public final class NamedType
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final Class<?> _class;
-    protected final int _hashCode;
-
-    protected String _name;
-    
-    public NamedType(Class<?> c) { this(c, null); }
-    
-    public NamedType(Class<?> c, String name)
-    {
-        _class = c;
-        _hashCode = c.getName().hashCode();
-        setName(name);
-    }
-
-    public Class<?> getType() { return _class; }
-    public String getName() { return _name; }
-    public void setName(String name) {
-        _name = (name == null || name.length() == 0) ? null : name;
-    }
-
-    public boolean hasName() { return _name != null; }
-    
-    /**
-     * Equality is defined based on class only, not on name
-     */
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-        return _class == ((NamedType) o)._class;
-    }
-
-    @Override
-    public int hashCode() { return _hashCode; }
-
-    @Override
-    public String toString() {
-    	return "[NamedType, class "+_class.getName()+", name: "+(_name == null ? "null" :("'"+_name+"'"))+"]";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/SubtypeResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/SubtypeResolver.java
deleted file mode 100644
index e23b6af..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/SubtypeResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-
-/**
- * Helper object used for handling registration on resolving of super-types
- * to sub-types.
- */
-public abstract class SubtypeResolver
-{
-    /**
-     * Method for registering specified subtypes (possibly including type
-     * names); for type entries without name, non-qualified class name
-     * as used as name (unless overridden by annotation).
-     */
-    public abstract void registerSubtypes(NamedType... types);
-
-    public abstract void registerSubtypes(Class<?>... classes);
-    
-    /**
-     * @deprecated Since 2.1: use variant that takes in property type.
-     */
-    @Deprecated
-    public abstract Collection<NamedType> collectAndResolveSubtypes(AnnotatedMember property,
-            MapperConfig<?> config, AnnotationIntrospector ai);
-
-    /**
-     * Method for finding out all reachable subtypes for a property specified
-     * by given element (method or field)
-     * 
-     * @param baseType Effective property base type to use; may differ from
-     *    actual type of property; for structured types it is content (value) type and NOT
-     *    structured type.
-     * 
-     * @since 2.1
-     */
-    public abstract Collection<NamedType> collectAndResolveSubtypes(AnnotatedMember property,
-            MapperConfig<?> config, AnnotationIntrospector ai, JavaType baseType);
-    
-    /**
-     * Method for finding out all reachable subtypes for given type.
-     */
-    public abstract Collection<NamedType> collectAndResolveSubtypes(AnnotatedClass basetype,
-            MapperConfig<?> config, AnnotationIntrospector ai);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.java
deleted file mode 100644
index 9aa97f9..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeDeserializer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-
-
-/**
- * Interface for deserializing type information from JSON content, to
- * type-safely deserialize data into correct polymorphic instance
- * (when type inclusion has been enabled for type handled).
- *<p>
- * Separate deserialization methods are needed because serialized
- * form for inclusion mechanism {@link As#PROPERTY}
- * is slighty different if value is not expressed as JSON Object:
- * and as such both type deserializer and serializer need to
- * JSON Object form (array, object or other (== scalar)) being used.
- */
-public abstract class TypeDeserializer
-{
-    /*
-    /**********************************************************
-    /* Initialization
-    /**********************************************************
-     */
-
-    /**
-     * Method called to create contextual version, to be used for
-     * values of given property. This may be the type itself
-     * (as is the case for bean properties), or values contained
-     * (for {@link java.util.Collection} or {@link java.util.Map}
-     * valued properties).
-     * 
-     * @since 2.0
-     */
-    public abstract TypeDeserializer forProperty(BeanProperty prop);
-    
-    /*
-    /**********************************************************
-    /* Introspection
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for type information inclusion method
-     * that deserializer uses; indicates how type information
-     * is (expected to be) embedded in JSON input.
-     */
-    public abstract As getTypeInclusion();
-
-    /**
-     * Name of property that contains type information, if
-     * property-based inclusion is used.
-     */
-    public abstract String getPropertyName();
-
-    /**
-     * Accessor for object that handles conversions between
-     * types and matching type ids.
-     */
-    public abstract TypeIdResolver getTypeIdResolver();
-
-    /**
-     * Accessor for "default implementation" type; optionally defined
-     * class to use in cases where type id is not
-     * accessible for some reason (either missing, or can not be
-     * resolved)
-     */
-    public abstract Class<?> getDefaultImpl();
-    
-    /*
-    /*********************************************************
-    /* Type deserialization methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called to let this type deserializer handle 
-     * deserialization of "typed" object, when value itself
-     * is serialized as JSON Object (regardless of Java type).
-     * Method needs to figure out intended
-     * polymorphic type, locate {@link JsonDeserializer} to use, and
-     * call it with JSON data to deserializer (which does not contain
-     * type information).
-     */
-    public abstract Object deserializeTypedFromObject(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to let this type deserializer handle 
-     * deserialization of "typed" object, when value itself
-     * is serialized as JSON Array (regardless of Java type).
-     * Method needs to figure out intended
-     * polymorphic type, locate {@link JsonDeserializer} to use, and
-     * call it with JSON data to deserializer (which does not contain
-     * type information).
-     */
-    public abstract Object deserializeTypedFromArray(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to let this type deserializer handle 
-     * deserialization of "typed" object, when value itself
-     * is serialized as a scalar JSON value (something other
-     * than Array or Object), regardless of Java type.
-     * Method needs to figure out intended
-     * polymorphic type, locate {@link JsonDeserializer} to use, and
-     * call it with JSON data to deserializer (which does not contain
-     * type information).
-     */
-    public abstract Object deserializeTypedFromScalar(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to let this type deserializer handle 
-     * deserialization of "typed" object, when value itself
-     * may have been serialized using any kind of JSON value
-     * (Array, Object, scalar). Should only be called if JSON
-     * serialization is polymorphic (not Java type); for example when
-     * using JSON node representation, or "untyped" Java object
-     * (which may be Map, Collection, wrapper/primitive etc).
-     */
-    public abstract Object deserializeTypedFromAny(JsonParser jp,
-            DeserializationContext ctxt)
-        throws IOException, JsonProcessingException;
-
-}
-    
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeIdResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeIdResolver.java
deleted file mode 100644
index ad352ea..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeIdResolver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Interface that defines standard API for converting types
- * to type identifiers and vice versa. Used by type resolvers
- * ({@link com.fasterxml.jackson.databind.jsontype.TypeSerializer},
- * {@link com.fasterxml.jackson.databind.jsontype.TypeDeserializer}) for converting
- * between type and matching id; id is stored in JSON and needed for
- * creating instances of proper subtypes when deserializing values.
- */
-public interface TypeIdResolver
-{
-    /*
-    /**********************************************************
-    /* Initialization/configuration methods
-    /**********************************************************
-     */
-
-    /**
-     * Method that will be called once before any type resolution calls;
-     * used to initialize instance with configuration. This is necessary
-     * since instances may be created via reflection, without ability to
-     * call specific constructor to pass in configuration settings.
-     * 
-     * @param baseType Base type for which this id resolver instance is
-     *   used
-     */
-    public void init(JavaType baseType);
-
-    /*
-    /**********************************************************
-    /* Conversions between types and type ids
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to serialize type of the type of given value
-     * as a String to include in serialized JSON content.
-     */
-    public String idFromValue(Object value);
-
-    /**
-     * Alternative method used for determining type from combination of
-     * value and type, using suggested type (that serializer provides)
-     * and possibly value of that type. Most common implementation will
-     * use suggested type as is.
-     */
-    public String idFromValueAndType(Object value, Class<?> suggestedType);
-
-    /**
-     * Method that can be called to figure out type id to use for instances
-     * of base type (declared type of property). This is usually only used
-     * for fallback handling, for cases where real type information is not
-     * available for some reason.
-     */
-    public String idFromBaseType();
-    
-    /**
-     * Method called to resolve type from given type identifier.
-     */
-    public JavaType typeFromId(String id);
-
-    /*
-    /**********************************************************
-    /* Accessors for metadata
-    /**********************************************************
-     */
-
-     /**
-      * Accessor for mechanism that this resolver uses for determining
-      * type id from type. Mostly informational; not required to be called
-      * or used.
-      */
-     public JsonTypeInfo.Id getMechanism();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java
deleted file mode 100644
index 58a801b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeResolverBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.SerializationConfig;
-
-/**
- * Interface that defines builders that are configured based on
- * annotations (like {@link com.fasterxml.jackson.annotation.JsonTypeInfo} or JAXB annotations),
- * and produce type serializers and deserializers used for
- * handling type information embedded in JSON to allow for safe
- * polymorphic type handling.
- *<p>
- * Builder is first initialized by calling {@link #init} method, and then
- * configured using <code>setXxx</code> (and <code>registerXxx</code>)
- * methods. Finally, after calling all configuration methods,
- * {@link #buildTypeSerializer} or {@link #buildTypeDeserializer}
- * will be called to get actual type resolver constructed
- * and used for resolving types for configured base type and its
- * subtypes.
- *<p>
- * Note that instances are used for two related but distinct use cases:
- *<ul>
- * <li>To create builders to use with explicit type information
- *    inclusion (usually via <code>@JsonTypeInfo</code> annotation)
- *   </li>
- * <li>To create builders when "default typing" is used; if so, type information
- *   is automatically included for certain kind of types, regardless of annotations
- *   </li>
- *</ul>
- * Important distinction between the cases is that in first case, calls to
- * create builders are only made when builders are certainly needed; whereas
- * in second case builder has to first verify whether type information is
- * applicable for given type, and if not, just return null to indicate this.
- * 
- * @author tatu
- */
-public interface TypeResolverBuilder<T extends TypeResolverBuilder<T>>
-{
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for currently configured default type; implementation
-     * class that may be used in case no valid type information is
-     * available during type resolution
-     */
-    public Class<?> getDefaultImpl();
-    
-    /*
-    /**********************************************************
-    /* Actual builder methods
-    /**********************************************************
-     */
-
-    /**
-     * Method for building type serializer based on current configuration
-     * of this builder.
-     * 
-     * @param baseType Base type that constructed resolver will
-     *    handle; super type of all types it will be used for.
-     */
-    public TypeSerializer buildTypeSerializer(SerializationConfig config,
-            JavaType baseType, Collection<NamedType> subtypes);
-
-    /**
-     * Method for building type deserializer based on current configuration
-     * of this builder.
-     * 
-     * @param baseType Base type that constructed resolver will
-     *    handle; super type of all types it will be used for.
-     * @param subtypes Known subtypes of the base type.
-     */
-    public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
-            JavaType baseType, Collection<NamedType> subtypes);
-    
-    /*
-    /**********************************************************
-    /* Initialization method(s) that must be called before other
-    /* configuration
-    /**********************************************************
-     */
-
-    /**
-     * Initialization method that is called right after constructing
-     * the builder instance.
-     *
-     * @param idType Which type metadata is used
-     * @param res (optional) Custom type id resolver used, if any
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but not necessarily)
-     */
-    public T init(JsonTypeInfo.Id idType, TypeIdResolver res);
-    
-    /*
-    /**********************************************************
-    /* Methods for configuring resolver to build 
-    /**********************************************************
-     */
-    
-    /**
-     * Method for specifying mechanism to use for including type metadata
-     * in JSON.
-     * If not explicitly called, setting defaults to
-     * {@link As#PROPERTY}.
-     * 
-     * @param includeAs Mechanism used for including type metadata in JSON
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but not necessarily)
-     */
-    public T inclusion(As includeAs);
-
-    /**
-     * Method for specifying name of property used for including type
-     * information. Not used for all inclusion mechanisms;
-     * usually only used with {@link As#PROPERTY}.
-     *<p>
-     * If not explicitly called, name of property to use is based on
-     * defaults for {@link com.fasterxml.jackson.annotation.JsonTypeInfo.Id} configured.
-     * 
-     * @param propName Name of JSON property to use for including
-     *    type information
-     * 
-     * @return Resulting builder instance (usually this builder,
-     *   but not necessarily)
-     */
-    public T typeProperty(String propName);
-
-    /**
-     * Method for specifying default implementation to use if type id 
-     * is either not available, or can not be resolved.
-     */
-    public T defaultImpl(Class<?> defaultImpl);
-
-    /**
-     * Method for specifying whether type id should be visible to
-     * {@link com.fasterxml.jackson.databind.JsonDeserializer}s or not.
-     * 
-     * @since 2.0
-     */
-    public T typeIdVisibility(boolean isVisible);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java
deleted file mode 100644
index c93cabd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-
-/**
- * Interface for serializing type information regarding instances of specified
- * base type (super class), so that exact subtype can be properly deserialized
- * later on. These instances are to be called by regular
- * {@link com.fasterxml.jackson.databind.JsonSerializer}s using proper contextual
- * calls, to add type information using mechanism type serializer was
- * configured with.
- * 
- * @author tatu
- */
-public abstract class TypeSerializer
-{
-    /*
-    /**********************************************************
-    /* Initialization
-    /**********************************************************
-     */
-
-    /**
-     * Method called to create contextual version, to be used for
-     * values of given property. This may be the type itself
-     * (as is the case for bean properties), or values contained
-     * (for {@link java.util.Collection} or {@link java.util.Map}
-     * valued properties).
-     * 
-     * @since 2.0
-     */
-    public abstract TypeSerializer forProperty(BeanProperty prop);
-    
-    /*
-    /**********************************************************
-    /* Introspection
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for type information inclusion method
-     * that serializer uses; indicates how type information
-     * is embedded in resulting JSON.
-     */
-    public abstract JsonTypeInfo.As getTypeInclusion();
-
-    /**
-     * Name of property that contains type information, if
-     * property-based inclusion is used.
-     */
-    public abstract String getPropertyName();
-    
-    /**
-     * Accessor for object that handles conversions between
-     * types and matching type ids.
-     */
-    public abstract TypeIdResolver getTypeIdResolver();
-    
-    /*
-    /**********************************************************
-    /* Type serialization methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to write initial part of type information for given
-     * value, when it will be output as scalar JSON value (not as JSON
-     * Object or Array).
-     * This means that the context after call can not be that of JSON Object;
-     * it may be Array or root context.
-     * 
-     * @param value Value that will be serialized, for which type information is
-     *   to be written
-     * @param jgen Generator to use for writing type information
-     */
-    public abstract void writeTypePrefixForScalar(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to write initial part of type information for given
-     * value, when it will be output as JSON Object value (not as JSON
-     * Array or scalar).
-     * This means that context after call must be JSON Object, meaning that
-     * caller can then proceed to output field entries.
-     * 
-     * @param value Value that will be serialized, for which type information is
-     *   to be written
-     * @param jgen Generator to use for writing type information
-     */
-    public abstract void writeTypePrefixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called to write initial part of type information for given
-     * value, when it will be output as JSON Array value (not as JSON
-     * Object or scalar).
-     * This means that context after call must be JSON Array, that is, there
-     * must be an open START_ARRAY to write contents in.
-     * 
-     * @param value Value that will be serialized, for which type information is
-     *   to be written
-     * @param jgen Generator to use for writing type information
-     */
-    public abstract void writeTypePrefixForArray(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-    
-    /**
-     * Method called after value has been serialized, to close any scopes opened
-     * by earlier matching call to {@link #writeTypePrefixForScalar}.
-     * Actual action to take may depend on various factors, but has to match with
-     * action {@link #writeTypePrefixForScalar} did (close array or object; or do nothing).
-     */
-    public abstract void writeTypeSuffixForScalar(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called after value has been serialized, to close any scopes opened
-     * by earlier matching call to {@link #writeTypePrefixForObject}.
-     * It needs to write closing END_OBJECT marker, and any other decoration
-     * that needs to be matched.
-     */
-    public abstract void writeTypeSuffixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Method called after value has been serialized, to close any scopes opened
-     * by earlier matching call to {@link #writeTypeSuffixForScalar}.
-     * It needs to write closing END_ARRAY marker, and any other decoration
-     * that needs to be matched.
-     */
-    public abstract void writeTypeSuffixForArray(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Alternative version of the prefix-for-scalar method, which is given
-     * actual type to use (instead of using exact type of the value); typically
-     * a super type of actual value type
-     */
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        writeTypePrefixForScalar(value, jgen);
-    }
-
-    /**
-     * Alternative version of the prefix-for-object method, which is given
-     * actual type to use (instead of using exact type of the value); typically
-     * a super type of actual value type
-     */
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        writeTypePrefixForObject(value, jgen);
-    }
-
-    /**
-     * Alternative version of the prefix-for-array method, which is given
-     * actual type to use (instead of using exact type of the value); typically
-     * a super type of actual value type
-     */
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        writeTypePrefixForArray(value, jgen);
-    }
-
-    /*
-    /**********************************************************
-    /* Type serialization methods with type id override
-    /**********************************************************
-     */
-
-    /**
-     * Method called to write initial part of type information for given
-     * value, when it will be output as scalar JSON value (not as JSON
-     * Object or Array),
-     * using specified custom type id instead of calling {@link TypeIdResolver}.
-     * This means that the context after call can not be that of JSON Object;
-     * it may be Array or root context.
-     * 
-     * @param value Value that will be serialized, for which type information is
-     *   to be written
-     * @param jgen Generator to use for writing type information
-     * @param typeId Exact type id to use
-     */
-    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-    
-    /**
-     * Method called to write initial part of type information for given
-     * value, when it will be output as JSON Object value (not as JSON
-     * Array or scalar),
-     * using specified custom type id instead of calling {@link TypeIdResolver}.
-     * This means that context after call must be JSON Object, meaning that
-     * caller can then proceed to output field entries.
-     * 
-     * @param value Value that will be serialized, for which type information is
-     *   to be written
-     * @param jgen Generator to use for writing type information
-     * @param typeId Exact type id to use
-     */
-    public abstract void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-    
-    public abstract void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-
-    public abstract void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-
-    public abstract void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-
-    public abstract void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen,
-            String typeId)
-        throws IOException, JsonProcessingException;
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.java
deleted file mode 100644
index 122a75d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeDeserializer.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.util.JsonParserSequence;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Type deserializer used with {@link As#WRAPPER_ARRAY}
- * inclusion mechanism. Simple since JSON structure used is always
- * the same, regardless of structure used for actual value: wrapping
- * is done using a 2-element JSON Array where type id is the first
- * element, and actual object data as second element.
- * 
- * @author tatu
- */
-public class AsArrayTypeDeserializer
-    extends TypeDeserializerBase
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 5345570420394408290L;
-
-    public AsArrayTypeDeserializer(JavaType bt, TypeIdResolver idRes,
-            String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
-    {
-        super(bt, idRes, typePropertyName, typeIdVisible, defaultImpl);
-    }
-
-    public AsArrayTypeDeserializer(AsArrayTypeDeserializer src, BeanProperty property) {
-        super(src, property);
-    }
-    
-    @Override
-    public TypeDeserializer forProperty(BeanProperty prop) {
-        if (prop == _property) { // usually if it's null
-            return this;
-        }
-        return new AsArrayTypeDeserializer(this, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() {
-        return As.WRAPPER_ARRAY;
-    }
-
-    /**
-     * Method called when actual object is serialized as JSON Array.
-     */
-    @Override
-    public Object deserializeTypedFromArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }
-
-    /**
-     * Method called when actual object is serialized as JSON Object
-     */
-    @Override
-    public Object deserializeTypedFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }
-    
-    @Override
-    public Object deserializeTypedFromScalar(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }    
-
-    @Override
-    public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }    
-    
-    /*
-    /***************************************************************
-    /* Internal methods
-    /***************************************************************
-     */
-
-    /**
-     * Method that handles type information wrapper, locates actual
-     * subtype deserializer to use, and calls it to do actual
-     * deserialization.
-     */
-    private final Object _deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        boolean hadStartArray = jp.isExpectedStartArrayToken();
-        String typeId = _locateTypeId(jp, ctxt);
-        JsonDeserializer<Object> deser = _findDeserializer(ctxt, typeId);
-        // Minor complication: we may need to merge type id in?
-        if (_typeIdVisible && jp.getCurrentToken() == JsonToken.START_OBJECT) {
-            // but what if there's nowhere to add it in? Error? Or skip? For now, skip.
-            TokenBuffer tb = new TokenBuffer(null);
-            tb.writeStartObject(); // recreate START_OBJECT
-            tb.writeFieldName(_typePropertyName);
-            tb.writeString(typeId);
-            jp = JsonParserSequence.createFlattened(tb.asParser(jp), jp);
-            jp.nextToken();
-        }
-        Object value = deser.deserialize(jp, ctxt);
-        // And then need the closing END_ARRAY
-        if (hadStartArray && jp.nextToken() != JsonToken.END_ARRAY) {
-            throw ctxt.wrongTokenException(jp, JsonToken.END_ARRAY,
-                    "expected closing END_ARRAY after type information and deserialized value");
-        }
-        return value;
-    }    
-    
-    protected final String _locateTypeId(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (!jp.isExpectedStartArrayToken()) {
-            // [JACKSON-712] Need to allow even more customized handling, if something unexpected seen...
-            // but should there be a way to limit this to likely success cases?
-            if (_defaultImpl != null) {
-                return _idResolver.idFromBaseType();
-            }
-            throw ctxt.wrongTokenException(jp, JsonToken.START_ARRAY, "need JSON Array to contain As.WRAPPER_ARRAY type information for class "+baseTypeName());
-        }
-        // And then type id as a String
-        if (jp.nextToken() != JsonToken.VALUE_STRING) {
-            if (_defaultImpl != null) {
-                return _idResolver.idFromBaseType();
-            }
-            throw ctxt.wrongTokenException(jp, JsonToken.VALUE_STRING, "need JSON String that contains type id (for subtype of "+baseTypeName()+")");
-        }
-        String result = jp.getText();
-        jp.nextToken();
-        return result;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java
deleted file mode 100644
index d750454..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Type serializer that will embed type information in an array,
- * as the first element, and actual value as the second element.
- * 
- * @author tatu
- */
-public class AsArrayTypeSerializer
-    extends TypeSerializerBase
-{
-    public AsArrayTypeSerializer(TypeIdResolver idRes, BeanProperty property)
-    {
-        super(idRes, property);
-    }
-
-    @Override
-    public AsArrayTypeSerializer forProperty(BeanProperty prop) {
-        if (_property == prop) return this;
-        return new AsArrayTypeSerializer(this._idResolver, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() { return As.WRAPPER_ARRAY; }
-    
-    /*
-    /**********************************************************
-    /* Writing prefixes
-    /**********************************************************
-     */
-    
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(idFromValue(value));
-        jgen.writeStartObject();
-    }
-
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(idFromValueAndType(value, type));
-        jgen.writeStartObject();
-    }
-    
-    @Override
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(idFromValue(value));
-        jgen.writeStartArray();
-    }
-
-    @Override
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(idFromValueAndType(value, type));
-        jgen.writeStartArray();
-    }
-    
-    @Override
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen)
-            throws IOException, JsonProcessingException
-    {
-        // only need the wrapper array
-        jgen.writeStartArray();
-        jgen.writeString(idFromValue(value));
-    }
-
-    @Override
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        // only need the wrapper array
-        jgen.writeStartArray();
-        jgen.writeString(idFromValueAndType(value, type));
-    }
-
-    /*
-    /**********************************************************
-    /* Writing suffixes
-    /**********************************************************
-     */
-    
-    @Override
-    public void writeTypeSuffixForObject(Object value, JsonGenerator jgen)
-            throws IOException, JsonProcessingException
-    {
-        jgen.writeEndObject();
-        jgen.writeEndArray();
-    }
-
-    @Override
-    public void writeTypeSuffixForArray(Object value, JsonGenerator jgen)
-            throws IOException, JsonProcessingException
-    {
-        // wrapper array first, and then array caller needs to close
-        jgen.writeEndArray();
-        jgen.writeEndArray();
-    }
-
-    @Override
-    public void writeTypeSuffixForScalar(Object value, JsonGenerator jgen)
-            throws IOException, JsonProcessingException
-    {
-        // just the wrapper array to close
-        jgen.writeEndArray();
-    }
-    
-    /*
-    /**********************************************************
-    /* Writing with custom type id
-    /**********************************************************
-     */
-
-    @Override
-    public void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException {
-        jgen.writeStartArray();
-        jgen.writeString(typeId);
-        jgen.writeStartObject();
-    }
-    
-    @Override
-    public void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(typeId);
-        jgen.writeStartArray();
-    }
-
-    @Override
-    public void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartArray();
-        jgen.writeString(typeId);
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException {
-        writeTypeSuffixForObject(value, jgen); // standard impl works fine
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen, String typeId)
-            throws IOException, JsonProcessingException {
-        writeTypeSuffixForArray(value, jgen); // standard impl works fine
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException {
-        writeTypeSuffixForScalar(value, jgen); // standard impl works fine
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.java
deleted file mode 100644
index c12112a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeDeserializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Type deserializer used with {@link As#EXTERNAL_PROPERTY} inclusion mechanism.
- * Actual implementation may look bit strange since it depends on comprehensive
- * pre-processing done by {@link com.fasterxml.jackson.databind.deser.BeanDeserializer}
- * to basically transform external type id into structure that looks more like
- * "wrapper-array" style inclusion. This intermediate form is chosen to allow
- * supporting all possible JSON structures.
- */
-public class AsExternalTypeDeserializer extends AsArrayTypeDeserializer
-{
-    private static final long serialVersionUID = 1L;
-
-    public AsExternalTypeDeserializer(JavaType bt, TypeIdResolver idRes,
-            String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
-    {
-        super(bt, idRes, typePropertyName, typeIdVisible, defaultImpl);
-    }
-
-    public AsExternalTypeDeserializer(AsExternalTypeDeserializer src, BeanProperty property) {
-        super(src, property);
-    }
-    
-    @Override
-    public TypeDeserializer forProperty(BeanProperty prop)
-    {
-        if (prop == _property) { // usually if it's null
-            return this;
-        }
-        return new AsExternalTypeDeserializer(this, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() {
-        return As.EXTERNAL_PROPERTY;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java
deleted file mode 100644
index 80e2337..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Type serializer that preferably embeds type information as an "external"
- * type property; embedded in enclosing JSON object.
- * Note that this serializer should only be used when value is being output
- * at JSON Object context; otherwise it can not work reliably, and will have
- * to revert operation similar to {@link AsPropertyTypeSerializer}.
- *<p>
- * Note that implementation of serialization is bit cumbersome as we must
- * serialized external type id AFTER object; this because callback only
- * occurs after field name has been written.
- */
-public class AsExternalTypeSerializer
-   extends TypeSerializerBase
-{
-   protected final String _typePropertyName;
-
-   public AsExternalTypeSerializer(TypeIdResolver idRes, BeanProperty property,
-          String propName)
-   {
-       super(idRes, property);
-       _typePropertyName = propName;
-   }
-
-   @Override
-   public AsExternalTypeSerializer forProperty(BeanProperty prop) {
-       if (_property == prop) return this;
-       return new AsExternalTypeSerializer(this._idResolver, prop, this._typePropertyName);
-   }
-   
-   @Override
-   public String getPropertyName() { return _typePropertyName; }
-
-   @Override
-   public As getTypeInclusion() { return As.EXTERNAL_PROPERTY; }
-
-   /*
-   /**********************************************************
-   /* Writing prefixes
-   /**********************************************************
-    */
-   
-   @Override
-   public void writeTypePrefixForObject(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen);
-   }
-
-   @Override
-   public void writeTypePrefixForObject(Object value, JsonGenerator jgen, Class<?> type)
-       throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen, type);
-   }
-   
-   @Override
-   public void writeTypePrefixForArray(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen);
-   }
-
-   @Override
-   public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> type)
-           throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen, type);
-   }
-
-   @Override
-   public void writeTypePrefixForScalar(Object value, JsonGenerator jgen)
-           throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen);
-   }
-
-   @Override
-   public void writeTypePrefixForScalar(Object value, JsonGenerator jgen, Class<?> type)
-           throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen, type);
-   }
-
-   /*
-   /**********************************************************
-   /* Writing suffixes
-   /**********************************************************
-    */
-   
-   @Override
-   public void writeTypeSuffixForObject(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       _writeSuffix(value, jgen, idFromValue(value));
-   }
-
-   @Override
-   public void writeTypeSuffixForArray(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       _writeSuffix(value, jgen, idFromValue(value));
-   }
-   
-   @Override
-   public void writeTypeSuffixForScalar(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       _writeSuffix(value, jgen, idFromValue(value));
-   }
-
-   /*
-   /**********************************************************
-   /* Writing with custom type id
-   /**********************************************************
-    */
-
-   @Override
-   public void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen); // here standard works fine
-   }
-   
-   @Override
-   public void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException {
-       _writePrefix(value, jgen); // here standard works fine
-   }
-   
-   @Override
-   public void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException
-   {
-       _writePrefix(value, jgen); // here standard works fine
-   }
-
-   @Override
-   public void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException {
-       _writeSuffix(value, jgen, typeId);// here standard works fine
-   }
-
-   @Override
-   public void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException {
-       _writeSuffix(value, jgen, typeId);// here standard works fine
-   }
-
-   @Override
-   public void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen, String typeId)
-           throws IOException, JsonProcessingException {
-       _writeSuffix(value, jgen, typeId);// here standard works fine
-   }
-   
-   /*
-   /**********************************************************
-   /* Helper methods
-   /**********************************************************
-    */
-   
-   protected final void _writePrefix(Object value, JsonGenerator jgen)
-       throws IOException, JsonProcessingException
-   {
-       jgen.writeStartObject();
-   }
-
-   protected final void _writePrefix(Object value, JsonGenerator jgen, Class<?> type)
-       throws IOException, JsonProcessingException
-   {
-       jgen.writeStartObject();
-   }
-   
-   protected final void _writeSuffix(Object value, JsonGenerator jgen, String typeId)
-       throws IOException, JsonProcessingException
-   {
-       jgen.writeEndObject();
-       jgen.writeStringField(_typePropertyName, typeId);
-   }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java
deleted file mode 100644
index 05d7ca4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.util.JsonParserSequence;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Type deserializer used with {@link As#PROPERTY}
- * inclusion mechanism.
- * Uses regular form (additional key/value entry before actual data)
- * when typed object is expressed as JSON Object; otherwise behaves similar to how
- * {@link As#WRAPPER_ARRAY} works.
- * Latter is used if JSON representation is polymorphic
- * 
- * @author tatu
- */
-public class AsPropertyTypeDeserializer extends AsArrayTypeDeserializer
-{
-    private static final long serialVersionUID = 1L;
-
-    public AsPropertyTypeDeserializer(JavaType bt, TypeIdResolver idRes,
-            String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
-    {
-        super(bt, idRes, typePropertyName, typeIdVisible, defaultImpl);
-    }
-
-    public AsPropertyTypeDeserializer(AsPropertyTypeDeserializer src, BeanProperty property) {
-        super(src, property);
-    }
-    
-    @Override
-    public TypeDeserializer forProperty(BeanProperty prop) {
-        if (prop == _property) { // usually if it's null
-            return this;
-        }
-        return new AsPropertyTypeDeserializer(this, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() {
-        return As.PROPERTY;
-    }
-
-    /**
-     * This is the trickiest thing to handle, since property we are looking
-     * for may be anywhere...
-     */
-    @Override
-    public Object deserializeTypedFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // but first, sanity check to ensure we have START_OBJECT or FIELD_NAME
-        JsonToken t = jp.getCurrentToken();
-        if (t == JsonToken.START_OBJECT) {
-            t = jp.nextToken();
-        } else if (t == JsonToken.START_ARRAY) {
-            /* This is most likely due to the fact that not all Java types are
-             * serialized as JSON Objects; so if "as-property" inclusion is requested,
-             * serialization of things like Lists must be instead handled as if
-             * "as-wrapper-array" was requested.
-             * But this can also be due to some custom handling: so, if "defaultImpl"
-             * is defined, it will be asked to handle this case.
-             */
-            return _deserializeTypedUsingDefaultImpl(jp, ctxt, null);
-        } else if (t != JsonToken.FIELD_NAME) {
-            return _deserializeTypedUsingDefaultImpl(jp, ctxt, null);
-        }
-        // Ok, let's try to find the property. But first, need token buffer...
-        TokenBuffer tb = null;
-
-        for (; t == JsonToken.FIELD_NAME; t = jp.nextToken()) {
-            String name = jp.getCurrentName();
-            jp.nextToken(); // to point to the value
-            if (_typePropertyName.equals(name)) { // gotcha!
-                return _deserializeTypedForId(jp, ctxt, tb);
-            }
-            if (tb == null) {
-                tb = new TokenBuffer(null);
-            }
-            tb.writeFieldName(name);
-            tb.copyCurrentStructure(jp);
-        }
-        return _deserializeTypedUsingDefaultImpl(jp, ctxt, tb);
-    }
-
-    protected final Object _deserializeTypedForId(JsonParser jp, DeserializationContext ctxt,
-            TokenBuffer tb)
-        throws IOException, JsonProcessingException
-    {
-        String typeId = jp.getText();
-        JsonDeserializer<Object> deser = _findDeserializer(ctxt, typeId);
-        if (_typeIdVisible) { // need to merge id back in JSON input?
-            if (tb == null) {
-                tb = new TokenBuffer(null);
-            }
-            tb.writeFieldName(jp.getCurrentName());
-            tb.writeString(typeId);
-        }
-        if (tb != null) { // need to put back skipped properties?
-            jp = JsonParserSequence.createFlattened(tb.asParser(jp), jp);
-        }
-        // Must point to the next value; tb had no current, jp pointed to VALUE_STRING:
-        jp.nextToken(); // to skip past String value
-        // deserializer should take care of closing END_OBJECT as well
-        return deser.deserialize(jp, ctxt);
-    }
-    
-    // off-lined to keep main method lean and mean...
-    protected Object _deserializeTypedUsingDefaultImpl(JsonParser jp,
-            DeserializationContext ctxt, TokenBuffer tb)
-        throws IOException, JsonProcessingException
-    {
-        // As per [JACKSON-614], may have default implementation to use
-        if (_defaultImpl != null) { 
-            JsonDeserializer<Object> deser = _findDefaultImplDeserializer(ctxt);
-            if (tb != null) {
-                tb.writeEndObject();
-                jp = tb.asParser(jp);
-                // must move to point to the first token:
-                jp.nextToken();
-            }
-            return deser.deserialize(jp, ctxt);
-        }
-        // or, perhaps we just bumped into a "natural" value (boolean/int/double/String)?
-        Object result = _deserializeIfNatural(jp, ctxt);
-        if (result != null) {
-            return result;
-        }
-        // or, something for which "as-property" won't work, changed into "wrapper-array" type:
-        if (jp.getCurrentToken() == JsonToken.START_ARRAY) {
-            return super.deserializeTypedFromAny(jp, ctxt);
-        }
-        throw ctxt.wrongTokenException(jp, JsonToken.FIELD_NAME,
-                "missing property '"+_typePropertyName+"' that is to contain type id  (for class "+baseTypeName()+")");
-    }
-
-    /* As per [JACKSON-352], also need to re-route "unknown" version. Need to think
-     * this through bit more in future, but for now this does address issue and has
-     * no negative side effects (at least within existing unit test suite).
-     */
-    @Override
-    public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        /* [JACKSON-387]: Sometimes, however, we get an array wrapper; specifically
-         *   when an array or list has been serialized with type information.
-         */
-        if (jp.getCurrentToken() == JsonToken.START_ARRAY) {
-            return super.deserializeTypedFromArray(jp, ctxt);
-        }
-        return deserializeTypedFromObject(jp, ctxt);
-    }    
-    
-    // These are fine from base class:
-    //public Object deserializeTypedFromArray(JsonParser jp, DeserializationContext ctxt)
-    //public Object deserializeTypedFromScalar(JsonParser jp, DeserializationContext ctxt)    
-
-    /**
-     * Helper method used to check if given parser might be pointing to
-     * a "natural" value, and one that would be acceptable as the
-     * result value (compatible with declared base type)
-     */
-    protected Object _deserializeIfNatural(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        switch (jp.getCurrentToken()) {
-        case VALUE_STRING:
-            if (_baseType.getRawClass().isAssignableFrom(String.class)) {
-                return jp.getText();
-            }
-            break;
-        case VALUE_NUMBER_INT:
-            if (_baseType.getRawClass().isAssignableFrom(Integer.class)) {
-                return jp.getIntValue();
-            }
-            break;
-
-        case VALUE_NUMBER_FLOAT:
-            if (_baseType.getRawClass().isAssignableFrom(Double.class)) {
-                return Double.valueOf(jp.getDoubleValue());
-            }
-            break;
-        case VALUE_TRUE:
-            if (_baseType.getRawClass().isAssignableFrom(Boolean.class)) {
-                return Boolean.TRUE;
-            }
-            break;
-        case VALUE_FALSE:
-            if (_baseType.getRawClass().isAssignableFrom(Boolean.class)) {
-                return Boolean.FALSE;
-            }
-            break;
-        }
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java
deleted file mode 100644
index 07d5122..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Type serializer that preferably embeds type information as an additional
- * JSON Object property, if possible (when resulting serialization would
- * use JSON Object). If this is not possible (for JSON Arrays, scalars),
- * uses a JSON Array wrapper (similar to how
- * {@link As#WRAPPER_ARRAY} always works) as a fallback.
- * 
- * @author tatus
- */
-public class AsPropertyTypeSerializer
-    extends AsArrayTypeSerializer
-{
-    protected final String _typePropertyName;
-
-    public AsPropertyTypeSerializer(TypeIdResolver idRes, BeanProperty property,
-            String propName)
-    {
-        super(idRes, property);
-        _typePropertyName = propName;
-    }
-
-    @Override
-    public AsPropertyTypeSerializer forProperty(BeanProperty prop) {
-        if (_property == prop) return this;
-        return new AsPropertyTypeSerializer(this._idResolver, prop, this._typePropertyName);
-    }
-    
-    @Override
-    public String getPropertyName() { return _typePropertyName; }
-
-    @Override
-    public As getTypeInclusion() { return As.PROPERTY; }
-    
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartObject();
-        jgen.writeStringField(_typePropertyName, idFromValue(value));
-    }
-
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen, Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartObject();
-        jgen.writeStringField(_typePropertyName, idFromValueAndType(value, type));
-    }
-    
-    //public void writeTypePrefixForArray(Object value, JsonGenerator jgen)
-    //public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> type)
-    //public void writeTypePrefixForScalar(Object value, JsonGenerator jgen)
-    //public void writeTypePrefixForScalar(Object value, JsonGenerator jgen, Class<?> type)
-
-    @Override
-    public void writeTypeSuffixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeEndObject();
-    }
-
-    //public void writeTypeSuffixForArray(Object value, JsonGenerator jgen)
-    //public void writeTypeSuffixForScalar(Object value, JsonGenerator jgen)
-
-
-    /*
-    /**********************************************************
-    /* Writing with custom type id
-    /**********************************************************
-     */
-
-    // Only need to override Object-variants
-    
-    @Override
-    public void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException {
-        jgen.writeStartObject();
-        jgen.writeStringField(_typePropertyName, typeId);
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException {
-        jgen.writeEndObject();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.java
deleted file mode 100644
index c9c7174..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeDeserializer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.util.JsonParserSequence;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Type deserializer used with {@link As#WRAPPER_OBJECT}
- * inclusion mechanism. Simple since JSON structure used is always
- * the same, regardless of structure used for actual value: wrapping
- * is done using a single-element JSON Object where type id is the key,
- * and actual object data as the value.
- * 
- * @author tatu
- */
-public class AsWrapperTypeDeserializer
-    extends TypeDeserializerBase
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 5345570420394408290L;
-
-    public AsWrapperTypeDeserializer(JavaType bt, TypeIdResolver idRes,
-            String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
-    {
-        super(bt, idRes, typePropertyName, typeIdVisible, null);
-    }
-
-    protected AsWrapperTypeDeserializer(AsWrapperTypeDeserializer src, BeanProperty property) {
-        super(src, property);
-    }
-    
-    @Override
-    public TypeDeserializer forProperty(BeanProperty prop)
-    {
-        if (prop == _property) { // usually if it's null
-            return this;
-        }
-        return new AsWrapperTypeDeserializer(this, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() {
-        return As.WRAPPER_OBJECT;
-    }
-
-    /**
-     * Deserializing type id enclosed using WRAPPER_OBJECT style is straightforward
-     */
-    @Override
-    public Object deserializeTypedFromObject(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }    
-
-    @Override
-    public Object deserializeTypedFromArray(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }
-
-    @Override
-    public Object deserializeTypedFromScalar(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }
-
-    @Override
-    public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        return _deserialize(jp, ctxt);
-    }
-    
-    /*
-    /***************************************************************
-    /* Internal methods
-    /***************************************************************
-     */
-
-    /**
-     * Method that handles type information wrapper, locates actual
-     * subtype deserializer to use, and calls it to do actual
-     * deserialization.
-     */
-    private final Object _deserialize(JsonParser jp, DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        // first, sanity checks
-        if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
-            throw ctxt.wrongTokenException(jp, JsonToken.START_OBJECT,
-                    "need JSON Object to contain As.WRAPPER_OBJECT type information for class "+baseTypeName());
-        }
-        // should always get field name, but just in case...
-        if (jp.nextToken() != JsonToken.FIELD_NAME) {
-            throw ctxt.wrongTokenException(jp, JsonToken.FIELD_NAME,
-                    "need JSON String that contains type id (for subtype of "+baseTypeName()+")");
-        }
-        final String typeId = jp.getText();
-        JsonDeserializer<Object> deser = _findDeserializer(ctxt, typeId);
-        jp.nextToken();
-
-        // Minor complication: we may need to merge type id in?
-        if (_typeIdVisible && jp.getCurrentToken() == JsonToken.START_OBJECT) {
-            // but what if there's nowhere to add it in? Error? Or skip? For now, skip.
-            TokenBuffer tb = new TokenBuffer(null);
-            tb.writeStartObject(); // recreate START_OBJECT
-            tb.writeFieldName(_typePropertyName);
-            tb.writeString(typeId);
-            jp = JsonParserSequence.createFlattened(tb.asParser(jp), jp);
-            jp.nextToken();
-        }
-        
-        Object value = deser.deserialize(jp, ctxt);
-        // And then need the closing END_OBJECT
-        if (jp.nextToken() != JsonToken.END_OBJECT) {
-            throw ctxt.wrongTokenException(jp, JsonToken.END_OBJECT,
-                    "expected closing END_OBJECT after type information and deserialized value");
-        }
-        return value;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java
deleted file mode 100644
index 0f4a4ae..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Type wrapper that tries to use an extra JSON Object, with a single
- * entry that has type name as key, to serialize type information.
- * If this is not possible (value is serialize as array or primitive),
- * will use {@link As#WRAPPER_ARRAY} mechanism as fallback: that is,
- * just use a wrapping array with type information as the first element
- * and value as second.
- * 
- * @author tatu
- */
-public class AsWrapperTypeSerializer
-    extends TypeSerializerBase
-{
-    public AsWrapperTypeSerializer(TypeIdResolver idRes, BeanProperty property)
-    {
-        super(idRes, property);
-    }
-
-    @Override
-    public AsWrapperTypeSerializer forProperty(BeanProperty prop) {
-        if (_property == prop) return this;
-        return new AsWrapperTypeSerializer(this._idResolver, prop);
-    }
-    
-    @Override
-    public As getTypeInclusion() { return As.WRAPPER_OBJECT; }
-    
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // wrapper
-        jgen.writeStartObject();
-        // and then JSON Object start caller wants
-        jgen.writeObjectFieldStart(idFromValue(value));
-    }
-
-    @Override
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        // wrapper
-        jgen.writeStartObject();
-        // and then JSON Object start caller wants
-        jgen.writeObjectFieldStart(idFromValueAndType(value, type));
-    }
-    
-    @Override
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // can still wrap ok
-        jgen.writeStartObject();
-        // and then JSON Array start caller wants
-        jgen.writeArrayFieldStart(idFromValue(value));
-    }
-
-    @Override
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        // can still wrap ok
-        jgen.writeStartObject();
-        // and then JSON Array start caller wants
-        jgen.writeArrayFieldStart(idFromValueAndType(value, type));
-    }
-
-    @Override
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // can still wrap ok
-        jgen.writeStartObject();
-        jgen.writeFieldName(idFromValue(value));
-    }
-
-    @Override
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen,
-            Class<?> type)
-        throws IOException, JsonProcessingException
-    {
-        // can still wrap ok
-        jgen.writeStartObject();
-        jgen.writeFieldName(idFromValueAndType(value, type));
-    }
-    
-    @Override
-    public void writeTypeSuffixForObject(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // first close JSON Object caller used
-        jgen.writeEndObject();
-        // and then wrapper
-        jgen.writeEndObject();
-    }
-
-    @Override
-    public void writeTypeSuffixForArray(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // first close array caller needed
-        jgen.writeEndArray();
-        // then wrapper object
-        jgen.writeEndObject();
-    }
-    
-    @Override
-    public void writeTypeSuffixForScalar(Object value, JsonGenerator jgen)
-        throws IOException, JsonProcessingException
-    {
-        // just need to close the wrapper object
-        jgen.writeEndObject();
-    }
-
-    /*
-    /**********************************************************
-    /* Writing with custom type id
-    /**********************************************************
-     */
-    
-    @Override
-    public void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartObject();
-        jgen.writeObjectFieldStart(typeId);
-    }
-    
-    @Override
-    public void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartObject();
-        jgen.writeArrayFieldStart(typeId);
-    }
-
-    @Override
-    public void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen, String typeId)
-        throws IOException, JsonProcessingException
-    {
-        jgen.writeStartObject();
-        jgen.writeFieldName(typeId);
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId)
-            throws IOException, JsonProcessingException {
-        writeTypeSuffixForObject(value, jgen); // standard impl works fine
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen, String typeId)
-            throws IOException, JsonProcessingException {
-        writeTypeSuffixForArray(value, jgen); // standard impl works fine
-    }
-
-    @Override
-    public void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen, String typeId)
-            throws IOException, JsonProcessingException {
-        writeTypeSuffixForScalar(value, jgen); // standard impl works fine
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java
deleted file mode 100644
index 7cc33d0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/ClassNameIdResolver.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * {@link com.fasterxml.jackson.databind.jsontype.TypeIdResolver} implementation
- * that converts between fully-qualified
- * Java class names and (JSON) Strings.
- */
-public class ClassNameIdResolver
-    extends TypeIdResolverBase
-{
-    public ClassNameIdResolver(JavaType baseType, TypeFactory typeFactory) {
-        super(baseType, typeFactory);
-    }
-
-//  @Override
-    public JsonTypeInfo.Id getMechanism() { return JsonTypeInfo.Id.CLASS; }
-
-    public void registerSubtype(Class<?> type, String name) {
-        // not used with class name - based resolvers
-    }
-    
-//  @Override
-    public String idFromValue(Object value) {
-        return _idFrom(value, value.getClass());
-    }
-
-//  @Override
-    public String idFromValueAndType(Object value, Class<?> type) {
-        return _idFrom(value, type);
-    }
-
-//  @Override
-    public JavaType typeFromId(String id)
-    {
-        /* 30-Jan-2010, tatu: Most ids are basic class names; so let's first
-         *    check if any generics info is added; and only then ask factory
-         *    to do translation when necessary
-         */
-        if (id.indexOf('<') > 0) {
-            JavaType t = _typeFactory.constructFromCanonical(id);
-            // note: may want to try combining with specialization (esp for EnumMap)?
-            return t;
-        }
-        try {
-            Class<?> cls =  ClassUtil.findClass(id);
-            return _typeFactory.constructSpecializedType(_baseType, cls);
-        } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("Invalid type id '"+id+"' (for id type 'Id.class'): no such class found");
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Invalid type id '"+id+"' (for id type 'Id.class'): "+e.getMessage(), e);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    protected final String _idFrom(Object value, Class<?> cls)
-    {
-        // [JACKSON-380] Need to ensure that "enum subtypes" work too
-        if (Enum.class.isAssignableFrom(cls)) {
-            if (!cls.isEnum()) { // means that it's sub-class of base enum, so:
-                cls = cls.getSuperclass();
-            }
-        }
-        String str = cls.getName();
-        if (str.startsWith("java.util")) {
-            /* 25-Jan-2009, tatu: There are some internal classes that
-             *   we can not access as is. We need better mechanism; for
-             *   now this has to do...
-             */
-            /* Enum sets and maps are problematic since we MUST know
-             * type of contained enums, to be able to deserialize.
-             * In addition, EnumSet is not a concrete type either
-             */
-            if (value instanceof EnumSet<?>) { // Regular- and JumboEnumSet...
-                Class<?> enumClass = ClassUtil.findEnumType((EnumSet<?>) value);
-                // not optimal: but EnumSet is not a customizable type so this is sort of ok
-                str = TypeFactory.defaultInstance().constructCollectionType(EnumSet.class, enumClass).toCanonical();
-            } else if (value instanceof EnumMap<?,?>) {
-                Class<?> enumClass = ClassUtil.findEnumType((EnumMap<?,?>) value);
-                Class<?> valueClass = Object.class;
-                // not optimal: but EnumMap is not a customizable type so this is sort of ok
-                str = TypeFactory.defaultInstance().constructMapType(EnumMap.class, enumClass, valueClass).toCanonical();
-            } else {
-                String end = str.substring(9);
-                if ((end.startsWith(".Arrays$") || end.startsWith(".Collections$"))
-                       && str.indexOf("List") >= 0) {
-                    /* 17-Feb-2010, tatus: Another such case: result of
-                     *    Arrays.asList() is named like so in Sun JDK...
-                     *   Let's just plain old ArrayList in its place
-                     * NOTE: chances are there are plenty of similar cases
-                     * for other wrappers... (immutable, singleton, synced etc)
-                     */
-                    str = "java.util.ArrayList";
-                }
-            }
-        } else if (str.indexOf('$') >= 0) {
-            /* Other special handling may be needed for inner classes, [JACKSON-584].
-             * The best way to handle would be to find 'hidden' constructor; pass parent
-             * value etc (which is actually done for non-anonymous static classes!),
-             * but that is just not possible due to various things. So, we will instead
-             * try to generalize type into something we will be more likely to be able
-             * construct.
-             */
-            Class<?> outer = ClassUtil.getOuterClass(cls);
-            if (outer != null) {
-                /* one more check: let's actually not worry if the declared
-                 * static type is non-static as well; if so, deserializer does
-                 * have a chance at figuring it all out.
-                 */
-                Class<?> staticType = _baseType.getRawClass();
-                if (ClassUtil.getOuterClass(staticType) == null) {
-                    // Is this always correct? Seems like it should be...
-                    cls = _baseType.getRawClass();
-                    str = cls.getName();
-                }
-            }
-        }
-        return str;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.java
deleted file mode 100644
index a377489..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/MinimalClassNameIdResolver.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-public class MinimalClassNameIdResolver
-    extends ClassNameIdResolver
-{
-    /**
-     * Package name of the base class, to be used for determining common
-     * prefix that can be omitted from included type id.
-     * Does not include the trailing dot.
-     */
-    protected final String _basePackageName;
-
-    /**
-     * Same as {@link #_basePackageName}, but includes trailing dot.
-     */
-    protected final String _basePackagePrefix;
-    
-    protected MinimalClassNameIdResolver(JavaType baseType, TypeFactory typeFactory)
-    {
-        super(baseType, typeFactory);
-        String base = baseType.getRawClass().getName();
-        int ix = base.lastIndexOf('.');
-        if (ix < 0) { // can this ever occur?
-            _basePackageName = "";
-            _basePackagePrefix = ".";
-        } else {
-            _basePackagePrefix = base.substring(0, ix+1);
-            _basePackageName = base.substring(0, ix);
-        }
-    }
-
-    @Override
-    public JsonTypeInfo.Id getMechanism() { return JsonTypeInfo.Id.MINIMAL_CLASS; }
-    
-    @Override
-    public String idFromValue(Object value)
-    {
-        String n = value.getClass().getName();
-        if (n.startsWith(_basePackagePrefix)) {
-            // note: we will leave the leading dot in there
-            return n.substring(_basePackagePrefix.length()-1);
-        }
-        return n;
-    }
-
-    @Override
-    public JavaType typeFromId(String id)
-    {
-        if (id.startsWith(".")) {
-            StringBuilder sb = new StringBuilder(id.length() + _basePackageName.length());
-            if  (_basePackageName.length() == 0) {
-                // no package; must remove leading '.' from id
-                sb.append(id.substring(1));
-            } else {
-                // otherwise just concatenate package, with leading-dot-partial name
-                sb.append(_basePackageName).append(id);
-            }
-            id = sb.toString();
-        }
-        return super.typeFromId(id);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.java
deleted file mode 100644
index b1763ed..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdSubtypeResolver.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;
-
-/**
- * Standard {@link SubtypeResolver} implementation.
- */
-public class StdSubtypeResolver
-    extends SubtypeResolver
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    protected LinkedHashSet<NamedType> _registeredSubtypes;
-
-    public StdSubtypeResolver() { }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override    
-    public void registerSubtypes(NamedType... types)
-    {
-        if (_registeredSubtypes == null) {
-            _registeredSubtypes = new LinkedHashSet<NamedType>();
-        }
-        for (NamedType type : types) {
-            _registeredSubtypes.add(type);
-        }
-    }
-
-    @Override
-    public void registerSubtypes(Class<?>... classes)
-    {
-        NamedType[] types = new NamedType[classes.length];
-        for (int i = 0, len = classes.length; i < len; ++i) {
-            types[i] = new NamedType(classes[i]);
-        }
-        registerSubtypes(types);
-    }
-
-    /**
-     * @deprecated Since 2.1
-     */
-    @Deprecated
-    @Override
-    public Collection<NamedType> collectAndResolveSubtypes(AnnotatedMember property,
-        MapperConfig<?> config, AnnotationIntrospector ai)
-    {
-        return collectAndResolveSubtypes(property, config, ai, null);
-    }
-    
-    /**
-     * 
-     * @param property Base member to use for type resolution: either annotated type (class),
-     *    or property (field, getter/setter)
-     *    
-     * @since 2.1
-     */
-    @Override
-    public Collection<NamedType> collectAndResolveSubtypes(AnnotatedMember property,
-        MapperConfig<?> config, AnnotationIntrospector ai, JavaType baseType)
-    {
-        // for backwards compatibility, must allow null here:
-        Class<?> rawBase = (baseType == null) ? property.getRawType() : baseType.getRawClass();
-        
-        HashMap<NamedType, NamedType> collected = new HashMap<NamedType, NamedType>();
-        // start with registered subtypes (which have precedence)
-        if (_registeredSubtypes != null) {
-            for (NamedType subtype : _registeredSubtypes) {
-                // is it a subtype of root type?
-                if (rawBase.isAssignableFrom(subtype.getType())) { // yes
-                    AnnotatedClass curr = AnnotatedClass.constructWithoutSuperTypes(subtype.getType(), ai, config);
-                    _collectAndResolve(curr, subtype, config, ai, collected);
-                }
-            }
-        }
-        
-        // then annotated types for property itself
-        Collection<NamedType> st = ai.findSubtypes(property);
-        if (st != null) {
-            for (NamedType nt : st) {
-                AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(nt.getType(), ai, config);
-                _collectAndResolve(ac, nt, config, ai, collected);
-            }            
-        }
-        
-        NamedType rootType = new NamedType(rawBase, null);
-        AnnotatedClass ac = AnnotatedClass.constructWithoutSuperTypes(rawBase, ai, config);
-            
-        // and finally subtypes via annotations from base type (recursively)
-        _collectAndResolve(ac, rootType, config, ai, collected);
-        return new ArrayList<NamedType>(collected.values());
-    }
-
-    @Override
-    public Collection<NamedType> collectAndResolveSubtypes(AnnotatedClass type,
-            MapperConfig<?> config, AnnotationIntrospector ai)
-    {
-        HashMap<NamedType, NamedType> subtypes = new HashMap<NamedType, NamedType>();
-        // [JACKSON-257] then consider registered subtypes (which have precedence over annotations)
-        if (_registeredSubtypes != null) {
-            Class<?> rawBase = type.getRawType();
-            for (NamedType subtype : _registeredSubtypes) {
-                // is it a subtype of root type?
-                if (rawBase.isAssignableFrom(subtype.getType())) { // yes
-                    AnnotatedClass curr = AnnotatedClass.constructWithoutSuperTypes(subtype.getType(), ai, config);
-                    _collectAndResolve(curr, subtype, config, ai, subtypes);
-                }
-            }
-        }
-        // and then check subtypes via annotations from base type (recursively)
-        NamedType rootType = new NamedType(type.getRawType(), null);
-        _collectAndResolve(type, rootType, config, ai, subtypes);
-        return new ArrayList<NamedType>(subtypes.values());
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to find subtypes for a specific type (class)
-     */
-    protected void _collectAndResolve(AnnotatedClass annotatedType, NamedType namedType,
-            MapperConfig<?> config, AnnotationIntrospector ai,
-            HashMap<NamedType, NamedType> collectedSubtypes)
-    {
-        if (!namedType.hasName()) {
-            String name = ai.findTypeName(annotatedType);
-            if (name != null) {
-                namedType = new NamedType(namedType.getType(), name);
-            }
-        }
-
-        // First things first: is base type itself included?
-        if (collectedSubtypes.containsKey(namedType)) {
-            // if so, no recursion; however, may need to update name?
-            if (namedType.hasName()) {
-                NamedType prev = collectedSubtypes.get(namedType);
-                if (!prev.hasName()) {
-                    collectedSubtypes.put(namedType, namedType);
-                }
-            }
-            return;
-        }
-        // if it wasn't, add and check subtypes recursively
-        collectedSubtypes.put(namedType, namedType);
-        Collection<NamedType> st = ai.findSubtypes(annotatedType);
-        if (st != null && !st.isEmpty()) {
-            for (NamedType subtype : st) {
-                AnnotatedClass subtypeClass = AnnotatedClass.constructWithoutSuperTypes(subtype.getType(), ai, config);
-                // One more thing: name may be either in reference, or in subtype:
-                if (!subtype.hasName()) {
-                    subtype = new NamedType(subtype.getType(), ai.findTypeName(subtypeClass));
-                }
-                _collectAndResolve(subtypeClass, subtype, config, ai, collectedSubtypes);
-            }
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java
deleted file mode 100644
index 6e9e0f0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Default {@link TypeResolverBuilder} implementation.
- *
- * @author tatu
- */
-public class StdTypeResolverBuilder
-    implements TypeResolverBuilder<StdTypeResolverBuilder>
-{
-    // Configuration settings:
-
-    protected JsonTypeInfo.Id _idType;
-
-    protected JsonTypeInfo.As _includeAs;
-
-    protected String _typeProperty;
-
-    /**
-     * Whether type id should be exposed to deserializers or not
-     */
-    protected boolean _typeIdVisible = false;
-    
-    /**
-     * Default class to use in case type information is not available
-     * or is broken.
-     */
-    protected Class<?> _defaultImpl;
-    
-    // Objects
-    
-    protected TypeIdResolver _customIdResolver;
-    
-    /*
-    /**********************************************************
-    /* Construction, initialization, actual building
-    /**********************************************************
-     */
-
-    public StdTypeResolverBuilder() { }
-
-    public static StdTypeResolverBuilder noTypeInfoBuilder() {
-        return new StdTypeResolverBuilder().init(JsonTypeInfo.Id.NONE, null);
-    }
-    
-//  @Override
-    public StdTypeResolverBuilder init(JsonTypeInfo.Id idType, TypeIdResolver idRes)
-    {
-        // sanity checks
-        if (idType == null) {
-            throw new IllegalArgumentException("idType can not be null");
-        }
-        _idType = idType;
-        _customIdResolver = idRes;
-        // Let's also initialize property name as per idType default
-        _typeProperty = idType.getDefaultPropertyName();
-        return this;
-    }
-    
-//  @Override
-    public TypeSerializer buildTypeSerializer(SerializationConfig config,
-            JavaType baseType, Collection<NamedType> subtypes)
-    {
-        if (_idType == JsonTypeInfo.Id.NONE) {
-            return null;
-        }
-        TypeIdResolver idRes = idResolver(config, baseType, subtypes, true, false);
-        switch (_includeAs) {
-        case WRAPPER_ARRAY:
-            return new AsArrayTypeSerializer(idRes, null);
-        case PROPERTY:
-            return new AsPropertyTypeSerializer(idRes, null,
-                    _typeProperty);
-        case WRAPPER_OBJECT:
-            return new AsWrapperTypeSerializer(idRes, null);
-        case EXTERNAL_PROPERTY:
-            return new AsExternalTypeSerializer(idRes, null,
-                    _typeProperty);
-        }
-        throw new IllegalStateException("Do not know how to construct standard type serializer for inclusion type: "+_includeAs);
-    }
-    
-//  @Override
-    public TypeDeserializer buildTypeDeserializer(DeserializationConfig config,
-            JavaType baseType, Collection<NamedType> subtypes)
-    {
-        if (_idType == JsonTypeInfo.Id.NONE) {
-            return null;
-        }
-
-        TypeIdResolver idRes = idResolver(config, baseType, subtypes, false, true);
-        
-        // First, method for converting type info to type id:
-        switch (_includeAs) {
-        case WRAPPER_ARRAY:
-            return new AsArrayTypeDeserializer(baseType, idRes,
-                    _typeProperty, _typeIdVisible, _defaultImpl);
-        case PROPERTY:
-            return new AsPropertyTypeDeserializer(baseType, idRes,
-                    _typeProperty, _typeIdVisible, _defaultImpl);
-        case WRAPPER_OBJECT:
-            return new AsWrapperTypeDeserializer(baseType, idRes,
-                    _typeProperty, _typeIdVisible, _defaultImpl);
-        case EXTERNAL_PROPERTY:
-            return new AsExternalTypeDeserializer(baseType, idRes,
-                    _typeProperty, _typeIdVisible, _defaultImpl);
-        }
-        throw new IllegalStateException("Do not know how to construct standard type serializer for inclusion type: "+_includeAs);
-    }
-
-    /*
-    /**********************************************************
-    /* Construction, configuration
-    /**********************************************************
-     */
-
-//  @Override
-    public StdTypeResolverBuilder inclusion(JsonTypeInfo.As includeAs) {
-        if (includeAs == null) {
-            throw new IllegalArgumentException("includeAs can not be null");
-        }
-        _includeAs = includeAs;
-        return this;
-    }
-
-    /**
-     * Method for constructing an instance with specified type property name
-     * (property name to use for type id when using "as-property" inclusion).
-     */
-//  @Override
-    public StdTypeResolverBuilder typeProperty(String typeIdPropName)
-    {
-        // ok to have null/empty; will restore to use defaults
-        if (typeIdPropName == null || typeIdPropName.length() == 0) {
-            typeIdPropName = _idType.getDefaultPropertyName();
-        }
-        _typeProperty = typeIdPropName;
-        return this;
-    }
-
-//  @Override
-    public StdTypeResolverBuilder defaultImpl(Class<?> defaultImpl)
-    {
-        _defaultImpl = defaultImpl;
-        return this;
-    }
-
-//  @Override
-    public StdTypeResolverBuilder typeIdVisibility(boolean isVisible) {
-        _typeIdVisible = isVisible;
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    public String getTypeProperty() { return _typeProperty; }
-
-//  @Override
-    public Class<?> getDefaultImpl() {
-        return _defaultImpl;
-    }
-
-    public boolean isTypeIdVisible() { return _typeIdVisible; }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method that will either return configured custom
-     * type id resolver, or construct a standard resolver
-     * given configuration.
-     */
-    protected TypeIdResolver idResolver(MapperConfig<?> config,
-            JavaType baseType, Collection<NamedType> subtypes,
-            boolean forSer, boolean forDeser)
-    {
-        // Custom id resolver?
-        if (_customIdResolver != null) {
-            return _customIdResolver;
-        }
-        if (_idType == null) {
-            throw new IllegalStateException("Can not build, 'init()' not yet called");
-        }
-        switch (_idType) {
-        case CLASS:
-            return new ClassNameIdResolver(baseType, config.getTypeFactory());
-        case MINIMAL_CLASS:
-            return new MinimalClassNameIdResolver(baseType, config.getTypeFactory());
-        case NAME:
-            return TypeNameIdResolver.construct(config, baseType, subtypes, forSer, forDeser);
-        case NONE: // hmmh. should never get this far with 'none'
-            return null;
-        case CUSTOM: // need custom resolver...
-        }
-        throw new IllegalStateException("Do not know how to construct standard type id resolver for idType: "+_idType);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.java
deleted file mode 100644
index bd06b56..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeDeserializerBase.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-
-/**
- * Base class for all standard Jackson {@link TypeDeserializer}s.
- */
-public abstract class TypeDeserializerBase
-    extends TypeDeserializer
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 278445030337366675L;
-
-    protected final TypeIdResolver _idResolver;
-    
-    protected final JavaType _baseType;
-
-    /**
-     * Property that contains value for which type information
-     * is included; null if value is a root value.
-     * Note that this value is not assigned during construction
-     * but only when {@link #forProperty} is called to create
-     * a copy.
-     */
-    protected final BeanProperty _property;
-
-    /**
-     * Type to use as the default implementation, if type id is
-     * missing or can not be resolved.
-     */
-    protected final JavaType _defaultImpl;
-
-    /**
-     * Name of type property used; needed for non-property versions too,
-     * in cases where type id is to be exposed as part of JSON.
-     */
-    protected final String _typePropertyName;
-    
-    protected final boolean _typeIdVisible;
-    
-    /**
-     * For efficient operation we will lazily build mappings from type ids
-     * to actual deserializers, once needed.
-     */
-    protected final HashMap<String,JsonDeserializer<Object>> _deserializers;
-
-    protected JsonDeserializer<Object> _defaultImplDeserializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected TypeDeserializerBase(JavaType baseType, TypeIdResolver idRes,
-            String typePropertyName, boolean typeIdVisible, Class<?> defaultImpl)
-    {
-        _baseType = baseType;
-        _idResolver = idRes;
-        _typePropertyName = typePropertyName;
-        _typeIdVisible = typeIdVisible;
-        _deserializers = new HashMap<String,JsonDeserializer<Object>>();
-        if (defaultImpl == null) {
-            _defaultImpl = null;
-        } else {
-            /* 16-Oct-2011, tatu: should call this via TypeFactory; this is
-             *    not entirely safe... however, since Collections/Maps are
-             *    seldom (if ever) base types, may be ok.
-             */
-            _defaultImpl = baseType.forcedNarrowBy(defaultImpl);
-        }
-
-        _property = null;
-    }
-
-    protected TypeDeserializerBase(TypeDeserializerBase src, BeanProperty property)
-    {
-        _baseType = src._baseType;
-        _idResolver = src._idResolver;
-        _typePropertyName = src._typePropertyName;
-        _typeIdVisible = src._typeIdVisible;
-        _deserializers = src._deserializers;
-        _defaultImpl = src._defaultImpl;
-        _defaultImplDeserializer = src._defaultImplDeserializer;
-
-        _property = property;
-    }
-
-    @Override
-    public abstract TypeDeserializer forProperty(BeanProperty prop);
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public abstract JsonTypeInfo.As getTypeInclusion();
-
-    public String baseTypeName() { return _baseType.getRawClass().getName(); }
-
-    @Override
-    public final String getPropertyName() { return _typePropertyName; }
-    
-    @Override    
-    public TypeIdResolver getTypeIdResolver() { return _idResolver; }
-
-    @Override    
-    public Class<?> getDefaultImpl() {
-        return (_defaultImpl == null) ? null : _defaultImpl.getRawClass();
-    }
-    
-    @Override
-    public String toString()
-    {
-    	StringBuilder sb = new StringBuilder();
-    	sb.append('[').append(getClass().getName());
-    	sb.append("; base-type:").append(_baseType);
-    	sb.append("; id-resolver: ").append(_idResolver);
-    	sb.append(']');
-    	return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods for sub-classes
-    /**********************************************************
-     */
-
-    protected final JsonDeserializer<Object> _findDeserializer(DeserializationContext ctxt,
-            String typeId)
-        throws IOException, JsonProcessingException
-    {
-        JsonDeserializer<Object> deser;
-
-        synchronized (_deserializers) {
-            deser = _deserializers.get(typeId);
-            if (deser == null) {
-                JavaType type = _idResolver.typeFromId(typeId);
-                if (type == null) {
-                    // As per [JACKSON-614], use the default impl if no type id available:
-                    if (_defaultImpl == null) {
-                        throw ctxt.unknownTypeException(_baseType, typeId);
-                    }
-                    deser = _findDefaultImplDeserializer(ctxt);
-                } else {
-                    /* 16-Dec-2010, tatu: Since nominal type we get here has no (generic) type parameters,
-                     *   we actually now need to explicitly narrow from base type (which may have parameterization)
-                     *   using raw type.
-                     *   
-                     *   One complication, though; can not change 'type class' (simple type to container); otherwise
-                     *   we may try to narrow a SimpleType (Object.class) into MapType (Map.class), losing actual
-                     *   type in process (getting SimpleType of Map.class which will not work as expected)
-                     */
-                    if (_baseType != null && _baseType.getClass() == type.getClass()) {
-                        type = _baseType.narrowBy(type.getRawClass());
-                    }
-                    deser = ctxt.findContextualValueDeserializer(type, _property);
-                }
-                _deserializers.put(typeId, deser);
-            }
-        }
-        return deser;
-    }
-
-    protected final JsonDeserializer<Object> _findDefaultImplDeserializer(DeserializationContext ctxt)
-        throws IOException, JsonProcessingException
-    {
-        if (_defaultImpl == null) {
-            return null;
-        }
-        synchronized (_defaultImpl) {
-            if (_defaultImplDeserializer == null) {
-                _defaultImplDeserializer = ctxt.findContextualValueDeserializer(
-                        _defaultImpl, _property);
-            }
-            return _defaultImplDeserializer;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.java
deleted file mode 100644
index 6bc545c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeIdResolverBase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-public abstract class TypeIdResolverBase
-    implements TypeIdResolver
-{
-    protected final TypeFactory _typeFactory;
-
-    /**
-     * Common base type for all polymorphic instances handled.
-     */
-    protected final JavaType _baseType;
-
-    protected TypeIdResolverBase(JavaType baseType, TypeFactory typeFactory)
-    {
-        _baseType = baseType;
-        _typeFactory = typeFactory;
-    }
-
-//  @Override
-    public void init(JavaType bt) {
-        // Standard type id resolvers do not need this: only useful for custom ones.
-    }
-
-//  @Override
-    public String idFromBaseType()
-    {
-        /* By default we will just defer to regular handling, handing out the
-         * base type; and since there is no value, must just pass null here
-         * assuming that implementations can deal with it.
-         * Alternative would be to pass a bogus Object, but that does not seem right.
-         */
-        return idFromValueAndType(null, _baseType.getRawClass());
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java
deleted file mode 100644
index 57cc90c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeNameIdResolver.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-
-public class TypeNameIdResolver
-    extends TypeIdResolverBase
-{
-    protected final MapperConfig<?> _config;
-    
-    /**
-     * Mappings from class name to type id, used for serialization
-     */
-    protected final HashMap<String, String> _typeToId;
-
-    /**
-     * Mappings from type id to JavaType, used for deserialization
-     */
-    protected final HashMap<String, JavaType> _idToType;
-    
-    protected TypeNameIdResolver(MapperConfig<?> config, JavaType baseType,
-            HashMap<String, String> typeToId, HashMap<String, JavaType> idToType)
-    {
-        super(baseType, config.getTypeFactory());
-        _config = config;
-        _typeToId = typeToId;
-        _idToType = idToType;
-    }
- 
-    public static TypeNameIdResolver construct(MapperConfig<?> config,
-            JavaType baseType,
-            Collection<NamedType> subtypes, boolean forSer, boolean forDeser)
-    {
-        // sanity check
-        if (forSer == forDeser) throw new IllegalArgumentException();
-        HashMap<String, String> typeToId = null;
-        HashMap<String, JavaType> idToType = null;
-
-        if (forSer) {
-            typeToId = new HashMap<String, String>();
-        }
-        if (forDeser) {
-            idToType = new HashMap<String, JavaType>();
-        }
-        if (subtypes != null) {
-            for (NamedType t : subtypes) {
-                /* no name? Need to figure out default; for now, let's just
-                 * use non-qualified class name
-                 */
-                Class<?> cls = t.getType();
-                String id = t.hasName() ? t.getName() : _defaultTypeId(cls);
-                if (forSer) {
-                    typeToId.put(cls.getName(), id);
-                }
-                if (forDeser) {
-                    /* 24-Feb-2011, tatu: [JACKSON-498] One more problem; sometimes
-                     *   we have same name for multiple types; if so, use most specific
-                     *   one.
-                     */
-                    JavaType prev = idToType.get(id);
-                    if (prev != null) { // Can only override if more specific
-                        if (cls.isAssignableFrom(prev.getRawClass())) { // nope, more generic (or same)
-                            continue;
-                        }
-                    }
-                    idToType.put(id, config.constructType(cls));
-                }
-            }
-        }
-        return new TypeNameIdResolver(config, baseType, typeToId, idToType);
-    }
-
-//  @Override
-    public JsonTypeInfo.Id getMechanism() { return JsonTypeInfo.Id.NAME; }
-
-//  @Override
-    public String idFromValue(Object value)
-    {
-        Class<?> cls = value.getClass();
-        final String key = cls.getName();
-        String name;
-        synchronized (_typeToId) {
-            name = _typeToId.get(key);
-            if (name == null) {
-                // 24-Feb-2011, tatu: As per [JACKSON-498], may need to dynamically look up name
-                // can either throw an exception, or use default name...
-                if (_config.isAnnotationProcessingEnabled()) {
-                    BeanDescription beanDesc = _config.introspectClassAnnotations(cls);
-                    name = _config.getAnnotationIntrospector().findTypeName(beanDesc.getClassInfo());
-                }
-                if (name == null) {
-                    // And if still not found, let's choose default?
-                    name = _defaultTypeId(cls);
-                }
-                _typeToId.put(key, name);
-            }
-        }
-        return name;
-    }
-
-//  @Override
-    public String idFromValueAndType(Object value, Class<?> type)
-    {
-        return idFromValue(value);
-    }
-    
-//  @Override
-    public JavaType typeFromId(String id)
-        throws IllegalArgumentException
-    {
-        JavaType t = _idToType.get(id);
-        /* Now: if no type is found, should we try to locate it by
-         * some other means? (specifically, if in same package as base type,
-         * could just try Class.forName)
-         * For now let's not add any such workarounds; can add if need be
-         */
-        return t;
-    }    
-
-    @Override
-    public String toString()
-    {
-    	StringBuilder sb = new StringBuilder();
-    	sb.append('[').append(getClass().getName());
-    	sb.append("; id-to-type=").append(_idToType);
-    	sb.append(']');
-    	return sb.toString();
-    }
-    
-    /*
-    /*********************************************************
-    /* Helper methods
-    /*********************************************************
-     */
-    
-    /**
-     * If no name was explicitly given for a class, we will just
-     * use non-qualified class name
-     */
-    protected static String _defaultTypeId(Class<?> cls)
-    {
-        String n = cls.getName();
-        int ix = n.lastIndexOf('.');
-        return (ix < 0) ? n : n.substring(ix+1);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.java
deleted file mode 100644
index 851a924..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/TypeSerializerBase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.fasterxml.jackson.databind.jsontype.impl;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-public abstract class TypeSerializerBase extends TypeSerializer
-{
-    protected final TypeIdResolver _idResolver;
-
-    protected final BeanProperty _property;
-    
-    protected TypeSerializerBase(TypeIdResolver idRes, BeanProperty property)
-    {
-        _idResolver = idRes;
-        _property = property;
-    }
-
-    @Override
-    public abstract JsonTypeInfo.As getTypeInclusion();
-
-    @Override
-    public String getPropertyName() { return null; }
-    
-    @Override
-    public TypeIdResolver getTypeIdResolver() { return _idResolver; }
-
-    /*
-    /**********************************************************
-    /* Helper methods for subclasses
-    /**********************************************************
-     */
-
-    protected String idFromValue(Object value) {
-        return _idResolver.idFromValue(value);
-    }
-
-    protected String idFromValueAndType(Object value, Class<?> type) {
-        return _idResolver.idFromValueAndType(value, type);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/package-info.java
deleted file mode 100644
index 8bb399d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/impl/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Package that contains standard implementations for
- * {@link com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder}
- * and
- * {@link com.fasterxml.jackson.databind.jsontype.TypeIdResolver}.
- */
-package com.fasterxml.jackson.databind.jsontype.impl;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/package-info.java
deleted file mode 100644
index fd931b0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/jsontype/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Package that contains interfaces that define how to implement
- * functionality for dynamically resolving type during deserialization.
- * This is needed for complete handling of polymorphic types, where
- * actual type can not be determined statically (declared type is
- * a supertype of actual polymorphic serialized types).
- */
-package com.fasterxml.jackson.databind.jsontype;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.java
deleted file mode 100644
index 7e6c901..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleAbstractTypeResolver.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-
-import com.fasterxml.jackson.databind.AbstractTypeResolver;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.ClassKey;
-
-/**
- * Simple {@link AbstractTypeResolver} implementation, which is
- * based on static mapping from abstract super types into
- * sub types (concrete or abstract), but retaining generic
- * parameterization.
- * Can be used for things like specifying which implementation of
- * {@link java.util.Collection} to use:
- *<pre>
- *  SimpleAbstractTypeResolver resolver = new SimpleAbstractTypeResolver();
- *  // To make all properties declared as Collection, List, to LinkedList
- *  resolver.addMapping(Collection.class, LinkedList.class);
- *  resolver.addMapping(List.class, LinkedList.class);
- *</pre>
- * Can also be used as an alternative to per-class annotations when defining
- * concrete implementations; however, only works with abstract types (since
- * this is only called for abstract types)
- */
-public class SimpleAbstractTypeResolver
-    extends AbstractTypeResolver
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 8635483102371490919L;
-
-    /**
-     * Mappings from super types to subtypes
-     */
-    protected final HashMap<ClassKey,Class<?>> _mappings = new HashMap<ClassKey,Class<?>>();
-
-    /**
-     * Method for adding a mapping from super type to specific subtype.
-     * Arguments will be checked by method, to ensure that <code>superType</code>
-     * is abstract (since resolver is never called for concrete classes);
-     * as well as to ensure that there is supertype/subtype relationship
-     * (to ensure there won't be cycles during resolution).
-     * 
-     * @param superType Abstract type to resolve
-     * @param subType Sub-class of superType, to map superTo to
-     * 
-     * @return This resolver, to allow chaining of initializations
-     */
-    public <T> SimpleAbstractTypeResolver addMapping(Class<T> superType, Class<? extends T> subType)
-    {
-        // Sanity checks, just in case someone tries to force typing...
-        if (superType == subType) {
-            throw new IllegalArgumentException("Can not add mapping from class to itself");
-        }
-        if (!superType.isAssignableFrom(subType)) {
-            throw new IllegalArgumentException("Can not add mapping from class "+superType.getName()
-                    +" to "+subType.getName()+", as latter is not a subtype of former");
-        }
-        if (!Modifier.isAbstract(superType.getModifiers())) {
-            throw new IllegalArgumentException("Can not add mapping from class "+superType.getName()
-                    +" since it is not abstract");
-        }
-        _mappings.put(new ClassKey(superType), subType);
-        return this;
-    }
-
-    @Override
-    public JavaType findTypeMapping(DeserializationConfig config, JavaType type)
-    {
-        // this is the main mapping base, so let's 
-        Class<?> src = type.getRawClass();
-        Class<?> dst = _mappings.get(new ClassKey(src));
-        if (dst == null) {
-            return null;
-        }
-        return type.narrowBy(dst);
-    }
-
-    
-    @Override
-    public JavaType resolveAbstractType(DeserializationConfig config, JavaType type)
-    {
-        // never materialize anything, so:
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleDeserializers.java
deleted file mode 100644
index 91246a8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleDeserializers.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.Deserializers;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.type.*;
-
-/**
- * Simple implementation {@link Deserializers} which allows registration of
- * deserializers based on raw (type erased class).
- * It can work well for basic bean and scalar type deserializers, but is not
- * a good fit for handling generic types (like {@link Map}s and {@link Collection}s
- * or array types).
- *<p>
- * Unlike {@link SimpleSerializers}, this class does not currently support generic mappings;
- * all mappings must be to exact declared deserialization type.
- */
-public class SimpleDeserializers
-   implements Deserializers, java.io.Serializable
-{
-    private static final long serialVersionUID = -3006673354353448880L;
-
-    protected HashMap<ClassKey,JsonDeserializer<?>> _classMappings = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction and configuring
-    /**********************************************************
-     */
-    
-    public SimpleDeserializers() { }
-
-    /**
-     * @since 2.1
-     */
-    public SimpleDeserializers(Map<Class<?>,JsonDeserializer<?>> desers) {
-        addDeserializers(desers);
-    }
-    
-    public <T> void addDeserializer(Class<T> forClass, JsonDeserializer<? extends T> deser)
-    {
-        ClassKey key = new ClassKey(forClass);
-        if (_classMappings == null) {
-            _classMappings = new HashMap<ClassKey,JsonDeserializer<?>>();
-        }
-        _classMappings.put(key, deser);
-    }
-
-    /**
-     * @since 2.1
-     */
-    @SuppressWarnings("unchecked")
-    public void addDeserializers(Map<Class<?>,JsonDeserializer<?>> desers)
-    {
-        for (Map.Entry<Class<?>,JsonDeserializer<?>> entry : desers.entrySet()) {
-            Class<?> cls = entry.getKey();
-            // what a mess... nominal generics safety...
-            JsonDeserializer<Object> deser = (JsonDeserializer<Object>) entry.getValue();
-            addDeserializer((Class<Object>) cls, deser);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Serializers implementation
-    /**********************************************************
-     */
-    
-//  @Override
-    public JsonDeserializer<?> findArrayDeserializer(ArrayType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-
-//  @Override
-    public JsonDeserializer<?> findBeanDeserializer(JavaType type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-
-//  @Override
-    public JsonDeserializer<?> findCollectionDeserializer(CollectionType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer,
-            JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-
-//  @Override
-    public JsonDeserializer<?> findCollectionLikeDeserializer(CollectionLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            TypeDeserializer elementTypeDeserializer,
-            JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-    
-//  @Override
-    public JsonDeserializer<?> findEnumDeserializer(Class<?> type,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type));
-    }
-
-//  @Override
-    public JsonDeserializer<?> findMapDeserializer(MapType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer,
-            JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-
-//  @Override
-    public JsonDeserializer<?> findMapLikeDeserializer(MapLikeType type,
-            DeserializationConfig config, BeanDescription beanDesc,
-            KeyDeserializer keyDeserializer,
-            TypeDeserializer elementTypeDeserializer,
-            JsonDeserializer<?> elementDeserializer)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-    
-//  @Override
-    public JsonDeserializer<?> findTreeNodeDeserializer(Class<? extends JsonNode> nodeType,
-            DeserializationConfig config, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(nodeType));
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.java
deleted file mode 100644
index 1ca88f7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleKeyDeserializers.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.KeyDeserializers;
-import com.fasterxml.jackson.databind.type.ClassKey;
-
-/**
- * Simple implementation {@link KeyDeserializers} which allows registration of
- * deserializers based on raw (type erased class).
- * It can work well for basic bean and scalar type deserializers, but is not
- * a good fit for handling generic types (like {@link Map}s and {@link Collection}s
- * or array types).
- *<p>
- * Unlike {@link SimpleSerializers}, this class does not currently support generic mappings;
- * all mappings must be to exact declared deserialization type.
- */
-public class SimpleKeyDeserializers
-    implements KeyDeserializers, java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = -6786398737835438187L;
-
-    protected HashMap<ClassKey,KeyDeserializer> _classMappings = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction and configuring
-    /**********************************************************
-     */
-    
-    public SimpleKeyDeserializers() { }
-
-    public SimpleKeyDeserializers addDeserializer(Class<?> forClass, KeyDeserializer deser)
-    {
-        if (_classMappings == null) {
-            _classMappings = new HashMap<ClassKey,KeyDeserializer>();
-        }
-        _classMappings.put(new ClassKey(forClass), deser);
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Serializers implementation
-    /**********************************************************
-     */
-
-//  @Override
-    public KeyDeserializer findKeyDeserializer(JavaType type,
-            DeserializationConfig config, BeanDescription beanDesc)
-    {
-        if (_classMappings == null) {
-            return null;
-        }
-        return _classMappings.get(new ClassKey(type.getRawClass()));
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleModule.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleModule.java
deleted file mode 100644
index 469a423..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleModule.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.Version;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-
-/**
- * Simple {@link Module} implementation that allows registration
- * of serializers and deserializers, and bean serializer
- * and deserializer modifiers.
- */
-public class SimpleModule
-    extends Module
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 3132264350026957446L;
-
-    protected final String _name;
-    protected final Version _version;
-    
-    protected SimpleSerializers _serializers = null;
-    protected SimpleDeserializers _deserializers = null;
-
-    protected SimpleSerializers _keySerializers = null;
-    protected SimpleKeyDeserializers _keyDeserializers = null;
-
-    /**
-     * Lazily-constructed resolver used for storing mappings from
-     * abstract classes to more specific implementing classes
-     * (which may be abstract or concrete)
-     */
-    protected SimpleAbstractTypeResolver _abstractTypes = null;
-
-    /**
-     * Lazily-constructed resolver used for storing mappings from
-     * abstract classes to more specific implementing classes
-     * (which may be abstract or concrete)
-     */
-    protected SimpleValueInstantiators _valueInstantiators = null;
-
-    /**
-     * Lazily-constructed map that contains mix-in definitions, indexed
-     * by target class, value being mix-in to apply.
-     */
-    protected HashMap<Class<?>, Class<?>> _mixins = null;
-    
-    /**
-     * Set of subtypes to register, if any.
-     */
-    protected LinkedHashSet<NamedType> _subtypes = null;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: creation
-    /**********************************************************
-     */
-
-    /**
-     * Constructors that should only be used for non-reusable
-     * convenience modules used by app code: "real" modules should
-     * use actual name and version number information.
-     */
-    public SimpleModule() {
-        // when passing 'this', can not chain constructors...
-        _name = "SimpleModule-"+System.identityHashCode(this);
-        _version = Version.unknownVersion();
-    }
-    
-    /**
-     * Convenience constructor that will default version to
-     * {@link Version#unknownVersion()}.
-     */
-    public SimpleModule(String name) {
-        this(name, Version.unknownVersion());
-    }
-
-    /**
-     * Convenience constructor that will use specified Version,
-     * including name from {@link Version#getArtifactId()}
-     */
-    public SimpleModule(Version version) {
-        _name = version.getArtifactId();
-        _version = version;
-    }
-    
-    /**
-     * Constructor to use for actual reusable modules.
-     * ObjectMapper may use name as identifier to notice attempts
-     * for multiple registrations of the same module (although it
-     * does not have to).
-     * 
-     * @param name Unique name of the module
-     * @param version Version of the module
-     */
-    public SimpleModule(String name, Version version) {
-        _name = name;
-        _version = version;
-    }
-
-    /**
-     * @since 2.1
-     */
-    public SimpleModule(String name, Version version,
-            Map<Class<?>,JsonDeserializer<?>> deserializers) {
-        this(name, version, deserializers, null);
-    }
-
-    /**
-     * @since 2.1
-     */
-    public SimpleModule(String name, Version version,
-            List<JsonSerializer<?>> serializers) {
-        this(name, version, null, serializers);
-    }
-    
-    /**
-     * @since 2.1
-     */
-    public SimpleModule(String name, Version version,
-            Map<Class<?>,JsonDeserializer<?>> deserializers,
-            List<JsonSerializer<?>> serializers)
-    {
-        _name = name;
-        _version = version;
-        if (deserializers != null) {
-            _deserializers = new SimpleDeserializers(deserializers);
-        }
-        if (serializers != null) {
-            _serializers = new SimpleSerializers(serializers);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Simple setters to allow overriding
-    /**********************************************************
-     */
-
-    /**
-     * Resets all currently configured serializers.
-     */
-    public void setSerializers(SimpleSerializers s) {
-        _serializers = s;
-    }
-
-    /**
-     * Resets all currently configured deserializers.
-     */
-    public void setDeserializers(SimpleDeserializers d) {
-        _deserializers = d;
-    }
-
-    /**
-     * Resets all currently configured key serializers.
-     */
-    public void setKeySerializers(SimpleSerializers ks) {
-        _keySerializers = ks;
-    }
-
-    /**
-     * Resets all currently configured key deserializers.
-     */
-    public void setKeyDeserializers(SimpleKeyDeserializers kd) {
-        _keyDeserializers = kd;
-    }
-
-    /**
-     * Resets currently configured abstract type mappings
-     */
-    public void setAbstractTypes(SimpleAbstractTypeResolver atr) {
-        _abstractTypes = atr;        
-    }
-
-    /**
-     * Resets all currently configured value instantiators
-     */
-    public void setValueInstantiators(SimpleValueInstantiators svi) {
-        _valueInstantiators = svi;
-    }
-    
-    /*
-    /**********************************************************
-    /* Configuration methods
-    /**********************************************************
-     */
-    
-    public SimpleModule addSerializer(JsonSerializer<?> ser)
-    {
-        if (_serializers == null) {
-            _serializers = new SimpleSerializers();
-        }
-        _serializers.addSerializer(ser);
-        return this;
-    }
-    
-    public <T> SimpleModule addSerializer(Class<? extends T> type, JsonSerializer<T> ser)
-    {
-        if (_serializers == null) {
-            _serializers = new SimpleSerializers();
-        }
-        _serializers.addSerializer(type, ser);
-        return this;
-    }
-
-    public <T> SimpleModule addKeySerializer(Class<? extends T> type, JsonSerializer<T> ser)
-    {
-        if (_keySerializers == null) {
-            _keySerializers = new SimpleSerializers();
-        }
-        _keySerializers.addSerializer(type, ser);
-        return this;
-    }
-    
-    public <T> SimpleModule addDeserializer(Class<T> type, JsonDeserializer<? extends T> deser)
-    {
-        if (_deserializers == null) {
-            _deserializers = new SimpleDeserializers();
-        }
-        _deserializers.addDeserializer(type, deser);
-        return this;
-    }
-
-    public SimpleModule addKeyDeserializer(Class<?> type, KeyDeserializer deser)
-    {
-        if (_keyDeserializers == null) {
-            _keyDeserializers = new SimpleKeyDeserializers();
-        }
-        _keyDeserializers.addDeserializer(type, deser);
-        return this;
-    }
-
-    /**
-     * Lazily-constructed resolver used for storing mappings from
-     * abstract classes to more specific implementing classes
-     * (which may be abstract or concrete)
-     */
-    public <T> SimpleModule addAbstractTypeMapping(Class<T> superType,
-            Class<? extends T> subType)
-    {
-        if (_abstractTypes == null) {
-            _abstractTypes = new SimpleAbstractTypeResolver();
-        }
-        // note: addMapping() will verify arguments
-        _abstractTypes = _abstractTypes.addMapping(superType, subType);
-        return this;
-    }
-
-    /**
-     * Method for registering {@link ValueInstantiator} to use when deserializing
-     * instances of type <code>beanType</code>.
-     *<p>
-     * Instantiator is
-     * registered when module is registered for <code>ObjectMapper</code>.
-     */
-    public SimpleModule addValueInstantiator(Class<?> beanType, ValueInstantiator inst)
-    {
-        if (_valueInstantiators == null) {
-            _valueInstantiators = new SimpleValueInstantiators();
-        }
-        _valueInstantiators = _valueInstantiators.addValueInstantiator(beanType, inst);
-        return this;
-    }
-
-    /**
-     * Method for adding set of subtypes to be registered with
-     * {@link ObjectMapper}
-     * this is an alternative to using annotations in super type to indicate subtypes.
-     */
-    public SimpleModule registerSubtypes(Class<?> ... subtypes)
-    {
-        if (_subtypes == null) {
-            _subtypes = new LinkedHashSet<NamedType>(Math.max(16, subtypes.length));
-        }
-        for (Class<?> subtype : subtypes) {
-            _subtypes.add(new NamedType(subtype));
-        }
-        return this;
-    }
-
-    /**
-     * Method for adding set of subtypes (along with type name to use) to be registered with
-     * {@link ObjectMapper}
-     * this is an alternative to using annotations in super type to indicate subtypes.
-     */
-    public SimpleModule registerSubtypes(NamedType ... subtypes)
-    {
-        if (_subtypes == null) {
-            _subtypes = new LinkedHashSet<NamedType>(Math.max(16, subtypes.length));
-        }
-        for (NamedType subtype : subtypes) {
-            _subtypes.add(subtype);
-        }
-        return this;
-    }
-    
-    /**
-     * Method for specifying that annotations define by <code>mixinClass</code>
-     * should be "mixed in" with annotations that <code>targetType</code>
-     * has (as if they were directly included on it!).
-     *<p>
-     * Mix-in annotations are
-     * registered when module is registered for <code>ObjectMapper</code>.
-     */
-    public SimpleModule setMixInAnnotation(Class<?> targetType, Class<?> mixinClass)
-    {
-        if (_mixins == null) {
-            _mixins = new HashMap<Class<?>, Class<?>>();
-        }
-        _mixins.put(targetType, mixinClass);
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Module impl
-    /**********************************************************
-     */
-    
-    @Override
-    public String getModuleName() {
-        return _name;
-    }
-
-    @Override
-    public void setupModule(SetupContext context)
-    {
-        if (_serializers != null) {
-            context.addSerializers(_serializers);
-        }
-        if (_deserializers != null) {
-            context.addDeserializers(_deserializers);
-        }
-        if (_keySerializers != null) {
-            context.addKeySerializers(_keySerializers);
-        }
-        if (_keyDeserializers != null) {
-            context.addKeyDeserializers(_keyDeserializers);
-        }
-        if (_abstractTypes != null) {
-            context.addAbstractTypeResolver(_abstractTypes);
-        }
-        if (_valueInstantiators != null) {
-            context.addValueInstantiators(_valueInstantiators);
-        }
-        if (_subtypes != null && _subtypes.size() > 0) {
-            context.registerSubtypes(_subtypes.toArray(new NamedType[_subtypes.size()]));
-        }
-        if (_mixins != null) {
-            for (Map.Entry<Class<?>,Class<?>> entry : _mixins.entrySet()) {
-                context.setMixInAnnotations(entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
-    @Override
-    public Version version() {
-        return _version;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleSerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleSerializers.java
deleted file mode 100644
index a76bfd6..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleSerializers.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.util.*;
-
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.Serializers;
-import com.fasterxml.jackson.databind.type.ArrayType;
-import com.fasterxml.jackson.databind.type.ClassKey;
-import com.fasterxml.jackson.databind.type.CollectionLikeType;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import com.fasterxml.jackson.databind.type.MapLikeType;
-import com.fasterxml.jackson.databind.type.MapType;
-
-/**
- * Simple implementation {@link Serializers} which allows registration of
- * serializers based on raw (type erased class).
- * It can work well for basic bean and scalar type serializers, but is not
- * a good fit for handling generic types (like {@link Map}s and {@link Collection}s).
- *<p>
- * Type registrations are assumed to be general; meaning that registration of serializer
- * for a super type will also be used for handling subtypes, unless an exact match
- * is found first. As an example, handler for {@link CharSequence} would also be used
- * serializing {@link StringBuilder} instances, unless a direct mapping was found.
- */
-public class SimpleSerializers
-    extends Serializers.Base
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 8531646511998456779L;
-
-    /**
-     * Class-based mappings that are used both for exact and
-     * sub-class matches.
-     */
-    protected HashMap<ClassKey,JsonSerializer<?>> _classMappings = null;
-
-    /**
-     * Interface-based matches.
-     */
-    protected HashMap<ClassKey,JsonSerializer<?>> _interfaceMappings = null;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction and configuring
-    /**********************************************************
-     */
-    
-    public SimpleSerializers() { }
-
-    /**
-     * @since 2.1
-     */
-    public SimpleSerializers(List<JsonSerializer<?>> sers) {
-        addSerializers(sers);
-    }
-    
-    /**
-     * Method for adding given serializer for type that {@link JsonSerializer#handledType}
-     * specifies (which MUST return a non-null class; and can NOT be {@link Object}, as a
-     * sanity check).
-     * For serializers that do not declare handled type, use the variant that takes
-     * two arguments.
-     * 
-     * @param ser
-     */
-    public void addSerializer(JsonSerializer<?> ser)
-    {
-        // Interface to match?
-        Class<?> cls = ser.handledType();
-        if (cls == null || cls == Object.class) {
-            throw new IllegalArgumentException("JsonSerializer of type "+ser.getClass().getName()
-                    +" does not define valid handledType() -- must either register with method that takes type argument "
-                    +" or make serializer extend 'com.fasterxml.jackson.databind.ser.std.StdSerializer'"); 
-        }
-        _addSerializer(cls, ser);
-    }
-
-    public <T> void addSerializer(Class<? extends T> type, JsonSerializer<T> ser)
-    {
-        _addSerializer(type, ser);
-    }
-
-    /**
-     * @since 2.1
-     */
-    public void addSerializers(List<JsonSerializer<?>> sers) {
-        for (JsonSerializer<?> ser : sers) {
-            addSerializer(ser);
-        }
-    }
-
-    private void _addSerializer(Class<?> cls, JsonSerializer<?> ser)
-    {
-        ClassKey key = new ClassKey(cls);
-        // Interface or class type?
-        if (cls.isInterface()) {
-            if (_interfaceMappings == null) {
-                _interfaceMappings = new HashMap<ClassKey,JsonSerializer<?>>();
-            }
-            _interfaceMappings.put(key, ser);
-        } else { // nope, class:
-            if (_classMappings == null) {
-                _classMappings = new HashMap<ClassKey,JsonSerializer<?>>();
-            }
-            _classMappings.put(key, ser);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Serializers implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc)
-    {
-        Class<?> cls = type.getRawClass();
-        ClassKey key = new ClassKey(cls);
-        JsonSerializer<?> ser = null;
-
-        // First: direct match?
-        if (cls.isInterface()) {
-            if (_interfaceMappings != null) {
-                ser = _interfaceMappings.get(key);
-                if (ser != null) {
-                    return ser;
-                }
-            }
-        } else {
-            if (_classMappings != null) {
-                ser = _classMappings.get(key);
-                if (ser != null) {
-                    return ser;
-                }
-                // If not direct match, maybe super-class match?
-                for (Class<?> curr = cls; (curr != null); curr = curr.getSuperclass()) {
-                    key.reset(curr);
-                    ser = _classMappings.get(key);
-                    if (ser != null) {
-                        return ser;
-                    }
-                }
-            }
-        }
-        // No direct match? How about super-interfaces?
-        if (_interfaceMappings != null) {
-            ser = _findInterfaceMapping(cls, key);
-            if (ser != null) {
-                return ser;
-            }
-            // still no matches? Maybe interfaces of super classes
-            if (!cls.isInterface()) {
-                while ((cls = cls.getSuperclass()) != null) {
-                    ser = _findInterfaceMapping(cls, key);
-                    if (ser != null) {
-                        return ser;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public JsonSerializer<?> findArraySerializer(SerializationConfig config,
-            ArrayType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) {
-        return findSerializer(config, type, beanDesc);
-    }
-
-    @Override
-    public JsonSerializer<?> findCollectionSerializer(SerializationConfig config,
-            CollectionType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) {
-        return findSerializer(config, type, beanDesc);
-    }
-
-    @Override
-    public JsonSerializer<?> findCollectionLikeSerializer(SerializationConfig config,
-            CollectionLikeType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) {
-        return findSerializer(config, type, beanDesc);
-    }
-        
-    @Override
-    public JsonSerializer<?> findMapSerializer(SerializationConfig config,
-            MapType type, BeanDescription beanDesc,
-            JsonSerializer<Object> keySerializer,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) {
-        return findSerializer(config, type, beanDesc);
-    }
-
-    @Override
-    public JsonSerializer<?> findMapLikeSerializer(SerializationConfig config,
-            MapLikeType type, BeanDescription beanDesc,
-            JsonSerializer<Object> keySerializer,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) {
-        return findSerializer(config, type, beanDesc);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    protected JsonSerializer<?> _findInterfaceMapping(Class<?> cls, ClassKey key)
-    {
-        for (Class<?> iface : cls.getInterfaces()) {
-            key.reset(iface);
-            JsonSerializer<?> ser = _interfaceMappings.get(key);
-            if (ser != null) {
-                return ser;
-            }
-            ser = _findInterfaceMapping(iface, key);
-            if (ser != null) {
-                return ser;
-            }
-        }
-        return null;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleValueInstantiators.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleValueInstantiators.java
deleted file mode 100644
index 00af428..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/SimpleValueInstantiators.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.fasterxml.jackson.databind.module;
-
-import java.util.HashMap;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.deser.ValueInstantiator;
-import com.fasterxml.jackson.databind.deser.ValueInstantiators;
-import com.fasterxml.jackson.databind.type.ClassKey;
-
-public class SimpleValueInstantiators
-    extends ValueInstantiators.Base
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = -8929386427526115130L;
-
-    /**
-     * Mappings from raw (type-erased, i.e. non-generic) types
-     * to matching {@link ValueInstantiator} instances.
-     */
-    protected HashMap<ClassKey,ValueInstantiator> _classMappings;
-
-    /*
-    /**********************************************************
-    /* Life-cycle, construction and configuring
-    /**********************************************************
-     */
-
-    public SimpleValueInstantiators()
-    {
-        _classMappings = new HashMap<ClassKey,ValueInstantiator>();        
-    }
-    
-    public SimpleValueInstantiators addValueInstantiator(Class<?> forType,
-            ValueInstantiator inst)
-    {
-        _classMappings.put(new ClassKey(forType), inst);
-        return this;
-    }
-    
-    @Override
-    public ValueInstantiator findValueInstantiator(DeserializationConfig config,
-            BeanDescription beanDesc, ValueInstantiator defaultInstantiator)
-    {
-        ValueInstantiator inst = _classMappings.get(new ClassKey(beanDesc.getBeanClass()));
-        return (inst == null) ? defaultInstantiator : inst;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/module/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/module/package-info.java
deleted file mode 100644
index 75cf295..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/module/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Package that contains classes and interfaces to help implement
- * custom extension {@link com.fasterxml.jackson.databind.Module}s
- * (which are registered using
- * {@link com.fasterxml.jackson.databind.ObjectMapper#registerModule}.
- *<p>
- * Note that classes in the package only support registering
- * handlers for non-generic types (types without type
- * parameterization) -- hence "simple" -- which works for
- * many cases, but not all. So if you will need to register
- * handlers for generic types, you will usually need to either
- * sub-class handlers, or implement/extend base types directly.
- */
-package com.fasterxml.jackson.databind.module;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ArrayNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/ArrayNode.java
deleted file mode 100644
index 8c6afa0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ArrayNode.java
+++ /dev/null
@@ -1,911 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Node class that represents Arrays mapped from Json content.
- */
-public class ArrayNode
-    extends ContainerNode<ArrayNode>
-{
-    // before 2.1, was explicitly `ArrayList`
-    protected List<JsonNode> _children;
-
-    public ArrayNode(JsonNodeFactory nc) { super(nc); }
-
-    protected ArrayNode(JsonNodeFactory nc, List<JsonNode> children) {
-        super(nc);
-        _children = children;
-    }
-    
-    // note: co-variant to allow caller-side type safety
-    @SuppressWarnings("unchecked")
-    @Override
-    public ArrayNode deepCopy()
-    {
-        /* 28-Sep-2012, tatu: Sub-classes really should override this method to
-         *   produce compliant copies.
-         */
-        if (getClass() != ArrayNode.class) {
-            throw new IllegalStateException("ArrayNode subtype ("+getClass().getName()+" does not override deepCopy(), needs to");
-        }
-        return _defaultDeepCopy();
-    }
-
-    /**
-     * Default implementation for 'deepCopy()': can be delegated to by sub-classes
-     * if necessary; but usually isn't.
-     */
-    protected ArrayNode _defaultDeepCopy()
-    {
-        if (_children == null) {
-            return new ArrayNode(_nodeFactory);
-        }
-        final int len = _children.size();
-        List<JsonNode> newKids = _createList(Math.max(4, len));
-        for (int i = 0; i < len; ++i) {
-            newKids.add(_children.get(i).deepCopy());
-        }
-        return new ArrayNode(_nodeFactory, newKids);
-    }
-    
-    /*
-    /**********************************************************
-    /* Implementation of core JsonNode API
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.START_ARRAY; }
-
-    @Override
-    public boolean isArray() { return true; }
-
-    @Override
-    public int size()
-    {
-        return (_children == null) ? 0 : _children.size();
-    }
-
-    @Override
-    public Iterator<JsonNode> elements()
-    {
-        return (_children == null) ? NoNodesIterator.instance() : _children.iterator();
-    }
-
-    @Override
-    public JsonNode get(int index)
-    {
-        if (index >= 0 && (_children != null) && index < _children.size()) {
-            return _children.get(index);
-        }
-        return null;
-    }
-
-    @Override
-    public JsonNode get(String fieldName) { return null; }
-
-    @Override
-    public JsonNode path(String fieldName) { return MissingNode.getInstance(); }
-
-    @Override
-    public JsonNode path(int index)
-    {
-        if (index >= 0 && (_children != null) && index < _children.size()) {
-            return _children.get(index);
-        }
-        return MissingNode.getInstance();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, serialization
-    /**********************************************************
-     */
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeStartArray();
-        if (_children != null) {
-            for (JsonNode n : _children) {
-                /* 17-Feb-2009, tatu: Can we trust that all nodes will always
-                 *   extend BaseJsonNode? Or if not, at least implement
-                 *   JsonSerializable? Let's start with former, change if
-                 *   we must.
-                 */
-                ((BaseJsonNode)n).serialize(jg, provider);
-            }
-        }
-        jg.writeEndArray();
-    }
-
-    @Override
-    public void serializeWithType(JsonGenerator jg, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        typeSer.writeTypePrefixForArray(this, jg);
-        if (_children != null) {
-            for (JsonNode n : _children) {
-                ((BaseJsonNode)n).serialize(jg, provider);
-            }
-        }
-        typeSer.writeTypeSuffixForArray(this, jg);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, finding value nodes
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonNode findValue(String fieldName)
-    {
-        if (_children != null) {
-            for (JsonNode node : _children) {
-                JsonNode value = node.findValue(fieldName);
-                if (value != null) {
-                    return value;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public List<JsonNode> findValues(String fieldName, List<JsonNode> foundSoFar)
-    {
-        if (_children != null) {
-            for (JsonNode node : _children) {
-                foundSoFar = node.findValues(fieldName, foundSoFar);
-            }
-        }
-        return foundSoFar;
-    }
-
-    @Override
-    public List<String> findValuesAsText(String fieldName, List<String> foundSoFar)
-    {
-        if (_children != null) {
-            for (JsonNode node : _children) {
-                foundSoFar = node.findValuesAsText(fieldName, foundSoFar);
-            }
-        }
-        return foundSoFar;
-    }
-    
-    @Override
-    public ObjectNode findParent(String fieldName)
-    {
-        if (_children != null) {
-            for (JsonNode node : _children) {
-                JsonNode parent = node.findParent(fieldName);
-                if (parent != null) {
-                    return (ObjectNode) parent;
-                }
-            }
-        }
-        return null;        
-    }
-
-    @Override
-    public List<JsonNode> findParents(String fieldName, List<JsonNode> foundSoFar)
-    {
-        if (_children != null) {
-            for (JsonNode node : _children) {
-                foundSoFar = node.findParents(fieldName, foundSoFar);
-            }
-        }
-        return foundSoFar;
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended ObjectNode API, accessors
-    /**********************************************************
-     */
-
-    /**
-     * Method that will set specified field, replacing old value,
-     * if any.
-     *
-     * @param value to set field to; if null, will be converted
-     *   to a {@link NullNode} first  (to remove field entry, call
-     *   {@link #remove} instead)
-     *
-     * @return Old value of the field, if any; null if there was no
-     *   old value.
-     */
-    public JsonNode set(int index, JsonNode value)
-    {
-        if (value == null) { // let's not store 'raw' nulls but nodes
-            value = nullNode();
-        }
-        return _set(index, value);
-    }
-
-    /**
-     * Method for adding specified node at the end of this array.
-     * 
-     * @return This node, to allow chaining
-     */
-    public ArrayNode add(JsonNode value)
-    {
-        if (value == null) { // let's not store 'raw' nulls but nodes
-            value = nullNode();
-        }
-        _add(value);
-        return this;
-    }
-
-    /**
-     * Method for adding all child nodes of given Array, appending to
-     * child nodes this array contains
-     * 
-     * @param other Array to add contents from
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ArrayNode addAll(ArrayNode other)
-    {
-        int len = other.size();
-        if (len > 0) {
-            if (_children == null) {
-                _children = _createList(len+2);
-            }
-            other.addContentsTo(_children);
-        }
-        return this;
-    }
-
-    /**
-     * Method for adding given nodes as child nodes of this array node.
-     * 
-     * @param nodes Nodes to add
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ArrayNode addAll(Collection<JsonNode> nodes)
-    {
-        int len = nodes.size();
-        if (len > 0) {
-            if (_children == null) {
-                _children = _createList(nodes.size());
-            }
-            _children.addAll(nodes);
-        }
-        return this;
-    }
-    
-    /**
-     * Method for inserting specified child node as an element
-     * of this Array. If index is 0 or less, it will be inserted as
-     * the first element; if >= size(), appended at the end, and otherwise
-     * inserted before existing element in specified index.
-     * No exceptions are thrown for any index.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ArrayNode insert(int index, JsonNode value)
-    {
-        if (value == null) {
-            value = nullNode();
-        }
-        _insert(index, value);
-        return this;
-    }
-
-    /**
-     * Method for removing an entry from this ArrayNode.
-     * Will return value of the entry at specified index, if entry existed;
-     * null if not.
-     * 
-     * @return Node removed, if any; null if none
-     */
-    public JsonNode remove(int index)
-    {
-        if (index >= 0 && (_children != null) && index < _children.size()) {
-            return _children.remove(index);
-        }
-        return null;
-    }
-
-    /**
-     * Method for removing all elements of this array, leaving the
-     * array empty.
-     * 
-     * @return This node (to allow chaining)
-     */
-    @Override
-    public ArrayNode removeAll()
-    {
-        _children = null;
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended ObjectNode API, mutators, generic; addXxx()/insertXxx()
-    /**********************************************************
-     */
-
-    /**
-     * Method that will construct an ArrayNode and add it as a
-     * field of this ObjectNode, replacing old value, if any.
-     *
-     * @return Newly constructed ArrayNode
-     */
-    public ArrayNode addArray()
-    {
-        ArrayNode n  = arrayNode();
-        _add(n);
-        return n;
-    }
-
-    /**
-     * Method that will construct an ObjectNode and add it at the end
-     * of this array node.
-     *
-     * @return Newly constructed ObjectNode
-     */
-    public ObjectNode addObject()
-    {
-        ObjectNode n  = objectNode();
-        _add(n);
-        return n;
-    }
-
-    /**
-     * Method that will construct a POJONode and add it at the end
-     * of this array node.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode addPOJO(Object value)
-    {
-        if (value == null) {
-            addNull();
-        } else {
-            _add(POJONode(value));
-        }
-        return this;
-    }
-
-    /**
-     * Method that will add a null value at the end of this array node.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode addNull()
-    {
-        _add(nullNode());
-        return this;
-    }
-
-    /**
-     * Method for adding specified number at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(int v) {
-        _add(numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(Integer value) {
-        if (value == null) {
-            return addNull();
-        }
-        return _add(numberNode(value.intValue()));
-    }
-    
-    /**
-     * Method for adding specified number at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(long v) { return _add(numberNode(v)); }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(Long value) {
-        if (value == null) {
-            return addNull();
-        }
-        return _add(numberNode(value.longValue()));
-    }
-    
-    /**
-     * Method for adding specified number at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(float v) {
-        return _add(numberNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(Float value) {
-        if (value == null) {
-            return addNull();
-        }
-        return _add(numberNode(value.floatValue()));
-    }
-    
-    /**
-     * Method for adding specified number at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(double v) {
-        return _add(numberNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(Double value) {
-        if (value == null) {
-            return addNull();
-        }
-        return _add(numberNode(value.doubleValue()));
-    }
-    
-    /**
-     * Method for adding specified number at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(BigDecimal v) {
-        if (v == null) {
-            return addNull();
-        }
-        return _add(numberNode(v));
-    }
-
-    /**
-     * Method for adding specified String value at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(String v) {
-        if (v == null) {
-            return addNull();
-        }
-        return _add(textNode(v));
-    }
-
-    /**
-     * Method for adding specified boolean value at the end of this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(boolean v) {
-        return _add(booleanNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(Boolean value) {
-        if (value == null) {
-            return addNull();
-        }
-        return _add(booleanNode(value.booleanValue()));
-    }
-    
-    /**
-     * Method for adding specified binary value at the end of this array
-     * (note: when serializing as JSON, will be output Base64 encoded)
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode add(byte[] v) {
-        if (v == null) {
-            return addNull();
-        }
-        return _add(binaryNode(v));
-    }
-
-    /**
-     * Method for creating an array node, inserting it at the
-     * specified point in the array,
-     * and returning the <b>newly created array</b>
-     * (note: NOT 'this' array)
-     */
-    public ArrayNode insertArray(int index)
-    {
-        ArrayNode n  = arrayNode();
-        _insert(index, n);
-        return n;
-    }
-
-    /**
-     * Method for creating an {@link ObjectNode}, appending it at the end
-     * of this array, and returning the <b>newly created node</b>
-     * (note: NOT 'this' array)
-     * 
-     * @return Newly constructed ObjectNode
-     */
-    public ObjectNode insertObject(int index)
-    {
-        ObjectNode n  = objectNode();
-        _insert(index, n);
-        return n;
-    }
-
-    /**
-     * Method that will construct a POJONode and
-     * insert it at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insertPOJO(int index, Object value)
-    {
-        if (value == null) {
-            return insertNull(index);
-        }
-        return _insert(index, POJONode(value));
-    }
-
-    /**
-     * Method that will insert a null value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insertNull(int index)
-    {
-        _insert(index, nullNode());
-        return this;
-    }
-
-    /**
-     * Method that will insert specified numeric value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, int v) {
-        _insert(index, numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, Integer value) {
-        if (value == null) {
-            insertNull(index);
-        } else {
-            _insert(index, numberNode(value.intValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method that will insert specified numeric value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, long v) {
-        return _insert(index, numberNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, Long value) {
-        if (value == null) {
-            return insertNull(index);
-        }
-        return _insert(index, numberNode(value.longValue()));
-    }
-    
-    /**
-     * Method that will insert specified numeric value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, float v) {
-        return _insert(index, numberNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, Float value) {
-        if (value == null) {
-            return insertNull(index);
-        }
-        return _insert(index, numberNode(value.floatValue()));
-    }
-    
-    /**
-     * Method that will insert specified numeric value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, double v) {
-        return _insert(index, numberNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, Double value) {
-        if (value == null) {
-            return insertNull(index);
-        }
-        return _insert(index, numberNode(value.doubleValue()));
-    }
-
-    /**
-     * Method that will insert specified numeric value
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, BigDecimal v) {
-        if (v == null) {
-            return insertNull(index);
-        }
-        return _insert(index, numberNode(v));
-    }
-
-    /**
-     * Method that will insert specified String
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, String v) {
-        if (v == null) {
-            return insertNull(index);
-        }
-        return _insert(index, textNode(v));
-    }
-
-    /**
-     * Method that will insert specified String
-     * at specified position in this array.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, boolean v) {
-        return _insert(index, booleanNode(v));
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, Boolean value) {
-        if (value == null) {
-            return insertNull(index);
-        }
-        return _insert(index, booleanNode(value.booleanValue()));
-    }
-    
-    /**
-     * Method that will insert specified binary value
-     * at specified position in this array
-     * (note: when written as JSON, will be Base64 encoded)
-     * 
-     * @return This array node, to allow chaining
-     */
-    public ArrayNode insert(int index, byte[] v) {
-        if (v == null) {
-            return insertNull(index);
-        }
-        return _insert(index, binaryNode(v));
-    }
-
-    /*
-    /**********************************************************
-    /* Package methods (for other node classes to use)
-    /**********************************************************
-     */
-
-    protected void addContentsTo(List<JsonNode> dst)
-    {
-        if (_children != null) {
-            for (JsonNode n : _children) {
-                dst.add(n);
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable methods
-    /**********************************************************
-     */
-
-    /**
-     * Internal factory method for creating {@link Map} used for storing
-     * child nodes. 
-     * Overridable by sub-classes, used when caller does not know what
-     * optimal size would, used for example when constructing a Map when adding
-     * the first one.
-     * 
-     * @since 2.1
-     */
-    protected List<JsonNode> _createList() {
-        return new ArrayList<JsonNode>();
-    }
-    
-    /**
-     * Internal factory method for creating {@link Map} used for storing
-     * child nodes. 
-     * Overridable by sub-classes, used when caller has an idea of what
-     * optimal size should be: used when copying contents of an existing node.
-     * 
-     * @since 2.1
-     */
-    protected List<JsonNode> _createList(int defaultSize) {
-        return new ArrayList<JsonNode>(defaultSize);
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        ArrayNode other = (ArrayNode) o;
-        if (_children == null || _children.size() == 0) {
-            return other.size() == 0;
-        }
-        return other._sameChildren(_children);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int hash;
-        if (_children == null) {
-            hash = 1;
-        } else {
-            hash = _children.size();
-            for (JsonNode n : _children) {
-                if (n != null) {
-                    hash ^= n.hashCode();
-                }
-            }
-        }
-        return hash;
-    }
-
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(16 + (size() << 4));
-        sb.append('[');
-        if (_children != null) {
-            for (int i = 0, len = _children.size(); i < len; ++i) {
-                if (i > 0) {
-                    sb.append(',');
-                }
-                sb.append(_children.get(i).toString());
-            }
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    public JsonNode _set(int index, JsonNode value)
-    {
-        if (_children == null || index < 0 || index >= _children.size()) {
-            throw new IndexOutOfBoundsException("Illegal index "+index+", array size "+size());
-        }
-        return _children.set(index, value);
-    }
-
-    private ArrayNode _add(JsonNode node)
-    {
-        if (_children == null) {
-            _children = _createList();
-        }
-        _children.add(node);
-        return this;
-    }
-
-    private ArrayNode _insert(int index, JsonNode node)
-    {
-        if (_children == null) {
-            _children = _createList();
-            _children.add(node);
-            return this;
-        }
-        if (index < 0) {
-            _children.add(0, node);
-        } else if (index >= _children.size()) {
-            _children.add(node);
-        } else {
-            _children.add(index, node);
-        }
-        return this;
-    }
-
-    /**
-     * Note: this method gets called iff <code>otherChildren</code>
-     * is non-empty
-     */
-    private boolean _sameChildren(List<JsonNode> otherChildren)
-    {
-        int len = otherChildren.size();
-        if (this.size() != len) { // important: call size() to handle case of null list...
-            return false;
-        }
-        for (int i = 0; i < len; ++i) {
-            if (!_children.get(i).equals(otherChildren.get(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BaseJsonNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/BaseJsonNode.java
deleted file mode 100644
index be817bd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BaseJsonNode.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.util.List;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializable;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Abstract base class common to all standard {@link JsonNode}
- * implementations.
- * The main addition here is that we declare that sub-classes must
- * implement {@link JsonSerializable}.
- * This simplifies object mapping aspects a bit, as no external serializers are needed.
- */
-public abstract class BaseJsonNode
-    extends JsonNode
-    implements JsonSerializable
-{
-    protected BaseJsonNode() { }
-
-    /*
-    /**********************************************************
-    /* Basic definitions for non-container types
-    /**********************************************************
-     */
-
-    @Override
-    public JsonNode findValue(String fieldName) {
-        return null;
-    }
-
-    @Override
-    public final JsonNode findPath(String fieldName)
-    {
-        JsonNode value = findValue(fieldName);
-        if (value == null) {
-            return MissingNode.getInstance();
-        }
-        return value;
-    }
-    
-    // note: co-variant return type
-    @Override
-    public ObjectNode findParent(String fieldName) {
-        return null;
-    }
-
-    @Override
-    public List<JsonNode> findValues(String fieldName, List<JsonNode> foundSoFar) {
-        return foundSoFar;
-    }
-
-    @Override
-    public List<String> findValuesAsText(String fieldName, List<String> foundSoFar) {
-        return foundSoFar;
-    }
-    
-    @Override
-    public List<JsonNode> findParents(String fieldName, List<JsonNode> foundSoFar) {
-        return foundSoFar;
-    }
-    
-    /*
-    /**********************************************************
-    /* Support for traversal-as-stream
-    /**********************************************************
-     */
-
-    @Override
-    public JsonParser traverse() {
-        return new TreeTraversingParser(this);
-    }
-
-    /**
-     * Method that can be used for efficient type detection
-     * when using stream abstraction for traversing nodes.
-     * Will return the first {@link JsonToken} that equivalent
-     * stream event would produce (for most nodes there is just
-     * one token but for structured/container types multiple)
-     */
-    @Override
-    public abstract JsonToken asToken();
-
-    /**
-     * Returns code that identifies type of underlying numeric
-     * value, if (and only if) node is a number node.
-     */
-    @Override
-    public JsonParser.NumberType numberType() {
-        // most types non-numeric, so:
-        return null; 
-    }
-
-    /*
-    /**********************************************************
-    /* JsonSerializable
-    /**********************************************************
-     */
-
-    /**
-     * Method called to serialize node instances using given generator.
-     */
-//  @Override
-    public abstract void serialize(JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException;
-
-    /**
-     * Type information is needed, even if JsonNode instances are "plain" JSON,
-     * since they may be mixed with other types.
-     */
-//  @Override
-    public abstract void serializeWithType(JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException;
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BigIntegerNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/BigIntegerNode.java
deleted file mode 100644
index c29f799..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BigIntegerNode.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-/**
- * Numeric node that contains simple 64-bit integer values.
- */
-public final class BigIntegerNode
-    extends NumericNode
-{
-    private final static BigInteger MIN_INTEGER = BigInteger.valueOf(Integer.MIN_VALUE);
-    private final static BigInteger MAX_INTEGER = BigInteger.valueOf(Integer.MAX_VALUE);
-    private final static BigInteger MIN_LONG = BigInteger.valueOf(Long.MIN_VALUE);
-    private final static BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
-    
-    final protected BigInteger _value;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    public BigIntegerNode(BigInteger v) { _value = v; }
-
-    public static BigIntegerNode valueOf(BigInteger v) { return new BigIntegerNode(v); }
-
-    /* 
-    /**********************************************************
-    /* Overrridden JsonNode methods
-    /**********************************************************
-     */
-
-    @Override
-    public JsonToken asToken() { return JsonToken.VALUE_NUMBER_INT; }
-
-    @Override
-    public JsonParser.NumberType numberType() { return JsonParser.NumberType.BIG_INTEGER; }
-
-    @Override
-    public boolean isIntegralNumber() { return true; }
-
-    @Override
-    public boolean isBigInteger() { return true; }
-
-    @Override public boolean canConvertToInt() {
-        return (_value.compareTo(MIN_INTEGER) >= 0) && (_value.compareTo(MAX_INTEGER) <= 0);
-    }
-    @Override public boolean canConvertToLong() {
-        return (_value.compareTo(MIN_LONG) >= 0) && (_value.compareTo(MAX_LONG) <= 0);
-    }
-    
-    @Override
-    public Number numberValue() {
-        return _value;
-    }
-
-    @Override
-    public int intValue() { return _value.intValue(); }
-
-    @Override
-    public long longValue() { return _value.longValue(); }
-
-    @Override
-    public BigInteger bigIntegerValue() { return _value; }
-
-    @Override
-    public double doubleValue() { return _value.doubleValue(); }
-
-    @Override
-    public BigDecimal decimalValue() { return new BigDecimal(_value); }
-
-    /* 
-    /**********************************************************
-    /* General type coercions
-    /**********************************************************
-     */
-    
-    @Override
-    public String asText() {
-        return _value.toString();
-    }
-
-    @Override
-    public boolean asBoolean(boolean defaultValue) {
-        return !BigInteger.ZERO.equals(_value);
-    }
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNumber(_value);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return ((BigIntegerNode) o)._value.equals(_value);
-    }
-
-    @Override
-    public int hashCode() {
-        return _value.hashCode();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BinaryNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/BinaryNode.java
deleted file mode 100644
index 057ad4d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BinaryNode.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Value node that contains Base64 encoded binary value, which will be
- * output and stored as Json String value.
- */
-public final class BinaryNode
-    extends ValueNode
-{
-    final static BinaryNode EMPTY_BINARY_NODE = new BinaryNode(new byte[0]);
-
-    final byte[] _data;
-
-    public BinaryNode(byte[] data)
-    {
-        _data = data;
-    }
-
-    public BinaryNode(byte[] data, int offset, int length)
-    {
-        if (offset == 0 && length == data.length) {
-            _data = data;
-        } else {
-            _data = new byte[length];
-            System.arraycopy(data, offset, _data, 0, length);
-        }
-    }
-
-    public static BinaryNode valueOf(byte[] data)
-    {
-        if (data == null) {
-            return null;
-        }
-        if (data.length == 0) {
-            return EMPTY_BINARY_NODE;
-        }
-        return new BinaryNode(data);
-    }
-
-    public static BinaryNode valueOf(byte[] data, int offset, int length)
-    {
-        if (data == null) {
-            return null;
-        }
-        if (length == 0) {
-            return EMPTY_BINARY_NODE;
-        }
-        return new BinaryNode(data, offset, length);
-    }
-
-    @Override
-    public JsonToken asToken() {
-        /* No distinct type; could use one for textual values,
-         * but given that it's not in text form at this point,
-         * embedded-object is closest
-         */
-        return JsonToken.VALUE_EMBEDDED_OBJECT;
-    }
-
-    @Override
-    public boolean isBinary() { return true; }
-
-    /**
-     *<p>
-     * Note: caller is not to modify returned array in any way, since
-     * it is not a copy but reference to the underlying byte array.
-     */
-    @Override
-    public byte[] binaryValue() { return _data; }
-
-    /**
-     * Hmmh. This is not quite as efficient as using {@link #serialize},
-     * but will work correctly.
-     */
-    @Override
-    public String asText() {
-        return Base64Variants.getDefaultVariant().encode(_data, false);
-    }
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeBinary(provider.getConfig().getBase64Variant(),
-                _data, 0, _data.length);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return Arrays.equals(((BinaryNode) o)._data, _data);
-    }
-
-    @Override
-    public int hashCode() {
-        return (_data == null) ? -1 : _data.length;
-    }
-
-    /**
-     * Different from other values, since contents need to be surrounded
-     * by (double) quotes.
-     */
-    @Override
-    public String toString()
-    {
-        return Base64Variants.getDefaultVariant().encode(_data, true);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BooleanNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/BooleanNode.java
deleted file mode 100644
index e86fc6b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/BooleanNode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * This concrete value class is used to contain boolean (true / false)
- * values. Only two instances are ever created, to minimize memory
- * usage
- */
-public final class BooleanNode
-    extends ValueNode
-{
-    // // Just need two instances...
-
-    public final static BooleanNode TRUE = new BooleanNode();
-    public final static BooleanNode FALSE = new BooleanNode();
-
-    private BooleanNode() { }
-
-    public static BooleanNode getTrue() { return TRUE; }
-    public static BooleanNode getFalse() { return FALSE; }
-
-    public static BooleanNode valueOf(boolean b) { return b ? TRUE : FALSE; }
-
-    // Interesting... two choices...
-    @Override public JsonToken asToken() {
-        return (this == TRUE) ? JsonToken.VALUE_TRUE : JsonToken.VALUE_FALSE;
-    }
-
-    @Override
-    public boolean isBoolean() { return true; }
-
-    @Override
-    public boolean booleanValue() {
-        return (this == TRUE);
-    }
-
-    @Override
-    public String asText() {
-        return (this == TRUE) ? "true" : "false";
-    }
-
-    @Override
-    public boolean asBoolean() {
-        return (this == TRUE);
-    }
-
-    @Override
-    public boolean asBoolean(boolean defaultValue) {
-        return (this == TRUE);
-    }
-    
-    @Override
-    public int asInt(int defaultValue) {
-        return (this == TRUE) ? 1 : 0;
-    }
-    @Override
-    public long asLong(long defaultValue) {
-        return (this == TRUE) ? 1L : 0L;
-    }
-    @Override
-    public double asDouble(double defaultValue) {
-        return (this == TRUE) ? 1.0 : 0.0;
-    }
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeBoolean(this == TRUE);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        /* Since there are only ever two instances in existence
-         * can do identity comparison
-         */
-        return (o == this);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ContainerNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/ContainerNode.java
deleted file mode 100644
index 4985e95..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ContainerNode.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-/**
- * This intermediate base class is used for all container nodes,
- * specifically, array and object nodes.
- */
-public abstract class ContainerNode<T extends ContainerNode<T>>
-    extends BaseJsonNode
-{
-    /**
-     * We will keep a reference to the Object (usually TreeMapper)
-     * that can construct instances of nodes to add to this container
-     * node.
-     */
-    protected final JsonNodeFactory _nodeFactory;
-
-    protected ContainerNode(JsonNodeFactory nc)
-    {
-        _nodeFactory = nc;
-    }
-
-    // all containers are mutable: can't define:
-//    @Override public abstract <T extends JsonNode> T deepCopy();
-    
-    @Override
-    public boolean isContainerNode() { return true; }
-
-    @Override
-    public abstract JsonToken asToken();
-    
-    @Override
-    public String asText() { return ""; }
-
-    /*
-    /**********************************************************
-    /* Find methods; made abstract again to ensure implementation
-    /**********************************************************
-     */
-
-    @Override
-    public abstract JsonNode findValue(String fieldName);
-    
-    @Override
-    public abstract ObjectNode findParent(String fieldName);
-
-    @Override
-    public abstract List<JsonNode> findValues(String fieldName, List<JsonNode> foundSoFar);
-    
-    @Override
-    public abstract List<JsonNode> findParents(String fieldName, List<JsonNode> foundSoFar);
-
-    @Override
-    public abstract List<String> findValuesAsText(String fieldName, List<String> foundSoFar);
-    
-    /*
-    /**********************************************************
-    /* Methods reset as abstract to force real implementation
-    /**********************************************************
-     */
-
-    @Override
-    public abstract int size();
-
-    @Override
-    public abstract JsonNode get(int index);
-
-    @Override
-    public abstract JsonNode get(String fieldName);
-
-    /*
-    /**********************************************************
-    /* NodeCreator implementation, just dispatch to
-    /* the real creator
-    /**********************************************************
-     */
-
-    /**
-     * Factory method that constructs and returns an empty {@link ArrayNode}
-     * Construction is done using registered {@link JsonNodeFactory}.
-     */
-    public final ArrayNode arrayNode() { return _nodeFactory.arrayNode(); }
-
-    /**
-     * Factory method that constructs and returns an empty {@link ObjectNode}
-     * Construction is done using registered {@link JsonNodeFactory}.
-     */
-    public final ObjectNode objectNode() { return _nodeFactory.objectNode(); }
-
-    public final NullNode nullNode() { return _nodeFactory.nullNode(); }
-
-    public final BooleanNode booleanNode(boolean v) { return _nodeFactory.booleanNode(v); }
-
-    public final NumericNode numberNode(byte v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(short v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(int v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(long v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(float v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(double v) { return _nodeFactory.numberNode(v); }
-    public final NumericNode numberNode(BigDecimal v) { return (_nodeFactory.numberNode(v)); }
-
-    public final TextNode textNode(String text) { return _nodeFactory.textNode(text); }
-
-    public final BinaryNode binaryNode(byte[] data) { return _nodeFactory.binaryNode(data); }
-    public final BinaryNode binaryNode(byte[] data, int offset, int length) { return _nodeFactory.binaryNode(data, offset, length); }
-
-    public final POJONode POJONode(Object pojo) { return _nodeFactory.POJONode(pojo); }
-
-    /*
-    /**********************************************************
-    /* Common mutators
-    /**********************************************************
-     */
-
-    /**
-     * Method for removing all children container has (if any)
-     *
-     * @return Container node itself (to allow method call chaining)
-     */
-    public abstract T removeAll();
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    protected static class NoNodesIterator
-        implements Iterator<JsonNode>
-    {
-        final static NoNodesIterator instance = new NoNodesIterator();
-
-        private NoNodesIterator() { }
-
-        public static NoNodesIterator instance() { return instance; }
-
-//      @Override
-        public boolean hasNext() { return false; }
-//      @Override
-        public JsonNode next() { throw new NoSuchElementException(); }
-
-//      @Override
-        public void remove() {
-            // could as well throw IllegalOperationException?
-            throw new IllegalStateException();
-        }
-    }
-
-    protected static class NoStringsIterator
-        implements Iterator<String>
-    {
-        final static NoStringsIterator instance = new NoStringsIterator();
-
-        private NoStringsIterator() { }
-
-        public static NoStringsIterator instance() { return instance; }
-
-//      @Override
-        public boolean hasNext() { return false; }
-//      @Override
-        public String next() { throw new NoSuchElementException(); }
-
-//      @Override
-        public void remove() {
-            // could as well throw IllegalOperationException?
-            throw new IllegalStateException();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/DecimalNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/DecimalNode.java
deleted file mode 100644
index 45a5f8c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/DecimalNode.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Numeric node that contains values that do not fit in simple
- * integer (int, long) or floating point (double) values.
- */
-public final class DecimalNode
-    extends NumericNode
-{
-    private final static BigDecimal MIN_INTEGER = BigDecimal.valueOf(Integer.MIN_VALUE);
-    private final static BigDecimal MAX_INTEGER = BigDecimal.valueOf(Integer.MAX_VALUE);
-    private final static BigDecimal MIN_LONG = BigDecimal.valueOf(Long.MIN_VALUE);
-    private final static BigDecimal MAX_LONG = BigDecimal.valueOf(Long.MAX_VALUE);
-
-    final protected BigDecimal _value;
-
-    /* 
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    public DecimalNode(BigDecimal v) { _value = v; }
-
-    public static DecimalNode valueOf(BigDecimal d) { return new DecimalNode(d); }
-
-    /* 
-    /**********************************************************
-    /* BaseJsonNode extended API
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_FLOAT; }
-
-    @Override
-    public JsonParser.NumberType numberType() { return JsonParser.NumberType.BIG_DECIMAL; }
-
-    /* 
-    /**********************************************************
-    /* Overrridden JsonNode methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isFloatingPointNumber() { return true; }
-    
-    @Override
-    public boolean isBigDecimal() { return true; }
-
-    @Override public boolean canConvertToInt() {
-        return (_value.compareTo(MIN_INTEGER) >= 0) && (_value.compareTo(MAX_INTEGER) <= 0);
-    }
-    @Override public boolean canConvertToLong() {
-        return (_value.compareTo(MIN_LONG) >= 0) && (_value.compareTo(MAX_LONG) <= 0);
-    }
-    
-    @Override
-    public Number numberValue() { return _value; }
-
-    @Override
-    public int intValue() { return _value.intValue(); }
-
-    @Override
-    public long longValue() { return _value.longValue(); }
-
-
-    @Override
-    public BigInteger bigIntegerValue() { return _value.toBigInteger(); }
-
-    @Override
-    public double doubleValue() { return _value.doubleValue(); }
-
-    @Override
-    public BigDecimal decimalValue() { return _value; }
-
-    @Override
-    public String asText() {
-        return _value.toString();
-    }
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNumber(_value);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return ((DecimalNode) o)._value.equals(_value);
-    }
-
-    @Override
-    public int hashCode() { return _value.hashCode(); }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/DoubleNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/DoubleNode.java
deleted file mode 100644
index ac1760f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/DoubleNode.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.NumberOutput;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Numeric node that contains 64-bit ("double precision")
- * floating point values simple 32-bit integer values.
- */
-public final class DoubleNode
-    extends NumericNode
-{
-    protected final double _value;
-
-    /* 
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    public DoubleNode(double v) { _value = v; }
-
-    public static DoubleNode valueOf(double v) { return new DoubleNode(v); }
-
-    /* 
-    /**********************************************************
-    /* BaseJsonNode extended API
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_FLOAT; }
-
-    @Override
-    public JsonParser.NumberType numberType() { return JsonParser.NumberType.DOUBLE; }
-
-    /* 
-    /**********************************************************
-    /* Overrridden JsonNode methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isFloatingPointNumber() { return true; }
-
-    @Override
-    public boolean isDouble() { return true; }
-
-    @Override public boolean canConvertToInt() {
-        return (_value >= Integer.MIN_VALUE && _value <= Integer.MAX_VALUE);
-    }
-    @Override public boolean canConvertToLong() {
-        return (_value >= Long.MIN_VALUE && _value <= Long.MAX_VALUE);
-    }
-    
-    @Override
-    public Number numberValue() {
-        return Double.valueOf(_value);
-    }
-
-    @Override
-        public int intValue() { return (int) _value; }
-
-    @Override
-        public long longValue() { return (long) _value; }
-
-    @Override
-        public double doubleValue() { return _value; }
-
-    @Override
-        public BigDecimal decimalValue() { return BigDecimal.valueOf(_value); }
-
-    @Override
-    public BigInteger bigIntegerValue() {
-        return decimalValue().toBigInteger();
-    }
-
-    @Override
-    public String asText() {
-        return NumberOutput.toString(_value);
-    }
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNumber(_value);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-
-        // We must account for NaNs: NaN does not equal NaN, therefore we have
-        // to use Double.compare().
-        final double otherValue = ((DoubleNode) o)._value;
-        return Double.compare(_value, otherValue) == 0;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        // same as hashCode Double.class uses
-        long l = Double.doubleToLongBits(_value);
-        return ((int) l) ^ (int) (l >> 32);
-
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/IntNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/IntNode.java
deleted file mode 100644
index d489547..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/IntNode.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.NumberOutput;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Numeric node that contains simple 32-bit integer values.
- */
-public final class IntNode
-    extends NumericNode
-{
-    // // // Let's cache small set of common value
-
-    final static int MIN_CANONICAL = -1;
-    final static int MAX_CANONICAL = 10;
-
-    private final static IntNode[] CANONICALS;
-    static {
-        int count = MAX_CANONICAL - MIN_CANONICAL + 1;
-        CANONICALS = new IntNode[count];
-        for (int i = 0; i < count; ++i) {
-            CANONICALS[i] = new IntNode(MIN_CANONICAL + i);
-        }
-    }
-
-    /**
-     * Integer value this node contains
-     */
-    final int _value;
-
-    /* 
-    ************************************************
-    * Construction
-    ************************************************
-    */
-
-    public IntNode(int v) { _value = v; }
-
-    public static IntNode valueOf(int i) {
-        if (i > MAX_CANONICAL || i < MIN_CANONICAL) return new IntNode(i);
-        return CANONICALS[i - MIN_CANONICAL];
-    }
-
-    /* 
-    /**********************************************************
-    /* BaseJsonNode extended API
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_INT; }
-
-    @Override
-    public JsonParser.NumberType numberType() { return JsonParser.NumberType.INT; }
-
-    /* 
-    /**********************************************************
-    /* Overrridden JsonNode methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isIntegralNumber() { return true; }
-
-    @Override
-    public boolean isInt() { return true; }
-
-    @Override public boolean canConvertToInt() { return true; }
-    @Override public boolean canConvertToLong() { return true; }
-    
-    @Override
-    public Number numberValue() {
-        return Integer.valueOf(_value);
-    }
-
-    @Override
-    public int intValue() { return _value; }
-
-    @Override
-    public long longValue() { return (long) _value; }
-
-    @Override
-    public double doubleValue() { return (double) _value; }
-
-    @Override
-    public BigDecimal decimalValue() { return BigDecimal.valueOf(_value); }
-
-    @Override
-    public BigInteger bigIntegerValue() { return BigInteger.valueOf(_value); }
-
-    @Override
-    public String asText() {
-        return NumberOutput.toString(_value);
-    }
-
-    @Override
-    public boolean asBoolean(boolean defaultValue) {
-        return _value != 0;
-    }
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNumber(_value);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return ((IntNode) o)._value == _value;
-    }
-
-    @Override
-        public int hashCode() { return _value; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/JsonNodeFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/JsonNodeFactory.java
deleted file mode 100644
index 8618b5a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/JsonNodeFactory.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Base class that specifies methods for getting access to
- * Node instances (newly constructed, or shared, depending
- * on type), as well as basic implementation of the methods. 
- * Designed to be sub-classed if extended functionality (additions
- * to behavior of node types, mostly) is needed.
- */
-public class JsonNodeFactory
-    implements java.io.Serializable // since 2.1
-{
-    // for 2.1:
-    private static final long serialVersionUID = 2323165117839546871L;
-
-    private final boolean _cfgBigDecimalExact;
-
-    private static final JsonNodeFactory decimalsNormalized
-        = new JsonNodeFactory(false);
-    private static final JsonNodeFactory decimalsAsIs
-        = new JsonNodeFactory(true);
-
-    /**
-     * Default singleton instance that construct "standard" node instances:
-     * given that this class is stateless, a globally shared singleton
-     * can be used.
-     */
-    public final static JsonNodeFactory instance = decimalsNormalized;
-
-    /**
-     * Main constructor
-     *
-     * <p>The only argument to this constructor is a boolean telling whether
-     * {@link DecimalNode} instances must be built with exact representations of
-     * {@link BigDecimal} instances.</p>
-     *
-     * <p>This has quite an influence since, for instance, a BigDecimal (and,
-     * therefore, a DecimalNode) constructed from input string {@code "1.0"} and
-     * another constructed with input string {@code "1.00"} <b>will not</b> be
-     * equal, since their scale differs (1 in the first case, 2 in the second
-     * case).</p>
-     *
-     * <p>Note that setting the argument to {@code true} does <i>not</i>
-     * guarantee a strict inequality between JSON representations: input texts
-     * {@code "0.1"} and {@code "1e-1"}, for instance, yield two equivalent
-     * BigDecimal instances since they have the same scale (1).</p>
-     *
-     * <p>The no-arg constructor (and the default {@link #instance}) calls this
-     * constructor with {@code false} as an argument.</p>
-     *
-     * @param bigDecimalExact see description
-     *
-     * @see BigDecimal
-     */
-    protected JsonNodeFactory(boolean bigDecimalExact)
-    {
-        _cfgBigDecimalExact = bigDecimalExact;
-    }
-
-    /**
-     * Default constructor
-     *
-     * <p>This calls {@link #JsonNodeFactory(boolean)} with {@code false}
-     * as an argument.</p>
-     */
-    protected JsonNodeFactory()
-    {
-        this(false);
-    }
-
-    /**
-     * Return a factory instance with the desired behavior for BigDecimals
-     *
-     * <p>See {@link #JsonNodeFactory(boolean)} for a full description.</p>
-     *
-     * @param bigDecimalExact see description
-     * @return a factory instance
-     */
-    public static JsonNodeFactory withExactBigDecimals(boolean bigDecimalExact)
-    {
-        return bigDecimalExact ? decimalsAsIs : decimalsNormalized;
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods for literal values
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for getting an instance of JSON boolean value
-     * (either literal 'true' or 'false')
-     */
-    public BooleanNode booleanNode(boolean v) {
-        return v ? BooleanNode.getTrue() : BooleanNode.getFalse();
-    }
-
-    /**
-     * Factory method for getting an instance of JSON null node (which
-     * represents literal null value)
-     */
-    public NullNode nullNode() { return NullNode.getInstance(); }
-
-    /*
-    /**********************************************************
-    /* Factory methods for numeric values
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 8-bit value
-     */
-    public NumericNode numberNode(byte v) { return IntNode.valueOf(v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may
-     * be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Byte value) {
-        return (value == null) ? nullNode() : IntNode.valueOf(value.intValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 16-bit integer value
-     */
-    public NumericNode numberNode(short v) { return IntNode.valueOf(v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may
-     * be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Short value) {
-        return (value == null) ? nullNode() : IntNode.valueOf(value.shortValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 32-bit integer value
-     */
-    public NumericNode numberNode(int v) { return IntNode.valueOf(v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may
-     * be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Integer value) {
-        return (value == null) ? nullNode() : IntNode.valueOf(value.intValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 64-bit integer value
-     */
-    public NumericNode numberNode(long v) { return LongNode.valueOf(v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Long value) {
-        return (value == null) ? nullNode() : LongNode.valueOf(value.longValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given unlimited range integer value
-     */
-    public NumericNode numberNode(BigInteger v) { return BigIntegerNode.valueOf(v); }
-
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 32-bit floating point value
-     */
-    public NumericNode numberNode(float v) { return DoubleNode.valueOf((double) v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may
-     * be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Float value) {
-        return (value == null) ? nullNode() : DoubleNode.valueOf(value.doubleValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given 64-bit floating point value
-     */
-    public NumericNode numberNode(double v) { return DoubleNode.valueOf(v); }
-
-    /**
-     * Alternate factory method that will handle wrapper value, which may
-     * be null.
-     * Due to possibility of null, returning type is not guaranteed to be
-     * {@link NumericNode}, but just {@link ValueNode}.
-     */
-    public ValueNode numberNode(Double value) {
-        return (value == null) ? nullNode() : DoubleNode.valueOf(value.doubleValue());
-    }
-    
-    /**
-     * Factory method for getting an instance of JSON numeric value
-     * that expresses given unlimited precision floating point value
-     *
-     * <p>In the event that the factory has been built to normalize decimal
-     * values, the BigDecimal argument will be stripped off its trailing zeroes,
-     * using {@link BigDecimal#stripTrailingZeros()}.</p>
-     *
-     * @see #JsonNodeFactory(boolean)
-     */
-    public NumericNode numberNode(BigDecimal v)
-    {
-        return DecimalNode.valueOf(_cfgBigDecimalExact ? v : v.stripTrailingZeros());
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods for textual values
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for constructing a node that represents JSON
-     * String value
-     */
-    public TextNode textNode(String text) { return TextNode.valueOf(text); }
-
-    /**
-     * Factory method for constructing a node that represents given
-     * binary data, and will get serialized as equivalent base64-encoded
-     * String value
-     */
-    public BinaryNode binaryNode(byte[] data) { return BinaryNode.valueOf(data); }
-
-    /**
-     * Factory method for constructing a node that represents given
-     * binary data, and will get serialized as equivalent base64-encoded
-     * String value
-     */
-    public BinaryNode binaryNode(byte[] data, int offset, int length) {
-        return BinaryNode.valueOf(data, offset, length);
-    }
-
-    /*
-    /**********************************************************
-    /* Factory method for structured values
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for constructing an empty JSON Array node
-     */
-    public ArrayNode arrayNode() { return new ArrayNode(this); }
-
-    /**
-     * Factory method for constructing an empty JSON Object ("struct") node
-     */
-    public ObjectNode objectNode() { return new ObjectNode(this); }
-
-    /**
-     * Factory method for constructing a wrapper for POJO
-     * ("Plain Old Java Object") objects; these will get serialized
-     * using data binding, usually as JSON Objects, but in some
-     * cases as JSON Strings or other node types.
-     */
-    public POJONode POJONode(Object pojo) { return new POJONode(pojo); }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/LongNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/LongNode.java
deleted file mode 100644
index c60a909..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/LongNode.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.NumberOutput;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Numeric node that contains simple 64-bit integer values.
- */
-public final class LongNode
-    extends NumericNode
-{
-    final long _value;
-
-    /* 
-    ************************************************
-    * Construction
-    ************************************************
-    */
-
-    public LongNode(long v) { _value = v; }
-
-    public static LongNode valueOf(long l) { return new LongNode(l); }
-
-    /* 
-    ************************************************
-    * Overrridden JsonNode methods
-    ************************************************
-    */
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_INT; }
-
-    @Override
-    public JsonParser.NumberType numberType() { return JsonParser.NumberType.LONG; }
-
-
-    @Override
-    public boolean isIntegralNumber() { return true; }
-
-    @Override
-    public boolean isLong() { return true; }
-
-    @Override public boolean canConvertToInt() {
-        return (_value >= Integer.MIN_VALUE && _value <= Integer.MAX_VALUE);
-    }
-    @Override public boolean canConvertToLong() { return true; }
-    
-    @Override
-    public Number numberValue() {
-        return Long.valueOf(_value);
-    }
-
-    @Override
-    public int intValue() { return (int) _value; }
-
-    @Override
-    public long longValue() { return _value; }
-
-    @Override
-    public double doubleValue() { return (double) _value; }
-
-    @Override
-    public BigDecimal decimalValue() { return BigDecimal.valueOf(_value); }
-
-    @Override
-    public BigInteger bigIntegerValue() { return BigInteger.valueOf(_value); }
-
-    @Override
-    public String asText() {
-        return NumberOutput.toString(_value);
-    }
-
-    @Override
-    public boolean asBoolean(boolean defaultValue) {
-        return _value != 0;
-    }
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNumber(_value);
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return ((LongNode) o)._value == _value;
-    }
-
-    @Override
-    public int hashCode() {
-        return ((int) _value) ^ (int) (_value >> 32);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/MissingNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/MissingNode.java
deleted file mode 100644
index b22bba8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/MissingNode.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * This singleton node class is generated to denote "missing nodes"
- * along paths that do not exist. For example, if a path via
- * element of an array is requested for an element outside range
- * of elements in the array; or for a non-array value, result
- * will be reference to this node.
- *<p>
- * In most respects this placeholder node will act as {@link NullNode};
- * for example, for purposes of value conversions, value is considered
- * to be null and represented as value zero when used for numeric
- * conversions. 
- */
-public final class MissingNode
-    extends BaseJsonNode
-{
-    private final static MissingNode instance = new MissingNode();
-
-    private MissingNode() { }
-
-    // Immutable: no need to copy
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T extends JsonNode> T deepCopy() { return (T) this; }
-    
-    public static MissingNode getInstance() { return instance; }
-
-    @Override public JsonToken asToken() { return JsonToken.NOT_AVAILABLE; }
-
-    @Override
-    public boolean isMissingNode() { return true; }
-
-    @Override
-    public String asText() { return ""; }
-
-    // // Note: not a numeric node, hence default 'asXxx()' are fine:
-    
-    /*
-    public int asInt(int defaultValue);
-    public long asLong(long defaultValue);
-    public double asDouble(double defaultValue);
-    public boolean asBoolean(boolean defaultValue);
-    */
-    
-    @Override
-    public JsonNode path(String fieldName) { return this; }
-
-    @Override
-    public JsonNode path(int index) { return this; }
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        /* Nothing to output... should we signal an error tho?
-         * Chances are, this is an erroneous call. For now, let's
-         * not do that; serialize as explicit null. Why? Because we
-         * can not just omit a value as JSON Object field name may have
-         * been written out.
-         */
-        jg.writeNull();
-    }
-
-    @Override
-    public void serializeWithType(JsonGenerator jg, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNull();
-    }
-    
-    @Override
-    public boolean equals(Object o)
-    {
-        /* Hmmh. Since there's just a singleton instance, this
-         * fails in all cases but with identity comparison.
-         * However: if this placeholder value was to be considered
-         * similar to Sql NULL, it shouldn't even equal itself?
-         * That might cause problems when dealing with collections
-         * like Sets... so for now, let's let identity comparison
-         * return true.
-         */
-        return (o == this);
-    }
-
-    @Override
-    public String toString()
-    {
-        // toString() should never return null
-        return "";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NodeCursor.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/NodeCursor.java
deleted file mode 100644
index 17d760d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NodeCursor.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-/**
- * Helper class used by {@link TreeTraversingParser} to keep track
- * of current location within traversed JSON tree.
- */
-abstract class NodeCursor
-    extends JsonStreamContext
-{
-    /**
-     * Parent cursor of this cursor, if any; null for root
-     * cursors.
-     */
-    protected final NodeCursor _parent;
-
-    /**
-     * Current field name
-     */
-    protected String _currentName;
-    
-    public NodeCursor(int contextType, NodeCursor p)
-    {
-        super();
-        _type = contextType;
-        _index = -1;
-        _parent = p;
-    }
-
-    /*
-    /**********************************************************
-    /* JsonStreamContext impl
-    /**********************************************************
-     */
-
-    // note: co-variant return type
-    @Override
-    public final NodeCursor getParent() { return _parent; }
-
-    @Override
-    public final String getCurrentName() {
-        return _currentName;
-    }
-
-    /**
-     * @since 2.0
-     */
-    public void overrideCurrentName(String name) {
-        _currentName = name;
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    public abstract JsonToken nextToken();
-    public abstract JsonToken nextValue();
-    public abstract JsonToken endToken();
-
-    public abstract JsonNode currentNode();
-    public abstract boolean currentHasChildren();
-    
-    /**
-     * Method called to create a new context for iterating all
-     * contents of the current structured value (JSON array or object)
-     */
-    public final NodeCursor iterateChildren() {
-        JsonNode n = currentNode();
-        if (n == null) throw new IllegalStateException("No current node");
-        if (n.isArray()) { // false since we have already returned START_ARRAY
-            return new Array(n, this);
-        }
-        if (n.isObject()) {
-            return new Object(n, this);
-        }
-        throw new IllegalStateException("Current node of type "+n.getClass().getName());
-    }
-
-    /*
-    /**********************************************************
-    /* Concrete implementations
-    /**********************************************************
-     */
-
-    /**
-     * Context matching root-level value nodes (i.e. anything other
-     * than JSON Object and Array).
-     * Note that context is NOT created for leaf values.
-     */
-    protected final static class RootValue
-        extends NodeCursor
-    {
-        protected JsonNode _node;
-
-        protected boolean _done = false;
-
-        public RootValue(JsonNode n, NodeCursor p) {
-            super(JsonStreamContext.TYPE_ROOT, p);
-            _node = n;
-        }
-
-        @Override
-        public void overrideCurrentName(String name) {
-            
-        }
-        
-        @Override
-        public JsonToken nextToken() {
-            if (!_done) {
-                _done = true;
-                return _node.asToken();
-            }
-            _node = null;
-            return null;
-        }
-        
-        @Override
-        public JsonToken nextValue() { return nextToken(); }
-        @Override
-        public JsonToken endToken() { return null; }
-        @Override
-        public JsonNode currentNode() { return _node; }
-        @Override
-        public boolean currentHasChildren() { return false; }
-    }
-
-    /**
-     * Cursor used for traversing non-empty JSON Array nodes
-     */
-    protected final static class Array
-        extends NodeCursor
-    {
-        protected Iterator<JsonNode> _contents;
-
-        protected JsonNode _currentNode;
-
-        public Array(JsonNode n, NodeCursor p) {
-            super(JsonStreamContext.TYPE_ARRAY, p);
-            _contents = n.elements();
-        }
-
-        @Override
-        public JsonToken nextToken()
-        {
-            if (!_contents.hasNext()) {
-                _currentNode = null;
-                return null;
-            }
-            _currentNode = _contents.next();
-            return _currentNode.asToken();
-        }
-
-        @Override
-        public JsonToken nextValue() { return nextToken(); }
-        @Override
-        public JsonToken endToken() { return JsonToken.END_ARRAY; }
-
-        @Override
-        public JsonNode currentNode() { return _currentNode; }
-        @Override
-        public boolean currentHasChildren() {
-            // note: ONLY to be called for container nodes
-            return ((ContainerNode<?>) currentNode()).size() > 0;
-        }
-    }
-
-    /**
-     * Cursor used for traversing non-empty JSON Object nodes
-     */
-    protected final static class Object
-        extends NodeCursor
-    {
-        protected Iterator<Map.Entry<String, JsonNode>> _contents;
-        protected Map.Entry<String, JsonNode> _current;
-
-        protected boolean _needEntry;
-        
-        public Object(JsonNode n, NodeCursor p)
-        {
-            super(JsonStreamContext.TYPE_OBJECT, p);
-            _contents = ((ObjectNode) n).fields();
-            _needEntry = true;
-        }
-
-        @Override
-        public JsonToken nextToken()
-        {
-            // Need a new entry?
-            if (_needEntry) {
-                if (!_contents.hasNext()) {
-                    _currentName = null;
-                    _current = null;
-                    return null;
-                }
-                _needEntry = false;
-                _current = _contents.next();
-                _currentName = (_current == null) ? null : _current.getKey();
-                return JsonToken.FIELD_NAME;
-            }
-            _needEntry = true;
-            return _current.getValue().asToken();
-        }
-
-        @Override
-        public JsonToken nextValue()
-        {
-            JsonToken t = nextToken();
-            if (t == JsonToken.FIELD_NAME) {
-                t = nextToken();
-            }
-            return t;
-        }
-
-        @Override
-        public JsonToken endToken() { return JsonToken.END_OBJECT; }
-
-        @Override
-        public JsonNode currentNode() {
-            return (_current == null) ? null : _current.getValue();
-        }
-        @Override
-        public boolean currentHasChildren() {
-            // note: ONLY to be called for container nodes
-            return ((ContainerNode<?>) currentNode()).size() > 0;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NullNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/NullNode.java
deleted file mode 100644
index 2b2eecd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NullNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * This singleton value class is used to contain explicit JSON null
- * value.
- */
-public final class NullNode
-    extends ValueNode
-{
-    // // Just need a fly-weight singleton
-
-    public final static NullNode instance = new NullNode();
-
-    private NullNode() { }
-
-    public static NullNode getInstance() { return instance; }
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_NULL; }
-
-    @Override
-    public boolean isNull() { return true; }
-
-    @Override
-    public String asText() {
-        return "null";
-    }
-
-    // as with MissingNode, not considered number node; hence defaults are returned if provided
-    
-    /*
-    public int asInt(int defaultValue);
-    public long asLong(long defaultValue);
-    public double asDouble(double defaultValue);
-    public boolean asBoolean(boolean defaultValue);
-    */
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeNull();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        return (o == this);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NumericNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/NumericNode.java
deleted file mode 100644
index 771ef2c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/NumericNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.JsonParser;
-
-/**
- * Intermediate value node used for numeric nodes.
- */
-public abstract class NumericNode
-    extends ValueNode
-{
-    protected NumericNode() { }
-
-    @Override
-    public final boolean isNumber() { return true; }
-
-    // // // Let's re-abstract so sub-classes handle them
-
-    @Override
-    public abstract JsonParser.NumberType numberType();
-
-    @Override public abstract Number numberValue();
-    @Override public abstract int intValue();
-    @Override public abstract long longValue();
-    @Override public abstract double doubleValue();
-    @Override public abstract BigDecimal decimalValue();
-    @Override public abstract BigInteger bigIntegerValue();
-
-    @Override public abstract boolean canConvertToInt();
-    @Override public abstract boolean canConvertToLong();
-    
-    /* 
-    /**********************************************************
-    /* General type coercions
-    /**********************************************************
-     */
-    
-    @Override
-    public abstract String asText();
-
-    @Override
-    public final int asInt() {
-        return intValue();
-    }
-    @Override
-    public final int asInt(int defaultValue) {
-        return intValue();
-    }
-
-    @Override
-    public final long asLong() {
-        return longValue();
-    }
-    @Override
-    public final long asLong(long defaultValue) {
-        return longValue();
-    }
-    
-    @Override
-    public final double asDouble() {
-        return doubleValue();
-    }
-    @Override
-    public final double asDouble(double defaultValue) {
-        return doubleValue();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ObjectNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/ObjectNode.java
deleted file mode 100644
index 8c91b24..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ObjectNode.java
+++ /dev/null
@@ -1,959 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Node that maps to JSON Object structures in JSON content.
- */
-public class ObjectNode
-    extends ContainerNode<ObjectNode>
-{
-    // note: until 2.1, was explicitly `LinkedHashMap`
-    protected Map<String, JsonNode> _children = null;
-
-    public ObjectNode(JsonNodeFactory nc) { super(nc); }
-
-    protected ObjectNode(JsonNodeFactory nc, Map<String, JsonNode> children) {
-        super(nc);
-        _children = children;
-    }
-    
-    /* Question: should this delegate to `JsonNodeFactory`? It does not absolutely
-     * have to, as long as sub-types override the method but...
-     */
-    // note: co-variant for type safety
-    @SuppressWarnings("unchecked")
-    @Override
-    public ObjectNode deepCopy()
-    {
-        /* 28-Sep-2012, tatu: Sub-classes really should override this method to
-         *   produce compliant copies.
-         */
-        if (getClass() != ObjectNode.class) {
-            throw new IllegalStateException("ObjectNode subtype ("+getClass().getName()+" does not override deepCopy(), needs to");
-        }
-        return _defaultDeepCopy();
-    }
- 
-    /**
-     * Default implementation for 'deepCopy()': can be delegated to by sub-classes
-     * if necessary; but usually isn't.
-     */
-    protected ObjectNode _defaultDeepCopy()
-    {
-        if (_children == null) {
-            return new ObjectNode(_nodeFactory);
-        }
-        final int len = _children.size();
-        Map<String, JsonNode> newKids = _createMap(Math.max(4, len));
-        for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-            newKids.put(entry.getKey(), entry.getValue().deepCopy());
-        }
-        return new ObjectNode(_nodeFactory, newKids);
-    }
-    
-    /*
-    /**********************************************************
-    /* Implementation of core JsonNode API
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.START_OBJECT; }
-
-    @Override
-    public boolean isObject() { return true; }
-
-    @Override
-    public int size() {
-        return (_children == null) ? 0 : _children.size();
-    }
-
-    @Override
-    public Iterator<JsonNode> elements()
-    {
-        return (_children == null) ? NoNodesIterator.instance() : _children.values().iterator();
-    }
-
-    @Override
-    public JsonNode get(int index) { return null; }
-
-    @Override
-    public JsonNode get(String fieldName)
-    {
-        if (_children != null) {
-            return _children.get(fieldName);
-        }
-        return null;
-    }
-
-    @Override
-    public Iterator<String> fieldNames() {
-        return (_children == null) ? NoStringsIterator.instance() : _children.keySet().iterator();
-    }
-
-    @Override
-    public JsonNode path(int index)
-    {
-        return MissingNode.getInstance();
-    }
-
-    @Override
-    public JsonNode path(String fieldName)
-    {
-        if (_children != null) {
-            JsonNode n = _children.get(fieldName);
-            if (n != null) {
-                return n;
-            }
-        }
-        return MissingNode.getInstance();
-    }
-
-    /**
-     * Method to use for accessing all fields (with both names
-     * and values) of this JSON Object.
-     */
-    @Override
-    public Iterator<Map.Entry<String, JsonNode>> fields()
-    {
-        if (_children == null) {
-            return NoFieldsIterator.instance;
-        }
-        return _children.entrySet().iterator();
-    }
-
-    @Override
-    public ObjectNode with(String propertyName)
-    {
-        if (_children == null) {
-            _children = _createMap();
-        } else {
-            JsonNode n = _children.get(propertyName);
-            if (n != null) {
-                if (n instanceof ObjectNode) {
-                    return (ObjectNode) n;
-                }
-                throw new UnsupportedOperationException("Property '"+propertyName
-                        +"' has value that is not of type ObjectNode (but "
-                        +n.getClass().getName()+")");
-            }
-        }
-        ObjectNode result = objectNode();
-        _children.put(propertyName, result);
-        return result;
-    }
-
-    @Override
-    public ArrayNode withArray(String propertyName)
-    {
-        if (_children == null) {
-            _children = _createMap();
-        } else {
-            JsonNode n = _children.get(propertyName);
-            if (n != null) {
-                if (n instanceof ArrayNode) {
-                    return (ArrayNode) n;
-                }
-                throw new UnsupportedOperationException("Property '"+propertyName
-                        +"' has value that is not of type ArrayNode (but "
-                        +n.getClass().getName()+")");
-            }
-        }
-        ArrayNode result = arrayNode();
-        _children.put(propertyName, result);
-        return result;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, finding value nodes
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonNode findValue(String fieldName)
-    {
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-                if (fieldName.equals(entry.getKey())) {
-                    return entry.getValue();
-                }
-                JsonNode value = entry.getValue().findValue(fieldName);
-                if (value != null) {
-                    return value;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @Override
-    public List<JsonNode> findValues(String fieldName, List<JsonNode> foundSoFar)
-    {
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-                if (fieldName.equals(entry.getKey())) {
-                    if (foundSoFar == null) {
-                        foundSoFar = new ArrayList<JsonNode>();
-                    }
-                    foundSoFar.add(entry.getValue());
-                } else { // only add children if parent not added
-                    foundSoFar = entry.getValue().findValues(fieldName, foundSoFar);
-                }
-            }
-        }
-        return foundSoFar;
-    }
-
-    @Override
-    public List<String> findValuesAsText(String fieldName, List<String> foundSoFar)
-    {
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-                if (fieldName.equals(entry.getKey())) {
-                    if (foundSoFar == null) {
-                        foundSoFar = new ArrayList<String>();
-                    }
-                    foundSoFar.add(entry.getValue().asText());
-                } else { // only add children if parent not added
-                    foundSoFar = entry.getValue().findValuesAsText(fieldName, foundSoFar);
-                }
-            }
-        }
-        return foundSoFar;
-    }
-    
-    @Override
-    public ObjectNode findParent(String fieldName)
-    {
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-                if (fieldName.equals(entry.getKey())) {
-                    return this;
-                }
-                JsonNode value = entry.getValue().findParent(fieldName);
-                if (value != null) {
-                    return (ObjectNode) value;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public List<JsonNode> findParents(String fieldName, List<JsonNode> foundSoFar)
-    {
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
-                if (fieldName.equals(entry.getKey())) {
-                    if (foundSoFar == null) {
-                        foundSoFar = new ArrayList<JsonNode>();
-                    }
-                    foundSoFar.add(this);
-                } else { // only add children if parent not added
-                    foundSoFar = entry.getValue().findParents(fieldName, foundSoFar);
-                }
-            }
-        }
-        return foundSoFar;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, serialization
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to serialize this node and
-     * all of its descendants using specified JSON generator.
-     */
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        jg.writeStartObject();
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> en : _children.entrySet()) {
-                jg.writeFieldName(en.getKey());
-                /* 17-Feb-2009, tatu: Can we trust that all nodes will always
-                 *   extend BaseJsonNode? Or if not, at least implement
-                 *   JsonSerializable? Let's start with former, change if
-                 *   we must.
-                 */
-                ((BaseJsonNode) en.getValue()).serialize(jg, provider);
-            }
-        }
-        jg.writeEndObject();
-    }
-
-    @Override
-    public void serializeWithType(JsonGenerator jg, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        typeSer.writeTypePrefixForObject(this, jg);
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> en : _children.entrySet()) {
-                jg.writeFieldName(en.getKey());
-                ((BaseJsonNode) en.getValue()).serialize(jg, provider);
-            }
-        }
-        typeSer.writeTypeSuffixForObject(this, jg);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended ObjectNode API, mutators, since 2.1
-    /**********************************************************
-     */
-
-    /**
-     * Method that will set specified field, replacing old value, if any.
-     * Note that this is identical to {@link #replace(String, JsonNode)},
-     * except for return value.
-     *<p>
-     * NOTE: added to replace those uses of {@link #put(String, JsonNode)}
-     * where chaining with 'this' is desired.
-     *
-     * @param value to set field to; if null, will be converted
-     *   to a {@link NullNode} first  (to remove field entry, call
-     *   {@link #remove} instead)
-     *
-     * @return This node after adding/replacing property value (to allow chaining)
-     *
-     * @since 2.1
-     */
-    public JsonNode set(String fieldName, JsonNode value)
-    {
-        if (value == null) {
-            value = nullNode();
-        }
-        _put(fieldName, value);
-        return this;
-    }
-
-    /**
-     * Method for adding given properties to this object node, overriding
-     * any existing values for those properties.
-     * 
-     * @param properties Properties to add
-     * 
-     * @return This node after adding/replacing property values (to allow chaining)
-     *
-     * @since 2.1
-     */
-    public JsonNode setAll(Map<String,JsonNode> properties)
-    {
-        if (_children == null) {
-            _children = _createMap();
-        } else {
-            for (Map.Entry<String, JsonNode> en : properties.entrySet()) {
-                JsonNode n = en.getValue();
-                if (n == null) {
-                    n = nullNode();
-                }
-                _children.put(en.getKey(), n);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Method for adding all properties of the given Object, overriding
-     * any existing values for those properties.
-     * 
-     * @param other Object of which properties to add to this object
-     *
-     * @return This node after addition (to allow chaining)
-     *
-     * @since 2.1
-     */
-    public JsonNode setAll(ObjectNode other)
-    {
-        int len = other.size();
-        if (len > 0) {
-            if (_children == null) {
-                _children = _createMap(len);
-            }
-            other.putContentsTo(_children);
-        }
-        return this;
-    }
-    
-    /**
-     * Method for replacing value of specific property with passed
-     * value, and returning value (or null if none).
-     *
-     * @param fieldName Property of which value to replace
-     * @param value Value to set property to, replacing old value if any
-     * 
-     * @return Old value of the property; null if there was no such property
-     *   with value
-     * 
-     * @since 2.1
-     */
-    public JsonNode replace(String fieldName, JsonNode value)
-    {
-        if (value == null) { // let's not store 'raw' nulls but nodes
-            value = nullNode();
-        }
-        return _put(fieldName, value);
-    }
-
-    /**
-     * Method for removing field entry from this ObjectNode, and
-     * returning instance after removal.
-     * 
-     * @return This node after removing entry (if any)
-     * 
-     * @since 2.1
-     */
-    public JsonNode without(String fieldName)
-    {
-        if (_children != null) {
-            _children.remove(fieldName);
-        }
-        return this;
-    }
-
-    /**
-     * Method for removing specified field properties out of
-     * this ObjectNode.
-     * 
-     * @param fieldNames Names of fields to remove
-     * 
-     * @return This node after removing entries
-     * 
-     * @since 2.1
-     */
-    public ObjectNode without(Collection<String> fieldNames)
-    {
-        if (_children != null) {
-            for (String fieldName : fieldNames) {
-                _children.remove(fieldName);
-            }
-        }
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended ObjectNode API, mutators, generic
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will set specified field, replacing old value, if any.
-     *
-     * @param value to set field to; if null, will be converted
-     *   to a {@link NullNode} first  (to remove field entry, call
-     *   {@link #remove} instead)
-     *<p>
-     * NOTE: this method will be <b>deprecated</b> in 2.2; and should
-     * be replace with either
-     * {@link #set(String,JsonNode)} or {@link #replace(String,JsonNode)},
-     * depending on which return value is desired for possible chaining.
-     *   
-     * @return Old value of the field, if any; null if there was no
-     *   old value.
-     */
-    public JsonNode put(String fieldName, JsonNode value)
-    {
-        if (value == null) { // let's not store 'raw' nulls but nodes
-            value = nullNode();
-        }
-        return _put(fieldName, value);
-    }
-    
-    /**
-     * Method for removing field entry from this ObjectNode.
-     * Will return value of the field, if such field existed;
-     * null if not.
-     * 
-     * @return Value of specified field, if it existed; null if not
-     */
-    public JsonNode remove(String fieldName)
-    {
-        if (_children != null) {
-            return _children.remove(fieldName);
-        }
-        return null;
-    }
-
-    /**
-     * Method for removing specified field properties out of
-     * this ObjectNode.
-     * 
-     * @param fieldNames Names of fields to remove
-     * 
-     * @return This node after removing entries
-     */
-    public ObjectNode remove(Collection<String> fieldNames)
-    {
-        if (_children != null) {
-            for (String fieldName : fieldNames) {
-                _children.remove(fieldName);
-            }
-        }
-        return this;
-    }
-    
-    /**
-     * Method for removing all field properties, such that this
-     * ObjectNode will contain no properties after call.
-     * 
-     * @return This node after removing all entries
-     */
-    @Override
-    public ObjectNode removeAll()
-    {
-        _children = null;
-        return this;
-    }
-
-    /**
-     * Method for adding given properties to this object node, overriding
-     * any existing values for those properties.
-     *<p>
-     * NOTE: this method will be <b>deprecated</b> in 2.2; and should
-     * be replace with {@link #setAll(Map)}.
-     * 
-     * @param properties Properties to add
-     * 
-     * @return This node after adding/replacing property values (to allow chaining)
-     */
-    public JsonNode putAll(Map<String,JsonNode> properties) {
-        return setAll(properties);
-    }
-
-    /**
-     * Method for adding all properties of the given Object, overriding
-     * any existing values for those properties.
-     *<p>
-     * NOTE: this method will be <b>deprecated</b> in 2.2; and should
-     * be replace with {@link #setAll(ObjectNode)}.
-     * 
-     * @param other Object of which properties to add to this object
-     * 
-     * @return This node (to allow chaining)
-     */
-    public JsonNode putAll(ObjectNode other) {
-        return setAll(other);
-    }
-
-    /**
-     * Method for removing all field properties out of this ObjectNode
-     * <b>except</b> for ones specified in argument.
-     * 
-     * @param fieldNames Fields to <b>retain</b> in this ObjectNode
-     * 
-     * @return This node (to allow call chaining)
-     */
-    public ObjectNode retain(Collection<String> fieldNames)
-    {
-        if (_children != null) {
-            Iterator<Map.Entry<String,JsonNode>> entries = _children.entrySet().iterator();
-            while (entries.hasNext()) {
-                Map.Entry<String, JsonNode> entry = entries.next();
-                if (!fieldNames.contains(entry.getKey())) {
-                    entries.remove();
-                }
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Method for removing all field properties out of this ObjectNode
-     * <b>except</b> for ones specified in argument.
-     * 
-     * @param fieldNames Fields to <b>retain</b> in this ObjectNode
-     * 
-     * @return This node (to allow call chaining)
-     */
-    public ObjectNode retain(String... fieldNames) {
-        return retain(Arrays.asList(fieldNames));
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended ObjectNode API, mutators, typed
-    /**********************************************************
-     */
-
-    /**
-     * Method that will construct an ArrayNode and add it as a
-     * field of this ObjectNode, replacing old value, if any.
-     *<p>
-     * <b>NOTE</b>: Unlike all <b>put(...)</b> methods, return value
-     * is <b>NOT</b> this <code>ObjectNode</code>, but the
-     * <b>newly created</b> <code>ArrayNode</code> instance.
-     *
-     * @return Newly constructed ArrayNode (NOT the old value,
-     *   which could be of any type)
-     */
-    public ArrayNode putArray(String fieldName)
-    {
-        ArrayNode n  = arrayNode();
-        _put(fieldName, n);
-        return n;
-    }
-
-    /**
-     * Method that will construct an ObjectNode and add it as a
-     * field of this ObjectNode, replacing old value, if any.
-     *<p>
-     * <b>NOTE</b>: Unlike all <b>put(...)</b> methods, return value
-     * is <b>NOT</b> this <code>ObjectNode</code>, but the
-     * <b>newly created</b> <code>ObjectNode</code> instance.
-     *
-     * @return Newly constructed ObjectNode (NOT the old value,
-     *   which could be of any type)
-     */
-    public ObjectNode putObject(String fieldName)
-    {
-        ObjectNode n  = objectNode();
-        _put(fieldName, n);
-        return n;
-    }
-
-    /**
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode putPOJO(String fieldName, Object pojo) {
-        _put(fieldName, POJONode(pojo));
-        return this;
-    }
-
-    /**
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode putNull(String fieldName)
-    {
-        _put(fieldName, nullNode());
-        return this;
-    }
-
-    /**
-     * Method for setting value of a field to specified numeric value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, int v) {
-        _put(fieldName, numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, Integer value) {
-        if (value == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, numberNode(value.intValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method for setting value of a field to specified numeric value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, long v) {
-        _put(fieldName, numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, Long value) {
-        if (value == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, numberNode(value.longValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method for setting value of a field to specified numeric value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, float v) {
-        _put(fieldName, numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, Float value) {
-        if (value == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, numberNode(value.floatValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method for setting value of a field to specified numeric value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, double v) {
-        _put(fieldName, numberNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, Double value) {
-        if (value == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, numberNode(value.doubleValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method for setting value of a field to specified numeric value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, BigDecimal v) {
-        if (v == null) {
-            putNull(fieldName);
-        } else {
-            _put(fieldName, numberNode(v));
-        }
-        return this;
-    }
-
-    /**
-     * Method for setting value of a field to specified String value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, String v) {
-        if (v == null) {
-            putNull(fieldName);
-        } else {
-            _put(fieldName, textNode(v));
-        }
-        return this;
-    }
-
-    /**
-     * Method for setting value of a field to specified String value.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, boolean v) {
-        _put(fieldName, booleanNode(v));
-        return this;
-    }
-
-    /**
-     * Alternative method that we need to avoid bumping into NPE issues
-     * with auto-unboxing.
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, Boolean value) {
-        if (value == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, booleanNode(value.booleanValue()));
-        }
-        return this;
-    }
-    
-    /**
-     * Method for setting value of a field to specified binary value
-     * 
-     * @return This node (to allow chaining)
-     */
-    public ObjectNode put(String fieldName, byte[] v) {
-        if (v == null) {
-            _put(fieldName, nullNode());
-        } else {
-            _put(fieldName, binaryNode(v));
-        }
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable methods
-    /**********************************************************
-     */
-
-    /**
-     * Internal factory method for creating {@link Map} used for storing
-     * child nodes. 
-     * Overridable by sub-classes, used when caller does not know what
-     * optimal size would, used for example when constructing a Map when adding
-     * the first one.
-     * 
-     * @since 2.1
-     */
-    protected Map<String, JsonNode> _createMap() {
-        return new LinkedHashMap<String, JsonNode>();
-    }
-    
-    /**
-     * Internal factory method for creating {@link Map} used for storing
-     * child nodes. 
-     * Overridable by sub-classes, used when caller has an idea of what
-     * optimal size should be: used when copying contents of an existing node.
-     * 
-     * @since 2.1
-     */
-    protected Map<String, JsonNode> _createMap(int defaultSize) {
-        return new LinkedHashMap<String, JsonNode>(defaultSize);
-    }
-    
-    /*
-    /**********************************************************
-    /* Package methods (for other node classes to use)
-    /**********************************************************
-     */
-
-    protected void putContentsTo(Map<String,JsonNode> dst)
-    {
-        if (_children != null) {
-            for (Map.Entry<String,JsonNode> en : _children.entrySet()) {
-                dst.put(en.getKey(), en.getValue());
-            }
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) {
-            return false;
-        }
-        ObjectNode other = (ObjectNode) o;
-        if (other.size() != size()) {
-            return false;
-        }
-        if (_children != null) {
-            for (Map.Entry<String, JsonNode> en : _children.entrySet()) {
-                String key = en.getKey();
-                JsonNode value = en.getValue();
-
-                JsonNode otherValue = other.get(key);
-
-                if (otherValue == null || !otherValue.equals(value)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return (_children == null) ? -1 : _children.hashCode();
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(32 + (size() << 4));
-        sb.append("{");
-        if (_children != null) {
-            int count = 0;
-            for (Map.Entry<String, JsonNode> en : _children.entrySet()) {
-                if (count > 0) {
-                    sb.append(",");
-                }
-                ++count;
-                TextNode.appendQuoted(sb, en.getKey());
-                sb.append(':');
-                sb.append(en.getValue().toString());
-            }
-        }
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    private final JsonNode _put(String fieldName, JsonNode value)
-    {
-        if (_children == null) {
-            _children = _createMap();
-        }
-        return _children.put(fieldName, value);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * For efficiency, let's share the "no fields" iterator...
-     */
-    protected static class NoFieldsIterator
-        implements Iterator<Map.Entry<String, JsonNode>>
-    {
-        final static NoFieldsIterator instance = new NoFieldsIterator();
-
-        private NoFieldsIterator() { }
-
-//      @Override
-        public boolean hasNext() { return false; }
-//      @Override
-        public Map.Entry<String,JsonNode> next() { throw new NoSuchElementException(); }
-
-//      @Override
-        public void remove() { // or IllegalOperationException?
-            throw new IllegalStateException();
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/POJONode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/POJONode.java
deleted file mode 100644
index 3c0ef32..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/POJONode.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Value node that contains a wrapped POJO, to be serialized as
- * a JSON constructed through data mapping (usually done by
- * calling {@link com.fasterxml.jackson.databind.ObjectMapper}).
- */
-public final class POJONode
-    extends ValueNode
-{
-    protected final Object _value;
-
-    public POJONode(Object v) { _value = v; }
-
-    /*
-    /**********************************************************
-    /* Base class overrides
-    /**********************************************************
-     */
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_EMBEDDED_OBJECT; }
-
-    @Override
-    public boolean isPojo() { return true; }
-
-    /**
-     * As it is possible that some implementations embed byte[] as POJONode
-     * (despite optimal being {@link BinaryNode}), let's add support for exposing
-     * binary data here too.
-     */
-    @Override
-    public byte[] binaryValue() throws IOException
-    {
-        if (_value instanceof byte[]) {
-            return (byte[]) _value;
-        }
-        return super.binaryValue();
-    }
-    
-    /* 
-    /**********************************************************
-    /* General type coercions
-    /**********************************************************
-     */
-
-    @Override
-    public String asText() {
-        return (_value == null) ? "null" : _value.toString();
-    }
-
-    @Override
-    public boolean asBoolean(boolean defaultValue)
-    {
-        if (_value != null && _value instanceof Boolean) {
-            return ((Boolean) _value).booleanValue();
-        }
-        return defaultValue;
-    }
-    
-    @Override
-    public int asInt(int defaultValue)
-    {
-        if (_value instanceof Number) {
-            return ((Number) _value).intValue();
-        }
-        return defaultValue;
-    }
-
-    @Override
-    public long asLong(long defaultValue)
-    {
-        if (_value instanceof Number) {
-            return ((Number) _value).longValue();
-        }
-        return defaultValue;
-    }
-    
-    @Override
-    public double asDouble(double defaultValue)
-    {
-        if (_value instanceof Number) {
-            return ((Number) _value).doubleValue();
-        }
-        return defaultValue;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, serialization
-    /**********************************************************
-     */
-
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        if (_value == null) {
-            jg.writeNull();
-        } else {
-            jg.writeObject(_value);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to access the POJO this node wraps.
-     */
-    public Object getPojo() { return _value; }
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        POJONode other = (POJONode) o;
-        if (_value == null) {
-            return other._value == null;
-        }
-        return _value.equals(other._value);
-    }
-
-    @Override
-    public int hashCode() { return _value.hashCode(); }
-
-    @Override
-    public String toString()
-    {
-        return String.valueOf(_value);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/TextNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/TextNode.java
deleted file mode 100644
index 602d86e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/TextNode.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.CharTypes;
-import com.fasterxml.jackson.core.io.NumberInput;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Value node that contains a text value.
- */
-public final class TextNode
-    extends ValueNode
-{
-    final static int INT_SPACE = ' ';
-
-    final static TextNode EMPTY_STRING_NODE = new TextNode("");
-
-    final String _value;
-
-    public TextNode(String v) { _value = v; }
-
-    /**
-     * Factory method that should be used to construct instances.
-     * For some common cases, can reuse canonical instances: currently
-     * this is the case for empty Strings, in future possible for
-     * others as well. If null is passed, will return null.
-     *
-     * @return Resulting {@link TextNode} object, if <b>v</b>
-     *   is NOT null; null if it is.
-     */
-    public static TextNode valueOf(String v)
-    {
-        if (v == null) {
-            return null;
-        }
-        if (v.length() == 0) {
-            return EMPTY_STRING_NODE;
-        }
-        return new TextNode(v);
-    }
-
-    @Override public JsonToken asToken() { return JsonToken.VALUE_STRING; }
-
-    /**
-     * Yes indeed it is textual
-     */
-    @Override
-    public boolean isTextual() { return true; }
-
-    @Override
-    public String textValue() {
-        return _value;
-    }
-
-    /**
-     * Method for accessing textual contents assuming they were
-     * base64 encoded; if so, they are decoded and resulting binary
-     * data is returned.
-     */
-    public byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException
-    {
-        ByteArrayBuilder builder = new ByteArrayBuilder(100);
-        final String str = _value;
-        int ptr = 0;
-        int len = str.length();
-
-        main_loop:
-        while (ptr < len) {
-            // first, we'll skip preceding white space, if any
-            char ch;
-            do {
-                ch = str.charAt(ptr++);
-                if (ptr >= len) {
-                    break main_loop;
-                }
-            } while (ch <= INT_SPACE);
-            int bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 0);
-            }
-            int decodedData = bits;
-            // then second base64 char; can't get padding yet, nor ws
-            if (ptr >= len) {
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                _reportInvalidBase64(b64variant, ch, 1);
-            }
-            decodedData = (decodedData << 6) | bits;
-            // third base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    // Got 12 bits, only need 8, need to shift
-                    decodedData >>= 4;
-                    builder.append(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-
-            // First branch: can get padding (-> 1 byte)
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 2);
-                }
-                // Ok, must get padding
-                if (ptr >= len) {
-                    _reportBase64EOF();
-                }
-                ch = str.charAt(ptr++);
-                if (!b64variant.usesPaddingChar(ch)) {
-                    _reportInvalidBase64(b64variant, ch, 3, "expected padding character '"+b64variant.getPaddingChar()+"'");
-                }
-                // Got 12 bits, only need 8, need to shift
-                decodedData >>= 4;
-                builder.append(decodedData);
-                continue;
-            }
-            // Nope, 2 or 3 bytes
-            decodedData = (decodedData << 6) | bits;
-            // fourth and last base64 char; can be padding, but not ws
-            if (ptr >= len) {
-                // but as per [JACKSON-631] can be end-of-input, iff not using padding
-                if (!b64variant.usesPadding()) {
-                    decodedData >>= 2;
-                    builder.appendTwoBytes(decodedData);
-                    break;
-                }
-                _reportBase64EOF();
-            }
-            ch = str.charAt(ptr++);
-            bits = b64variant.decodeBase64Char(ch);
-            if (bits < 0) {
-                if (bits != Base64Variant.BASE64_VALUE_PADDING) {
-                    _reportInvalidBase64(b64variant, ch, 3);
-                }
-                decodedData >>= 2;
-                builder.appendTwoBytes(decodedData);
-            } else {
-                // otherwise, our triple is now complete
-                decodedData = (decodedData << 6) | bits;
-                builder.appendThreeBytes(decodedData);
-            }
-        }
-        return builder.toByteArray();
-    }
-
-    @Override
-    public byte[] binaryValue() throws IOException
-    {
-        return getBinaryValue(Base64Variants.getDefaultVariant());
-    }
-    
-    /* 
-    /**********************************************************
-    /* General type coercions
-    /**********************************************************
-     */
-
-    @Override
-    public String asText() {
-        return _value;
-    }
-
-    // note: neither fast nor elegant, but these work for now:
-
-    @Override
-    public boolean asBoolean(boolean defaultValue) {
-        if (_value != null) {
-            if ("true".equals(_value.trim())) {
-                return true;
-            }
-        }
-        return defaultValue;
-    }
-    
-    @Override
-    public int asInt(int defaultValue) {
-        return NumberInput.parseAsInt(_value, defaultValue);
-    }
-
-    @Override
-    public long asLong(long defaultValue) {
-        return NumberInput.parseAsLong(_value, defaultValue);
-    }
-    
-    @Override
-    public double asDouble(double defaultValue) {
-        return NumberInput.parseAsDouble(_value, defaultValue);
-    }
-    
-    /* 
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public final void serialize(JsonGenerator jg, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        if (_value == null) {
-            jg.writeNull();
-        } else {
-            jg.writeString(_value);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Overridden standard methods
-    /**********************************************************
-     */
-    
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) { // final class, can do this
-            return false;
-        }
-        return ((TextNode) o)._value.equals(_value);
-    }
-    
-    @Override
-    public int hashCode() { return _value.hashCode(); }
-
-    /**
-     * Different from other values, Strings need quoting
-     */
-    @Override
-    public String toString()
-    {
-        int len = _value.length();
-        len = len + 2 + (len >> 4);
-        StringBuilder sb = new StringBuilder(len);
-        appendQuoted(sb, _value);
-        return sb.toString();
-    }
-
-    protected static void appendQuoted(StringBuilder sb, String content)
-    {
-        sb.append('"');
-        CharTypes.appendQuoted(sb, content);
-        sb.append('"');
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    protected void _reportInvalidBase64(Base64Variant b64variant, char ch, int bindex)
-        throws JsonParseException
-    {
-        _reportInvalidBase64(b64variant, ch, bindex, null);
-    }
-
-    /**
-     * @param bindex Relative index within base64 character unit; between 0
-     *   and 3 (as unit has exactly 4 characters)
-     */
-    protected void _reportInvalidBase64(Base64Variant b64variant, char ch, int bindex, String msg)
-        throws JsonParseException
-    {
-        String base;
-        if (ch <= INT_SPACE) {
-            base = "Illegal white space character (code 0x"+Integer.toHexString(ch)+") as character #"+(bindex+1)+" of 4-char base64 unit: can only used between units";
-        } else if (b64variant.usesPaddingChar(ch)) {
-            base = "Unexpected padding character ('"+b64variant.getPaddingChar()+"') as character #"+(bindex+1)+" of 4-char base64 unit: padding only legal as 3rd or 4th character";
-        } else if (!Character.isDefined(ch) || Character.isISOControl(ch)) {
-            // Not sure if we can really get here... ? (most illegal xml chars are caught at lower level)
-            base = "Illegal character (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        } else {
-            base = "Illegal character '"+ch+"' (code 0x"+Integer.toHexString(ch)+") in base64 content";
-        }
-        if (msg != null) {
-            base = base + ": " + msg;
-        }
-        throw new JsonParseException(base, JsonLocation.NA);
-    }
-
-    protected void _reportBase64EOF()
-        throws JsonParseException
-    {
-        throw new JsonParseException("Unexpected end-of-String when base64 content", JsonLocation.NA);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/TreeTraversingParser.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/TreeTraversingParser.java
deleted file mode 100644
index 216e0b4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/TreeTraversingParser.java
+++ /dev/null
@@ -1,411 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.base.ParserMinimalBase;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-
-/**
- * Facade over {@link JsonNode} that implements {@link JsonParser} to allow
- * accessing contents of JSON tree in alternate form (stream of tokens).
- * Useful when a streaming source is expected by code, such as data binding
- * functionality.
- * 
- * @author tatu
- */
-public class TreeTraversingParser extends ParserMinimalBase
-{
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    protected ObjectCodec _objectCodec;
-
-    /**
-     * Traversal context within tree
-     */
-    protected NodeCursor _nodeCursor;
-
-    /*
-    /**********************************************************
-    /* State
-    /**********************************************************
-     */
-
-    /**
-     * Sometimes parser needs to buffer a single look-ahead token; if so,
-     * it'll be stored here. This is currently used for handling 
-     */
-    protected JsonToken _nextToken;
-
-    /**
-     * Flag needed to handle recursion into contents of child
-     * Array/Object nodes.
-     */
-    protected boolean _startContainer;
-    
-    /**
-     * Flag that indicates whether parser is closed or not. Gets
-     * set when parser is either closed by explicit call
-     * ({@link #close}) or when end-of-input is reached.
-     */
-    protected boolean _closed;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    public TreeTraversingParser(JsonNode n) { this(n, null); }
-
-    public TreeTraversingParser(JsonNode n, ObjectCodec codec)
-    {
-        super(0);
-        _objectCodec = codec;
-        if (n.isArray()) {
-            _nextToken = JsonToken.START_ARRAY;
-            _nodeCursor = new NodeCursor.Array(n, null);
-        } else if (n.isObject()) {
-            _nextToken = JsonToken.START_OBJECT;
-            _nodeCursor = new NodeCursor.Object(n, null);
-        } else { // value node
-            _nodeCursor = new NodeCursor.RootValue(n, null);
-        }
-    }
-
-    @Override
-    public void setCodec(ObjectCodec c) {
-        _objectCodec = c;
-    }
-
-    @Override
-    public ObjectCodec getCodec() {
-        return _objectCodec;
-    }
-
-    @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-    
-    /*
-    /**********************************************************
-    /* Closeable implementation
-    /**********************************************************
-     */
-
-    @Override
-    public void close() throws IOException
-    {
-        if (!_closed) {
-            _closed = true;
-            _nodeCursor = null;
-            _currToken = null;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, traversal
-    /**********************************************************
-     */
-
-    @Override
-    public JsonToken nextToken() throws IOException, JsonParseException
-    {
-        if (_nextToken != null) {
-            _currToken = _nextToken;
-            _nextToken = null;
-            return _currToken;
-        }
-        // are we to descend to a container child?
-        if (_startContainer) {
-            _startContainer = false;
-            // minor optimization: empty containers can be skipped
-            if (!_nodeCursor.currentHasChildren()) {
-                _currToken = (_currToken == JsonToken.START_OBJECT) ?
-                    JsonToken.END_OBJECT : JsonToken.END_ARRAY;
-                return _currToken;
-            }
-            _nodeCursor = _nodeCursor.iterateChildren();
-            _currToken = _nodeCursor.nextToken();
-            if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-                _startContainer = true;
-            }
-            return _currToken;
-        }
-        // No more content?
-        if (_nodeCursor == null) {
-            _closed = true; // if not already set
-            return null;
-        }
-        // Otherwise, next entry from current cursor
-        _currToken = _nodeCursor.nextToken();
-        if (_currToken != null) {
-            if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-                _startContainer = true;
-            }
-            return _currToken;
-        }
-        // null means no more children; need to return end marker
-        _currToken = _nodeCursor.endToken();
-        _nodeCursor = _nodeCursor.getParent();
-        return _currToken;
-    }
-    
-    // default works well here:
-    //public JsonToken nextValue() throws IOException, JsonParseException
-
-    @Override
-    public JsonParser skipChildren() throws IOException, JsonParseException
-    {
-        if (_currToken == JsonToken.START_OBJECT) {
-            _startContainer = false;
-            _currToken = JsonToken.END_OBJECT;
-        } else if (_currToken == JsonToken.START_ARRAY) {
-            _startContainer = false;
-            _currToken = JsonToken.END_ARRAY;
-        }
-        return this;
-    }
-
-    @Override
-    public boolean isClosed() {
-        return _closed;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, token accessors
-    /**********************************************************
-     */
-
-    @Override
-    public String getCurrentName() {
-        return (_nodeCursor == null) ? null : _nodeCursor.getCurrentName();
-    }
-
-    @Override
-    public void overrideCurrentName(String name)
-    {
-        if (_nodeCursor != null) {
-            _nodeCursor.overrideCurrentName(name);
-        }
-    }
-    
-    @Override
-    public JsonStreamContext getParsingContext() {
-        return _nodeCursor;
-    }
-
-    @Override
-    public JsonLocation getTokenLocation() {
-        return JsonLocation.NA;
-    }
-
-    @Override
-    public JsonLocation getCurrentLocation() {
-        return JsonLocation.NA;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, access to textual content
-    /**********************************************************
-     */
-
-    @Override
-    public String getText()
-    {
-        if (_closed) {
-            return null;
-        }
-        // need to separate handling a bit...
-        switch (_currToken) {
-        case FIELD_NAME:
-            return _nodeCursor.getCurrentName();
-        case VALUE_STRING:
-            return currentNode().textValue();
-        case VALUE_NUMBER_INT:
-        case VALUE_NUMBER_FLOAT:
-            return String.valueOf(currentNode().numberValue());
-        case VALUE_EMBEDDED_OBJECT:
-            JsonNode n = currentNode();
-            if (n != null && n.isBinary()) {
-                // this will convert it to base64
-                return n.asText();
-            }
-        }
-
-        return (_currToken == null) ? null : _currToken.asString();
-    }
-
-    @Override
-    public char[] getTextCharacters() throws IOException, JsonParseException {
-        return getText().toCharArray();
-    }
-
-    @Override
-    public int getTextLength() throws IOException, JsonParseException {
-        return getText().length();
-    }
-
-    @Override
-    public int getTextOffset() throws IOException, JsonParseException {
-        return 0;
-    }
-
-    @Override
-    public boolean hasTextCharacters() {
-        // generally we do not have efficient access as char[], hence:
-        return false;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API, typed non-text access
-    /**********************************************************
-     */
-
-    //public byte getByteValue() throws IOException, JsonParseException
-
-    @Override
-    public NumberType getNumberType() throws IOException, JsonParseException {
-        JsonNode n = currentNumericNode();
-        return (n == null) ? null : n.numberType();
-    }
-
-    @Override
-    public BigInteger getBigIntegerValue() throws IOException, JsonParseException
-    {
-        return currentNumericNode().bigIntegerValue();
-    }
-
-    @Override
-    public BigDecimal getDecimalValue() throws IOException, JsonParseException {
-        return currentNumericNode().decimalValue();
-    }
-
-    @Override
-    public double getDoubleValue() throws IOException, JsonParseException {
-        return currentNumericNode().doubleValue();
-    }
-
-    @Override
-    public float getFloatValue() throws IOException, JsonParseException {
-        return (float) currentNumericNode().doubleValue();
-    }
-
-    @Override
-    public long getLongValue() throws IOException, JsonParseException {
-        return currentNumericNode().longValue();
-    }
-
-    @Override
-    public int getIntValue() throws IOException, JsonParseException {
-        return currentNumericNode().intValue();
-    }
-
-    @Override
-    public Number getNumberValue() throws IOException, JsonParseException {
-        return currentNumericNode().numberValue();
-    }
-
-    @Override
-    public Object getEmbeddedObject()
-    {
-        if (!_closed) {
-            JsonNode n = currentNode();
-            if (n != null) {
-                if (n.isPojo()) {
-                    return ((POJONode) n).getPojo();
-                }
-                if (n.isBinary()) {
-                    return ((BinaryNode) n).binaryValue();
-                }
-            }
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API, typed binary (base64) access
-    /**********************************************************
-     */
-
-    @Override
-    public byte[] getBinaryValue(Base64Variant b64variant)
-        throws IOException, JsonParseException
-    {
-        // Multiple possibilities...
-        JsonNode n = currentNode();
-        if (n != null) { // binary node?
-            byte[] data = n.binaryValue();
-            // (or TextNode, which can also convert automatically!)
-            if (data != null) {
-                return data;
-            }
-            // Or maybe byte[] as POJO?
-            if (n.isPojo()) {
-                Object ob = ((POJONode) n).getPojo();
-                if (ob instanceof byte[]) {
-                    return (byte[]) ob;
-                }
-            }
-        }
-        // otherwise return null to mark we have no binary content
-        return null;
-    }
-
-
-    @Override
-    public int readBinaryValue(Base64Variant b64variant, OutputStream out)
-            throws IOException, JsonParseException
-    {
-        byte[] data = getBinaryValue(b64variant);
-        if (data != null) {
-            out.write(data, 0, data.length);
-            return data.length;
-        }
-        return 0;
-    }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected JsonNode currentNode() {
-        if (_closed || _nodeCursor == null) {
-            return null;
-        }
-        return _nodeCursor.currentNode();
-    }
-
-    protected JsonNode currentNumericNode()
-        throws JsonParseException
-    {
-        JsonNode n = currentNode();
-        if (n == null || !n.isNumber()) {
-            JsonToken t = (n == null) ? null : n.asToken();
-            throw _constructError("Current token ("+t+") not numeric, can not use numeric value accessors");
-        }
-        return n;
-    }
-
-    @Override
-    protected void _handleEOF() throws JsonParseException {
-        _throwInternal(); // should never get called
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ValueNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/ValueNode.java
deleted file mode 100644
index e42249e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/ValueNode.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.fasterxml.jackson.databind.node;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * This intermediate base class is used for all leaf nodes, that is,
- * all non-container (array or object) nodes, except for the
- * "missing node".
- */
-public abstract class ValueNode
-    extends BaseJsonNode
-{
-    protected ValueNode() { }
-
-    /**
-     * All current value nodes are immutable, so we can just return
-     * them as is.
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T extends JsonNode> T deepCopy() { return (T) this; }
-    
-    @Override public boolean isValueNode() { return true; }
-
-    @Override public abstract JsonToken asToken();
-
-    @Override
-    public void serializeWithType(JsonGenerator jg, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        typeSer.writeTypePrefixForScalar(this, jg);
-        serialize(jg, provider);
-        typeSer.writeTypeSuffixForScalar(this, jg);
-    }
-    
-    /*
-    /**********************************************************************
-    /* Public API, path handling
-    /**********************************************************************
-     */
-
-    @Override
-    public JsonNode path(String fieldName) { return MissingNode.getInstance(); }
-
-    @Override
-    public JsonNode path(int index) { return MissingNode.getInstance(); }
-
-    /*
-    /**********************************************************************
-    /* Base impls for standard methods
-    /**********************************************************************
-     */
-
-    @Override
-    public String toString() { return asText(); }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/node/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/node/package-info.java
deleted file mode 100644
index 7732ebc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/node/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Contains concrete {@link com.fasterxml.jackson.databind.JsonNode} implementations
- * Jackson uses for the Tree model.
- * These classes are public since concrete type will be needed
- * for most operations that modify node trees. For read-only access concrete
- * types are usually not needed.
- */
-package com.fasterxml.jackson.databind.node;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/package-info.java
deleted file mode 100644
index 70d19f8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/package-info.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-Contains basic mapper (conversion) functionality that
-allows for converting between regular streaming json content and
-Java objects (beans or Tree Model: support for both is via
-{@link com.fasterxml.jackson.databind.ObjectMapper} class, as well
-as convenience methods included in
-{@link com.fasterxml.jackson.core.JsonParser}
-<p>
-Object mapper will convert Json content to ant from
-basic Java wrapper types (Integer, Boolean, Double),
-Collection types (List, Map), Java Beans,
-Strings and nulls.
-<p>
-Tree mapper builds dynamically typed tree of {@link com.fasterxml.jackson.databind.JsonNode}s
-from JSON content (and writes such trees as JSON),
-similar to how DOM model works with XML.
-Main benefits over Object mapping are:
-<ul>
- <li>No null checks are needed (dummy
-nodes are created as necessary to represent "missing" Object fields
-and Array elements)
-  </li>
- <li>No type casts are usually needed: all public access methods are defined
-in basic <code>JsonNode</code> class, and when "incompatible" method (such as Array
-element access on, say, Boolean node) is used, returned node is
-virtual "missing" node.
-  </li>
-</ul>
-Because of its dynamic nature, Tree mapping is often convenient
-for basic path access and tree navigation, where structure of
-the resulting tree is known in advance.
-*/
-
-package com.fasterxml.jackson.databind;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/AnyGetterWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/AnyGetterWriter.java
deleted file mode 100644
index 787fcee..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/AnyGetterWriter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.util.Map;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.ser.std.MapSerializer;
-
-/**
- * Class similar to {@link BeanPropertyWriter}, but that will be used
- * for serializing {@link com.fasterxml.jackson.annotation.JsonAnyGetter} annotated
- * (Map) properties
- */
-public class AnyGetterWriter
-{
-    protected final BeanProperty _property;
-
-    /**
-     * Method (or field) that represents the "any getter"
-     */
-    protected final AnnotatedMember _accessor;
-    
-    protected MapSerializer _serializer;
-    
-    public AnyGetterWriter(BeanProperty property,
-            AnnotatedMember accessor, MapSerializer serializer)
-    {
-        _accessor = accessor;
-        _property = property;
-        _serializer = serializer;
-    }
-
-    public void getAndSerialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws Exception
-    {
-        Object value = _accessor.getValue(bean);
-        if (value == null) {
-            return;
-        }
-        if (!(value instanceof Map<?,?>)) {
-            throw new JsonMappingException("Value returned by 'any-getter' ("
-                    +_accessor.getName()+"()) not java.util.Map but "+value.getClass().getName());
-        }
-        _serializer.serializeFields((Map<?,?>) value, jgen, provider);
-    }
-
-    // Note: NOT part of ResolvableSerializer...
-    public void resolve(SerializerProvider provider) throws JsonMappingException
-    {
-        _serializer = (MapSerializer) _serializer.createContextual(provider, _property);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java
deleted file mode 100644
index 8af3b37..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java
+++ /dev/null
@@ -1,883 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
-import com.fasterxml.jackson.databind.ext.OptionalHandlerFactory;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.impl.IndexedStringListSerializer;
-import com.fasterxml.jackson.databind.ser.impl.StringArraySerializer;
-import com.fasterxml.jackson.databind.ser.impl.StringCollectionSerializer;
-import com.fasterxml.jackson.databind.ser.std.*;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-import com.fasterxml.jackson.databind.util.EnumValues;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * Factory class that can provide serializers for standard JDK classes,
- * as well as custom classes that extend standard classes or implement
- * one of "well-known" interfaces (such as {@link java.util.Collection}).
- *<p>
- * Since all the serializers are eagerly instantiated, and there is
- * no additional introspection or customizability of these types,
- * this factory is essentially stateless.
- */
-public abstract class BasicSerializerFactory
-    extends SerializerFactory
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = -1416617628045738132L;
-
-    /*
-    /**********************************************************
-    /* Configuration, lookup tables/maps
-    /**********************************************************
-     */
-
-    /**
-     * Since these are all JDK classes, we shouldn't have to worry
-     * about ClassLoader used to load them. Rather, we can just
-     * use the class name, and keep things simple and efficient.
-     */
-    protected final static HashMap<String, JsonSerializer<?>> _concrete =
-        new HashMap<String, JsonSerializer<?>>();
-    
-    /**
-     * Actually it may not make much sense to eagerly instantiate all
-     * kinds of serializers: so this Map actually contains class references,
-     * not instances
-     */
-    protected final static HashMap<String, Class<? extends JsonSerializer<?>>> _concreteLazy =
-        new HashMap<String, Class<? extends JsonSerializer<?>>>();
-    
-    static {
-        /* String and string-like types (note: date types explicitly
-         * not included -- can use either textual or numeric serialization)
-         */
-        _concrete.put(String.class.getName(), new StringSerializer());
-        final ToStringSerializer sls = ToStringSerializer.instance;
-        _concrete.put(StringBuffer.class.getName(), sls);
-        _concrete.put(StringBuilder.class.getName(), sls);
-        _concrete.put(Character.class.getName(), sls);
-        _concrete.put(Character.TYPE.getName(), sls);
-
-        // Primitives/wrappers for primitives (primitives needed for Beans)
-        NumberSerializers.addAll(_concrete);
-        _concrete.put(Boolean.TYPE.getName(), new BooleanSerializer(true));
-        _concrete.put(Boolean.class.getName(), new BooleanSerializer(false));
-
-        // Other numbers, more complicated
-        final JsonSerializer<?> ns = new NumberSerializers.NumberSerializer();
-        _concrete.put(BigInteger.class.getName(), ns);
-        _concrete.put(BigDecimal.class.getName(), ns);
-        
-        // Other discrete non-container types:
-        // First, Date/Time zoo:
-        _concrete.put(Calendar.class.getName(), CalendarSerializer.instance);
-        DateSerializer dateSer = DateSerializer.instance;
-        _concrete.put(java.util.Date.class.getName(), dateSer);
-        // note: timestamps are very similar to java.util.Date, thus serialized as such
-        _concrete.put(java.sql.Timestamp.class.getName(), dateSer);
-        _concrete.put(java.sql.Date.class.getName(), new SqlDateSerializer());
-        _concrete.put(java.sql.Time.class.getName(), new SqlTimeSerializer());
-
-        // And then other standard non-structured JDK types
-        for (Map.Entry<Class<?>,Object> en : new StdJdkSerializers().provide()) {
-            Object value = en.getValue();
-            if (value instanceof JsonSerializer<?>) {
-                _concrete.put(en.getKey().getName(), (JsonSerializer<?>) value);
-            } else if (value instanceof Class<?>) {
-                @SuppressWarnings("unchecked")
-                Class<? extends JsonSerializer<?>> cls = (Class<? extends JsonSerializer<?>>) value;
-                _concreteLazy.put(en.getKey().getName(), cls);
-            } else { // should never happen, but:
-                throw new IllegalStateException("Internal error: unrecognized value of type "+en.getClass().getName());
-            }
-        }
-
-        // Jackson-specific type(s)
-        // (Q: can this ever be sub-classed?)
-        _concreteLazy.put(TokenBuffer.class.getName(), TokenBufferSerializer.class);
-    }
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-    
-    /**
-     * Configuration settings for this factory; immutable instance (just like this
-     * factory), new version created via copy-constructor (fluent-style)
-     */
-    protected final SerializerFactoryConfig _factoryConfig;
-    
-    /**
-     * Helper object used to deal with serializers for optional JDK types (like ones
-     * omitted from GAE, Android)
-     */
-    protected OptionalHandlerFactory optionalHandlers = OptionalHandlerFactory.instance;
-
-    /*
-    /**********************************************************
-    /* Life cycle
-    /**********************************************************
-     */
-
-    /**
-     * We will provide default constructor to allow sub-classing,
-     * but make it protected so that no non-singleton instances of
-     * the class will be instantiated.
-     */
-    protected BasicSerializerFactory(SerializerFactoryConfig config) {
-        _factoryConfig = (config == null) ? new SerializerFactoryConfig() : config;
-    }
-    
-    /**
-     * Method for getting current {@link SerializerFactoryConfig}.
-      *<p>
-     * Note that since instances are immutable, you can NOT change settings
-     * by accessing an instance and calling methods: this will simply create
-     * new instance of config object.
-     */
-    public SerializerFactoryConfig getFactoryConfig() {
-        return _factoryConfig;
-    }
-
-    /**
-     * Method used for creating a new instance of this factory, but with different
-     * configuration. Reason for specifying factory method (instead of plain constructor)
-     * is to allow proper sub-classing of factories.
-     *<p>
-     * Note that custom sub-classes generally <b>must override</b> implementation
-     * of this method, as it usually requires instantiating a new instance of
-     * factory type. Check out javadocs for
-     * {@link com.fasterxml.jackson.databind.ser.BeanSerializerFactory} for more details.
-     */
-    public abstract SerializerFactory withConfig(SerializerFactoryConfig config);
-
-    /**
-     * Convenience method for creating a new factory instance with an additional
-     * serializer provider.
-     */
-    @Override
-    public final SerializerFactory withAdditionalSerializers(Serializers additional) {
-        return withConfig(_factoryConfig.withAdditionalSerializers(additional));
-    }
-
-    /**
-     * Convenience method for creating a new factory instance with an additional
-     * key serializer provider.
-     */
-    @Override
-    public final SerializerFactory withAdditionalKeySerializers(Serializers additional) {
-        return withConfig(_factoryConfig.withAdditionalKeySerializers(additional));
-    }
-    
-    /**
-     * Convenience method for creating a new factory instance with additional bean
-     * serializer modifier.
-     */
-    @Override
-    public final SerializerFactory withSerializerModifier(BeanSerializerModifier modifier) {
-        return withConfig(_factoryConfig.withSerializerModifier(modifier));
-    }
-
-    /*
-    /**********************************************************
-    /* SerializerFactory impl
-    /**********************************************************
-     */
-    
-    // Implemented by sub-classes
-    @Override
-    public abstract JsonSerializer<Object> createSerializer(SerializerProvider prov,
-            JavaType type)
-        throws JsonMappingException;
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public JsonSerializer<Object> createKeySerializer(SerializationConfig config,
-            JavaType type)
-    {
-        // Minor optimization: to avoid constructing beanDesc, bail out if none registered
-        if (!_factoryConfig.hasKeySerializers()) {
-            return null;
-        }
-        // We should not need any member method info; at most class annotations for Map type
-        BeanDescription beanDesc = config.introspectClassAnnotations(type.getRawClass());
-        JsonSerializer<?> ser = null;
-        
-        // Only thing we have here are module-provided key serializers:
-        for (Serializers serializers : _factoryConfig.keySerializers()) {
-            ser = serializers.findSerializer(config, type, beanDesc);
-            if (ser != null) {
-                break;
-            }
-        }
-        return (JsonSerializer<Object>) ser;
-    }
-    
-    /**
-     * Method called to construct a type serializer for values with given declared
-     * base type. This is called for values other than those of bean property
-     * types.
-     */
-    @Override
-    public TypeSerializer createTypeSerializer(SerializationConfig config,
-            JavaType baseType)
-    {
-        BeanDescription bean = config.introspectClassAnnotations(baseType.getRawClass());
-        AnnotatedClass ac = bean.getClassInfo();
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findTypeResolver(config, ac, baseType);
-        /* Ok: if there is no explicit type info handler, we may want to
-         * use a default. If so, config object knows what to use.
-         */
-        Collection<NamedType> subtypes = null;
-        if (b == null) {
-            b = config.getDefaultTyper(baseType);
-        } else {
-            subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(ac, config, ai);
-        }
-        if (b == null) {
-            return null;
-        }
-        return b.buildTypeSerializer(config, baseType, subtypes);
-    }
-
-    /*
-    /**********************************************************
-    /* Additional API for other core classes
-    /**********************************************************
-     */
-
-    public final JsonSerializer<?> getNullSerializer() {
-        return NullSerializer.instance;
-    }    
-
-    protected abstract Iterable<Serializers> customSerializers();
-    
-    /*
-    /**********************************************************
-    /* Overridable secondary serializer accessor methods
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will use fast lookup (and identity comparison) methods to
-     * see if we know serializer to use for given type.
-     */
-    protected final JsonSerializer<?> findSerializerByLookup(JavaType type,
-            SerializationConfig config, BeanDescription beanDesc,
-            boolean staticTyping)
-    {
-        Class<?> raw = type.getRawClass();
-        String clsName = raw.getName();
-        JsonSerializer<?> ser = _concrete.get(clsName);
-        if (ser != null) {
-            return ser;
-        }
-        Class<? extends JsonSerializer<?>> serClass = _concreteLazy.get(clsName);
-        if (serClass != null) {
-            try {
-                return serClass.newInstance();
-            } catch (Exception e) {
-                throw new IllegalStateException("Failed to instantiate standard serializer (of type "+serClass.getName()+"): "
-                        +e.getMessage(), e);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Method called to see if one of primary per-class annotations
-     * (or related, like implementing of {@link JsonSerializable})
-     * determines the serializer to use.
-     *<p>
-     * Currently handles things like:
-     *<ul>
-     * <li>If type implements {@link JsonSerializable}, use that
-     *  </li>
-     * <li>If type has {@link com.fasterxml.jackson.annotation.JsonValue} annotation (or equivalent), build serializer
-     *    based on that property
-     *  </li>
-     *</ul>
-     *
-     * @since 2.0
-     */
-    protected final JsonSerializer<?> findSerializerByAnnotations(SerializerProvider prov, 
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        Class<?> raw = type.getRawClass();
-        // First: JsonSerializable?
-        if (JsonSerializable.class.isAssignableFrom(raw)) {
-            return SerializableSerializer.instance;
-        }
-        // Second: @JsonValue for any type
-        AnnotatedMethod valueMethod = beanDesc.findJsonValueMethod();
-        if (valueMethod != null) {
-            Method m = valueMethod.getAnnotated();
-            if (prov.canOverrideAccessModifiers()) {
-                ClassUtil.checkAndFixAccess(m);
-            }
-            JsonSerializer<Object> ser = findSerializerFromAnnotation(prov, valueMethod);
-            return new JsonValueSerializer(m, ser);
-        }
-        // No well-known annotations...
-        return null;
-    }
-    
-    /**
-     * Method for checking if we can determine serializer to use based on set of
-     * known primary types, checking for set of known base types (exact matches
-     * having been compared against with <code>findSerializerByLookup</code>).
-     * This does not include "secondary" interfaces, but
-     * mostly concrete or abstract base classes.
-     */
-    protected final JsonSerializer<?> findSerializerByPrimaryType(SerializerProvider prov, 
-            JavaType type, BeanDescription beanDesc,
-            boolean staticTyping)
-        throws JsonMappingException
-    {
-        Class<?> raw = type.getRawClass();
-        // One unfortunate special case, as per [JACKSON-484]
-        if (InetAddress.class.isAssignableFrom(raw)) {
-            return InetAddressSerializer.instance;
-        }
-        // ... and another one, [JACKSON-522], for TimeZone
-        if (TimeZone.class.isAssignableFrom(raw)) {
-            return TimeZoneSerializer.instance;
-        }
-        // and yet one more [JACKSON-789]
-        if (java.nio.charset.Charset.class.isAssignableFrom(raw)) {
-            return ToStringSerializer.instance;
-        }
-        
-        // Then check for optional/external serializers [JACKSON-386]
-        JsonSerializer<?> ser = optionalHandlers.findSerializer(prov.getConfig(), type);
-        if (ser != null) {
-            return ser;
-        }
-        
-        if (Number.class.isAssignableFrom(raw)) {
-            return NumberSerializers.NumberSerializer.instance;
-        }
-        if (Enum.class.isAssignableFrom(raw)) {
-            /* As per [Issue#24], may want to use alternate shape, serialize as JSON Object.
-             * Challenge here is that EnumSerializer does not know how to produce
-             * POJO style serialization, so we must handle that special case separately;
-             * otherwise pass it to EnumSerializer.
-             */
-            JsonFormat.Value format = beanDesc.findExpectedFormat(null);
-            if (format != null && format.getShape() == JsonFormat.Shape.OBJECT) {
-                // one special case: suppress serialization of "getDeclaringClass()"...
-                ((BasicBeanDescription) beanDesc).removeProperty("declaringClass");
-            } else {
-                @SuppressWarnings("unchecked")
-                Class<Enum<?>> enumClass = (Class<Enum<?>>) raw;
-                return EnumSerializer.construct(enumClass, prov.getConfig(), beanDesc, format);
-            }
-        }
-        if (Calendar.class.isAssignableFrom(raw)) {
-            return CalendarSerializer.instance;
-        }
-        if (java.util.Date.class.isAssignableFrom(raw)) {
-            return DateSerializer.instance;
-        }
-        return null;
-    }
-        
-    /**
-     * Reflection-based serialized find method, which checks if
-     * given class implements one of recognized "add-on" interfaces.
-     * Add-on here means a role that is usually or can be a secondary
-     * trait: for example,
-     * bean classes may implement {@link Iterable}, but their main
-     * function is usually something else. The reason for
-     */
-    protected final JsonSerializer<?> findSerializerByAddonType(SerializationConfig config,
-            JavaType javaType, BeanDescription beanDesc,
-            boolean staticTyping)
-        throws JsonMappingException
-    {
-        Class<?> type = javaType.getRawClass();
-
-        // These need to be in decreasing order of specificity...
-        if (Iterator.class.isAssignableFrom(type)) {
-            return buildIteratorSerializer(config, javaType, beanDesc, staticTyping);
-        }
-        if (Iterable.class.isAssignableFrom(type)) {
-            return buildIterableSerializer(config, javaType, beanDesc,  staticTyping);
-        }
-        if (CharSequence.class.isAssignableFrom(type)) {
-            return ToStringSerializer.instance;
-        }
-        return null;
-    }
-    
-    /**
-     * Helper method called to check if a class or method
-     * has an annotation
-     * (@link com.fasterxml.jackson.databind.annotation.JsonSerialize#using)
-     * that tells the class to use for serialization.
-     * Returns null if no such annotation found.
-     */
-    protected JsonSerializer<Object> findSerializerFromAnnotation(SerializerProvider prov,
-            Annotated a)
-        throws JsonMappingException
-    {
-        Object serDef = prov.getAnnotationIntrospector().findSerializer(a);
-        if (serDef == null) {
-            return null;
-        }
-        return prov.serializerInstance(a, serDef);
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods, container types:
-    /**********************************************************
-     */
-
-    /**
-     * Deprecated method; final to help identify problems with sub-classes,
-     * as this method will NOT be called any more in 2.1
-     * 
-     * @deprecated Since 2.1 (removed 'property' argument)
-     */
-    @Deprecated
-    protected final JsonSerializer<?> buildContainerSerializer(SerializerProvider prov,
-            JavaType type, BeanDescription beanDesc, BeanProperty property, boolean staticTyping)
-        throws JsonMappingException
-    {
-        return  buildContainerSerializer(prov, type, beanDesc, staticTyping);
-    }
-    
-    /**
-     * @since 2.1
-     */
-    protected JsonSerializer<?> buildContainerSerializer(SerializerProvider prov,
-            JavaType type, BeanDescription beanDesc, boolean staticTyping)
-        throws JsonMappingException
-    {
-        final SerializationConfig config = prov.getConfig();
-        // Let's see what we can learn about element/content/value type, type serializer for it:
-        JavaType elementType = type.getContentType();
-        TypeSerializer elementTypeSerializer = createTypeSerializer(config,
-                elementType);
-
-        // if elements have type serializer, can not force static typing:
-        if (elementTypeSerializer != null) {
-            staticTyping = false;
-        }
-        JsonSerializer<Object> elementValueSerializer = _findContentSerializer(prov,
-                beanDesc.getClassInfo());
-        
-        if (type.isMapLikeType()) { // implements java.util.Map
-            MapLikeType mlt = (MapLikeType) type;
-            /* 29-Sep-2012, tatu: This is actually too early to (try to) find
-             *  key serializer from property annotations, and can lead to caching
-             *  issues (see [Issue#75]). Instead, must be done from 'createContextual()' call.
-             *  But we do need to check class annotations.
-             */
-            JsonSerializer<Object> keySerializer = _findKeySerializer(prov, beanDesc.getClassInfo());
-            if (mlt.isTrueMapType()) {
-                return buildMapSerializer(config, (MapType) mlt, beanDesc, staticTyping,
-                        keySerializer, elementTypeSerializer, elementValueSerializer);
-            }
-            // Only custom serializers may be available:
-            for (Serializers serializers : customSerializers()) {
-                JsonSerializer<?> ser = serializers.findMapLikeSerializer(config,
-                        (MapLikeType) type, beanDesc, keySerializer, elementTypeSerializer, elementValueSerializer);
-                if (ser != null) {
-                    return ser;
-                }
-            }
-            return null;
-        }
-        if (type.isCollectionLikeType()) {
-            CollectionLikeType clt = (CollectionLikeType) type;
-            if (clt.isTrueCollectionType()) { // only have custom ones, if any:
-                CollectionType trueCT = (CollectionType) clt;
-                // Module-provided custom collection serializers?
-                for (Serializers serializers : customSerializers()) {
-                    JsonSerializer<?> ser = serializers.findCollectionSerializer(config,
-                            trueCT, beanDesc, elementTypeSerializer, elementValueSerializer);
-                    if (ser != null) {
-                        return ser;
-                    }
-                }
-
-                // As per [Issue#24], may want to use alternate shape, serialize as JSON Object.
-                // Challenge here is that EnumSerializer does not know how to produce
-                // POJO style serialization, so we must handle that special case separately;
-                // otherwise pass it to EnumSerializer.
-                JsonFormat.Value format = beanDesc.findExpectedFormat(null);
-
-                if (format == null || format.getShape() != JsonFormat.Shape.OBJECT) {
-                    return buildCollectionSerializer(config, trueCT, beanDesc, staticTyping,
-                            elementTypeSerializer, elementValueSerializer);
-                }
-            } else {
-                // Only custom variants for this:
-                for (Serializers serializers : customSerializers()) {
-                    JsonSerializer<?> ser = serializers.findCollectionLikeSerializer(config,
-                            (CollectionLikeType) type, beanDesc, elementTypeSerializer, elementValueSerializer);
-                    if (ser != null) {
-                        return ser;
-                    }
-                }
-                // fall through either way (whether shape dictates serialization as POJO or not)
-                return null;
-            }
-        }
-        if (type.isArrayType()) {
-            return buildArraySerializer(config, (ArrayType) type, beanDesc, staticTyping,
-                    elementTypeSerializer, elementValueSerializer);
-        }
-        return null;
-    }
-
-    /**
-     * Deprecated method; final to help identify problems with sub-classes,
-     * as this method will NOT be called any more in 2.1
-     * 
-     * @deprecated Since 2.1
-     */
-    @Deprecated
-    protected final JsonSerializer<?> buildCollectionSerializer(SerializationConfig config,
-            CollectionType type,
-            BeanDescription beanDesc, BeanProperty property,
-            boolean staticTyping,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) 
-        throws JsonMappingException
-    {
-        return buildCollectionSerializer(config, type, beanDesc,
-                staticTyping, elementTypeSerializer, elementValueSerializer);
-    }
-    
-    /**
-     * Helper method that handles configuration details when constructing serializers for
-     * {@link java.util.List} types that support efficient by-index access
-     * 
-     * @since 2.1
-     */
-    protected JsonSerializer<?> buildCollectionSerializer(SerializationConfig config,
-            CollectionType type, BeanDescription beanDesc, boolean staticTyping,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer) 
-        throws JsonMappingException
-    {
-        Class<?> raw = type.getRawClass();
-        if (EnumSet.class.isAssignableFrom(raw)) {
-            // this may or may not be available (Class doesn't; type of field/method does)
-            JavaType enumType = type.getContentType();
-            // and even if nominally there is something, only use if it really is enum
-            if (!enumType.isEnumType()) {
-                enumType = null;
-            }
-            return StdContainerSerializers.enumSetSerializer(enumType);
-        }
-        Class<?> elementRaw = type.getContentType().getRawClass();
-        if (isIndexedList(raw)) {
-            if (elementRaw == String.class) {
-                // [JACKSON-829] Must NOT use if we have custom serializer
-                if (elementValueSerializer == null || ClassUtil.isJacksonStdImpl(elementValueSerializer)) {
-                    return IndexedStringListSerializer.instance;
-                }
-            }
-            return StdContainerSerializers.indexedListSerializer(type.getContentType(), staticTyping,
-                    elementTypeSerializer, elementValueSerializer);
-        }
-        if (elementRaw == String.class) {
-            // [JACKSON-829] Must NOT use if we have custom serializer
-            if (elementValueSerializer == null || ClassUtil.isJacksonStdImpl(elementValueSerializer)) {
-                return StringCollectionSerializer.instance;
-            }
-        }
-        return StdContainerSerializers.collectionSerializer(type.getContentType(), staticTyping,
-                elementTypeSerializer, elementValueSerializer);
-    }
-    
-    protected boolean isIndexedList(Class<?> cls)
-    {
-        return RandomAccess.class.isAssignableFrom(cls);
-    }
-    
-    /*
-    /**********************************************************
-    /* Factory methods, for Maps
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method that handles configuration details when constructing serializers for
-     * {@link java.util.Map} types.
-     */
-    protected JsonSerializer<?> buildMapSerializer(SerializationConfig config,
-            MapType type, BeanDescription beanDesc,
-            boolean staticTyping, JsonSerializer<Object> keySerializer,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        throws JsonMappingException
-    {
-        for (Serializers serializers : customSerializers()) {
-            JsonSerializer<?> ser = serializers.findMapSerializer(config, type, beanDesc,
-                    keySerializer, elementTypeSerializer, elementValueSerializer);
-            if (ser != null) {
-                return ser;
-            }
-        }
-        if (EnumMap.class.isAssignableFrom(type.getRawClass())) {
-            JavaType keyType = type.getKeyType();
-            // Need to find key enum values...
-            EnumValues enums = null;
-            if (keyType.isEnumType()) { // non-enum if we got it as type erased class (from instance)
-                @SuppressWarnings("unchecked")
-                Class<Enum<?>> enumClass = (Class<Enum<?>>) keyType.getRawClass();
-                enums = EnumValues.construct(enumClass, config.getAnnotationIntrospector());
-            }
-            return new EnumMapSerializer(type.getContentType(), staticTyping, enums,
-                elementTypeSerializer, elementValueSerializer);
-        }
-        return MapSerializer.construct(config.getAnnotationIntrospector().findPropertiesToIgnore(beanDesc.getClassInfo()),
-                type, staticTyping, elementTypeSerializer,
-                keySerializer, elementValueSerializer);
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods, for Arrays
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method that handles configuration details when constructing serializers for
-     * <code>Object[]</code> (and subtypes, except for String).
-     */
-    protected JsonSerializer<?> buildArraySerializer(SerializationConfig config,
-            ArrayType type, BeanDescription beanDesc,
-            boolean staticTyping,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        throws JsonMappingException
-    {
-         // Module-provided custom collection serializers?
-         for (Serializers serializers : customSerializers()) {
-             JsonSerializer<?> ser = serializers.findArraySerializer(config,
-                     type, beanDesc, elementTypeSerializer, elementValueSerializer);
-             if (ser != null) {
-                 return ser;
-             }
-         }
-        Class<?> raw = type.getRawClass();
-        // Important: do NOT use standard serializers if non-standard element value serializer specified
-        if (elementValueSerializer == null || ClassUtil.isJacksonStdImpl(elementValueSerializer)) {
-            if (String[].class == raw) {
-                return StringArraySerializer.instance;
-            }
-            // other standard types?
-            JsonSerializer<?> ser = StdArraySerializers.findStandardImpl(raw);
-            if (ser != null) {
-                return ser;
-            }
-        }
-        return new ObjectArraySerializer(type.getContentType(), staticTyping, elementTypeSerializer,
-                elementValueSerializer);
-    }
-
-    /*
-    /**********************************************************
-    /* Factory methods, for non-container types
-    /**********************************************************
-     */
-
-    protected JsonSerializer<?> buildIteratorSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc,
-            boolean staticTyping)
-        throws JsonMappingException
-    {
-        // if there's generic type, it'll be the first contained type
-        JavaType valueType = type.containedType(0);
-        if (valueType == null) {
-            valueType = TypeFactory.unknownType();
-        }
-        TypeSerializer vts = createTypeSerializer(config, valueType);
-        return StdContainerSerializers.iteratorSerializer(valueType,
-                usesStaticTyping(config, beanDesc, vts), vts);
-    }
-    
-    protected JsonSerializer<?> buildIterableSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc,
-            boolean staticTyping)
-        throws JsonMappingException
-    {
-        // if there's generic type, it'll be the first contained type
-        JavaType valueType = type.containedType(0);
-        if (valueType == null) {
-            valueType = TypeFactory.unknownType();
-        }
-        TypeSerializer vts = createTypeSerializer(config, valueType);
-        return StdContainerSerializers.iterableSerializer(valueType,
-                usesStaticTyping(config, beanDesc, vts), vts);
-    }
-    
-    /*
-    /**********************************************************
-    /* Other helper methods
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method used to encapsulate details of annotation-based type coercion
-     */
-    @SuppressWarnings("unchecked")
-    protected <T extends JavaType> T modifyTypeByAnnotation(SerializationConfig config,
-            Annotated a, T type)
-    {
-        // first: let's check class for the instance itself:
-        Class<?> superclass = config.getAnnotationIntrospector().findSerializationType(a);
-        if (superclass != null) {
-            try {
-                type = (T) type.widenBy(superclass);
-            } catch (IllegalArgumentException iae) {
-                throw new IllegalArgumentException("Failed to widen type "+type+" with concrete-type annotation (value "+superclass.getName()+"), method '"+a.getName()+"': "+iae.getMessage());
-            }
-        }
-        return modifySecondaryTypesByAnnotation(config, a, type);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected static <T extends JavaType> T modifySecondaryTypesByAnnotation(SerializationConfig config,
-            Annotated a, T type)
-    {
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        // then key class
-        if (type.isContainerType()) {
-            Class<?> keyClass = intr.findSerializationKeyType(a, type.getKeyType());
-            if (keyClass != null) {
-                // illegal to use on non-Maps
-                if (!(type instanceof MapType)) {
-                    throw new IllegalArgumentException("Illegal key-type annotation: type "+type+" is not a Map type");
-                }
-                try {
-                    type = (T) ((MapType) type).widenKey(keyClass);
-                } catch (IllegalArgumentException iae) {
-                    throw new IllegalArgumentException("Failed to narrow key type "+type+" with key-type annotation ("+keyClass.getName()+"): "+iae.getMessage());
-                }
-            }
-            
-            // and finally content class; only applicable to structured types
-            Class<?> cc = intr.findSerializationContentType(a, type.getContentType());
-            if (cc != null) {
-                try {
-                    type = (T) type.widenContentsBy(cc);
-                } catch (IllegalArgumentException iae) {
-                    throw new IllegalArgumentException("Failed to narrow content type "+type+" with content-type annotation ("+cc.getName()+"): "+iae.getMessage());
-                }
-            }
-        }
-        return type;
-    }
-
-    /**
-     * Helper method called to try to find whether there is an annotation in the
-     * class that indicates key serializer to use.
-     * If so, will try to instantiate key serializer and return it; otherwise returns null.
-     */
-    protected JsonSerializer<Object> _findKeySerializer(SerializerProvider prov,
-            Annotated a)
-        throws JsonMappingException
-    {
-        AnnotationIntrospector intr = prov.getAnnotationIntrospector();
-        Object serDef = intr.findKeySerializer(a);
-        if (serDef != null) {
-            return prov.serializerInstance(a, serDef);
-        }
-        return null;
-    }
-
-    /**
-     * Helper method called to try to find whether there is an annotation in the
-     * class that indicates content ("value") serializer to use.
-     * If so, will try to instantiate key serializer and return it; otherwise returns null.
-     */
-    protected JsonSerializer<Object> _findContentSerializer(SerializerProvider prov,
-            Annotated a)
-        throws JsonMappingException
-    {
-        AnnotationIntrospector intr = prov.getAnnotationIntrospector();
-        Object serDef = intr.findContentSerializer(a);
-        if (serDef != null) {
-            return prov.serializerInstance(a, serDef);
-        }
-        return null;
-    }
-
-    /**
-     * @deprecated Since 2.1: use method without 'property'
-     */
-    @Deprecated
-    protected final  boolean usesStaticTyping(SerializationConfig config,
-            BeanDescription beanDesc, TypeSerializer typeSer, BeanProperty property)
-    {
-        return usesStaticTyping(config, beanDesc, typeSer);
-    }
-    
-    /**
-     * Helper method to check whether global settings and/or class
-     * annotations for the bean class indicate that static typing
-     * (declared types)  should be used for properties.
-     * (instead of dynamic runtime types).
-     * 
-     * @since 2.1 (earlier had variant with additional 'property' parameter)
-     */
-    protected boolean usesStaticTyping(SerializationConfig config,
-            BeanDescription beanDesc, TypeSerializer typeSer)
-    {
-        /* 16-Aug-2010, tatu: If there is a (value) type serializer, we can not force
-         *    static typing; that would make it impossible to handle expected subtypes
-         */
-        if (typeSer != null) {
-            return false;
-        }
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        JsonSerialize.Typing t = intr.findSerializationTyping(beanDesc.getClassInfo());
-        if (t != null) {
-            if (t == JsonSerialize.Typing.STATIC) {
-                return true;
-            }
-        } else {
-            if (config.isEnabled(MapperFeature.USE_STATIC_TYPING)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected Class<?> _verifyAsClass(Object src, String methodName, Class<?> noneClass)
-    {
-        if (src == null) {
-            return null;
-        }
-        if (!(src instanceof Class)) {
-            throw new IllegalStateException("AnnotationIntrospector."+methodName+"() returned value of type "+src.getClass().getName()+": expected type JsonSerializer or Class<JsonSerializer> instead");
-        }
-        Class<?> cls = (Class<?>) src;
-        if (cls == noneClass || cls == NoClass.class) {
-            return null;
-        }
-        return cls;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyFilter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyFilter.java
deleted file mode 100644
index 4b8979c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyFilter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * Interface that defines API for filter objects use (as configured
- * using {@link com.fasterxml.jackson.annotation.JsonFilter})
- * for filtering bean properties to serialize.
- *<p>
- * Note that Jackson 2.1 added two new methods -- as a result, it is
- * strongly recommended that custom implementations extend
- * {@link com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter},
- * to avoid backwards compatibility issues in future.
- */
-public interface BeanPropertyFilter
-{
-    /**
-     * Method called by {@link BeanSerializer} to let filter decide what to do with
-     * given bean property value: the usual choices are to either filter out (i.e.
-     * do nothing) or write using given {@link BeanPropertyWriter}, although filters
-     * can choose other to do something different altogether.
-     * 
-     * @param bean Bean of which property value to serialize
-     * @param jgen Generator use for serializing value
-     * @param prov Provider that can be used for accessing dynamic aspects of serialization
-     *    processing
-     * @param writer Default bean property serializer to use
-     */
-    public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov,
-            BeanPropertyWriter writer)
-        throws Exception;
-    
-    /**
-     * Method called by {@link BeanSerializer} to let the filter determine whether, and in what
-     * form the given property exist within the parent, or root, schema. Filters can omit
-     * adding the property to the node, or choose the form of the schema value for the property.
-     *<p>
-     * Typical implementation is something like:
-     *<pre>
-     * if (include(writer)) {
-     *      writer.depositSchemaProperty(propertiesNode, provider);
-     * }
-     *</pre>
-     * 
-     * @param writer Bean property serializer to use to create schema value
-     * @param propertiesNode Node which the given property would exist within
-     * @param provider Provider that can be used for accessing dynamic aspects of serialization
-     * 	processing
-     * 
-     * @since 2.1
-     */
-    public void depositSchemaProperty(BeanPropertyWriter writer, ObjectNode propertiesNode,
-            SerializerProvider provider)
-        throws JsonMappingException;
-    
-    /**
-     * Method called by {@link BeanSerializer} to let the filter determine whether, and in what
-     * form the given property exist within the parent, or root, schema. Filters can omit
-     * adding the property to the node, or choose the form of the schema value for the property
-     *<p>
-     * Typical implementation is something like:
-     *<pre>
-     * if (include(writer)) {
-     *      writer.depositSchemaProperty(objectVisitor, provider);
-     * }
-     *</pre>
-     * 
-     * @param writer Bean property serializer to use to create schema value
-     * @param objectVisitor JsonObjectFormatVisitor which should be aware of 
-     * the property's existence
-     * @param provider Provider that can be used for accessing dynamic aspects of serialization
-     * 	processing
-     * 
-     * @since 2.1
-     */
-    public void depositSchemaProperty(BeanPropertyWriter writer, JsonObjectFormatVisitor objectVisitor,
-            SerializerProvider provider)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
deleted file mode 100644
index 8358f96..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
+++ /dev/null
@@ -1,688 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-import com.fasterxml.jackson.databind.ser.impl.UnwrappingBeanPropertyWriter;
-import com.fasterxml.jackson.databind.util.Annotations;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Base bean property handler class, which implements common parts of
- * reflection-based functionality for accessing a property value
- * and serializing it.
- *<p> 
- * Note that current design tries to keep instances immutable (semi-functional
- * style); mostly because these instances are exposed to application
- * code and this is to reduce likelihood of data corruption and
- * synchronization issues.
- */
-public class BeanPropertyWriter
-    implements BeanProperty
-{
-    /**
-     * Marker object used to indicate "do not serialize if empty"
-     */
-    public final static Object MARKER_FOR_EMPTY = new Object();
-    
-    /*
-    /**********************************************************
-    /* Settings for accessing property value to serialize
-    /**********************************************************
-     */
-
-    /**
-     * Member (field, method) that represents property and allows access
-     * to associated annotations.
-     */
-    protected final AnnotatedMember _member;
-
-    /**
-     * Annotations from context (most often, class that declares property,
-     * or in case of sub-class serializer, from that sub-class)
-     */
-    protected final Annotations _contextAnnotations;
-    
-    /**
-     * Type property is declared to have, either in class definition 
-     * or associated annotations.
-     */
-    protected final JavaType _declaredType;
-    
-    /**
-     * Accessor method used to get property value, for
-     * method-accessible properties.
-     * Null if and only if {@link #_field} is null.
-     */
-    protected final Method _accessorMethod;
-    
-    /**
-     * Field that contains the property value for field-accessible
-     * properties.
-     * Null if and only if {@link #_accessorMethod} is null.
-     */
-    protected final Field _field;
-    
-    /*
-    /**********************************************************
-    /* Opaque internal data that bean serializer factory and
-    /* bean serializers can add.
-    /**********************************************************
-     */
-
-    protected HashMap<Object,Object> _internalSettings;
-    
-    /*
-    /**********************************************************
-    /* Serialization settings
-    /**********************************************************
-     */
-    
-    /**
-     * Logical name of the property; will be used as the field name
-     * under which value for the property is written.
-     */
-    protected final SerializedString _name;
-
-    /**
-     * Type to use for locating serializer; normally same as return
-     * type of the accessor method, but may be overridden by annotations.
-     */
-    protected final JavaType _cfgSerializationType;
-
-    /**
-     * Serializer to use for writing out the value: null if it can not
-     * be known statically; non-null if it can.
-     */
-    protected JsonSerializer<Object> _serializer;
-
-    /**
-     * Serializer used for writing out null values, if any: if null,
-     * null values are to be suppressed.
-     */
-    protected JsonSerializer<Object> _nullSerializer;
-    
-    /**
-     * In case serializer is not known statically (i.e. <code>_serializer</code>
-     * is null), we will use a lookup structure for storing dynamically
-     * resolved mapping from type(s) to serializer(s).
-     */
-    protected PropertySerializerMap _dynamicSerializers;
-
-    /**
-     * Whether null values are to be suppressed (nothing written out if
-     * value is null) or not.
-     */
-    protected final boolean _suppressNulls;
-    
-    /**
-     * Value that is considered default value of the property; used for
-     * default-value-suppression if enabled.
-     */
-    protected final Object _suppressableValue;
-
-    /**
-     * Alternate set of property writers used when view-based filtering
-     * is available for the Bean.
-     */
-    protected final Class<?>[] _includeInViews;
-
-    /**
-     * If property being serialized needs type information to be
-     * included this is the type serializer to use.
-     * Declared type (possibly augmented with annotations) of property
-     * is used for determining exact mechanism to use (compared to
-     * actual runtime type used for serializing actual state).
-     */
-    protected TypeSerializer _typeSerializer;
-    
-    /**
-     * Base type of the property, if the declared type is "non-trivial";
-     * meaning it is either a structured type (collection, map, array),
-     * or parameterized. Used to retain type information about contained
-     * type, which is mostly necessary if type meta-data is to be
-     * included.
-     */
-    protected JavaType _nonTrivialBaseType;
-
-    /*
-    /**********************************************************
-    /* Construction, configuration
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    public BeanPropertyWriter(BeanPropertyDefinition propDef,
-            AnnotatedMember member, Annotations contextAnnotations,
-            JavaType declaredType,
-            JsonSerializer<?> ser, TypeSerializer typeSer, JavaType serType,
-            boolean suppressNulls, Object suppressableValue)
-    {
-        
-        _member = member;
-        _contextAnnotations = contextAnnotations;
-        _name = new SerializedString(propDef.getName());
-        _declaredType = declaredType;
-        _serializer = (JsonSerializer<Object>) ser;
-        _dynamicSerializers = (ser == null) ? PropertySerializerMap.emptyMap() : null;
-        _typeSerializer = typeSer;
-        _cfgSerializationType = serType;
-
-        if (member instanceof AnnotatedField) {
-            _accessorMethod = null;
-            _field = (Field) member.getMember();
-        } else if (member instanceof AnnotatedMethod) {
-            _accessorMethod = (Method) member.getMember();
-            _field = null;
-        } else {
-            throw new IllegalArgumentException("Can not pass member of type "+member.getClass().getName());
-        }
-        _suppressNulls = suppressNulls;
-        _suppressableValue = suppressableValue;
-        _includeInViews = propDef.findViews();
-
-        // this will be resolved later on, unless nulls are to be suppressed
-        _nullSerializer = null;
-    }
-
-    /**
-     * "Copy constructor" to be used by filtering sub-classes
-     */
-    protected BeanPropertyWriter(BeanPropertyWriter base) {
-        this(base, base._name);
-    }
-
-    protected BeanPropertyWriter(BeanPropertyWriter base, SerializedString name)
-    {
-        _name = name;
-
-        _member = base._member;
-        _contextAnnotations = base._contextAnnotations;
-        _declaredType = base._declaredType;
-        _accessorMethod = base._accessorMethod;
-        _field = base._field;
-        _serializer = base._serializer;
-        _nullSerializer = base._nullSerializer;
-        // one more thing: copy internal settings, if any (since 1.7)
-        if (base._internalSettings != null) {
-            _internalSettings = new HashMap<Object,Object>(base._internalSettings);
-        }
-        _cfgSerializationType = base._cfgSerializationType;
-        _dynamicSerializers = base._dynamicSerializers;
-        _suppressNulls = base._suppressNulls;
-        _suppressableValue = base._suppressableValue;
-        _includeInViews = base._includeInViews;
-        _typeSerializer = base._typeSerializer;
-        _nonTrivialBaseType = base._nonTrivialBaseType;
-    }
-
-    public BeanPropertyWriter rename(NameTransformer transformer) {
-        String newName = transformer.transform(_name.getValue());
-        if (newName.equals(_name.toString())) {
-            return this;
-        }
-        return new BeanPropertyWriter(this, new SerializedString(newName));
-    }
-    
-    /**
-     * Method called to assign value serializer for property
-     * 
-     * @since 2.0
-     */
-    public void assignSerializer(JsonSerializer<Object> ser)
-    {
-        // may need to disable check in future?
-        if (_serializer != null && _serializer != ser) {
-            throw new IllegalStateException("Can not override serializer");
-        }
-        _serializer = ser;
-    }
-
-    /**
-     * Method called to assign null value serializer for property
-     * 
-     * @since 2.0
-     */
-    public void assignNullSerializer(JsonSerializer<Object> nullSer)
-    {
-        // may need to disable check in future?
-        if (_nullSerializer != null && _nullSerializer != nullSer) {
-            throw new IllegalStateException("Can not override null serializer");
-        }
-        _nullSerializer = nullSer;
-    }
-    
-    /**
-     * Method called create an instance that handles details of unwrapping
-     * contained value.
-     */
-    public BeanPropertyWriter unwrappingWriter(NameTransformer unwrapper) {
-        return new UnwrappingBeanPropertyWriter(this, unwrapper);
-    }
-
-    /**
-     * Method called to define type to consider as "non-trivial" basetype,
-     * needed for dynamic serialization resolution for complex (usually container)
-     * types
-     */
-    public void setNonTrivialBaseType(JavaType t) {
-        _nonTrivialBaseType = t;
-    }
-
-    /*
-    /**********************************************************
-    /* BeanProperty impl
-    /**********************************************************
-     */
-    
-//    @Override
-    public String getName() {
-        return _name.getValue();
-    }
-
-//    @Override
-    public JavaType getType() {
-        return _declaredType;
-    }
-
-//  @Override
-    public <A extends Annotation> A getAnnotation(Class<A> acls) {
-        return _member.getAnnotation(acls);
-    }
-
-//  @Override
-    public <A extends Annotation> A getContextAnnotation(Class<A> acls) {
-        return _contextAnnotations.get(acls);
-    }
-
-//    @Override
-    public AnnotatedMember getMember() {
-        return _member;
-    }
-    
-    /*
-    /**********************************************************
-    /* Managing and accessing of opaque internal settings
-    /* (used by extensions)
-    /**********************************************************
-     */
-    
-    /**
-     * Method for accessing value of specified internal setting.
-     * 
-     * @return Value of the setting, if any; null if none.
-     */
-    public Object getInternalSetting(Object key)
-    {
-        if (_internalSettings == null) {
-            return null;
-        }
-        return _internalSettings.get(key);
-    }
-    
-    /**
-     * Method for setting specific internal setting to given value
-     * 
-     * @return Old value of the setting, if any (null if none)
-     */
-    public Object setInternalSetting(Object key, Object value)
-    {
-        if (_internalSettings == null) {
-            _internalSettings = new HashMap<Object,Object>();
-        }
-        return _internalSettings.put(key, value);
-    }
-
-    /**
-     * Method for removing entry for specified internal setting.
-     * 
-     * @return Existing value of the setting, if any (null if none)
-     */
-    public Object removeInternalSetting(Object key)
-    {
-        Object removed = null;
-        if (_internalSettings != null) {
-            removed = _internalSettings.remove(key);
-            // to reduce memory usage, let's also drop the Map itself, if empty
-            if (_internalSettings.size() == 0) {
-                _internalSettings = null;
-            }
-        }
-        return removed;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    public SerializedString getSerializedName() { return _name; }
-    
-    public boolean hasSerializer() { return _serializer != null; }
-    public boolean hasNullSerializer() { return _nullSerializer != null; }
-
-    public boolean willSuppressNulls() { return _suppressNulls; }
-    
-    // Needed by BeanSerializer#getSchema
-    public JsonSerializer<Object> getSerializer() {
-        return _serializer;
-    }
-
-    public JavaType getSerializationType() {
-        return _cfgSerializationType;
-    }
-
-    public Class<?> getRawSerializationType() {
-        return (_cfgSerializationType == null) ? null : _cfgSerializationType.getRawClass();
-    }
-    
-    public Class<?> getPropertyType() 
-    {
-        if (_accessorMethod != null) {
-            return _accessorMethod.getReturnType();
-        }
-        return _field.getType();
-    }
-
-    /**
-     * Get the generic property type of this property writer.
-     *
-     * @return The property type, or null if not found.
-     */
-    public Type getGenericPropertyType()
-    {
-        if (_accessorMethod != null) {
-            return _accessorMethod.getGenericReturnType();
-        }
-        return _field.getGenericType();
-    }
-
-    public Class<?>[] getViews() { return _includeInViews; }
-
-    /**
-     *<p>
-     * NOTE: due to introspection, this is a <b>slow</b> method to call
-     * and should never be called during actual serialization or filtering
-     * of the property. Rather it is needed for traversal needed for things
-     * like constructing JSON Schema instances.
-     * 
-     * @since 2.1
-     */
-    protected boolean isRequired(AnnotationIntrospector intr)
-    {
-        Boolean value = intr.hasRequiredMarker(_member);
-        return (value == null) ? false : value.booleanValue();
-    }
-
-    /*
-    /**********************************************************
-    /* Support for JsonFormatVisitable
-    /**********************************************************
-     */
-
-    /**
-     * Method called to handle appropriate type-specific visiting
-     * over logical property this writer handles.
-     * 
-     * @param objectVisitor ObjectVisitor which can receive the property
-     * 
-     * @since 2.1
-     */
-    public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor)
-        throws JsonMappingException
-    {
-        if (isRequired(objectVisitor.getProvider().getAnnotationIntrospector())) {
-            objectVisitor.property(this); 
-        } else {
-            objectVisitor.optionalProperty(this);
-        }
-    }
-
-    /**
-     * Attempt to add the output of the given {@link BeanPropertyWriter} in the given {@link ObjectNode}.
-     * Otherwise, add the default schema {@link JsonNode} in place of the writer's output
-     * 
-     * @param propertiesNode Node which the given property would exist within
-     * @param provider Provider that can be used for accessing dynamic aspects of serialization
-     *  processing
-     *  
-     *  {@link BeanPropertyFilter#depositSchemaProperty(BeanPropertyWriter, ObjectNode, SerializerProvider)}
-     * 
-     * @since 2.1
-     */
-    public void depositSchemaProperty(ObjectNode propertiesNode, SerializerProvider provider)
-        throws JsonMappingException
-    {
-        JavaType propType = getSerializationType();
-        // 03-Dec-2010, tatu: SchemaAware REALLY should use JavaType, but alas it doesn't...
-        Type hint = (propType == null) ? getGenericPropertyType() : propType.getRawClass();
-        JsonNode schemaNode;
-        // Maybe it already has annotated/statically configured serializer?
-        JsonSerializer<Object> ser = getSerializer();
-        if (ser == null) { // nope
-            Class<?> serType = getRawSerializationType();
-            if (serType == null) {
-                serType = getPropertyType();
-            }
-            ser = provider.findValueSerializer(serType, this);
-        }
-        boolean isOptional = !isRequired(provider.getAnnotationIntrospector());
-        if (ser instanceof SchemaAware) {
-            schemaNode =  ((SchemaAware) ser).getSchema(provider, hint, isOptional) ;
-        } else {  
-            schemaNode = JsonSchema.getDefaultSchemaNode(); 
-        }
-        propertiesNode.put(getName(), schemaNode);
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization functionality
-    /**********************************************************
-     */
-
-    /**
-     * Method called to access property that this bean stands for, from
-     * within given bean, and to serialize it as a JSON Object field
-     * using appropriate serializer.
-     */
-    public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws Exception
-    {
-        Object value = get(bean);
-        // Null handling is bit different, check that first
-        if (value == null) {
-            if (_nullSerializer != null) {
-                jgen.writeFieldName(_name);
-                _nullSerializer.serialize(null, jgen, prov);
-            }
-            return;
-        }
-        // then find serializer to use
-        JsonSerializer<Object> ser = _serializer;
-        if (ser == null) {
-            Class<?> cls = value.getClass();
-            PropertySerializerMap map = _dynamicSerializers;
-            ser = map.serializerFor(cls);
-            if (ser == null) {
-                ser = _findAndAddDynamic(map, cls, prov);
-            }
-        }
-        // and then see if we must suppress certain values (default, empty)
-        if (_suppressableValue != null) {
-            if (MARKER_FOR_EMPTY == _suppressableValue) {
-                if (ser.isEmpty(value)) {
-                    return;
-                }
-            } else if (_suppressableValue.equals(value)) {
-                return;
-            }
-        }
-        // For non-nulls: simple check for direct cycles
-        if (value == bean) {
-            _handleSelfReference(bean, ser);
-        }
-        jgen.writeFieldName(_name);
-        if (_typeSerializer == null) {
-            ser.serialize(value, jgen, prov);
-        } else {
-            ser.serializeWithType(value, jgen, prov, _typeSerializer);
-        }
-    }
-
-    /**
-     * Alternative to {@link #serializeAsField} that is used when a POJO
-     * is serialized as JSON Array; the difference is that no field names
-     * are written.
-     * 
-     * @since 2.1
-     */
-    public void serializeAsColumn(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws Exception
-    {
-        Object value = get(bean);
-        if (value == null) { // nulls need specialized handling
-            if (_nullSerializer != null) {
-                _nullSerializer.serialize(null, jgen, prov);
-            } else { // can NOT suppress entries in tabular output
-                jgen.writeNull();
-            }
-        }
-        // otherwise find serializer to use
-        JsonSerializer<Object> ser = _serializer;
-        if (ser == null) {
-            Class<?> cls = value.getClass();
-            PropertySerializerMap map = _dynamicSerializers;
-            ser = map.serializerFor(cls);
-            if (ser == null) {
-                ser = _findAndAddDynamic(map, cls, prov);
-            }
-        }
-        // and then see if we must suppress certain values (default, empty)
-        if (_suppressableValue != null) {
-            if (MARKER_FOR_EMPTY == _suppressableValue) {
-                if (ser.isEmpty(value)) { // can NOT suppress entries in tabular output
-                    serializeAsPlaceholder(bean, jgen, prov);
-                    return;
-                }
-            } else if (_suppressableValue.equals(value)) { // can NOT suppress entries in tabular output
-                serializeAsPlaceholder(bean, jgen, prov);
-                return;
-            }
-        }
-        // For non-nulls: simple check for direct cycles
-        if (value == bean) {
-            _handleSelfReference(bean, ser);
-        }
-        if (_typeSerializer == null) {
-            ser.serialize(value, jgen, prov);
-        } else {
-            ser.serializeWithType(value, jgen, prov, _typeSerializer);
-        }
-    }
-
-    /**
-     * Method called to serialize a placeholder used in tabular output when
-     * real value is not to be included (is filtered out), but when we need
-     * an entry so that field indexes will not be off. Typically this should
-     * output null or empty String, depending on datatype.
-     * 
-     * @since 2.1
-     */
-    public void serializeAsPlaceholder(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws Exception
-    {
-        if (_nullSerializer != null) {
-            _nullSerializer.serialize(null, jgen, prov);
-        } else {
-            jgen.writeNull();
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    protected JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            Class<?> type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result;
-        if (_nonTrivialBaseType != null) {
-            JavaType t = provider.constructSpecializedType(_nonTrivialBaseType, type);
-            result = map.findAndAddSerializer(t, provider, this);
-        } else {
-            result = map.findAndAddSerializer(type, provider, this);
-        }
-        // did we get a new map of serializers? If so, start using it
-        if (map != result.map) {
-            _dynamicSerializers = result.map;
-        }
-        return result.serializer;
-    }
-    
-    /**
-     * Method that can be used to access value of the property this
-     * Object describes, from given bean instance.
-     *<p>
-     * Note: method is final as it should not need to be overridden -- rather,
-     * calling method(s) ({@link #serializeAsField}) should be overridden
-     * to change the behavior
-     */
-    public final Object get(Object bean) throws Exception
-    {
-        if (_accessorMethod != null) {
-            return _accessorMethod.invoke(bean);
-        }
-        return _field.get(bean);
-    }
-
-    protected void _handleSelfReference(Object bean, JsonSerializer<?> ser)
-        throws JsonMappingException
-    {
-        /* 05-Feb-2012, tatu: Usually a problem, but NOT if we are handling
-         *    object id; this may be the case for BeanSerializers at least.
-         */
-        if (ser.usesObjectId()) {
-            return;
-        }
-        throw new JsonMappingException("Direct self-reference leading to cycle");
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(40);
-        sb.append("property '").append(getName()).append("' (");
-        if (_accessorMethod != null) {
-            sb.append("via method ").append(_accessorMethod.getDeclaringClass().getName()).append("#").append(_accessorMethod.getName());
-        } else {
-            sb.append("field \"").append(_field.getDeclaringClass().getName()).append("#").append(_field.getName());
-        }
-        if (_serializer == null) {
-            sb.append(", no static serializer");
-        } else {
-            sb.append(", static serializer of type "+_serializer.getClass().getName());
-        }
-        sb.append(')');
-        return sb.toString();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializer.java
deleted file mode 100644
index 38ae0f8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializer.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.ser.impl.BeanAsArraySerializer;
-import com.fasterxml.jackson.databind.ser.impl.ObjectIdWriter;
-import com.fasterxml.jackson.databind.ser.impl.UnwrappingBeanSerializer;
-import com.fasterxml.jackson.databind.ser.impl.WritableObjectId;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Serializer class that can serialize Java objects that map
- * to JSON Object output. Internally handling is mostly dealt with
- * by a sequence of {@link BeanPropertyWriter}s that will handle
- * access value to serialize and call appropriate serializers to
- * write out JSON.
- *<p>
- * Implementation note: we will post-process resulting serializer,
- * to figure out actual serializers for final types. This must be
- * done from {@link #resolve} method, and NOT from constructor;
- * otherwise we could end up with an infinite loop.
- */
-public class BeanSerializer
-    extends BeanSerializerBase
-{
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-    /**
-     * @param builder Builder object that contains collected information
-     *   that may be needed for serializer
-     * @param properties Property writers used for actual serialization
-     */
-    public BeanSerializer(JavaType type, BeanSerializerBuilder builder,
-            BeanPropertyWriter[] properties, BeanPropertyWriter[] filteredProperties)
-    {
-        super(type, builder, properties, filteredProperties);
-    }
-    
-    /**
-     * Alternate copy constructor that can be used to construct
-     * standard {@link BeanSerializer} passing an instance of
-     * "compatible enough" source serializer.
-     */
-    protected BeanSerializer(BeanSerializerBase src) {
-        super(src);
-    }
-
-    protected BeanSerializer(BeanSerializerBase src, ObjectIdWriter objectIdWriter) {
-        super(src, objectIdWriter);
-    }
-
-    protected BeanSerializer(BeanSerializerBase src, String[] toIgnore) {
-        super(src, toIgnore);
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: factory methods, fluent factories
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing dummy bean serializer; one that
-     * never outputs any properties
-     */
-    public static BeanSerializer createDummy(JavaType forType)
-    {
-        return new BeanSerializer(forType, null, NO_PROPS, null);
-    }
-
-    @Override
-    public JsonSerializer<Object> unwrappingSerializer(NameTransformer unwrapper) {
-        return new UnwrappingBeanSerializer(this, unwrapper);
-    }
-
-    @Override
-    public BeanSerializer withObjectIdWriter(ObjectIdWriter objectIdWriter) {
-        return new BeanSerializer(this, objectIdWriter);
-    }
-
-    @Override
-    protected BeanSerializer withIgnorals(String[] toIgnore) {
-        return new BeanSerializer(this, toIgnore);
-    }
-
-    /**
-     * Implementation has to check whether as-array serialization
-     * is possible reliably; if (and only if) so, will construct
-     * a {@link BeanAsArraySerializer}, otherwise will return this
-     * serializer as is.
-     */
-    @Override
-    protected BeanSerializerBase asArraySerializer()
-    {
-        /* Can not:
-         * 
-         * - have Object Id (may be allowed in future)
-         * - have any getter
-         * 
-         */
-        if ((_objectIdWriter == null)
-                && (_anyGetterWriter == null)
-                && (_propertyFilterId == null)
-                ) {
-            return new BeanAsArraySerializer(this);
-        }
-        // already is one, so:
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializer implementation that differs between impls
-    /**********************************************************
-     */
-
-    /**
-     * Main serialization method that will delegate actual output to
-     * configured
-     * {@link BeanPropertyWriter} instances.
-     */
-    @Override
-    public final void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_objectIdWriter != null) {
-            serializeWithObjectId(bean, jgen, provider);
-            return;
-        }
-        jgen.writeStartObject();
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-        jgen.writeEndObject();
-    }
-
-    private final void serializeWithObjectId(Object bean,
-            JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final ObjectIdWriter w = _objectIdWriter;
-        WritableObjectId oid = provider.findObjectId(bean, w.generator);
-        Object id = oid.id;
-        
-        if (id != null) { // have seen before; serialize just id
-            oid.serializer.serialize(id, jgen, provider);
-            return;
-        }
-        // if not, bit more work:
-        oid.serializer = w.serializer;
-        oid.id = id = oid.generator.generateId(bean);
-        // possibly. Or maybe not:
-        if (w.alwaysAsId) { 
-            oid.serializer.serialize(id, jgen, provider);
-            return;
-        }
-        // If not, need to inject the id:
-        jgen.writeStartObject();
-        SerializedString name = w.propertyName;
-        if (name != null) {
-            jgen.writeFieldName(name);
-            w.serializer.serialize(id, jgen, provider);
-        }
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-        jgen.writeEndObject();
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override public String toString() {
-        return "BeanSerializer for "+handledType().getName();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.java
deleted file mode 100644
index 06b59cd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.ser.impl.ObjectIdWriter;
-
-/**
- * Builder class used for aggregating deserialization information about
- * a POJO, in order to build a {@link JsonSerializer} for serializing
- * intances.
- * Main reason for using separate builder class is that this makes it easier
- * to make actual serializer class fully immutable.
- */
-public class BeanSerializerBuilder
-{
-    private final static BeanPropertyWriter[] NO_PROPERTIES = new BeanPropertyWriter[0];
-
-    /*
-    /**********************************************************
-    /* Basic configuration we start with
-    /**********************************************************
-     */
-
-    final protected BeanDescription _beanDesc;
-
-    protected SerializationConfig _config;
-    
-    /*
-    /**********************************************************
-    /* Accumulated information about properties
-    /**********************************************************
-     */
-
-    /**
-     * Bean properties, in order of serialization
-     */
-    protected List<BeanPropertyWriter> _properties;
-
-    /**
-     * Optional array of filtered property writers; if null, no
-     * view-based filtering is performed.
-     */
-    protected BeanPropertyWriter[] _filteredProperties;
-    
-    /**
-     * Writer used for "any getter" properties, if any.
-     */
-    protected AnyGetterWriter _anyGetter;
-
-    /**
-     * Id of the property filter to use for POJO, if any.
-     */
-    protected Object _filterId;
-
-    /**
-     * Property that is used for type id (and not serialized as regular
-     * property)
-     */
-    protected AnnotatedMember _typeId;
-
-    /**
-     * Object responsible for serializing Object Ids for the handled
-     * type, if any.
-     */
-    protected ObjectIdWriter _objectIdWriter;
-    
-    /*
-    /**********************************************************
-    /* Construction and setter methods
-    /**********************************************************
-     */
-    
-    public BeanSerializerBuilder(BeanDescription beanDesc) {
-        _beanDesc = beanDesc;
-    }
-
-    /**
-     * Copy-constructor that may be used for sub-classing
-     */
-    protected BeanSerializerBuilder(BeanSerializerBuilder src) {
-        _beanDesc = src._beanDesc;
-        _properties = src._properties;
-        _filteredProperties = src._filteredProperties;
-        _anyGetter = src._anyGetter;
-        _filterId = src._filterId;
-    }
-
-    /**
-     * Initialization method called right after construction, to specify
-     * configuration to use.
-     *<p>
-     * Note: ideally should be passed in constructor, but for backwards
-     * compatibility, needed to add a setter instead
-     * 
-     * @since 2.1
-     */
-    protected void setConfig(SerializationConfig config) {
-        _config = config;
-    }
-    
-    public void setProperties(List<BeanPropertyWriter> properties) {
-        _properties = properties;
-    }
-
-    public void setFilteredProperties(BeanPropertyWriter[] properties) {
-        _filteredProperties = properties;
-    }
-    
-    public void setAnyGetter(AnyGetterWriter anyGetter) {
-        _anyGetter = anyGetter;
-    }
-
-    public void setFilterId(Object filterId) {
-        _filterId = filterId;
-    }
-    
-    public void setTypeId(AnnotatedMember idProp) {
-        // Not legal to use multiple ones...
-        if (_typeId != null) {
-            throw new IllegalArgumentException("Multiple type ids specified with "+_typeId+" and "+idProp);
-        }
-        _typeId = idProp;
-    }
-
-    public void setObjectIdWriter(ObjectIdWriter w) {
-        _objectIdWriter = w;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors for things BeanSerializer cares about:
-    /* note -- likely to change between minor revisions
-    /* by new methods getting added.
-    /**********************************************************
-     */
-
-    public AnnotatedClass getClassInfo() { return _beanDesc.getClassInfo(); }
-    
-    public BeanDescription getBeanDescription() { return _beanDesc; }
-
-    public List<BeanPropertyWriter> getProperties() { return _properties; }
-    public boolean hasProperties() {
-        return (_properties != null) && (_properties.size() > 0);
-    }
-
-    public BeanPropertyWriter[] getFilteredProperties() { return _filteredProperties; }
-    
-    public AnyGetterWriter getAnyGetter() { return _anyGetter; }
-    
-    public Object getFilterId() { return _filterId; }
-
-    public AnnotatedMember getTypeId() { return _typeId; }
-
-    public ObjectIdWriter getObjectIdWriter() { return _objectIdWriter; }
-    
-    /*
-    /**********************************************************
-    /* Build methods for actually creating serializer instance
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to create {@link BeanSerializer} instance with
-     * all accumulated information. Will construct a serializer if we
-     * have enough information, or return null if not.
-     */
-    public JsonSerializer<?> build()
-    {
-        BeanPropertyWriter[] properties;
-        // No properties or any getter? No real serializer; caller gets to handle
-        if (_properties == null || _properties.isEmpty()) {
-            if (_anyGetter == null) {
-                return null;
-            }
-            properties = NO_PROPERTIES;
-        } else {
-            properties = _properties.toArray(new BeanPropertyWriter[_properties.size()]);
-            
-        }
-        return new BeanSerializer(_beanDesc.getType(), this,
-                properties, _filteredProperties);
-    }
-    
-    /**
-     * Factory method for constructing an "empty" serializer; one that
-     * outputs no properties (but handles JSON objects properly, including
-     * type information)
-     */
-    public BeanSerializer createDummy() {
-        return BeanSerializer.createDummy(_beanDesc.getType());
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java
deleted file mode 100644
index fc3329a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java
+++ /dev/null
@@ -1,752 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.impl.FilteredBeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.impl.ObjectIdWriter;
-import com.fasterxml.jackson.databind.ser.impl.PropertyBasedObjectIdGenerator;
-import com.fasterxml.jackson.databind.ser.std.MapSerializer;
-import com.fasterxml.jackson.databind.type.*;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Factory class that can provide serializers for any regular Java beans
- * (as defined by "having at least one get method recognizable as bean
- * accessor" -- where {@link Object#getClass} does not count);
- * as well as for "standard" JDK types. Latter is achieved
- * by delegating calls to {@link BasicSerializerFactory} 
- * to find serializers both for "standard" JDK types (and in some cases,
- * sub-classes as is the case for collection classes like
- * {@link java.util.List}s and {@link java.util.Map}s) and bean (value)
- * classes.
- *<p>
- * Note about delegating calls to {@link BasicSerializerFactory}:
- * although it would be nicer to use linear delegation
- * for construction (to essentially dispatch all calls first to the
- * underlying {@link BasicSerializerFactory}; or alternatively after
- * failing to provide bean-based serializer}, there is a problem:
- * priority levels for detecting standard types are mixed. That is,
- * we want to check if a type is a bean after some of "standard" JDK
- * types, but before the rest.
- * As a result, "mixed" delegation used, and calls are NOT done using
- * regular {@link SerializerFactory} interface but rather via
- * direct calls to {@link BasicSerializerFactory}.
- *<p>
- * Finally, since all caching is handled by the serializer provider
- * (not factory) and there is no configurability, this
- * factory is stateless.
- * This means that a global singleton instance can be used.
- */
-public class BeanSerializerFactory
-    extends BasicSerializerFactory
-    implements java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Like {@link BasicSerializerFactory}, this factory is stateless, and
-     * thus a single shared global (== singleton) instance can be used
-     * without thread-safety issues.
-     */
-    public final static BeanSerializerFactory instance = new BeanSerializerFactory(null);
-
-    /*
-    /**********************************************************
-    /* Life-cycle: creation, configuration
-    /**********************************************************
-     */
-
-    /**
-     * Constructor for creating instances with specified configuration.
-     */
-    protected BeanSerializerFactory(SerializerFactoryConfig config)
-    {
-        super(config);
-    }
-    
-    /**
-     * Method used by module registration functionality, to attach additional
-     * serializer providers into this serializer factory. This is typically
-     * handled by constructing a new instance with additional serializers,
-     * to ensure thread-safe access.
-     */
-    @Override
-    public SerializerFactory withConfig(SerializerFactoryConfig config)
-    {
-        if (_factoryConfig == config) {
-            return this;
-        }
-        /* 22-Nov-2010, tatu: Handling of subtypes is tricky if we do immutable-with-copy-ctor;
-         *    and we pretty much have to here either choose between losing subtype instance
-         *    when registering additional serializers, or losing serializers.
-         *    Instead, let's actually just throw an error if this method is called when subtype
-         *    has not properly overridden this method; this to indicate problem as soon as possible.
-         */
-        if (getClass() != BeanSerializerFactory.class) {
-            throw new IllegalStateException("Subtype of BeanSerializerFactory ("+getClass().getName()
-                    +") has not properly overridden method 'withAdditionalSerializers': can not instantiate subtype with "
-                    +"additional serializer definitions");
-        }
-        return new BeanSerializerFactory(config);
-    }
-
-    @Override
-    protected Iterable<Serializers> customSerializers() {
-        return _factoryConfig.serializers();
-    }
-    
-    /*
-    /**********************************************************
-    /* SerializerFactory impl
-    /**********************************************************
-     */
-
-    /**
-     * Main serializer constructor method. We will have to be careful
-     * with respect to ordering of various method calls: essentially
-     * we want to reliably figure out which classes are standard types,
-     * and which are beans. The problem is that some bean Classes may
-     * implement standard interfaces (say, {@link java.lang.Iterable}.
-     *<p>
-     * Note: sub-classes may choose to complete replace implementation,
-     * if they want to alter priority of serializer lookups.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public JsonSerializer<Object> createSerializer(SerializerProvider prov,
-            JavaType origType)
-        throws JsonMappingException
-    {
-        // Very first thing, let's check if there is explicit serializer annotation:
-        final SerializationConfig config = prov.getConfig();
-        BeanDescription beanDesc = config.introspect(origType);
-        JsonSerializer<?> ser = findSerializerFromAnnotation(prov, beanDesc.getClassInfo());
-        if (ser != null) {
-            return (JsonSerializer<Object>) ser;
-        }
-        boolean staticTyping;
-        
-        // Next: we may have annotations that further define types to use...
-        JavaType type = modifyTypeByAnnotation(config, beanDesc.getClassInfo(), origType);
-        if (type == origType) { // no changes, won't force static typing
-            staticTyping = false;
-        } else { // changes; assume static typing; plus, need to re-introspect if class differs
-            staticTyping = true;
-            if (type.getRawClass() != origType.getRawClass()) {
-                beanDesc = config.introspect(type);
-            }
-        }
-
-        // Then JsonSerializable, @JsonValue etc:
-        ser = findSerializerByAnnotations(prov, type, beanDesc);
-        if (ser != null) {
-            return (JsonSerializer<Object>) ser;
-        }
-        
-        // Container types differ from non-container types
-        // (note: called method checks for module-provided serializers)
-        if (origType.isContainerType()) {
-            if (!staticTyping) {
-                staticTyping = usesStaticTyping(config, beanDesc, null);
-                // [JACKSON-822]: Need to figure out how to force passed parameterization
-                //  to stick...
-                /*
-                if (property == null) {
-                    JavaType t = origType.getContentType();
-                    if (t != null && !t.hasRawClass(Object.class)) {
-                        staticTyping = true;
-                    }
-                }
-                */
-            }
-            // 03-Aug-2012, tatu: As per [Issue#40], may require POJO serializer...
-            ser =  buildContainerSerializer(prov, type, beanDesc, staticTyping);
-            if (ser != null) {
-                return (JsonSerializer<Object>) ser;
-            }
-        } else {
-            // Modules may provide serializers of POJO types:
-            for (Serializers serializers : customSerializers()) {
-                ser = serializers.findSerializer(config, type, beanDesc);
-                if (ser != null) {
-                    return (JsonSerializer<Object>) ser;
-                }
-            }
-        }
-        
-        /* Otherwise, we will check "primary types"; both marker types that
-         * indicate specific handling (JsonSerializable), or main types that have
-         * precedence over container types
-         */
-        ser = findSerializerByLookup(type, config, beanDesc, staticTyping);
-        if (ser == null) {
-            ser = findSerializerByPrimaryType(prov, type, beanDesc, staticTyping);
-            if (ser == null) {
-                /* And this is where this class comes in: if type is not a
-                 * known "primary JDK type", perhaps it's a bean? We can still
-                 * get a null, if we can't find a single suitable bean property.
-                 */
-                ser = findBeanSerializer(prov, type, beanDesc);
-                /* Finally: maybe we can still deal with it as an
-                 * implementation of some basic JDK interface?
-                 */
-                if (ser == null) {
-                    ser = findSerializerByAddonType(config, type, beanDesc, staticTyping);
-                }
-            }
-        }
-        return (JsonSerializer<Object>) ser;
-    }
-    
-    /*
-    /**********************************************************
-    /* Other public methods that are not part of
-    /* JsonSerializerFactory API
-    /**********************************************************
-     */
-
-    /**
-     * Deprecated method; final to help identify problems with sub-classes,
-     * as this method will NOT be called any more in 2.1
-     * 
-     * @deprecated Since 2.1 (use variant without 'property' argument).
-     */
-    @Deprecated
-    public final JsonSerializer<Object> findBeanSerializer(SerializerProvider prov,
-            JavaType type, BeanDescription beanDesc, BeanProperty property)
-        throws JsonMappingException {
-        return findBeanSerializer(prov, type, beanDesc);
-    }
-    
-    /**
-     * Method that will try to construct a {@link BeanSerializer} for
-     * given class. Returns null if no properties are found.
-     */
-    @SuppressWarnings("unchecked")
-    public JsonSerializer<Object> findBeanSerializer(SerializerProvider prov,
-            JavaType type, BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        // First things first: we know some types are not beans...
-        if (!isPotentialBeanType(type.getRawClass())) {
-            // 03-Aug-2012, tatu: Except we do need to allow serializers for Enums,
-            //   as per [Issue#24]
-            if (!type.isEnumType()) {
-                return null;
-            }
-        }
-        JsonSerializer<Object> serializer = constructBeanSerializer(prov, beanDesc);
-        // [JACKSON-440] Need to allow overriding actual serializer, as well...
-        if (_factoryConfig.hasSerializerModifiers()) {
-            for (BeanSerializerModifier mod : _factoryConfig.serializerModifiers()) {
-                serializer = (JsonSerializer<Object>)mod.modifySerializer(prov.getConfig(),
-                        beanDesc, serializer);
-            }
-        }
-        return serializer;
-    }
-
-    /**
-     * @deprecated Since 2.1
-     */
-    @Deprecated
-    public final TypeSerializer findPropertyTypeSerializer(JavaType baseType,
-            SerializationConfig config, AnnotatedMember accessor, BeanProperty property)
-        throws JsonMappingException {
-        return findPropertyTypeSerializer(baseType, config, accessor);
-    }
-    
-    /**
-     * Method called to create a type information serializer for values of given
-     * non-container property
-     * if one is needed. If not needed (no polymorphic handling configured), should
-     * return null.
-     *
-     * @param baseType Declared type to use as the base type for type information serializer
-     * 
-     * @return Type serializer to use for property values, if one is needed; null if not.
-     */
-    public TypeSerializer findPropertyTypeSerializer(JavaType baseType,
-            SerializationConfig config, AnnotatedMember accessor)
-        throws JsonMappingException
-    {
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyTypeResolver(config, accessor, baseType);        
-        // Defaulting: if no annotations on member, check value class
-        if (b == null) {
-            return createTypeSerializer(config, baseType);
-        }
-        Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(
-                accessor, config, ai, baseType);
-        return b.buildTypeSerializer(config, baseType, subtypes);
-    }
-
-    /**
-     * Method called to create a type information serializer for values of given
-     * container property
-     * if one is needed. If not needed (no polymorphic handling configured), should
-     * return null.
-     *
-     * @param containerType Declared type of the container to use as the base type for type information serializer
-     * 
-     * @return Type serializer to use for property value contents, if one is needed; null if not.
-     */    
-    public TypeSerializer findPropertyContentTypeSerializer(JavaType containerType,
-            SerializationConfig config, AnnotatedMember accessor)
-        throws JsonMappingException
-    {
-        JavaType contentType = containerType.getContentType();
-        AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyContentTypeResolver(config, accessor, containerType);        
-        // Defaulting: if no annotations on member, check value class
-        if (b == null) {
-            return createTypeSerializer(config, contentType);
-        }
-        Collection<NamedType> subtypes = config.getSubtypeResolver().collectAndResolveSubtypes(accessor,
-                config, ai, contentType);
-        return b.buildTypeSerializer(config, contentType, subtypes);
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable non-public factory methods
-    /**********************************************************
-     */
-
-    /**
-     * Deprecated method; final to help identify problems with sub-classes,
-     * as this method will NOT be called any more in 2.1
-     * 
-     * @deprecated Since 2.1, do not pass 'property' argument
-     */
-    @Deprecated
-    protected final JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov,
-            BeanDescription beanDesc, BeanProperty property)
-        throws JsonMappingException
-    {
-        return constructBeanSerializer(prov, beanDesc);
-    }
-    
-    /**
-     * Method called to construct serializer for serializing specified bean type.
-     * 
-     * @since 2.1
-     */
-    @SuppressWarnings("unchecked")
-    protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov,
-            BeanDescription beanDesc)
-        throws JsonMappingException
-    {
-        // 13-Oct-2010, tatu: quick sanity check: never try to create bean serializer for plain Object
-        // 05-Jul-2012, tatu: ... but we should be able to just return "unknown type" serializer, right?
-        if (beanDesc.getBeanClass() == Object.class) {
-            return prov.getUnknownTypeSerializer(Object.class);
-//            throw new IllegalArgumentException("Can not create bean serializer for Object.class");
-        }
-        final SerializationConfig config = prov.getConfig();
-        BeanSerializerBuilder builder = constructBeanSerializerBuilder(beanDesc);
-        builder.setConfig(config);
-        
-        // First: any detectable (auto-detect, annotations) properties to serialize?
-        List<BeanPropertyWriter> props = findBeanProperties(prov, beanDesc, builder);
-        if (props == null) {
-            props = new ArrayList<BeanPropertyWriter>();
-        }
-        // [JACKSON-440] Need to allow modification bean properties to serialize:
-        if (_factoryConfig.hasSerializerModifiers()) {
-            for (BeanSerializerModifier mod : _factoryConfig.serializerModifiers()) {
-                props = mod.changeProperties(config, beanDesc, props);
-            }
-        }
-        
-        // Any properties to suppress?
-        props = filterBeanProperties(config, beanDesc, props);
-        
-        // [JACKSON-440] Need to allow reordering of properties to serialize
-        if (_factoryConfig.hasSerializerModifiers()) {
-            for (BeanSerializerModifier mod : _factoryConfig.serializerModifiers()) {
-                props = mod.orderProperties(config, beanDesc, props);
-            }
-        }
-
-        /* And if Object Id is needed, some preparation for that as well: better
-         * do before view handling, mostly for the custom id case which needs
-         * access to a property
-         */
-        builder.setObjectIdWriter(constructObjectIdHandler(prov, beanDesc, props));
-        
-        builder.setProperties(props);
-        builder.setFilterId(findFilterId(config, beanDesc));
-        
-        AnnotatedMember anyGetter = beanDesc.findAnyGetter();
-        if (anyGetter != null) { // since 1.6
-            if (config.canOverrideAccessModifiers()) {
-                anyGetter.fixAccess();
-            }
-            JavaType type = anyGetter.getType(beanDesc.bindingsForBeanType());
-            // copied from BasicSerializerFactory.buildMapSerializer():
-            boolean staticTyping = config.isEnabled(MapperFeature.USE_STATIC_TYPING);
-            JavaType valueType = type.getContentType();
-            TypeSerializer typeSer = createTypeSerializer(config, valueType);
-            // last 2 nulls; don't know key, value serializers (yet)
-            MapSerializer mapSer = MapSerializer.construct(/* ignored props*/ null, type, staticTyping,
-                    typeSer, null, null);
-            BeanProperty.Std anyProp = new BeanProperty.Std(anyGetter.getName(), valueType,
-                    beanDesc.getClassAnnotations(), anyGetter);
-            builder.setAnyGetter(new AnyGetterWriter(anyProp, anyGetter, mapSer));
-        }
-        // Next: need to gather view information, if any:
-        processViews(config, builder);
-        
-        // Finally: let interested parties mess with the result bit more...
-        if (_factoryConfig.hasSerializerModifiers()) {
-            for (BeanSerializerModifier mod : _factoryConfig.serializerModifiers()) {
-                builder = mod.updateBuilder(config, beanDesc, builder);
-            }
-        }
-        
-        JsonSerializer<Object> ser = (JsonSerializer<Object>) builder.build();
-
-        /* However, after all modifications: no properties, no serializer
-         * (note; as per [JACKSON-670], check was moved later on from an earlier location)
-         */
-        if (ser == null) {
-            /* 27-Nov-2009, tatu: Except that as per [JACKSON-201], we are
-             *   ok with that as long as it has a recognized class annotation
-             *  (which may come from a mix-in too)
-             */
-            if (beanDesc.hasKnownClassAnnotations()) {
-                return builder.createDummy();
-            }
-        }
-        return ser;
-    }
-
-    protected ObjectIdWriter constructObjectIdHandler(SerializerProvider prov,
-            BeanDescription beanDesc, List<BeanPropertyWriter> props)
-        throws JsonMappingException
-    {
-        ObjectIdInfo objectIdInfo = beanDesc.getObjectIdInfo();
-        if (objectIdInfo == null) {
-            return null;
-        }
-        ObjectIdGenerator<?> gen;
-        Class<?> implClass = objectIdInfo.getGeneratorType();
-
-        // Just one special case: Property-based generator is trickier
-        if (implClass == ObjectIdGenerators.PropertyGenerator.class) { // most special one, needs extra work
-            String propName = objectIdInfo.getPropertyName();
-            BeanPropertyWriter idProp = null;
-
-            for (int i = 0, len = props.size() ;; ++i) {
-                if (i == len) {
-                    throw new IllegalArgumentException("Invalid Object Id definition for "+beanDesc.getBeanClass().getName()
-                            +": can not find property with name '"+propName+"'");
-                }
-                BeanPropertyWriter prop = props.get(i);
-                if (propName.equals(prop.getName())) {
-                    idProp = prop;
-                    /* Let's force it to be the first property to output
-                     * (although it may still get rearranged etc)
-                     */
-                    if (i > 0) {
-                        props.remove(i);
-                        props.add(0, idProp);
-                    }
-                    break;
-                }
-            }
-            JavaType idType = idProp.getType();
-            gen = new PropertyBasedObjectIdGenerator(objectIdInfo, idProp);
-            // one more thing: must ensure that ObjectIdWriter does not actually write the value:
-            return ObjectIdWriter.construct(idType, null, gen, objectIdInfo.getAlwaysAsId());
-            
-        } 
-        // other types are simpler
-        JavaType type = prov.constructType(implClass);
-        // Could require type to be passed explicitly, but we should be able to find it too:
-        JavaType idType = prov.getTypeFactory().findTypeParameters(type, ObjectIdGenerator.class)[0];
-        gen = prov.objectIdGeneratorInstance(beanDesc.getClassInfo(), objectIdInfo);
-        return ObjectIdWriter.construct(idType, objectIdInfo.getPropertyName(), gen,
-                objectIdInfo.getAlwaysAsId());
-    }
-
-    /**
-     * Method called to construct a filtered writer, for given view
-     * definitions. Default implementation constructs filter that checks
-     * active view type to views property is to be included in.
-     */
-    protected BeanPropertyWriter constructFilteredBeanWriter(BeanPropertyWriter writer,
-            Class<?>[] inViews)
-    {
-        return FilteredBeanPropertyWriter.constructViewBased(writer, inViews);
-    }
-    
-    protected PropertyBuilder constructPropertyBuilder(SerializationConfig config,
-            BeanDescription beanDesc)
-    {
-        return new PropertyBuilder(config, beanDesc);
-    }
-
-    protected BeanSerializerBuilder constructBeanSerializerBuilder(BeanDescription beanDesc) {
-        return new BeanSerializerBuilder(beanDesc);
-    }
-
-    /**
-     * Method called to find filter that is configured to be used with bean
-     * serializer being built, if any.
-     */
-    protected Object findFilterId(SerializationConfig config, BeanDescription beanDesc)
-    {
-        return config.getAnnotationIntrospector().findFilterId(beanDesc.getClassInfo());
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridable non-public introspection methods
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method used to skip processing for types that we know
-     * can not be (i.e. are never consider to be) beans: 
-     * things like primitives, Arrays, Enums, and proxy types.
-     *<p>
-     * Note that usually we shouldn't really be getting these sort of
-     * types anyway; but better safe than sorry.
-     */
-    protected boolean isPotentialBeanType(Class<?> type)
-    {
-        return (ClassUtil.canBeABeanType(type) == null) && !ClassUtil.isProxyType(type);
-    }
-
-    /**
-     * Method used to collect all actual serializable properties.
-     * Can be overridden to implement custom detection schemes.
-     */
-    protected List<BeanPropertyWriter> findBeanProperties(SerializerProvider prov,
-            BeanDescription beanDesc, BeanSerializerBuilder builder)
-        throws JsonMappingException
-    {
-        List<BeanPropertyDefinition> properties = beanDesc.findProperties();
-        final SerializationConfig config = prov.getConfig();
-
-        // [JACKSON-429]: ignore specified types
-        removeIgnorableTypes(config, beanDesc, properties);
-        
-        // and possibly remove ones without matching mutator...
-        if (config.isEnabled(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS)) {
-            removeSetterlessGetters(config, beanDesc, properties);
-        }
-        
-        // nothing? can't proceed (caller may or may not throw an exception)
-        if (properties.isEmpty()) {
-            return null;
-        }
-        // null is for value type serializer, which we don't have access to from here (ditto for bean prop)
-        boolean staticTyping = usesStaticTyping(config, beanDesc, null);
-        PropertyBuilder pb = constructPropertyBuilder(config, beanDesc);
-        
-        ArrayList<BeanPropertyWriter> result = new ArrayList<BeanPropertyWriter>(properties.size());
-        TypeBindings typeBind = beanDesc.bindingsForBeanType();
-        for (BeanPropertyDefinition property : properties) {
-            final AnnotatedMember accessor = property.getAccessor();
-            // [JACKSON-762]: type id? Requires special handling:
-            if (property.isTypeId()) {
-                if (accessor != null) { // only add if we can access... but otherwise?
-                    if (config.canOverrideAccessModifiers()) {
-                        accessor.fixAccess();
-                    }
-                    builder.setTypeId(accessor);
-                }
-                continue;
-            }
-            // [JACKSON-235]: suppress writing of back references
-            AnnotationIntrospector.ReferenceProperty refType = property.findReferenceType();
-            if (refType != null && refType.isBackReference()) {
-                continue;
-            }
-            if (accessor instanceof AnnotatedMethod) {
-                result.add(_constructWriter(prov, property, typeBind, pb, staticTyping, (AnnotatedMethod) accessor));
-            } else {
-                result.add(_constructWriter(prov, property, typeBind, pb, staticTyping, (AnnotatedField) accessor));
-            }
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable non-public methods for manipulating bean properties
-    /**********************************************************
-     */
-    
-    /**
-     * Overridable method that can filter out properties. Default implementation
-     * checks annotations class may have.
-     */
-    protected List<BeanPropertyWriter> filterBeanProperties(SerializationConfig config,
-            BeanDescription beanDesc, List<BeanPropertyWriter> props)
-    {
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        AnnotatedClass ac = beanDesc.getClassInfo();
-        String[] ignored = intr.findPropertiesToIgnore(ac);
-        if (ignored != null && ignored.length > 0) {
-            HashSet<String> ignoredSet = ArrayBuilders.arrayToSet(ignored);
-            Iterator<BeanPropertyWriter> it = props.iterator();
-            while (it.hasNext()) {
-                if (ignoredSet.contains(it.next().getName())) {
-                    it.remove();
-                }
-            }
-        }
-        return props;
-    }
-
-    /**
-     * Method called to handle view information for constructed serializer,
-     * based on bean property writers.
-     *<p>
-     * Note that this method is designed to be overridden by sub-classes
-     * if they want to provide custom view handling. As such it is not
-     * considered an internal implementation detail, and will be supported
-     * as part of API going forward.
-     */
-    protected void processViews(SerializationConfig config, BeanSerializerBuilder builder)
-    {
-        // [JACKSON-232]: whether non-annotated fields are included by default or not is configurable
-        List<BeanPropertyWriter> props = builder.getProperties();
-        boolean includeByDefault = config.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION);
-        final int propCount = props.size();
-        int viewsFound = 0;
-        BeanPropertyWriter[] filtered = new BeanPropertyWriter[propCount];
-        // Simple: view information is stored within individual writers, need to combine:
-        for (int i = 0; i < propCount; ++i) {
-            BeanPropertyWriter bpw = props.get(i);
-            Class<?>[] views = bpw.getViews();
-            if (views == null) { // no view info? include or exclude by default?
-                if (includeByDefault) {
-                    filtered[i] = bpw;
-                }
-            } else {
-                ++viewsFound;
-                filtered[i] = constructFilteredBeanWriter(bpw, views);
-            }
-        }
-        // minor optimization: if no view info, include-by-default, can leave out filtering info altogether:
-        if (includeByDefault && viewsFound == 0) {
-            return;
-        }
-        builder.setFilteredProperties(filtered);
-    }
-
-    /**
-     * Method that will apply by-type limitations (as per [JACKSON-429]);
-     * by default this is based on {@link com.fasterxml.jackson.annotation.JsonIgnoreType} annotation but
-     * can be supplied by module-provided introspectors too.
-     */
-    protected void removeIgnorableTypes(SerializationConfig config, BeanDescription beanDesc,
-            List<BeanPropertyDefinition> properties)
-    {
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        HashMap<Class<?>,Boolean> ignores = new HashMap<Class<?>,Boolean>();
-        Iterator<BeanPropertyDefinition> it = properties.iterator();
-        while (it.hasNext()) {
-            BeanPropertyDefinition property = it.next();
-            AnnotatedMember accessor = property.getAccessor();
-            if (accessor == null) {
-                it.remove();
-                continue;
-            }
-            Class<?> type = accessor.getRawType();
-            Boolean result = ignores.get(type);
-            if (result == null) {
-                BeanDescription desc = config.introspectClassAnnotations(type);
-                AnnotatedClass ac = desc.getClassInfo();
-                result = intr.isIgnorableType(ac);
-                // default to false, non-ignorable
-                if (result == null) {
-                    result = Boolean.FALSE;
-                }
-                ignores.put(type, result);
-            }
-            // lotsa work, and yes, it is ignorable type, so:
-            if (result.booleanValue()) {
-                it.remove();
-            }
-        }
-    }
-
-    /**
-     * Helper method that will remove all properties that do not have a mutator.
-     */
-    protected void removeSetterlessGetters(SerializationConfig config, BeanDescription beanDesc,
-            List<BeanPropertyDefinition> properties)
-    {
-        Iterator<BeanPropertyDefinition> it = properties.iterator();
-        while (it.hasNext()) {
-            BeanPropertyDefinition property = it.next();
-            // one caveat: as per [JACKSON-806], only remove implicit properties;
-            // explicitly annotated ones should remain
-            if (!property.couldDeserialize() && !property.isExplicitlyIncluded()) {
-                it.remove();
-            }
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal helper methods
-    /**********************************************************
-     */
-
-    /**
-     * Secondary helper method for constructing {@link BeanPropertyWriter} for
-     * given member (field or method).
-     */
-    protected BeanPropertyWriter _constructWriter(SerializerProvider prov,
-            BeanPropertyDefinition propDef, TypeBindings typeContext,
-            PropertyBuilder pb, boolean staticTyping, AnnotatedMember accessor)
-        throws JsonMappingException
-    {
-        final String name = propDef.getName();
-        if (prov.canOverrideAccessModifiers()) {
-            accessor.fixAccess();
-        }
-        JavaType type = accessor.getType(typeContext);
-        BeanProperty.Std property = new BeanProperty.Std(name, type, pb.getClassAnnotations(), accessor);
-
-        // Does member specify a serializer? If so, let's use it.
-        JsonSerializer<?> annotatedSerializer = findSerializerFromAnnotation(prov,
-                accessor);
-        /* 02-Feb-2012, tatu: Unlike most other codepaths, Serializer produced
-         *  here will NOT be resolved or contextualized, unless done here, so:
-         */
-        if (annotatedSerializer instanceof ResolvableSerializer) {
-            ((ResolvableSerializer) annotatedSerializer).resolve(prov);
-        }
-        if (annotatedSerializer instanceof ContextualSerializer) {
-            annotatedSerializer = ((ContextualSerializer) annotatedSerializer).createContextual(prov, property);
-        }
-        // And how about polymorphic typing? First special to cover JAXB per-field settings:
-        TypeSerializer contentTypeSer = null;
-        if (ClassUtil.isCollectionMapOrArray(type.getRawClass())) {
-            contentTypeSer = findPropertyContentTypeSerializer(type, prov.getConfig(), accessor);
-        }
-
-        // and if not JAXB collection/array with annotations, maybe regular type info?
-        TypeSerializer typeSer = findPropertyTypeSerializer(type, prov.getConfig(), accessor);
-        BeanPropertyWriter pbw = pb.buildWriter(propDef, type, annotatedSerializer,
-                        typeSer, contentTypeSer, accessor, staticTyping);
-        return pbw;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerModifier.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerModifier.java
deleted file mode 100644
index a0dc468..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/BeanSerializerModifier.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.util.List;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializationConfig;
-
-/**
- * Abstract class that defines API for objects that can be registered (for {@link BeanSerializerFactory}
- * to participate in constructing {@link BeanSerializer} instances.
- * This is typically done by modules that want alter some aspects of serialization
- * process; and is preferable to sub-classing of {@link BeanSerializerFactory}.
- *<p>
- * Sequence in which callback methods are called is as follows:
- * <ol>
- *  <li>After factory has collected tentative set of properties (instances of
- *     <code>BeanPropertyWriter</code>) is sent for modification via
- *     {@link #changeProperties}. Changes can include removal, addition and
- *     replacement of suggested properties.
- *  <li>Resulting set of properties are ordered (sorted) by factory, as per
- *     configuration, and then {@link #orderProperties} is called to allow
- *     modifiers to alter ordering.
- *  <li>After all bean properties and related information is accumulated,
- *     {@link #updateBuilder} is called with builder, to allow builder state
- *     to be modified (including possibly replacing builder itself if necessary)
- *  <li>Once all bean information has been determined,
- *     factory creates default {@link BeanSerializer} instance and passes
- *     it to modifiers using {@link #modifySerializer}, for possible
- *     modification or replacement (by any {@link com.fasterxml.jackson.databind.JsonSerializer} instance)
- * </ol>
- *<p>
- * Default method implementations are "no-op"s, meaning that methods are implemented
- * but have no effect.
- */
-public abstract class BeanSerializerModifier
-{
-    /**
-     * Method called by {@link BeanSerializerFactory} with tentative set
-     * of discovered properties.
-     * Implementations can add, remove or replace any of passed properties.
-     *
-     * Properties <code>List</code> passed as argument is modifiable, and returned List must
-     * likewise be modifiable as it may be passed to multiple registered
-     * modifiers.
-     */
-    public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
-            BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties) {
-        return beanProperties;
-    }
-
-    /**
-     * Method called by {@link BeanSerializerFactory} with set of properties
-     * to serialize, in default ordering (based on defaults as well as 
-     * possible type annotations).
-     * Implementations can change ordering any way they like.
-     *
-     * Properties <code>List</code> passed as argument is modifiable, and returned List must
-     * likewise be modifiable as it may be passed to multiple registered
-     * modifiers.
-     */
-    public List<BeanPropertyWriter> orderProperties(SerializationConfig config,
-            BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties) {
-        return beanProperties;
-    }
-
-    /**
-     * Method called by {@link BeanSerializerFactory} after collecting all information
-     * regarding POJO to serialize and updating builder with it, but before constructing
-     * serializer.
-     * Implementations may choose to modify state of builder (to affect serializer being
-     * built), or even completely replace it (if they want to build different kind of
-     * serializer). Typically, however, passed-in builder is returned, possibly with
-     * some modifications.
-     */
-    public BeanSerializerBuilder updateBuilder(SerializationConfig config,
-            BeanDescription beanDesc, BeanSerializerBuilder builder) {
-        return builder;
-    }
-    
-    /**
-     * Method called by {@link BeanSerializerFactory} after constructing default
-     * bean serializer instance with properties collected and ordered earlier.
-     * Implementations can modify or replace given serializer and return serializer
-     * to use. Note that although initial serializer being passed is of type
-     * {@link BeanSerializer}, modifiers may return serializers of other types;
-     * and this is why implementations must check for type before casting.
-     */
-    public JsonSerializer<?> modifySerializer(SerializationConfig config,
-            BeanDescription beanDesc, JsonSerializer<?> serializer) {
-        return serializer;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContainerSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContainerSerializer.java
deleted file mode 100644
index b08fb09..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContainerSerializer.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-/**
- * Intermediate base class for serializers used for serializing
- * types that contain element(s) of other types, such as arrays,
- * {@link java.util.Collection}s (<code>Lists</code>, <code>Sets</code>
- * etc) and {@link java.util.Map}s and iterable things
- * ({@link java.util.Iterator}s).
- */
-public abstract class ContainerSerializer<T>
-    extends StdSerializer<T>
-{
-    /*
-    /**********************************************************
-    /* Construction, initialization
-    /**********************************************************
-     */
-
-    protected ContainerSerializer(Class<T> t) {
-        super(t);
-    }
-    
-    /**
-     * Alternate constructor that is (alas!) needed to work
-     * around kinks of generic type handling
-     * 
-     * @param t
-     */
-    protected ContainerSerializer(Class<?> t, boolean dummy) {
-        super(t, dummy);
-    }
-
-    protected ContainerSerializer(ContainerSerializer<?> src) {
-        super(src._handledType, false);
-    }
-    
-    /**
-     * Factory(-like) method that can be used to construct a new container
-     * serializer that uses specified {@link TypeSerializer} for decorating
-     * contained values with additional type information.
-     * 
-     * @param vts Type serializer to use for contained values; can be null,
-     *    in which case 'this' serializer is returned as is
-     * @return Serializer instance that uses given type serializer for values if
-     *    that is possible (or if not, just 'this' serializer)
-     */
-    public ContainerSerializer<?> withValueTypeSerializer(TypeSerializer vts) {
-        if (vts == null) return this;
-        return _withValueTypeSerializer(vts);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for finding declared (static) element type for
-     * type this serializer is used for.
-     */
-    public abstract JavaType getContentType();
-
-    /**
-     * Accessor for serializer used for serializing contents
-     * (List and array elements, Map values etc) of the
-     * container for which this serializer is used, if it is
-     * known statically.
-     * Note that for dynamic types this may return null; if so,
-     * caller has to instead use {@link #getContentType()} and
-     * {@link com.fasterxml.jackson.databind.SerializerProvider#findValueSerializer}.
-     */
-    public abstract JsonSerializer<?> getContentSerializer();
-    
-    /*
-    /**********************************************************
-    /* Abstract methods for sub-classes to implement
-    /**********************************************************
-     */
-    
-    /* Overridden as abstract, to force re-implementation; necessary for all
-     * collection types.
-     */
-    @Override
-    public abstract boolean isEmpty(T value);
-
-    /**
-     * Method called to determine if the given value (of type handled by
-     * this serializer) contains exactly one element.
-     *<p>
-     * Note: although it might seem sensible to instead define something
-     * like "getElementCount()" method, this would not work well for
-     * containers that do not keep track of size (like linked lists may
-     * not).
-     */
-    public abstract boolean hasSingleElement(T value);
-    
-    /**
-     * Method that needs to be implemented to allow construction of a new
-     * serializer object with given {@link TypeSerializer}, used when
-     * addition type information is to be embedded.
-     */
-    protected abstract ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts);
-
-    /*
-    /**********************************************************
-    /* Helper methods for sub-types
-    /**********************************************************
-     */
-
-    /**
-     * Helper method used to encapsulate logic for determining whether there is
-     * a property annotation that overrides element type; if so, we can
-     * and need to statically find the serializer.
-     * 
-     * @since 2.1
-     */
-    protected boolean hasContentTypeAnnotation(SerializerProvider provider,
-            BeanProperty property)
-    {
-        if (property != null) {
-            AnnotationIntrospector intr = provider.getAnnotationIntrospector();
-            if (intr != null) {
-                if (intr.findSerializationContentType(property.getMember(), property.getType()) != null) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContextualSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContextualSerializer.java
deleted file mode 100644
index 3bb3161..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ContextualSerializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Add-on interface that {@link JsonSerializer}s can implement to get a callback
- * that can be used to create contextual instances of serializer to use for
- * handling properties of supported type. This can be useful
- * for serializers that can be configured by annotations, or should otherwise
- * have differing behavior depending on what kind of property is being serialized.
- *<p>
- * Note that in cases where serializer needs both contextualization and
- * resolution -- that is, implements both this interface and {@link ResolvableSerializer}
- * -- resolution via {@link ResolvableSerializer} occurs first, and contextual
- * resolution (via this interface) later on.
- */
-public interface ContextualSerializer
-{
-    /**
-     * Method called to see if a different (or differently configured) serializer
-     * is needed to serialize values of specified property.
-     * Note that instance that this method is called on is typically shared one and
-     * as a result method should <b>NOT</b> modify this instance but rather construct
-     * and return a new instance. This instance should only be returned as-is, in case
-     * it is already suitable for use.
-     * 
-     * @param prov Serializer provider to use for accessing config, other serializers
-     * @param property Method or field that represents the property
-     *   (and is used to access value to serialize).
-     *   Should be available; but there may be cases where caller can not provide it and
-     *   null is passed instead (in which case impls usually pass 'this' serializer as is)
-     * 
-     * @return Serializer to use for serializing values of specified property;
-     *   may be this instance or a new instance.
-     * 
-     * @throws JsonMappingException
-     */
-    public JsonSerializer<?> createContextual(SerializerProvider prov,
-            BeanProperty property)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java
deleted file mode 100644
index a24c027..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.NoClass;
-import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.impl.WritableObjectId;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Standard implementation used by {@link ObjectMapper}:
- * adds methods only exposed to {@link ObjectMapper},
- * as well as constructors.
- *<p>
- * Note that class is abstract just because it does not
- * define {@link #createInstance} method.
- *<p>
- * Also note that all custom {@link SerializerProvider}
- * implementations must sub-class this class: {@link ObjectMapper}
- * requires this type, not basic provider type.
- */
-public abstract class DefaultSerializerProvider
-    extends SerializerProvider
-    implements java.io.Serializable // since 2.1; only because ObjectWriter needs it
-{
-    private static final long serialVersionUID = 1L;
-
-    /*
-    /**********************************************************
-    /* State, for non-blueprint instances: Object Id handling
-    /**********************************************************
-     */
-
-    /**
-     * Per-serialization map Object Ids that have seen so far, iff
-     * Object Id handling is enabled.
-     */
-    protected transient IdentityHashMap<Object, WritableObjectId> _seenObjectIds;
-    
-    protected transient ArrayList<ObjectIdGenerator<?>> _objectIdGenerators;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected DefaultSerializerProvider() { super(); }
-
-    protected DefaultSerializerProvider(SerializerProvider src,
-            SerializationConfig config,SerializerFactory f) {
-        super(src, config, f);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API: methods that ObjectMapper will call
-    /**********************************************************
-     */
-
-    /**
-     * Overridable method, used to create a non-blueprint instances from the blueprint.
-     * This is needed to retain state during serialization.
-     */
-    public abstract DefaultSerializerProvider createInstance(SerializationConfig config,
-            SerializerFactory jsf);
-    
-    /**
-     * The method to be called by {@link ObjectMapper} and {@link ObjectWriter}
-     * for serializing given value, using serializers that
-     * this provider has access to (via caching and/or creating new serializers
-     * as need be).
-     */
-    public void serializeValue(JsonGenerator jgen, Object value)
-        throws IOException, JsonGenerationException
-    {
-        JsonSerializer<Object> ser;
-        final boolean wrap;
-
-        if (value == null) { // no type provided; must just use the default null serializer
-            ser = getDefaultNullValueSerializer();
-            wrap = false; // no name to use for wrapping; can't do!
-        } else {
-            Class<?> cls = value.getClass();
-            // true, since we do want to cache root-level typed serializers (ditto for null property)
-            ser = findTypedValueSerializer(cls, true, null);
-
-            // Ok: should we wrap result in an additional property ("root name")?
-            String rootName = _config.getRootName();
-            if (rootName == null) { // not explicitly specified
-                // [JACKSON-163]
-                wrap = _config.isEnabled(SerializationFeature.WRAP_ROOT_VALUE);
-                if (wrap) {
-                    jgen.writeStartObject();
-                    jgen.writeFieldName(_rootNames.findRootName(value.getClass(), _config));
-                }
-            } else if (rootName.length() == 0) {
-                wrap = false;
-            } else { // [JACKSON-764]
-                // empty String means explicitly disabled; non-empty that it is enabled
-                wrap = true;
-                jgen.writeStartObject();
-                jgen.writeFieldName(rootName);
-            }
-        }
-        try {
-            ser.serialize(value, jgen, this);
-            if (wrap) {
-                jgen.writeEndObject();
-            }
-        } catch (IOException ioe) { // As per [JACKSON-99], pass IOException and subtypes as-is
-            throw ioe;
-        } catch (Exception e) { // but wrap RuntimeExceptions, to get path information
-            String msg = e.getMessage();
-            if (msg == null) {
-                msg = "[no message for "+e.getClass().getName()+"]";
-            }
-            throw new JsonMappingException(msg, e);
-        }
-    }
-
-    /**
-     * The method to be called by {@link ObjectMapper} and {@link ObjectWriter}
-     * for serializing given value (assumed to be of specified root type,
-     * instead of runtime type of value),
-     * using serializers that
-     * this provider has access to (via caching and/or creating new serializers
-     * as need be),
-     * 
-     * @param rootType Type to use for locating serializer to use, instead of actual
-     *    runtime type. Must be actual type, or one of its super types
-     */
-    public void serializeValue(JsonGenerator jgen, Object value, JavaType rootType)
-        throws IOException, JsonGenerationException
-    {
-        final boolean wrap;
-
-        JsonSerializer<Object> ser;
-        if (value == null) {
-            ser = getDefaultNullValueSerializer();
-            wrap = false;
-        } else {
-            // Let's ensure types are compatible at this point
-            if (!rootType.getRawClass().isAssignableFrom(value.getClass())) {
-                _reportIncompatibleRootType(value, rootType);
-            }
-            // root value, not reached via property:
-            ser = findTypedValueSerializer(rootType, true, null);
-            // [JACKSON-163]
-            wrap = _config.isEnabled(SerializationFeature.WRAP_ROOT_VALUE);
-            if (wrap) {
-                jgen.writeStartObject();
-                jgen.writeFieldName(_rootNames.findRootName(rootType, _config));
-            }
-        }
-        try {
-            ser.serialize(value, jgen, this);
-            if (wrap) {
-                jgen.writeEndObject();
-            }
-        } catch (IOException ioe) { // no wrapping for IO (and derived)
-            throw ioe;
-        } catch (Exception e) { // but others do need to be, to get path etc
-            String msg = e.getMessage();
-            if (msg == null) {
-                msg = "[no message for "+e.getClass().getName()+"]";
-            }
-            throw new JsonMappingException(msg, e);
-        }
-    }
-
-    /**
-     * The method to be called by {@link ObjectWriter}
-     * for serializing given value (assumed to be of specified root type,
-     * instead of runtime type of value), when it may know specific
-     * {@link JsonSerializer} to use.
-     * 
-     * @param rootType Type to use for locating serializer to use, instead of actual
-     *    runtime type, if no serializer is passed
-     * @param ser Root Serializer to use, if not null
-     * 
-     * @since 2.1
-     */
-    public void serializeValue(JsonGenerator jgen, Object value, JavaType rootType,
-            JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
-    {
-        final boolean wrap;
-
-        if (value == null) {
-            ser = getDefaultNullValueSerializer();
-            wrap = false;
-        } else {
-            // Let's ensure types are compatible at this point
-            if (rootType != null) {
-                if (!rootType.getRawClass().isAssignableFrom(value.getClass())) {
-                    _reportIncompatibleRootType(value, rootType);
-                }
-            }
-            // root value, not reached via property:
-            if (ser == null) {
-                ser = findTypedValueSerializer(rootType, true, null);
-            }
-            wrap = _config.isEnabled(SerializationFeature.WRAP_ROOT_VALUE);
-            if (wrap) {
-                jgen.writeStartObject();
-                jgen.writeFieldName(_rootNames.findRootName(rootType, _config));
-            }
-        }
-        try {
-            ser.serialize(value, jgen, this);
-            if (wrap) {
-                jgen.writeEndObject();
-            }
-        } catch (IOException ioe) { // no wrapping for IO (and derived)
-            throw ioe;
-        } catch (Exception e) { // but others do need to be, to get path etc
-            String msg = e.getMessage();
-            if (msg == null) {
-                msg = "[no message for "+e.getClass().getName()+"]";
-            }
-            throw new JsonMappingException(msg, e);
-        }
-    }
-    
-    /**
-     * The method to be called by {@link ObjectMapper} and {@link ObjectWriter}
-     * to generate <a href="http://json-schema.org/">JSON schema</a> for
-     * given type.
-     *
-     * @param type The type for which to generate schema
-     */
-    public JsonSchema generateJsonSchema(Class<?> type)
-            throws JsonMappingException
-        {
-            if (type == null) {
-                throw new IllegalArgumentException("A class must be provided");
-            }
-            /* no need for embedded type information for JSON schema generation (all
-             * type information it needs is accessible via "untyped" serializer)
-             */
-            JsonSerializer<Object> ser = findValueSerializer(type, null);
-            JsonNode schemaNode = (ser instanceof SchemaAware) ?
-                    ((SchemaAware) ser).getSchema(this, null) : 
-                    JsonSchema.getDefaultSchemaNode();
-            if (!(schemaNode instanceof ObjectNode)) {
-                throw new IllegalArgumentException("Class " + type.getName() +
-                        " would not be serialized as a JSON object and therefore has no schema");
-            }
-            return new JsonSchema((ObjectNode) schemaNode);
-        }
-    
-    /**
-     * The method to be called by {@link ObjectMapper} and {@link ObjectWriter}
-     * to to expose the format of the given to to the given visitor
-     *
-     * @param javaType The type for which to generate format
-     * @param visitor the visitor to accept the format
-     */
-    public void acceptJsonFormatVisitor(JavaType javaType, JsonFormatVisitorWrapper visitor)
-        throws JsonMappingException
-    {
-        if (javaType == null) {
-            throw new IllegalArgumentException("A class must be provided");
-        }
-        /* no need for embedded type information for JSON schema generation (all
-         * type information it needs is accessible via "untyped" serializer)
-         */
-        findValueSerializer(javaType, null).acceptJsonFormatVisitor(visitor, javaType);
-    }
-    
-    /**
-     * Method that can be called to see if this serializer provider
-     * can find a serializer for an instance of given class.
-     *<p>
-     * Note that no Exceptions are thrown, including unchecked ones:
-     * implementations are to swallow exceptions if necessary.
-     */
-    public boolean hasSerializerFor(Class<?> cls) {
-        return _findExplicitUntypedSerializer(cls) != null;
-    }
-
-    /*
-    /********************************************************
-    /* Access to caching details
-    /********************************************************
-     */
-
-    /**
-     * Method that can be used to determine how many serializers this
-     * provider is caching currently
-     * (if it does caching: default implementation does)
-     * Exact count depends on what kind of serializers get cached;
-     * default implementation caches all serializers, including ones that
-     * are eagerly constructed (for optimal access speed)
-     *<p> 
-     * The main use case for this method is to allow conditional flushing of
-     * serializer cache, if certain number of entries is reached.
-     */
-    public int cachedSerializersCount() {
-        return _serializerCache.size();
-    }
-
-    /**
-     * Method that will drop all serializers currently cached by this provider.
-     * This can be used to remove memory usage (in case some serializers are
-     * only used once or so), or to force re-construction of serializers after
-     * configuration changes for mapper than owns the provider.
-     */
-    public void flushCachedSerializers() {
-        _serializerCache.flush();
-    }
-
-    /*
-    /**********************************************************
-    /* Object Id handling
-    /**********************************************************
-     */
-
-    @Override
-    public ObjectIdGenerator<?> objectIdGeneratorInstance(Annotated annotated,
-            ObjectIdInfo objectIdInfo)
-        throws JsonMappingException
-    {
-        Class<?> implClass = objectIdInfo.getGeneratorType();
-        HandlerInstantiator hi = _config.getHandlerInstantiator();
-        ObjectIdGenerator<?> gen;
-
-        if (hi != null) {
-            gen =  hi.objectIdGeneratorInstance(_config, annotated, implClass);
-        } else {
-            gen = (ObjectIdGenerator<?>) ClassUtil.createInstance(implClass,
-                    _config.canOverrideAccessModifiers());
-        }
-        return gen.forScope(objectIdInfo.getScope());
-    }
-    
-    @Override
-    public WritableObjectId findObjectId(Object forPojo,
-            ObjectIdGenerator<?> generatorType)
-    {
-        if (_seenObjectIds == null) {
-            _seenObjectIds = new IdentityHashMap<Object,WritableObjectId>();
-        } else {
-            WritableObjectId oid = _seenObjectIds.get(forPojo);
-            if (oid != null) {
-                return oid;
-            }
-        }
-        // Not seen yet; must add an entry, return it. For that, we need generator
-        ObjectIdGenerator<?> generator = null;
-        
-        if (_objectIdGenerators == null) {
-            _objectIdGenerators = new ArrayList<ObjectIdGenerator<?>>(8);
-        } else {
-            for (int i = 0, len = _objectIdGenerators.size(); i < len; ++i) {
-                ObjectIdGenerator<?> gen = _objectIdGenerators.get(i);
-                if (gen.canUseFor(generatorType)) {
-                    generator = gen;
-                    break;
-                }
-            }
-        }
-        if (generator == null) {
-            generator = generatorType.newForSerialization(this);
-            _objectIdGenerators.add(generator);
-        }
-        WritableObjectId oid = new WritableObjectId(generator);
-        _seenObjectIds.put(forPojo, oid);
-        return oid;
-    }
-
-    /*
-    /**********************************************************
-    /* Factory method impls
-    /**********************************************************
-     */
-    
-    @Override
-    public JsonSerializer<Object> serializerInstance(Annotated annotated,
-            Object serDef)
-        throws JsonMappingException
-    
-    {
-        if (serDef == null) {
-            return null;
-        }
-        JsonSerializer<?> ser;
-        
-        if (serDef instanceof JsonSerializer) {
-            ser = (JsonSerializer<?>) serDef;
-        } else {
-            /* Alas, there's no way to force return type of "either class
-             * X or Y" -- need to throw an exception after the fact
-             */
-            if (!(serDef instanceof Class)) {
-                throw new IllegalStateException("AnnotationIntrospector returned serializer definition of type "
-                        +serDef.getClass().getName()+"; expected type JsonSerializer or Class<JsonSerializer> instead");
-            }
-            Class<?> serClass = (Class<?>)serDef;
-            // there are some known "no class" markers to consider too:
-            if (serClass == JsonSerializer.None.class || serClass == NoClass.class) {
-                return null;
-            }
-            if (!JsonSerializer.class.isAssignableFrom(serClass)) {
-                throw new IllegalStateException("AnnotationIntrospector returned Class "
-                        +serClass.getName()+"; expected Class<JsonSerializer>");
-            }
-            HandlerInstantiator hi = _config.getHandlerInstantiator();
-            if (hi != null) {
-                ser = hi.serializerInstance(_config, annotated, serClass);
-            } else {
-                ser = (JsonSerializer<?>) ClassUtil.createInstance(serClass,
-                        _config.canOverrideAccessModifiers());
-            }
-        }
-        return (JsonSerializer<Object>) _handleResolvable(ser);
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Concrete implementation that defines factory method(s),
-     * defined as final.
-     */
-    public final static class Impl extends DefaultSerializerProvider
-    {
-        private static final long serialVersionUID = 1L;
-
-        public Impl() { super(); }
-
-        protected Impl(SerializerProvider src,
-                SerializationConfig config,SerializerFactory f) {
-            super(src, config, f);
-        }
-
-        @Override
-        public Impl createInstance(SerializationConfig config,
-                SerializerFactory jsf) {
-            return new Impl(this, config, jsf);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/FilterProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/FilterProvider.java
deleted file mode 100644
index 115c05b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/FilterProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-/**
- * Interface for objects that providers instances of {@link BeanPropertyFilter}
- * that match given ids. A provider is configured to be used during serialization,
- * to find filter to used based on id specified by {@link com.fasterxml.jackson.annotation.JsonFilter}
- * annotation on bean class.
- */
-public abstract class FilterProvider
-{
-    /**
-     * Lookup method used to find {@link BeanPropertyFilter} that has specified id.
-     * Note that id is typically a {@link java.lang.String}, but is not necessarily
-     * limited to that; that is, while standard components use String, custom
-     * implementation can choose other kinds of keys.
-     * 
-     * @return Filter registered with specified id, if one defined; null if
-     *   none found.
-     */
-    public abstract BeanPropertyFilter findFilter(Object filterId);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/PropertyBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
deleted file mode 100644
index 4912c63..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
-import com.fasterxml.jackson.databind.introspect.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.util.*;
-
-/**
- * Helper class for {@link BeanSerializerFactory} that is used to
- * construct {@link BeanPropertyWriter} instances. Can be sub-classed
- * to change behavior.
- */
-public class PropertyBuilder
-{
-    final protected SerializationConfig _config;
-    final protected BeanDescription _beanDesc;
-    final protected JsonInclude.Include _outputProps;
-
-    final protected AnnotationIntrospector _annotationIntrospector;
-
-    /**
-     * If a property has serialization inclusion value of
-     * {@link Inclusion#ALWAYS}, we need to know the default
-     * value of the bean, to know if property value equals default
-     * one.
-     */
-    protected Object _defaultBean;
-
-    public PropertyBuilder(SerializationConfig config, BeanDescription beanDesc)
-    {
-        _config = config;
-        _beanDesc = beanDesc;
-        _outputProps = beanDesc.findSerializationInclusion(config.getSerializationInclusion());
-        _annotationIntrospector = _config.getAnnotationIntrospector();
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    public Annotations getClassAnnotations() {
-        return _beanDesc.getClassAnnotations();
-    }
-    
-    /**
-     * @param contentTypeSer Optional explicit type information serializer
-     *    to use for contained values (only used for properties that are
-     *    of container type)
-     */
-    protected BeanPropertyWriter buildWriter(BeanPropertyDefinition propDef,
-            JavaType declaredType, JsonSerializer<?> ser,
-            TypeSerializer typeSer, TypeSerializer contentTypeSer,
-            AnnotatedMember am, boolean defaultUseStaticTyping)
-    {
-        // do we have annotation that forces type to use (to declared type or its super type)?
-        JavaType serializationType = findSerializationType(am, defaultUseStaticTyping, declaredType);
-
-        // Container types can have separate type serializers for content (value / element) type
-        if (contentTypeSer != null) {
-            /* 04-Feb-2010, tatu: Let's force static typing for collection, if there is
-             *    type information for contents. Should work well (for JAXB case); can be
-             *    revisited if this causes problems.
-             */
-            if (serializationType == null) {
-//                serializationType = TypeFactory.type(am.getGenericType(), _beanDesc.getType());
-                serializationType = declaredType;
-            }
-            JavaType ct = serializationType.getContentType();
-            /* 03-Sep-2010, tatu: This is somehow related to [JACKSON-356], but I don't completely
-             *   yet understand how pieces fit together. Still, better be explicit than rely on
-             *   NPE to indicate an issue...
-             */
-            if (ct == null) {
-                throw new IllegalStateException("Problem trying to create BeanPropertyWriter for property '"
-                        +propDef.getName()+"' (of type "+_beanDesc.getType()+"); serialization type "+serializationType+" has no content");
-            }
-            serializationType = serializationType.withContentTypeHandler(contentTypeSer);
-            ct = serializationType.getContentType();
-        }
-        
-        Object valueToSuppress = null;
-        boolean suppressNulls = false;
-
-        JsonInclude.Include methodProps = _annotationIntrospector.findSerializationInclusion(am, _outputProps);
-        if (methodProps != null) {
-            switch (methodProps) {
-            case NON_DEFAULT:
-                valueToSuppress = getDefaultValue(propDef.getName(), am);
-                if (valueToSuppress == null) {
-                    suppressNulls = true;
-                } else {
-                    // [JACKSON-531]: Allow comparison of arrays too...
-                    if (valueToSuppress.getClass().isArray()) {
-                        valueToSuppress = Comparators.getArrayComparator(valueToSuppress);
-                    }
-                }
-                break;
-            case NON_EMPTY:
-                // always suppress nulls
-                suppressNulls = true;
-                // but possibly also 'empty' values:
-                valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
-                break;
-            case NON_NULL:
-                suppressNulls = true;
-                // fall through
-            case ALWAYS: // default
-                // we may still want to suppress empty collections, as per [JACKSON-254]:
-                if (declaredType.isContainerType()
-                        && !_config.isEnabled(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS)) {
-                    valueToSuppress = BeanPropertyWriter.MARKER_FOR_EMPTY;
-                }
-                break;
-            }
-        }
-
-        BeanPropertyWriter bpw = new BeanPropertyWriter(propDef,
-                am, _beanDesc.getClassAnnotations(), declaredType,
-                ser, typeSer, serializationType, suppressNulls, valueToSuppress);
-        
-        // [JACKSON-132]: Unwrapping
-        NameTransformer unwrapper = _annotationIntrospector.findUnwrappingNameTransformer(am);
-        if (unwrapper != null) {
-            bpw = bpw.unwrappingWriter(unwrapper);
-        }
-        return bpw;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper methods; annotation access
-    /**********************************************************
-     */
-
-    /**
-     * Method that will try to determine statically defined type of property
-     * being serialized, based on annotations (for overrides), and alternatively
-     * declared type (if static typing for serialization is enabled).
-     * If neither can be used (no annotations, dynamic typing), returns null.
-     */
-    protected JavaType findSerializationType(Annotated a, boolean useStaticTyping, JavaType declaredType)
-    {
-        // [JACKSON-120]: Check to see if serialization type is fixed
-        Class<?> serClass = _annotationIntrospector.findSerializationType(a);
-        if (serClass != null) {
-            // Must be a super type to be usable
-            Class<?> rawDeclared = declaredType.getRawClass();
-            if (serClass.isAssignableFrom(rawDeclared)) {
-                declaredType = declaredType.widenBy(serClass);
-            } else {
-                /* 18-Nov-2010, tatu: Related to fixing [JACKSON-416], an issue with such
-                 *   check is that for deserialization more specific type makes sense;
-                 *   and for serialization more generic. But alas JAXB uses but a single
-                 *   annotation to do both... Hence, we must just discard type, as long as
-                 *   types are related
-                 */
-                if (!rawDeclared.isAssignableFrom(serClass)) {
-                    throw new IllegalArgumentException("Illegal concrete-type annotation for method '"+a.getName()+"': class "+serClass.getName()+" not a super-type of (declared) class "+rawDeclared.getName());
-                }
-                /* 03-Dec-2010, tatu: Actually, ugh, to resolve [JACKSON-415] may further relax this
-                 *   and actually accept subtypes too for serialization. Bit dangerous in theory
-                 *   but need to trust user here...
-                 */
-                declaredType = _config.constructSpecializedType(declaredType, serClass);
-            }
-            useStaticTyping = true;
-        }
-
-        JavaType secondary = BeanSerializerFactory.modifySecondaryTypesByAnnotation(_config, a, declaredType);
-        if (secondary != declaredType) {
-            useStaticTyping = true;
-            declaredType = secondary;
-        }
-        
-        /* [JACKSON-114]: if using static typing, declared type is known
-         * to be the type...
-         */
-        if (!useStaticTyping) {
-            JsonSerialize.Typing typing = _annotationIntrospector.findSerializationTyping(a);
-            if (typing != null) {
-                useStaticTyping = (typing == JsonSerialize.Typing.STATIC);
-            }
-        }
-        return useStaticTyping ? declaredType : null;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for default value handling
-    /**********************************************************
-     */
-    
-    protected Object getDefaultBean()
-    {
-        if (_defaultBean == null) {
-            /* If we can fix access rights, we should; otherwise non-public
-             * classes or default constructor will prevent instantiation
-             */
-            _defaultBean = _beanDesc.instantiateBean(_config.canOverrideAccessModifiers());
-            if (_defaultBean == null) {
-                Class<?> cls = _beanDesc.getClassInfo().getAnnotated();
-                throw new IllegalArgumentException("Class "+cls.getName()+" has no default constructor; can not instantiate default bean value to support 'properties=JsonSerialize.Inclusion.NON_DEFAULT' annotation");
-            }
-        }
-        return _defaultBean;
-    }
-
-    protected Object getDefaultValue(String name, AnnotatedMember member)
-    {
-        Object defaultBean = getDefaultBean();
-        try {
-            return member.getValue(defaultBean);
-        } catch (Exception e) {
-            return _throwWrapped(e, name, defaultBean);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for exception handling
-    /**********************************************************
-     */
-    
-    protected Object _throwWrapped(Exception e, String propName, Object defaultBean)
-    {
-        Throwable t = e;
-        while (t.getCause() != null) {
-            t = t.getCause();
-        }
-        if (t instanceof Error) throw (Error) t;
-        if (t instanceof RuntimeException) throw (RuntimeException) t;
-        throw new IllegalArgumentException("Failed to get property '"+propName+"' of default "+defaultBean.getClass().getName()+" instance");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ResolvableSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ResolvableSerializer.java
deleted file mode 100644
index c86d0c1..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/ResolvableSerializer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Interface used to indicate serializers that want to do post-processing
- * after construction and being added to {@link SerializerProvider},
- * but before being used. This is typically used to resolve references
- * to other contained types; for example, bean serializers use this
- * to eagerly find serializers for contained field types.
- *<p>
- * Note that in cases where serializer needs both contextualization and
- * resolution -- that is, implements both this interface and {@link ContextualSerializer}
- * -- resolution via this interface occurs first, and contextual
- * resolution (using {@link ContextualSerializer}) later on.
- */
-public interface ResolvableSerializer
-{
-    /**
-     * Method called after {@link SerializerProvider} has registered
-     * the serializer, but before it has returned it to the caller.
-     * Called object can then resolve its dependencies to other types,
-     * including self-references (direct or indirect).
-     *<p>
-     * Note that this method does NOT return serializer, since resolution
-     * is not allowed to change actual serializer to use.
-     *
-     * @param provider Provider that has constructed serializer this method
-     *   is called on.
-     */
-    public abstract void resolve(SerializerProvider provider)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerCache.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerCache.java
deleted file mode 100644
index b3a6fa4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerCache.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.ser.impl.ReadOnlyClassToSerializerMap;
-
-/**
- * Simple cache object that allows for doing 2-level lookups: first level is
- * by "local" read-only lookup Map (used without locking)
- * and second backup level is by a shared modifiable HashMap.
- * The idea is that after a while, most serializers are found from the
- * local Map (to optimize performance, reduce lock contention),
- * but that during buildup we can use a shared map to reduce both
- * number of distinct read-only maps constructed, and number of
- * serializers constructed.
- *<p>
- * Since version 1.5 cache will actually contain three kinds of entries,
- * based on combination of class pair key. First class in key is for the
- * type to serialize, and second one is type used for determining how
- * to resolve value type. One (but not both) of entries can be null.
- */
-public final class SerializerCache
-{
-    /**
-     * Shared, modifiable map; all access needs to be through synchronized blocks.
-     *<p>
-     * NOTE: keys are of various types (see below for key types), in addition to
-     * basic {@link JavaType} used for "untyped" serializers.
-     */
-    private HashMap<TypeKey, JsonSerializer<Object>> _sharedMap = new HashMap<TypeKey, JsonSerializer<Object>>(64);
-
-    /**
-     * Most recent read-only instance, created from _sharedMap, if any.
-     */
-    private ReadOnlyClassToSerializerMap _readOnlyMap = null;
-
-    public SerializerCache() { }
-
-    /**
-     * Method that can be called to get a read-only instance populated from the
-     * most recent version of the shared lookup Map.
-     */
-    public ReadOnlyClassToSerializerMap getReadOnlyLookupMap()
-    {
-        ReadOnlyClassToSerializerMap m;
-        synchronized (this) {
-            m = _readOnlyMap;
-            if (m == null) {
-                _readOnlyMap = m = ReadOnlyClassToSerializerMap.from(_sharedMap);
-            }
-        }
-        return m.instance();
-    }
-
-    /*
-    /**********************************************************
-    /* Lookup methods for accessing shared (slow) cache
-    /**********************************************************
-     */
-
-    public synchronized int size() {
-        return _sharedMap.size();
-    }
-    
-    /**
-     * Method that checks if the shared (and hence, synchronized) lookup Map might have
-     * untyped serializer for given type.
-     */
-    public JsonSerializer<Object> untypedValueSerializer(Class<?> type)
-    {
-        synchronized (this) {
-            return _sharedMap.get(new TypeKey(type, false));
-        }
-    }
-
-    public JsonSerializer<Object> untypedValueSerializer(JavaType type)
-    {
-        synchronized (this) {
-            return _sharedMap.get(new TypeKey(type, false));
-        }
-    }
-
-    public JsonSerializer<Object> typedValueSerializer(JavaType type)
-    {
-        synchronized (this) {
-            return _sharedMap.get(new TypeKey(type, true));
-        }
-    }
-
-    public JsonSerializer<Object> typedValueSerializer(Class<?> cls)
-    {
-        synchronized (this) {
-            return _sharedMap.get(new TypeKey(cls, true));
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Methods for adding shared serializer instances
-    /**********************************************************
-     */
-    
-    /**
-     * Method called if none of lookups succeeded, and caller had to construct
-     * a serializer. If so, we will update the shared lookup map so that it
-     * can be resolved via it next time.
-     */
-    public void addTypedSerializer(JavaType type, JsonSerializer<Object> ser)
-    {
-        synchronized (this) {
-            if (_sharedMap.put(new TypeKey(type, true), ser) == null) {
-                // let's invalidate the read-only copy, too, to get it updated
-                _readOnlyMap = null;
-            }
-        }
-    }
-
-    public void addTypedSerializer(Class<?> cls, JsonSerializer<Object> ser)
-    {
-        synchronized (this) {
-            if (_sharedMap.put(new TypeKey(cls, true), ser) == null) {
-                // let's invalidate the read-only copy, too, to get it updated
-                _readOnlyMap = null;
-            }
-        }
-    }
-    
-    public void addAndResolveNonTypedSerializer(Class<?> type, JsonSerializer<Object> ser,
-            SerializerProvider provider)
-        throws JsonMappingException
-    {
-        synchronized (this) {
-            if (_sharedMap.put(new TypeKey(type, false), ser) == null) {
-                // let's invalidate the read-only copy, too, to get it updated
-                _readOnlyMap = null;
-            }
-            /* Finally: some serializers want to do post-processing, after
-             * getting registered (to handle cyclic deps).
-             */
-            /* 14-May-2011, tatu: As per [JACKSON-570], resolving needs to be done
-             *   in synchronized manner; this because while we do need to register
-             *   instance first, we also must keep lock until resolution is complete
-             */
-            if (ser instanceof ResolvableSerializer) {
-                ((ResolvableSerializer) ser).resolve(provider);
-            }
-        }
-    }
-
-    public void addAndResolveNonTypedSerializer(JavaType type, JsonSerializer<Object> ser,
-            SerializerProvider provider)
-        throws JsonMappingException
-    {
-        synchronized (this) {
-            if (_sharedMap.put(new TypeKey(type, false), ser) == null) {
-                // let's invalidate the read-only copy, too, to get it updated
-                _readOnlyMap = null;
-            }
-            /* Finally: some serializers want to do post-processing, after
-             * getting registered (to handle cyclic deps).
-             */
-            /* 14-May-2011, tatu: As per [JACKSON-570], resolving needs to be done
-             *   in synchronized manner; this because while we do need to register
-             *   instance first, we also must keep lock until resolution is complete
-             */
-            if (ser instanceof ResolvableSerializer) {
-                ((ResolvableSerializer) ser).resolve(provider);
-            }
-        }
-    }
-
-    /**
-     * Method called by StdSerializerProvider#flushCachedSerializers() to
-     * clear all cached serializers
-     */
-    public synchronized void flush() {
-        _sharedMap.clear();
-    }
-
-    /*
-    /**************************************************************
-    /* Helper class(es)
-    /**************************************************************
-     */
-
-    /**
-     * Key that offers two "modes"; one with raw class, as used for
-     * cases were raw class type is available (for example, when using
-     * runtime type); and one with full generics-including.
-     */
-    public final static class TypeKey
-    {
-        protected int _hashCode;
-
-        protected Class<?> _class;
-
-        protected JavaType _type;
-
-        /**
-         * Indicator of whether serializer stored has a type serializer
-         * wrapper around it or not; if not, it is "untyped" serializer;
-         * if it has, it is "typed"
-         */
-        protected boolean _isTyped;
-        
-        public TypeKey(Class<?> key, boolean typed) {
-            _class = key;
-            _type = null;
-            _isTyped = typed;
-            _hashCode = hash(key, typed);
-        }
-
-        public TypeKey(JavaType key, boolean typed) {
-            _type = key;
-            _class = null;
-            _isTyped = typed;
-            _hashCode = hash(key, typed);
-        }
-
-        private final static int hash(Class<?> cls, boolean typed) {
-            int hash = cls.getName().hashCode();
-            if (typed) {
-                ++hash;
-            }
-            return hash;
-        }
-
-        private final static int hash(JavaType type, boolean typed) {
-            int hash = type.hashCode() - 1;
-            if (typed) {
-                --hash;
-            }
-            return hash;
-        }
-        
-        public void resetTyped(Class<?> cls) {
-            _type = null;
-            _class = cls;
-            _isTyped = true;
-            _hashCode = hash(cls, true);
-        }
-
-        public void resetUntyped(Class<?> cls) {
-            _type = null;
-            _class = cls;
-            _isTyped = false;
-            _hashCode = hash(cls, false);
-        }
-        
-        public void resetTyped(JavaType type) {
-            _type = type;
-            _class = null;
-            _isTyped = true;
-            _hashCode = hash(type, true);
-        }
-
-        public void resetUntyped(JavaType type) {
-            _type = type;
-            _class = null;
-            _isTyped = false;
-            _hashCode = hash(type, false);
-        }
-        
-        @Override public final int hashCode() { return _hashCode; }
-
-        @Override public final String toString() {
-            if (_class != null) {
-                return "{class: "+_class.getName()+", typed? "+_isTyped+"}";
-            }
-            return "{type: "+_type+", typed? "+_isTyped+"}";
-        }
-        
-        // note: we assume key is never used for anything other than as map key, so:
-        @Override public final boolean equals(Object o)
-        {
-            if (o == this) return true;
-            TypeKey other = (TypeKey) o;
-            if (other._isTyped == _isTyped) {
-                if (_class != null) {
-                    return other._class == _class;
-                }
-                return _type.equals(other._type);
-            }
-            return false;
-        } 
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerFactory.java
deleted file mode 100644
index c45de4a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/SerializerFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Abstract class that defines API used by {@link SerializerProvider}
- * to obtain actual
- * {@link JsonSerializer} instances from multiple distinct factories.
- */
-public abstract class SerializerFactory
-{
-    /*
-    /**********************************************************
-    /* Additional configuration methods
-    /**********************************************************
-     */
-
-    /**
-     * Convenience method for creating a new factory instance with additional serializer
-     * provider; equivalent to calling
-     *<pre>
-     *   withConfig(getConfig().withAdditionalSerializers(additional));
-     *<pre>
-     */
-    public abstract SerializerFactory withAdditionalSerializers(Serializers additional);
-
-    public abstract SerializerFactory withAdditionalKeySerializers(Serializers additional);
-    
-    /**
-     * Convenience method for creating a new factory instance with additional bean
-     * serializer modifier; equivalent to calling
-     *<pre>
-     *   withConfig(getConfig().withSerializerModifier(modifier));
-     *<pre>
-     */
-    public abstract SerializerFactory withSerializerModifier(BeanSerializerModifier modifier);
-    
-    /*
-    /**********************************************************
-    /* Basic SerializerFactory API:
-    /**********************************************************
-     */
-
-    /**
-     * @deprecated Since 2.1: need to use the new variant without 'property'
-     *    argument (since one won't be passed)
-     */
-    @Deprecated
-    public JsonSerializer<Object> createSerializer(SerializerProvider prov,
-            JavaType baseType, BeanProperty property)
-        throws JsonMappingException {
-        return createSerializer(prov, baseType);
-    }
-    
-    /**
-      * Method called to create (or, for immutable serializers, reuse) a serializer for given type. 
-      * 
-      * @param prov Provider that needs to be used to resolve annotation-provided
-      *    serializers (but NOT for others)
-      *    
-      * @since 2.1 (earlier versions had method with different signature)
-      */
-    public abstract JsonSerializer<Object> createSerializer(SerializerProvider prov,
-            JavaType baseType)
-        throws JsonMappingException;
-    
-    /**
-     * Method called to create a type information serializer for given base type,
-     * if one is needed. If not needed (no polymorphic handling configured), should
-     * return null.
-     *
-     * @param baseType Declared type to use as the base type for type information serializer
-     * 
-     * @return Type serializer to use for the base type, if one is needed; null if not.
-     */
-    public abstract TypeSerializer createTypeSerializer(SerializationConfig config,
-            JavaType baseType)
-        throws JsonMappingException;
-
-    /**
-     * Method called to create serializer to use for serializing JSON property names (which must
-     * be output as <code>JsonToken.FIELD_NAME</code>) for Map that has specified declared
-     * key type, and is for specified property (or, if property is null, as root value)
-     * 
-     * @param baseType Declared type for Map keys
-     * 
-     * @return Serializer to use, if factory knows it; null if not (in which case default
-     *   serializer is to be used)
-     */
-    public abstract JsonSerializer<Object> createKeySerializer(SerializationConfig config,
-            JavaType baseType)
-        throws JsonMappingException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/Serializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/Serializers.java
deleted file mode 100644
index f6a905e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/Serializers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.fasterxml.jackson.databind.ser;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.type.*;
-
-/**
- * Interface that defines API for simple extensions that can provide additional serializers
- * for various types. Access is by a single callback method; instance is to either return
- * a configured {@link JsonSerializer} for specified type, or null to indicate that it
- * does not support handling of the type. In latter case, further calls can be made
- * for other providers; in former case returned serializer is used for handling of
- * instances of specified type.
- */
-public interface Serializers
-{
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified type, which is not of a container type (for which other methods are
-     * called).
-     * 
-     * @param type Fully resolved type of instances to serialize
-     * @param config Serialization configuration in use
-     * @param beanDesc Additional information about type
-     *    
-     * @return Configured serializer to use for the type; or null if implementation
-     *    does not recognize or support type
-     */
-    public JsonSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc);
-
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified array type.
-     * Implementation should return a serializer instance if it supports
-     * specified type; or null if it does not.
-     */
-    public JsonSerializer<?> findArraySerializer(SerializationConfig config,
-            ArrayType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer);
-
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified {@link java.util.Collection} type.
-     * Implementation should return a serializer instance if it supports
-     * specified type; or null if it does not.
-     */
-    public JsonSerializer<?> findCollectionSerializer(SerializationConfig config,
-            CollectionType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer);
-
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified "Collection-like" type (type that acts like {@link java.util.Collection},
-     * but does not implement it).
-     * Implementation should return a serializer instance if it supports
-     * specified type; or null if it does not.
-     */
-    public JsonSerializer<?> findCollectionLikeSerializer(SerializationConfig config,
-            CollectionLikeType type, BeanDescription beanDesc,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer);
-    
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified {@link java.util.Map} type.
-     * Implementation should return a serializer instance if it supports
-     * specified type; or null if it does not.
-     */
-    public JsonSerializer<?> findMapSerializer(SerializationConfig config,
-            MapType type, BeanDescription beanDesc,
-            JsonSerializer<Object> keySerializer,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer);
-
-    /**
-     * Method called by serialization framework first time a serializer is needed for
-     * specified "Map-like" type (type that acts like {@link java.util.Map},
-     * but does not implement it).
-     * Implementation should return a serializer instance if it supports
-     * specified type; or null if it does not.
-     */
-    public JsonSerializer<?> findMapLikeSerializer(SerializationConfig config,
-            MapLikeType type, BeanDescription beanDesc,
-            JsonSerializer<Object> keySerializer,
-            TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer);
-
-    /**
-     * Basic {@link Serializers} implementation that implements all methods but provides
-     * no serializers. Its main purpose is to serve as a base class so that
-     * sub-classes only need to override methods they need.
-     */
-    public static class Base implements Serializers
-    {
-//      @Override
-        public JsonSerializer<?> findSerializer(SerializationConfig config,
-                JavaType type, BeanDescription beanDesc)
-        {
-            return null;
-        }
-        
-//      @Override
-        public JsonSerializer<?> findArraySerializer(SerializationConfig config,
-                ArrayType type, BeanDescription beanDesc,
-                TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonSerializer<?> findCollectionSerializer(SerializationConfig config,
-                CollectionType type, BeanDescription beanDesc,
-                TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonSerializer<?> findCollectionLikeSerializer(SerializationConfig config,
-                CollectionLikeType type, BeanDescription beanDesc,
-                TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        {
-            return null;
-        }
-            
-//      @Override
-        public JsonSerializer<?> findMapSerializer(SerializationConfig config,
-                MapType type, BeanDescription beanDesc,
-                JsonSerializer<Object> keySerializer,
-                TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        {
-            return null;
-        }
-
-//      @Override
-        public JsonSerializer<?> findMapLikeSerializer(SerializationConfig config,
-                MapLikeType type, BeanDescription beanDesc,
-                JsonSerializer<Object> keySerializer,
-                TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
-        {
-            return null;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java
deleted file mode 100644
index 677f32b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Specialized POJO serializer that differs from
- * {@link com.fasterxml.jackson.databind.ser.BeanSerializer}
- * in that instead of producing a JSON Object it will output
- * a JSON Array, omitting field names, and serializing values in
- * specified serialization order.
- * This behavior is usually triggered by using annotation
- * {@link com.fasterxml.jackson.annotation.JsonFormat} or its
- * equivalents.
- *<p>
- * This serializer can be used for "simple" instances; and will NOT
- * be used if one of following is true:
- *<ul>
- * <li>Unwrapping is used (no way to expand out array in JSON Object)
- *  </li>
- * <li>Type information ("type id") is to be used: while this could work
- *   for some embedding methods, it would likely cause conflicts.
- *  </li>
- * <li>Object Identity ("object id") is used: while references would work,
- *    the problem is inclusion of id itself.
- *  </li>
- *</ul>
- * Note that it is theoretically possible that last 2 issues could be addressed
- * (by reserving room in array, for example); and if so, support improved.
- *<p>
- * In cases where array-based output is not feasible, this serializer
- * can instead delegate to the original Object-based serializer; this
- * is why a reference is retained to the original serializer.
- * 
- * @since 2.1
- */
-public class BeanAsArraySerializer
-    extends BeanSerializerBase
-{
-    /**
-     * Serializer that would produce JSON Object version; used in
-     * cases where array output can not be used.
-     */
-    protected final BeanSerializerBase _defaultSerializer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-
-    public BeanAsArraySerializer(BeanSerializerBase src) {    
-        super(src, (ObjectIdWriter) null);
-        _defaultSerializer = src;
-    }
-
-    protected BeanAsArraySerializer(BeanSerializerBase src, String[] toIgnore) {
-        super(src, toIgnore);
-        _defaultSerializer = src;
-    }
-
-    /*
-    /**********************************************************
-    /* Life-cycle: factory methods, fluent factories
-    /**********************************************************
-     */
-
-    @Override
-    public JsonSerializer<Object> unwrappingSerializer(NameTransformer transformer) {
-        /* If this gets called, we will just need delegate to the default
-         * serializer, to "undo" as-array serialization
-         */
-        return _defaultSerializer.unwrappingSerializer(transformer);
-    }
-
-    @Override
-    public boolean isUnwrappingSerializer() {
-        return false;
-    }
-
-    @Override
-    public BeanSerializerBase withObjectIdWriter(ObjectIdWriter objectIdWriter) {
-        // can't handle Object Ids, for now, so:
-        return _defaultSerializer.withObjectIdWriter(objectIdWriter);
-    }
-
-    @Override
-    protected BeanAsArraySerializer withIgnorals(String[] toIgnore) {
-        return new BeanAsArraySerializer(this, toIgnore);
-    }
-
-    @Override
-    protected BeanSerializerBase asArraySerializer() {
-        // already is one, so:
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializer implementation that differs between impls
-    /**********************************************************
-     */
-
-    // Re-defined from base class...
-    @Override
-    public void serializeWithType(Object bean, JsonGenerator jgen,
-            SerializerProvider provider, TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        /* Should not even get here; but let's be nice and re-route
-         * if need be.
-         */
-        _defaultSerializer.serializeWithType(bean, jgen, provider, typeSer);
-    }
-    
-    /**
-     * Main serialization method that will delegate actual output to
-     * configured
-     * {@link BeanPropertyWriter} instances.
-     */
-    @Override
-    public final void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // [JACKSON-805]
-        if (provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED)
-                && hasSingleElement(provider)) {
-            serializeAsArray(bean, jgen, provider);
-            return;
-        }
-        /* note: it is assumed here that limitations (type id, object id,
-         * any getter, filtering) have already been checked; so code here
-         * is trivial.
-         */
-        jgen.writeStartArray();
-        serializeAsArray(bean, jgen, provider);
-        jgen.writeEndArray();
-    }
-
-    /*
-    /**********************************************************
-    /* Field serialization methods
-    /**********************************************************
-     */
-    private boolean hasSingleElement(SerializerProvider provider) {
-        final BeanPropertyWriter[] props;
-        if (_filteredProps != null && provider.getSerializationView() != null) {
-            props = _filteredProps;
-        } else {
-            props = _props;
-        }
-        return props.length == 1;
-    }
-
-    protected final void serializeAsArray(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final BeanPropertyWriter[] props;
-        if (_filteredProps != null && provider.getSerializationView() != null) {
-            props = _filteredProps;
-        } else {
-            props = _props;
-        }
-
-        int i = 0;
-        try {
-            for (final int len = props.length; i < len; ++i) {
-                BeanPropertyWriter prop = props[i];
-                if (prop == null) { // can have nulls in filtered list; but if so, MUST write placeholders
-                    jgen.writeNull();
-                } else {
-                    prop.serializeAsColumn(bean, jgen, provider);
-                }
-            }
-            // NOTE: any getters can not be supported either
-            //if (_anyGetterWriter != null) {
-            //    _anyGetterWriter.getAndSerialize(bean, jgen, provider);
-            //}
-        } catch (Exception e) {
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            wrapAndThrow(provider, e, bean, name);
-        } catch (StackOverflowError e) {
-            JsonMappingException mapE = new JsonMappingException("Infinite recursion (StackOverflowError)", e);
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            mapE.prependPath(new JsonMappingException.Reference(bean, name));
-            throw mapE;
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override public String toString() {
-        return "BeanAsArraySerializer for "+handledType().getName();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FailingSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FailingSerializer.java
deleted file mode 100644
index fafa13d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FailingSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-/**
- * Special bogus "serializer" that will throw
- * {@link JsonGenerationException} if its {@link #serialize}
- * gets invoked. Most commonly registered as handler for unknown types,
- * as well as for catching unintended usage (like trying to use null
- * as Map/Object key).
- */
-public final class FailingSerializer
-    extends StdSerializer<Object>
-{
-    final String _msg;
-    
-    public FailingSerializer(String msg) {
-        super(Object.class);
-        _msg = msg;
-    }
-    
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        throw new JsonGenerationException(_msg);
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return null;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        ;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java
deleted file mode 100644
index 12b34c8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Decorated {@link BeanPropertyWriter} that will filter out properties
- * that are not to be included in currently active JsonView.
- */
-public abstract class FilteredBeanPropertyWriter
-{    
-    public static BeanPropertyWriter constructViewBased(BeanPropertyWriter base, Class<?>[] viewsToIncludeIn)
-    {
-        if (viewsToIncludeIn.length == 1) {
-            return new SingleView(base, viewsToIncludeIn[0]);
-        }
-        return new MultiView(base, viewsToIncludeIn);
-    }
-
-    /*
-    /**********************************************************
-    /* Concrete sub-classes
-    /**********************************************************
-     */
-
-    private final static class SingleView
-        extends BeanPropertyWriter
-    {
-        protected final BeanPropertyWriter _delegate;
-
-        protected final Class<?> _view;
-        
-        protected SingleView(BeanPropertyWriter delegate, Class<?> view)
-        {
-            super(delegate);
-            _delegate = delegate;
-            _view = view;
-        }
-
-        @Override
-        public SingleView rename(NameTransformer transformer) {
-            return new SingleView(_delegate.rename(transformer), _view);
-        }
-        
-        @Override
-        public void assignSerializer(JsonSerializer<Object> ser) {
-            _delegate.assignSerializer(ser);
-        }
-
-        @Override
-        public void assignNullSerializer(JsonSerializer<Object> nullSer) {
-            _delegate.assignNullSerializer(nullSer);
-        }
-        
-        @Override
-        public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
-            throws Exception
-        {
-            Class<?> activeView = prov.getSerializationView();
-            if (activeView == null || _view.isAssignableFrom(activeView)) {
-                _delegate.serializeAsField(bean, jgen, prov);
-            }
-        }
-
-        @Override
-        public void serializeAsColumn(Object bean, JsonGenerator jgen, SerializerProvider prov)
-            throws Exception
-        {
-            Class<?> activeView = prov.getSerializationView();
-            if (activeView == null || _view.isAssignableFrom(activeView)) {
-                _delegate.serializeAsColumn(bean, jgen, prov);
-            } else {
-                _delegate.serializeAsPlaceholder(bean, jgen, prov);
-            }
-        }
-    }
-
-    private final static class MultiView
-        extends BeanPropertyWriter
-    {
-        protected final BeanPropertyWriter _delegate;
-
-        protected final Class<?>[] _views;
-        
-        protected MultiView(BeanPropertyWriter delegate, Class<?>[] views) {
-            super(delegate);
-            _delegate = delegate;
-            _views = views;
-        }
-
-        @Override
-        public MultiView rename(NameTransformer transformer) {
-            return new MultiView(_delegate.rename(transformer), _views);
-        }
-        
-        @Override
-        public void assignSerializer(JsonSerializer<Object> ser) {
-            _delegate.assignSerializer(ser);
-        }
-
-        @Override
-        public void assignNullSerializer(JsonSerializer<Object> nullSer) {
-            _delegate.assignNullSerializer(nullSer);
-        }
-        
-        @Override
-        public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
-            throws Exception
-        {
-            final Class<?> activeView = prov.getSerializationView();
-            if (activeView != null) {
-                int i = 0, len = _views.length;
-                for (; i < len; ++i) {
-                    if (_views[i].isAssignableFrom(activeView)) break;
-                }
-                // not included, bail out:
-                if (i == len) {
-                    return;
-                }
-            }
-            _delegate.serializeAsField(bean, jgen, prov);
-        }
-
-        @Override
-        public void serializeAsColumn(Object bean, JsonGenerator jgen, SerializerProvider prov)
-            throws Exception
-        {
-            final Class<?> activeView = prov.getSerializationView();
-            if (activeView != null) {
-                int i = 0, len = _views.length;
-                for (; i < len; ++i) {
-                    if (_views[i].isAssignableFrom(activeView)) break;
-                }
-                // not included, bail out:
-                if (i == len) {
-                    _delegate.serializeAsPlaceholder(bean, jgen, prov);
-                    return;
-                }
-            }
-            _delegate.serializeAsColumn(bean, jgen, prov);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java
deleted file mode 100644
index e7e0a93..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.std.AsArraySerializerBase;
-
-/**
- * This is an optimized serializer for Lists that can be efficiently
- * traversed by index (as opposed to others, such as {@link LinkedList}
- * that can not}.
- */
-@JacksonStdImpl
-public final class IndexedListSerializer
-    extends AsArraySerializerBase<List<?>>
-{
-    public IndexedListSerializer(JavaType elemType, boolean staticTyping, TypeSerializer vts,
-            BeanProperty property, JsonSerializer<Object> valueSerializer)
-    {
-        super(List.class, elemType, staticTyping, vts, property, valueSerializer);
-    }
-
-    public IndexedListSerializer(IndexedListSerializer src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> valueSerializer)
-    {
-        super(src, property, vts, valueSerializer);
-    }
-
-    @Override
-    public IndexedListSerializer withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer) {
-        return new IndexedListSerializer(this, property, vts, elementSerializer);
-    }
-
-    @Override
-    public boolean isEmpty(List<?> value) {
-        return (value == null) || value.isEmpty();
-    }
-
-    @Override
-    public boolean hasSingleElement(List<?> value) {
-        return (value.size() == 1);
-    }
-
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-        return new IndexedListSerializer(_elementType, _staticTyping, vts, _property, _elementSerializer);
-    }
-    
-    @Override
-    public void serializeContents(List<?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_elementSerializer != null) {
-            serializeContentsUsing(value, jgen, provider, _elementSerializer);
-            return;
-        }
-        if (_valueTypeSerializer != null) {
-            serializeTypedContents(value, jgen, provider);
-            return;
-        }
-        final int len = value.size();
-        if (len == 0) {
-            return;
-        }
-        int i = 0;
-        try {
-            PropertySerializerMap serializers = _dynamicSerializers;
-            for (; i < len; ++i) {
-                Object elem = value.get(i);
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    Class<?> cc = elem.getClass();
-                    JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                    if (serializer == null) {
-                        // To fix [JACKSON-508]
-                        if (_elementType.hasGenericTypes()) {
-                            serializer = _findAndAddDynamic(serializers,
-                                    provider.constructSpecializedType(_elementType, cc), provider);
-                        } else {
-                            serializer = _findAndAddDynamic(serializers, cc, provider);
-                        }
-                        serializers = _dynamicSerializers;
-                    }
-                    serializer.serialize(elem, jgen, provider);
-                }
-            }
-        } catch (Exception e) {
-            // [JACKSON-55] Need to add reference information
-            wrapAndThrow(provider, e, value, i);
-        }
-    }
-    
-    public void serializeContentsUsing(List<?> value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.size();
-        if (len == 0) {
-            return;
-        }
-        final TypeSerializer typeSer = _valueTypeSerializer;
-        for (int i = 0; i < len; ++i) {
-            Object elem = value.get(i);
-            try {
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else if (typeSer == null) {
-                    ser.serialize(elem, jgen, provider);
-                } else {
-                    ser.serializeWithType(elem, jgen, provider, typeSer);
-                }
-            } catch (Exception e) {
-                // [JACKSON-55] Need to add reference information
-                wrapAndThrow(provider, e, value, i);
-            }
-        }
-    }
-
-    public void serializeTypedContents(List<?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.size();
-        if (len == 0) {
-            return;
-        }
-        int i = 0;
-        try {
-            final TypeSerializer typeSer = _valueTypeSerializer;
-            PropertySerializerMap serializers = _dynamicSerializers;
-            for (; i < len; ++i) {
-                Object elem = value.get(i);
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    Class<?> cc = elem.getClass();
-                    JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                    if (serializer == null) {
-                        // To fix [JACKSON-508]
-                        if (_elementType.hasGenericTypes()) {
-                            serializer = _findAndAddDynamic(serializers,
-                                    provider.constructSpecializedType(_elementType, cc), provider);
-                        } else {
-                            serializer = _findAndAddDynamic(serializers, cc, provider);
-                        }
-                        serializers = _dynamicSerializers;
-                    }
-                    serializer.serializeWithType(elem, jgen, provider, typeSer);
-                }
-            }
-        } catch (Exception e) {
-            // [JACKSON-55] Need to add reference information
-            wrapAndThrow(provider, e, value, i);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
deleted file mode 100644
index 22ece46..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.std.StaticListSerializerBase;
-
-/**
- * Efficient implement for serializing {@link List}s that contains Strings and are random-accessible.
- * The only complexity is due to possibility that serializer for {@link String}
- * may be overridde; because of this, logic is needed to ensure that the default
- * serializer is in use to use fastest mode, or if not, to defer to custom
- * String serializer.
- */
-@JacksonStdImpl
-public final class IndexedStringListSerializer
-    extends StaticListSerializerBase<List<String>>
-    implements ContextualSerializer
-{
-    public final static IndexedStringListSerializer instance = new IndexedStringListSerializer();
-    
-    protected final JsonSerializer<String> _serializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected IndexedStringListSerializer() {
-        this(null);
-    }
-
-    @SuppressWarnings("unchecked")
-    public IndexedStringListSerializer(JsonSerializer<?> ser) {
-        super(List.class);
-        _serializer = (JsonSerializer<String>) ser;
-        
-    }
-
-    @Override protected JsonNode contentSchema() {
-        return createSchemaNode("string", true);
-    }
-
-	@Override
-	protected void acceptContentVisitor(JsonArrayFormatVisitor visitor) {
-		visitor.itemsFormat(JsonFormatTypes.STRING);
-		
-	}
-
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-    
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _serializer;
-        }
-        if (ser == null) {
-            ser = provider.findValueSerializer(String.class, property);
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        // Optimization: default serializer just writes String, so we can avoid a call:
-        if (isDefaultSerializer(ser)) {
-            ser = null;
-        }
-        // note: will never have TypeSerializer, because Strings are "natural" type
-        if (ser == _serializer) {
-            return this;
-        }
-        return new IndexedStringListSerializer(ser);
-    }
-
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-
-    @Override
-    public void serialize(List<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeStartArray();
-        if (_serializer == null) {
-            serializeContents(value, jgen, provider);
-        } else {
-            serializeUsingCustom(value, jgen, provider);
-        }
-        jgen.writeEndArray();
-    }
-    
-    @Override
-    public void serializeWithType(List<String> value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForArray(value, jgen);
-        if (_serializer == null) {
-            serializeContents(value, jgen, provider);
-        } else {
-            serializeUsingCustom(value, jgen, provider);
-        }
-        typeSer.writeTypeSuffixForArray(value, jgen);
-    }
-    
-    private final void serializeContents(List<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        int i = 0;
-        try {
-            final int len = value.size();
-            for (; i < len; ++i) {
-                String str = value.get(i);
-                if (str == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    jgen.writeString(str);
-                }
-            }
-        } catch (Exception e) {
-            wrapAndThrow(provider, e, value, i);
-        }
-    }
-
-    private final void serializeUsingCustom(List<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        int i = 0;
-        try {
-            final int len = value.size();
-            final JsonSerializer<String> ser = _serializer;
-            for (i = 0; i < len; ++i) {
-                String str = value.get(i);
-                if (str == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    ser.serialize(str, jgen, provider);
-                }
-            }
-        } catch (Exception e) {
-            wrapAndThrow(provider, e, value, i);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
deleted file mode 100644
index 15f6639..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.std.AsArraySerializerBase;
-
-@JacksonStdImpl
-public class IteratorSerializer
-    extends AsArraySerializerBase<Iterator<?>>
-{
-    public IteratorSerializer(JavaType elemType, boolean staticTyping, TypeSerializer vts,
-            BeanProperty property)
-    {
-        super(Iterator.class, elemType, staticTyping, vts, property, null);
-    }
-
-    public IteratorSerializer(IteratorSerializer src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> valueSerializer)
-    {
-        super(src, property, vts, valueSerializer);
-    }
-
-    @Override
-    public boolean isEmpty(Iterator<?> value) {
-        return (value == null) || !value.hasNext();
-    }
-
-    @Override
-    public boolean hasSingleElement(Iterator<?> value) {
-        // no really good way to determine (without consuming iterator), so:
-        return false;
-    }
-    
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-        return new IteratorSerializer(_elementType, _staticTyping, vts, _property);
-    }
-
-    @Override
-    public IteratorSerializer withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer) {
-        return new IteratorSerializer(this, property, vts, elementSerializer);
-    }
-
-    @Override
-    public void serializeContents(Iterator<?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (value.hasNext()) {
-            final TypeSerializer typeSer = _valueTypeSerializer;
-            JsonSerializer<Object> prevSerializer = null;
-            Class<?> prevClass = null;
-            do {
-                Object elem = value.next();
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    // Minor optimization to avoid most lookups:
-                    Class<?> cc = elem.getClass();
-                    JsonSerializer<Object> currSerializer;
-                    if (cc == prevClass) {
-                        currSerializer = prevSerializer;
-                    } else {
-                        currSerializer = provider.findValueSerializer(cc, _property);
-                        prevSerializer = currSerializer;
-                        prevClass = cc;
-                    }
-                    if (typeSer == null) {
-                        currSerializer.serialize(elem, jgen, provider);
-                    } else {
-                        currSerializer.serializeWithType(elem, jgen, provider, typeSer);
-                    }
-                }
-            } while (value.hasNext());
-        }
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/JsonSerializerMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/JsonSerializerMap.java
deleted file mode 100644
index 90997a3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/JsonSerializerMap.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.util.Map;
-
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ser.SerializerCache.TypeKey;
-
-/**
- * Specialized read-only map used for storing and accessing serializers by type.
- */
-public class JsonSerializerMap
-{
-    private final Bucket[] _buckets;
-
-    private final int _size;
-    
-    public JsonSerializerMap(Map<TypeKey,JsonSerializer<Object>> serializers)
-    {
-        int size = findSize(serializers.size());
-        _size = size;
-        int hashMask = (size-1);
-        Bucket[] buckets = new Bucket[size];
-        for (Map.Entry<TypeKey,JsonSerializer<Object>> entry : serializers.entrySet()) {
-            TypeKey key = entry.getKey();
-            int index = key.hashCode() & hashMask;
-            buckets[index] = new Bucket(buckets[index], key, entry.getValue());
-        }
-        _buckets = buckets;
-    }
-    
-    private final static int findSize(int size)
-    {
-        // For small enough results (64 or less), we'll require <= 50% fill rate; otherwise 80%
-        int needed = (size <= 64) ? (size + size) : (size + (size >> 2));
-        int result = 8;
-        while (result < needed) {
-            result += result;
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    public int size() { return _size; }
-    
-    public JsonSerializer<Object> find(TypeKey key)
-    {
-        int index = key.hashCode() & (_buckets.length-1);
-        Bucket bucket = _buckets[index];
-        /* Ok let's actually try unrolling loop slightly as this shows up in profiler;
-         * and also because in vast majority of cases first entry is either null
-         * or matches.
-         */
-        if (bucket == null) {
-            return null;
-        }
-        if (key.equals(bucket.key)) {
-            return bucket.value;
-        }
-        while ((bucket = bucket.next) != null) {
-            if (key.equals(bucket.key)) {
-                return bucket.value;
-            }
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper beans
-    /**********************************************************
-     */
-    
-    private final static class Bucket
-    {
-        public final TypeKey key;
-        public final JsonSerializer<Object> value;
-        public final Bucket next;
-        
-        public Bucket(Bucket next, TypeKey key, JsonSerializer<Object> value)
-        {
-            this.next = next;
-            this.key = key;
-            this.value = value;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.java
deleted file mode 100644
index 86d88ad..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ObjectIdWriter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Object that knows how to serialize Object Ids.
- */
-public final class ObjectIdWriter
-{
-    public final JavaType idType;
-
-    /**
-     * Name of id property to write, if not null: if null, should
-     * only write references, but id property is handled by some
-     * other entity.
-     */
-    public final SerializedString propertyName;
-    
-    /**
-     * Blueprint generator instance: actual instance will be
-     * fetched from {@link SerializerProvider} using this as
-     * the key.
-     */
-    public final ObjectIdGenerator<?> generator;
-    
-    /**
-     * Serializer used for serializing id values.
-     */
-    public final JsonSerializer<Object> serializer;
-
-    /**
-     * Marker that indicates what the first reference is to be
-     * serialized as full POJO, or as Object Id (other references
-     * will always be serialized as Object Id)
-     * 
-     * @since 2.1
-     */
-    public final boolean alwaysAsId;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    @SuppressWarnings("unchecked")
-    protected ObjectIdWriter(JavaType t, SerializedString propName,
-            ObjectIdGenerator<?> gen, JsonSerializer<?> ser, boolean alwaysAsId)
-    {
-        idType = t;
-        propertyName = propName;
-        generator = gen;
-        serializer = (JsonSerializer<Object>) ser;
-        this.alwaysAsId = alwaysAsId;
-    }
-
-    /**
-     * Factory method called by {@link com.fasterxml.jackson.databind.ser.std.BeanSerializerBase}
-     * with the initial information based on standard settings for the type
-     * for which serializer is being built.
-     */
-    public static ObjectIdWriter construct(JavaType idType, String propName,
-            ObjectIdGenerator<?> generator, boolean alwaysAsId)
-    {
-        SerializedString serName = (propName == null) ? null : new SerializedString(propName);
-        return new ObjectIdWriter(idType, serName, generator, null, alwaysAsId);
-    }
-
-    public ObjectIdWriter withSerializer(JsonSerializer<?> ser) {
-        return new ObjectIdWriter(idType, propertyName, generator, ser, alwaysAsId);
-    }
-
-    /**
-     * @since 2.1
-     */
-    public ObjectIdWriter withAlwaysAsId(boolean newState) {
-        if (newState == alwaysAsId) {
-            return this;
-        }
-        return new ObjectIdWriter(idType, propertyName, generator, serializer, newState);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.java
deleted file mode 100644
index db3808a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertyBasedObjectIdGenerator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.ser.*;
-
-public class PropertyBasedObjectIdGenerator
-    extends ObjectIdGenerators.PropertyGenerator
-{
-    protected final BeanPropertyWriter _property;
-    
-    public PropertyBasedObjectIdGenerator(ObjectIdInfo oid, BeanPropertyWriter prop)
-    {
-        this(oid.getScope(), prop);
-    }
-
-    protected PropertyBasedObjectIdGenerator(Class<?> scope, BeanPropertyWriter prop)
-    {
-        super(scope);
-        _property = prop;
-    }
-
-    /**
-     * We must override this method, to prevent errors when scopes are the same,
-     * but underlying class (on which to access property) is different.
-     */
-    @Override
-    public boolean canUseFor(ObjectIdGenerator<?> gen) {
-        if (gen.getClass() == getClass()) {
-            PropertyBasedObjectIdGenerator other = (PropertyBasedObjectIdGenerator) gen;
-            if (other.getScope() == _scope) {
-                /* 26-Jul-2012, tatu: This is actually not enough, because the property
-                 *   accessor within BeanPropertyWriter won't work for other property fields
-                 *  (see [https://github.com/FasterXML/jackson-module-jaxb-annotations/issues/9]
-                 *  for details).
-                 *  So we need to verify that underlying property is actually the same.
-                 */
-                return (other._property == _property);
-            }
-        }
-        return false;
-    }
-    
-    @Override
-    public Object generateId(Object forPojo) {
-        try {
-            return _property.get(forPojo);
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new IllegalStateException("Problem accessing property '"
-                    +_property.getName()+"': "+e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public ObjectIdGenerator<Object> forScope(Class<?> scope) {
-        return (scope == _scope) ? this : new PropertyBasedObjectIdGenerator(scope, _property);
-    }
-
-    @Override
-    public ObjectIdGenerator<Object> newForSerialization(Object context) {
-        // No state, can return this
-        return this;
-    }
-
-    @Override
-    public com.fasterxml.jackson.annotation.ObjectIdGenerator.IdKey key(Object key) {
-        // should we use general type for all; or type of property itself?
-        return new IdKey(getClass(), _scope, key);
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.java
deleted file mode 100644
index 9978d35..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/PropertySerializerMap.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-
-/**
- * Helper container used for resolving serializers for dynamic (possibly but not
- * necessarily polymorphic) properties: properties whose type is not forced
- * to use dynamic (declared) type and that are not final.
- * If so, serializer to use can only be established once actual value type is known.
- * Since this happens a lot unless static typing is forced (or types are final)
- * this implementation is optimized for efficiency.
- * Instances are immutable; new instances are created with factory methods: this
- * is important to ensure correct multi-threaded access.
- */
-public abstract class PropertySerializerMap
-{
-    /**
-     * Main lookup method. Takes a "raw" type since usage is always from
-     * place where parameterization is fixed such that there can not be
-     * type-parametric variations.
-     */
-    public abstract JsonSerializer<Object> serializerFor(Class<?> type);
-
-    /**
-     * Method called if initial lookup fails; will both find serializer
-     * and construct new map instance if warranted, and return both
-     * @throws JsonMappingException 
-     */
-    public final SerializerAndMapResult findAndAddSerializer(Class<?> type,
-            SerializerProvider provider, BeanProperty property)
-        throws JsonMappingException
-    {
-        JsonSerializer<Object> serializer = provider.findValueSerializer(type, property);
-        return new SerializerAndMapResult(serializer, newWith(type, serializer));
-    }
-
-    public final SerializerAndMapResult findAndAddSerializer(JavaType type,
-            SerializerProvider provider, BeanProperty property)
-        throws JsonMappingException
-    {
-        JsonSerializer<Object> serializer = provider.findValueSerializer(type, property);
-        return new SerializerAndMapResult(serializer, newWith(type.getRawClass(), serializer));
-    }
-
-    public abstract PropertySerializerMap newWith(Class<?> type, JsonSerializer<Object> serializer);
-    
-    public static PropertySerializerMap emptyMap() {
-        return Empty.instance;
-    }
-    
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Value class used for returning tuple that has both serializer
-     * that was retrieved and new map instance
-     */
-    public final static class SerializerAndMapResult
-    {
-        public final JsonSerializer<Object> serializer;
-        public final PropertySerializerMap map;
-        
-        public SerializerAndMapResult(JsonSerializer<Object> serializer,
-                PropertySerializerMap map)
-        {
-            this.serializer = serializer;
-            this.map = map;
-        }
-    }
-
-    /**
-     * Trivial container for bundling type + serializer entries.
-     */
-    private final static class TypeAndSerializer
-    {
-        public final Class<?> type;
-        public final JsonSerializer<Object> serializer;
-
-        public TypeAndSerializer(Class<?> type, JsonSerializer<Object> serializer) {
-            this.type = type;
-            this.serializer = serializer;
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Implementations
-    /**********************************************************
-     */
-
-    /**
-     * Bogus instance that contains no serializers; used as the default
-     * map with new serializers.
-     */
-    private final static class Empty extends PropertySerializerMap
-    {
-        protected final static Empty instance = new Empty();
-
-        @Override
-        public JsonSerializer<Object> serializerFor(Class<?> type) {
-            return null; // empty, nothing to find
-        }        
-
-        @Override
-        public PropertySerializerMap newWith(Class<?> type, JsonSerializer<Object> serializer) {
-            return new Single(type, serializer);
-        }
-    }
-
-    /**
-     * Map that contains a single serializer; although seemingly silly
-     * this is probably the most commonly used variant because many
-     * theoretically dynamic or polymorphic types just have single
-     * actual type.
-     */
-    private final static class Single extends PropertySerializerMap
-    {
-        private final Class<?> _type;
-        private final JsonSerializer<Object> _serializer;
-
-        public Single(Class<?> type, JsonSerializer<Object> serializer) {
-            _type = type;
-            _serializer = serializer;
-        }
-
-        @Override
-        public JsonSerializer<Object> serializerFor(Class<?> type)
-        {
-            if (type == _type) {
-                return _serializer;
-            }
-            return null;
-        }
-
-        @Override
-        public PropertySerializerMap newWith(Class<?> type, JsonSerializer<Object> serializer) {
-            return new Double(_type, _serializer, type, serializer);
-        }
-    }
-
-    private final static class Double extends PropertySerializerMap
-    {
-        private final Class<?> _type1, _type2;
-        private final JsonSerializer<Object> _serializer1, _serializer2;
-
-        public Double(Class<?> type1, JsonSerializer<Object> serializer1,
-                Class<?> type2, JsonSerializer<Object> serializer2)
-        {
-            _type1 = type1;
-            _serializer1 = serializer1;
-            _type2 = type2;
-            _serializer2 = serializer2;
-        }
-
-        @Override
-        public JsonSerializer<Object> serializerFor(Class<?> type)
-        {
-            if (type == _type1) {
-                return _serializer1;
-            }
-            if (type == _type2) {
-                return _serializer2;
-            }
-            return null;
-        }        
-
-        @Override
-        public PropertySerializerMap newWith(Class<?> type, JsonSerializer<Object> serializer) {
-            // Ok: let's just create generic one
-            TypeAndSerializer[] ts = new TypeAndSerializer[2];
-            ts[0] = new TypeAndSerializer(_type1, _serializer1);
-            ts[1] = new TypeAndSerializer(_type2, _serializer2);
-            return new Multi(ts);
-        }
-    }
-    
-    private final static class Multi extends PropertySerializerMap
-    {
-        /**
-         * Let's limit number of serializers we actually cache; linear
-         * lookup won't scale too well beyond smallish number, and if
-         * we really want to support larger collections should use
-         * a hash map. But it seems unlikely this is a common use
-         * case so for now let's just stop building after hard-coded
-         * limit. 8 sounds like a reasonable stab for now.
-         */
-        private final static int MAX_ENTRIES = 8;
-        
-        private final TypeAndSerializer[] _entries;
-
-        public Multi(TypeAndSerializer[] entries) {
-            _entries = entries;
-        }
-
-        @Override
-        public JsonSerializer<Object> serializerFor(Class<?> type)
-        {
-            for (int i = 0, len = _entries.length; i < len; ++i) {
-                TypeAndSerializer entry = _entries[i];
-                if (entry.type == type) {
-                    return entry.serializer;
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public PropertySerializerMap newWith(Class<?> type, JsonSerializer<Object> serializer)
-        {
-            int len = _entries.length;
-            // Will only grow up to N entries
-            if (len == MAX_ENTRIES) {
-                return this;
-            }
-            // 1.6 has nice resize methods but we are still 1.5
-            TypeAndSerializer[] entries = new TypeAndSerializer[len+1];
-            System.arraycopy(_entries, 0, entries, 0, len);
-            entries[len] = new TypeAndSerializer(type, serializer);
-            return new Multi(entries);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.java
deleted file mode 100644
index 345f82e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.util.*;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ser.SerializerCache.TypeKey;
-
-/**
- * Optimized lookup table for accessing two types of serializers; typed
- * and non-typed. Only accessed from a single thread, so no synchronization
- * needed for accessors.
- */
-public final class ReadOnlyClassToSerializerMap
-{
-    /**
-     * Actual mappings from type key to serializers
-     */
-    protected final JsonSerializerMap _map;
-
-    /**
-     * We'll reuse key class to avoid unnecessary instantiations; since
-     * this is not shared between threads, we can just reuse single
-     * instance.
-     */
-    protected final TypeKey _cacheKey = new TypeKey(getClass(), false);
-    
-    private ReadOnlyClassToSerializerMap(JsonSerializerMap map)
-    {
-        _map = map;
-    }
-
-    public ReadOnlyClassToSerializerMap instance()
-    {
-        return new ReadOnlyClassToSerializerMap(_map);
-    }
-
-    /**
-     * Factory method for creating the "blueprint" lookup map. Such map
-     * can not be used as is but just shared: to get an actual usable
-     * instance, {@link #instance} has to be called first.
-     */
-    public static ReadOnlyClassToSerializerMap from(HashMap<TypeKey, JsonSerializer<Object>> src)
-    {
-        return new ReadOnlyClassToSerializerMap(new JsonSerializerMap(src));
-    }
-
-    public JsonSerializer<Object> typedValueSerializer(JavaType type)
-    { 
-        _cacheKey.resetTyped(type);
-        return _map.find(_cacheKey);
-    }
-
-    public JsonSerializer<Object> typedValueSerializer(Class<?> cls)
-    { 
-        _cacheKey.resetTyped(cls);
-        return _map.find(_cacheKey);
-    }
-    
-    public JsonSerializer<Object> untypedValueSerializer(Class<?> cls)
-    { 
-        _cacheKey.resetUntyped(cls);
-        return _map.find(_cacheKey);
-    }
-
-    public JsonSerializer<Object> untypedValueSerializer(JavaType type)
-    { 
-        _cacheKey.resetUntyped(type);
-        return _map.find(_cacheKey);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.java
deleted file mode 100644
index 5f76585..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleBeanPropertyFilter.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.ser.BeanPropertyFilter;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-
-/**
- * Simple {@link BeanPropertyFilter} implementation that only uses property name
- * to determine whether to serialize property as is, or to filter it out.
- */
-public abstract class SimpleBeanPropertyFilter
-    implements BeanPropertyFilter // sub-classes must also implement java.io.Serializable
-{
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected SimpleBeanPropertyFilter() { }
-
-    /**
-     * Factory method to construct filter that filters out all properties <b>except</b>
-     * ones includes in set
-     */
-    public static SimpleBeanPropertyFilter filterOutAllExcept(Set<String> properties) {
-        return new FilterExceptFilter(properties);
-    }
-
-    public static SimpleBeanPropertyFilter filterOutAllExcept(String... propertyArray) {
-        HashSet<String> properties = new HashSet<String>(propertyArray.length);
-        Collections.addAll(properties, propertyArray);
-        return new FilterExceptFilter(properties);
-    }
-
-    public static SimpleBeanPropertyFilter serializeAllExcept(Set<String> properties) {
-        return new SerializeExceptFilter(properties);
-    }
-
-    public static SimpleBeanPropertyFilter serializeAllExcept(String... propertyArray) {
-        HashSet<String> properties = new HashSet<String>(propertyArray.length);
-        Collections.addAll(properties, propertyArray);
-        return new SerializeExceptFilter(properties);
-    }
-
-    /*
-    /**********************************************************
-    /* Methods for sub-classes
-    /**********************************************************
-     */
-
-    /**
-     * Method called to determine whether property will be included
-     * (if 'true' returned) or filtered out (if 'false' returned)
-     */
-    protected abstract boolean include(BeanPropertyWriter writer);
-
-    public void serializeAsField(Object bean, JsonGenerator jgen,
-            SerializerProvider provider, BeanPropertyWriter writer) throws Exception
-    {
-        if (include(writer)) {
-            writer.serializeAsField(bean, jgen, provider);
-        }
-    }
-
-    
-    public void depositSchemaProperty(BeanPropertyWriter writer,
-            ObjectNode propertiesNode, SerializerProvider provider)
-        throws JsonMappingException
-    {
-        if (include(writer)) {
-            writer.depositSchemaProperty(propertiesNode, provider);
-        }
-    }
-
-    public void depositSchemaProperty(BeanPropertyWriter writer,
-            JsonObjectFormatVisitor objectVisitor, SerializerProvider provider)
-        throws JsonMappingException
-    {
-        if (include(writer)) {
-            writer.depositSchemaProperty(objectVisitor);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Sub-classes
-    /**********************************************************
-     */
-
-    /**
-     * Filter implementation which defaults to filtering out unknown
-     * properties and only serializes ones explicitly listed.
-     */
-    public static class FilterExceptFilter
-        extends SimpleBeanPropertyFilter
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * Set of property names to serialize.
-         */
-        protected final Set<String> _propertiesToInclude;
-
-        public FilterExceptFilter(Set<String> properties) {
-            _propertiesToInclude = properties;
-        }
-
-        @Override
-        protected boolean include(BeanPropertyWriter writer) {
-            return _propertiesToInclude.contains(writer.getName());
-        }
-    }
-
-    /**
-     * Filter implementation which defaults to serializing all
-     * properties, except for ones explicitly listed to be filtered out.
-     */
-    public static class SerializeExceptFilter
-        extends SimpleBeanPropertyFilter
-    {
-        /**
-         * Set of property names to filter out.
-         */
-        protected final Set<String> _propertiesToExclude;
-
-        public SerializeExceptFilter(Set<String> properties) {
-            _propertiesToExclude = properties;
-        }
-
-        @Override
-        protected boolean include(BeanPropertyWriter writer) {
-            return !_propertiesToExclude.contains(writer.getName());
-        }
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java
deleted file mode 100644
index f7febc0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/SimpleFilterProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.ser.*;
-
-/**
- * Simple {@link FilterProvider} implementation that just stores
- * direct id-to-filter mapping.
- */
-public class SimpleFilterProvider
-    extends FilterProvider
-    implements java.io.Serializable // since 2.1
-{
-    // generated for 2.1.0
-    private static final long serialVersionUID = -2825494703774121220L;
-
-    /**
-     * Mappings from ids to filters.
-     */
-    protected final Map<String,BeanPropertyFilter> _filtersById;
-
-    /**
-     * This is the filter we return in case no mapping was found for
-     * given id; default is 'null' (in which case caller typically
-     * reports an error), but can be set to an explicit filter.
-     */
-    protected BeanPropertyFilter _defaultFilter;
-
-    /**
-     * Flag that indicates whether request for an unknown filter id should
-     * result an exception (default) or not.
-     * Note that this is only relevant if no default filter has been
-     * configured.
-     */
-    protected boolean _cfgFailOnUnknownId = true;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: constructing, configuring
-    /**********************************************************
-     */
-    
-    public SimpleFilterProvider() {
-        this(new HashMap<String,BeanPropertyFilter>());
-    }
-
-    /**
-     * @param mapping Mapping from id to filter; used as is, no copy is made.
-     */
-    public SimpleFilterProvider(Map<String,BeanPropertyFilter> mapping) {
-        _filtersById = mapping;
-    }
-    
-    /**
-     * Method for defining filter to return for "unknown" filters; cases
-     * where there is no mapping from given id to an explicit filter.
-     * 
-     * @param f Filter to return when no filter is found for given id
-     */
-    public SimpleFilterProvider setDefaultFilter(BeanPropertyFilter f)
-    {
-        _defaultFilter = f;
-        return this;
-    }
-
-    public BeanPropertyFilter getDefaultFilter() {
-        return _defaultFilter;
-    }
-    
-    public SimpleFilterProvider setFailOnUnknownId(boolean state) {
-        _cfgFailOnUnknownId = state;
-        return this;
-    }
-
-    public boolean willFailOnUnknownId() {
-        return _cfgFailOnUnknownId;
-    }
-    
-    public SimpleFilterProvider addFilter(String id, BeanPropertyFilter filter) {
-        _filtersById.put(id, filter);
-        return this;
-    }
-
-    public BeanPropertyFilter removeFilter(String id) {
-        return _filtersById.remove(id);
-    }
-
-    /*
-    /**********************************************************
-    /* Public lookup API
-    /**********************************************************
-     */
-    
-    @Override
-    public BeanPropertyFilter findFilter(Object filterId)
-    {
-        BeanPropertyFilter f = _filtersById.get(filterId);
-        if (f == null) {
-            f = _defaultFilter;
-            if (f == null && _cfgFailOnUnknownId) {
-                throw new IllegalArgumentException("No filter configured with id '"+filterId+"' (type "
-                        +filterId.getClass().getName()+")");
-            }
-        }
-        return f;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
deleted file mode 100644
index 556e197..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.std.ArraySerializerBase;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Standard serializer used for <code>String[]</code> values.
- */
-@JacksonStdImpl
-public class StringArraySerializer
-    extends ArraySerializerBase<String[]>
-    implements ContextualSerializer
-{
-    /* Note: not clean in general, but we are betting against
-     * anyone re-defining properties of String.class here...
-     */
-    private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(String.class);
-
-    public final static StringArraySerializer instance = new StringArraySerializer();
-    
-    /**
-     * Value serializer to use, if it's not the standard one
-     * (if it is we can optimize serialization a lot)
-     */
-    protected final JsonSerializer<Object> _elementSerializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected StringArraySerializer() {
-        super(String[].class, null);
-        _elementSerializer = null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public StringArraySerializer(StringArraySerializer src,
-            BeanProperty prop, JsonSerializer<?> ser) {
-        super(src, prop);
-        _elementSerializer = (JsonSerializer<Object>) ser;
-    }
-    
-    /**
-     * Strings never add type info; hence, even if type serializer is suggested,
-     * we'll ignore it...
-     */
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-    
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _elementSerializer;
-        }
-        if (ser == null) {
-            ser = provider.findValueSerializer(String.class, property);
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        // Optimization: default serializer just writes String, so we can avoid a call:
-        if (isDefaultSerializer(ser)) {
-            ser = null;
-        }
-        // note: will never have TypeSerializer, because Strings are "natural" type
-        if (ser == _elementSerializer) {
-            return this;
-        }
-        return new StringArraySerializer(this, property, ser);
-    }
-
-    /*
-    /**********************************************************
-    /* Simple accessors
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return VALUE_TYPE;
-    }
-
-    @Override
-    public JsonSerializer<?> getContentSerializer() {
-        return _elementSerializer;
-    }
-    
-    @Override
-    public boolean isEmpty(String[] value) {
-        return (value == null) || (value.length == 0);
-    }
-
-    @Override
-    public boolean hasSingleElement(String[] value) {
-        return (value.length == 1);
-    }
-    
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serializeContents(String[] value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.length;
-        if (len == 0) {
-            return;
-        }
-        if (_elementSerializer != null) {
-            serializeContentsSlow(value, jgen, provider, _elementSerializer);
-            return;
-        }
-        /* 08-Dec-2008, tatus: If we want this to be fully overridable
-         *  (for example, to support String cleanup during writing
-         *  or something), we should find serializer  by provider.
-         *  But for now, that seems like an overkill: and caller can
-         *  add custom serializer if that is needed as well.
-         * (ditto for null values)
-         */
-        //JsonSerializer<String> ser = (JsonSerializer<String>)provider.findValueSerializer(String.class);
-        for (int i = 0; i < len; ++i) {
-            String str = value[i];
-            if (str == null) {
-                jgen.writeNull();
-            } else {
-                //ser.serialize(value[i], jgen, provider);
-                jgen.writeString(value[i]);
-            }
-        }
-    }
-
-    private void serializeContentsSlow(String[] value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
-    {
-        for (int i = 0, len = value.length; i < len; ++i) {
-            String str = value[i];
-            if (str == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                ser.serialize(value[i], jgen, provider);
-            }
-        }
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        ObjectNode o = createSchemaNode("array", true);
-        o.put("items", createSchemaNode("string"));
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.STRING);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
deleted file mode 100644
index 506f56a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.std.StaticListSerializerBase;
-
-/**
- * Efficient implement for serializing {@link Collection}s that contain Strings.
- * The only complexity is due to possibility that serializer for {@link String}
- * may be overridde; because of this, logic is needed to ensure that the default
- * serializer is in use to use fastest mode, or if not, to defer to custom
- * String serializer.
- */
-@JacksonStdImpl
-public class StringCollectionSerializer
-    extends StaticListSerializerBase<Collection<String>>
-    implements ContextualSerializer
-{
-    public final static StringCollectionSerializer instance = new StringCollectionSerializer();
-    
-    protected final JsonSerializer<String> _serializer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected StringCollectionSerializer() {
-        this(null);
-    }
-
-    @SuppressWarnings("unchecked")
-    protected StringCollectionSerializer(JsonSerializer<?> ser)
-    {
-        super(Collection.class);
-        _serializer = (JsonSerializer<String>) ser;
-    }        
-    
-    @Override protected JsonNode contentSchema() {
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    protected void acceptContentVisitor(JsonArrayFormatVisitor visitor) {
-        visitor.itemsFormat(JsonFormatTypes.STRING);
-    }
-
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-    
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _serializer;
-        }
-        if (ser == null) {
-            ser = provider.findValueSerializer(String.class, property);
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        // Optimization: default serializer just writes String, so we can avoid a call:
-        if (isDefaultSerializer(ser)) {
-            ser = null;
-        }
-        // note: will never have TypeSerializer, because Strings are "natural" type
-        if (ser == _serializer) {
-            return this;
-        }
-        return new StringCollectionSerializer(ser);
-    }
-
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serialize(Collection<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeStartArray();
-        if (_serializer == null) {
-            serializeContents(value, jgen, provider);
-        } else {
-            serializeUsingCustom(value, jgen, provider);
-        }
-        jgen.writeEndArray();
-    }
-    
-    @Override
-    public void serializeWithType(Collection<String> value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForArray(value, jgen);
-        if (_serializer == null) {
-            serializeContents(value, jgen, provider);
-        } else {
-            serializeUsingCustom(value, jgen, provider);
-        }
-        typeSer.writeTypeSuffixForArray(value, jgen);
-    }
-    
-    private final void serializeContents(Collection<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_serializer != null) {
-            serializeUsingCustom(value, jgen, provider);
-            return;
-        }
-        int i = 0;
-        for (String str : value) {
-            try {
-                if (str == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    jgen.writeString(str);
-                }
-                ++i;
-            } catch (Exception e) {
-                wrapAndThrow(provider, e, value, i);
-            }
-        }
-    }
-
-    private void serializeUsingCustom(Collection<String> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final JsonSerializer<String> ser = _serializer;
-        int i = 0;
-        for (String str : value) {
-            try {
-                if (str == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    ser.serialize(str, jgen, provider);
-                }
-            } catch (Exception e) {
-                wrapAndThrow(provider, e, value, i);
-            }
-       }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.java
deleted file mode 100644
index d2ac529..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/TypeWrappedSerializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Simple serializer that will call configured type serializer, passing
- * in configured data serializer, and exposing it all as a simple
- * serializer.
- */
-public final class TypeWrappedSerializer
-    extends JsonSerializer<Object>
-{
-    final protected TypeSerializer _typeSerializer;
-    final protected JsonSerializer<Object> _serializer;
-
-    @SuppressWarnings("unchecked")
-    public TypeWrappedSerializer(TypeSerializer typeSer, JsonSerializer<?> ser)
-    {
-        super();
-        _typeSerializer = typeSer;
-        _serializer = (JsonSerializer<Object>) ser;
-    }
-
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        _serializer.serializeWithType(value, jgen, provider, _typeSerializer);
-    }
-
-    @Override
-    public void serializeWithType(Object value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        /* Is this an erroneous call? For now, let's assume it is not, and
-         * that type serializer is just overridden if so
-         */
-        _serializer.serializeWithType(value, jgen, provider, typeSer);
-    }
-    
-    @Override
-    public Class<Object> handledType() { return Object.class; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java
deleted file mode 100644
index ba4b990..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
-public class UnknownSerializer
-    extends StdSerializer<Object>
-{
-    public UnknownSerializer() {
-        super(Object.class);
-    }
-    
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonMappingException
-    {
-        // 27-Nov-2009, tatu: As per [JACKSON-201] may or may not fail...
-        if (provider.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS)) {
-            failForEmpty(value);
-        }
-        // But if it's fine, we'll just output empty JSON Object:
-        jgen.writeStartObject();
-        jgen.writeEndObject();
-    }
-
-    @Override
-    public final void serializeWithType(Object value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        if (provider.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS)) {
-            failForEmpty(value);
-        }
-        typeSer.writeTypePrefixForObject(value, jgen);
-        typeSer.writeTypeSuffixForObject(value, jgen);
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint) throws JsonMappingException {
-        return null;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) { 
-    	visitor.expectAnyFormat(typeHint);
-    }
-
-    protected void failForEmpty(Object value) throws JsonMappingException
-    {
-        throw new JsonMappingException("No serializer found for class "+value.getClass().getName()+" and no properties discovered to create BeanSerializer (to avoid exception, disable SerializationConfig.SerializationFeature.FAIL_ON_EMPTY_BEANS) )");
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java
deleted file mode 100644
index f9a582d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Variant of {@link BeanPropertyWriter} which will handle unwrapping
- * of JSON Object (including of properties of Object within surrounding
- * JSON object, and not as sub-object).
- */
-public class UnwrappingBeanPropertyWriter
-    extends BeanPropertyWriter
-{
-    /**
-     * Transformer used to add prefix and/or suffix for properties
-     * of unwrapped POJO.
-     */
-    protected final NameTransformer _nameTransformer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public UnwrappingBeanPropertyWriter(BeanPropertyWriter base, NameTransformer unwrapper) {
-        super(base);
-        _nameTransformer = unwrapper;
-    }
-
-    private UnwrappingBeanPropertyWriter(UnwrappingBeanPropertyWriter base, NameTransformer transformer,
-            SerializedString name) {
-        super(base, name);
-        _nameTransformer = transformer;
-    }
-
-    @Override
-    public UnwrappingBeanPropertyWriter rename(NameTransformer transformer)
-    {
-        String oldName = _name.getValue();
-        String newName = transformer.transform(oldName);
-
-        // important: combine transformers:
-        transformer = NameTransformer.chainedTransformer(transformer, _nameTransformer);
-    
-        return new UnwrappingBeanPropertyWriter(this, transformer, new SerializedString(newName));
-    }
-
-    /*
-    /**********************************************************
-    /* Overrides
-    /**********************************************************
-     */
-    
-    @Override
-    public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws Exception
-    {
-        Object value = get(bean);
-        if (value == null) {
-            // Hmmh. I assume we MUST pretty much suppress nulls, since we
-            // can't really unwrap them...
-            return;
-        }
-        JsonSerializer<Object> ser = _serializer;
-        if (ser == null) {
-            Class<?> cls = value.getClass();
-            PropertySerializerMap map = _dynamicSerializers;
-            ser = map.serializerFor(cls);
-            if (ser == null) {
-                ser = _findAndAddDynamic(map, cls, prov);
-            }
-        }
-        if (_suppressableValue != null) {
-            if (MARKER_FOR_EMPTY == _suppressableValue) {
-                if (ser.isEmpty(value)) {
-                    return;
-                }
-            } else if (_suppressableValue.equals(value)) {
-                return;
-            }
-        }
-        // For non-nulls, first: simple check for direct cycles
-        if (value == bean) {
-            _handleSelfReference(bean, ser);
-        }
-
-        // note: must verify we are using unwrapping serializer; if not, will write field name
-        if (!ser.isUnwrappingSerializer()) {
-            jgen.writeFieldName(_name);
-        }
-
-        if (_typeSerializer == null) {
-            ser.serialize(value, jgen, prov);
-        } else {
-            ser.serializeWithType(value, jgen, prov, _typeSerializer);
-        }
-    }
-
-    // need to override as we must get unwrapping instance...
-    @Override
-    public void assignSerializer(JsonSerializer<Object> ser)
-    {
-        super.assignSerializer(ser);
-        if (_serializer != null) {
-            NameTransformer t = _nameTransformer;
-            if (_serializer.isUnwrappingSerializer()) {
-                t = NameTransformer.chainedTransformer(t, ((UnwrappingBeanSerializer) _serializer)._nameTransformer);
-            }
-            _serializer = _serializer.unwrappingSerializer(t);
-        }
-    }
-    
-    // need to override as we must get unwrapping instance...
-    @Override
-    protected JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            Class<?> type, SerializerProvider provider) throws JsonMappingException
-    {
-        JsonSerializer<Object> serializer;
-        if (_nonTrivialBaseType != null) {
-            JavaType subtype = provider.constructSpecializedType(_nonTrivialBaseType, type);
-            serializer = provider.findValueSerializer(subtype, this);
-        } else {
-            serializer = provider.findValueSerializer(type, this);
-        }
-        NameTransformer t = _nameTransformer;
-        if (serializer.isUnwrappingSerializer()) {
-            t = NameTransformer.chainedTransformer(t, ((UnwrappingBeanSerializer) serializer)._nameTransformer);
-        }
-        serializer = serializer.unwrappingSerializer(t);
-        
-        _dynamicSerializers = _dynamicSerializers.newWith(type, serializer);
-        return serializer;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java
deleted file mode 100644
index c4bb5ec..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-public class UnwrappingBeanSerializer
-    extends BeanSerializerBase
-{
-    /**
-     * Transformer used to add prefix and/or suffix for properties
-     * of unwrapped POJO.
-     */
-    protected final NameTransformer _nameTransformer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used for creating unwrapping instance of a
-     * standard <code>BeanSerializer</code>
-     */
-    public UnwrappingBeanSerializer(BeanSerializerBase src, NameTransformer transformer) {
-        super(src, transformer);
-        _nameTransformer = transformer;
-    }
-
-    public UnwrappingBeanSerializer(UnwrappingBeanSerializer src, ObjectIdWriter objectIdWriter) {    
-        super(src, objectIdWriter);
-        _nameTransformer = src._nameTransformer;
-    }
-
-    protected UnwrappingBeanSerializer(UnwrappingBeanSerializer src, String[] toIgnore) {
-        super(src, toIgnore);
-        _nameTransformer = src._nameTransformer;
-    }
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: factory methods, fluent factories
-    /**********************************************************
-     */
-
-    @Override
-    public JsonSerializer<Object> unwrappingSerializer(NameTransformer transformer) {
-        // !!! 23-Jan-2012, tatu: Should we chain transformers?
-        return new UnwrappingBeanSerializer(this, transformer);
-    }
-
-    @Override
-    public boolean isUnwrappingSerializer() {
-        return true; // sure is
-    }
-
-    @Override
-    public UnwrappingBeanSerializer withObjectIdWriter(ObjectIdWriter objectIdWriter) {
-        return new UnwrappingBeanSerializer(this, objectIdWriter);
-    }
-
-    @Override
-    protected UnwrappingBeanSerializer withIgnorals(String[] toIgnore) {
-        return new UnwrappingBeanSerializer(this, toIgnore);
-    }
-
-    /**
-     * JSON Array output can not be done if unwrapping operation is
-     * requested; so implementation will simply return 'this'.
-     */
-    @Override
-    protected BeanSerializerBase asArraySerializer() {
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializer implementation that differs between impls
-    /**********************************************************
-     */
-
-    /**
-     * Main serialization method that will delegate actual output to
-     * configured
-     * {@link BeanPropertyWriter} instances.
-     */
-    @Override
-    public final void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_objectIdWriter != null) {
-            serializeWithObjectId(bean, jgen, provider);
-            return;
-        }
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-    }
-
-    private final void serializeWithObjectId(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final ObjectIdWriter w = _objectIdWriter;
-        WritableObjectId oid = provider.findObjectId(bean, w.generator);
-        Object id = oid.id;
-        
-        if (id != null) { // have seen before; serialize just id
-            oid.serializer.serialize(id, jgen, provider);
-            return;
-        }
-        // if not, bit more work:
-        oid.serializer = w.serializer;
-        oid.id = id = oid.generator.generateId(bean);
-        // possibly. Or maybe not:
-        if (w.alwaysAsId) { 
-            oid.serializer.serialize(id, jgen, provider);
-            return;
-        }
-        
-        jgen.writeStartObject();
-        SerializedString name = w.propertyName;
-        if (name != null) {
-            jgen.writeFieldName(name);
-            w.serializer.serialize(id, jgen, provider);
-        }
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-        jgen.writeEndObject();
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override public String toString() {
-        return "UnwrappingBeanSerializer for "+handledType().getName();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/WritableObjectId.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/WritableObjectId.java
deleted file mode 100644
index 8d237bc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/WritableObjectId.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.databind.ser.impl;
-
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-
-/**
- * Simple value container used to keep track of Object Ids during
- * serialization.
- */
-public final class WritableObjectId
-{
-    public final ObjectIdGenerator<?> generator;
-    
-    public JsonSerializer<Object> serializer;
-
-    public Object id;
-    
-    public WritableObjectId(ObjectIdGenerator<?> generator) {
-        this.generator = generator;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/package-info.java
deleted file mode 100644
index d1b84bb..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/impl/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Contains implementation classes of serialization part of 
- * data binding.
- */
-package com.fasterxml.jackson.databind.ser.impl;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/package-info.java
deleted file mode 100644
index e8c31db..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Contains implementation classes of serialization part of 
- * data binding.
- */
-package com.fasterxml.jackson.databind.ser;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java
deleted file mode 100644
index 1f68d91..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.*;
-
-/**
- * Intermediate base class for serializers used for various
- * Java arrays.
- * 
- * @param <T> Type of arrays serializer handles
- */
-public abstract class ArraySerializerBase<T>
-    extends ContainerSerializer<T>
-{
-    protected final BeanProperty _property;
-
-    protected ArraySerializerBase(Class<T> cls)
-    {
-        super(cls);
-        _property = null;
-    }
-
-    protected ArraySerializerBase(Class<T> cls, BeanProperty property)
-    {
-        super(cls);
-        _property = property;
-    }
-
-    protected ArraySerializerBase(ArraySerializerBase<?> src)
-    {
-        super(src._handledType, false);
-        _property = src._property;
-    }
-    
-    protected ArraySerializerBase(ArraySerializerBase<?> src, BeanProperty property)
-    {
-        super(src._handledType, false);
-        _property = property;
-    }
-    
-    @Override
-    public final void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // [JACKSON-805]
-        if (provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED)
-                && hasSingleElement(value)) {
-            serializeContents(value, jgen, provider);
-            return;
-        }
-        jgen.writeStartArray();
-        serializeContents(value, jgen, provider);
-        jgen.writeEndArray();
-    }
-    
-    @Override
-    public final void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        // note: let's NOT consider [JACKSON-805] here; gets too complicated, and probably just won't work
-        typeSer.writeTypePrefixForArray(value, jgen);
-        serializeContents(value, jgen, provider);
-        typeSer.writeTypeSuffixForArray(value, jgen);
-    }
-
-    protected abstract void serializeContents(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java
deleted file mode 100644
index 42d6421..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-
-/**
- * Base class for serializers that will output contents as JSON
- * arrays; typically serializers used for {@link java.util.Collection}
- * and array types.
- */
-public abstract class AsArraySerializerBase<T>
-    extends ContainerSerializer<T>
-    implements ContextualSerializer
-{
-    protected final boolean _staticTyping;
-
-    protected final JavaType _elementType;
-
-    /**
-     * Type serializer used for values, if any.
-     */
-    protected final TypeSerializer _valueTypeSerializer;
-
-    /**
-     * Value serializer to use, if it can be statically determined
-     */
-    protected final JsonSerializer<Object> _elementSerializer;
-
-    /**
-     * Collection-valued property being serialized with this instance
-     */
-    protected final BeanProperty _property;
-
-    /**
-     * If element type can not be statically determined, mapping from
-     * runtime type to serializer is handled using this object
-     */
-    protected PropertySerializerMap _dynamicSerializers;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected AsArraySerializerBase(Class<?> cls, JavaType et, boolean staticTyping,
-            TypeSerializer vts, BeanProperty property, JsonSerializer<Object> elementSerializer)
-    {
-        // typing with generics is messy... have to resort to this:
-        super(cls, false);
-        _elementType = et;
-        // static if explicitly requested, or if element type is final
-        _staticTyping = staticTyping || (et != null && et.isFinal());
-        _valueTypeSerializer = vts;
-        _property = property;
-        _elementSerializer = elementSerializer;
-        _dynamicSerializers = PropertySerializerMap.emptyMap();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected AsArraySerializerBase(AsArraySerializerBase<?> src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> elementSerializer)
-    {
-        super(src);
-        _elementType = src._elementType;
-        _staticTyping = src._staticTyping;
-        _valueTypeSerializer = vts;
-        _property = src._property;
-        _elementSerializer = (JsonSerializer<Object>) elementSerializer;
-        _dynamicSerializers = src._dynamicSerializers;
-    }
-    
-    public abstract AsArraySerializerBase<T> withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer);
-
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-    
-    /**
-     * This method is needed to resolve contextual annotations like
-     * per-property overrides, as well as do recursive call
-     * to <code>createContextual</code> of content serializer, if
-     * known statically.
-     */
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        TypeSerializer typeSer = _valueTypeSerializer;
-        if (typeSer != null) {
-            typeSer = typeSer.forProperty(property);
-        }
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _elementSerializer;
-        }
-        if (ser == null) {
-            // 30-Sep-2012, tatu: One more thing -- if explicit content type is annotated,
-            //   we can consider it a static case as well.
-            if (_elementType != null) {
-                if (_staticTyping || hasContentTypeAnnotation(provider, property)) {
-                    ser = provider.findValueSerializer(_elementType, property);
-                }
-            }
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        if ((ser != _elementSerializer) || (property != _property) || _valueTypeSerializer != typeSer) {
-            return withResolved(property, typeSer, ser);
-        }
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public JavaType getContentType() {
-        return _elementType;
-    }
-
-    @Override
-    public JsonSerializer<?> getContentSerializer() {
-        return _elementSerializer;
-    }
-
-    /*
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public final void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // [JACKSON-805]
-        if (provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED)
-                && hasSingleElement(value)) {
-            serializeContents(value, jgen, provider);
-            return;
-        }
-        jgen.writeStartArray();
-        serializeContents(value, jgen, provider);
-        jgen.writeEndArray();
-    }
-    
-    @Override
-    public final void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        // note: let's NOT consider [JACKSON-805] here; gets too complicated, and probably just won't work
-        typeSer.writeTypePrefixForArray(value, jgen);
-        serializeContents(value, jgen, provider);
-        typeSer.writeTypeSuffixForArray(value, jgen);
-    }
-
-    protected abstract void serializeContents(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException;
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        /* 15-Jan-2010, tatu: This should probably be rewritten, given that
-         *    more information about content type is actually being explicitly
-         *    passed. So there should be less need to try to re-process that
-         *    information.
-         */
-        ObjectNode o = createSchemaNode("array", true);
-        JavaType contentType = null;
-        if (typeHint != null) {
-            JavaType javaType = provider.constructType(typeHint);
-            contentType = javaType.getContentType();
-            if (contentType == null) { // could still be parametrized (Iterators)
-                if (typeHint instanceof ParameterizedType) {
-                    Type[] typeArgs = ((ParameterizedType) typeHint).getActualTypeArguments();
-                    if (typeArgs.length == 1) {
-                        contentType = provider.constructType(typeArgs[0]);
-                    }
-                }
-            }
-        }
-        if (contentType == null && _elementType != null) {
-            contentType = _elementType;
-        }
-        if (contentType != null) {
-            JsonNode schemaNode = null;
-            // 15-Oct-2010, tatu: We can't serialize plain Object.class; but what should it produce here? Untyped?
-            if (contentType.getRawClass() != Object.class) {
-                JsonSerializer<Object> ser = provider.findValueSerializer(contentType, _property);
-                if (ser instanceof SchemaAware) {
-                    schemaNode = ((SchemaAware) ser).getSchema(provider, null);
-                }
-            }
-            if (schemaNode == null) {
-                schemaNode = JsonSchema.getDefaultSchemaNode();
-            }
-            o.put("items", schemaNode);
-        }
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        /* 15-Jan-2010, tatu: This should probably be rewritten, given that
-         *    more information about content type is actually being explicitly
-         *    passed. So there should be less need to try to re-process that
-         *    information.
-         */
-        //ObjectNode o = createSchemaNode("array", true);
-        JsonArrayFormatVisitor arrayVisitor = visitor.expectArrayFormat(typeHint);
-        JavaType contentType = null;
-        if (typeHint != null) {
-            contentType = typeHint.getContentType();
-            if (contentType == null) { // could still be parameterized (Iterators)
-                // 30-Sep-2012, tatu: This is wrong, should use TypeFactory... but it is alas
-                //    not being passed (oversight)
-                if (typeHint instanceof ParameterizedType) {
-                    Type[] typeArgs = ((ParameterizedType) typeHint).getActualTypeArguments();
-                    if (typeArgs.length == 1) {
-                        contentType = visitor.getProvider().constructType(typeArgs[0]);
-                    }
-                }
-            }
-        }
-        if (contentType == null && _elementType != null) {
-            contentType = _elementType;
-        }
-        if (contentType != null) {
-//            JsonNode schemaNode = null;
-            arrayVisitor.itemsFormat(contentType);
-        }
-    }
-
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            Class<?> type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        // did we get a new map of serializers? If so, start using it
-        if (map != result.map) {
-            _dynamicSerializers = result.map;
-        }
-        return result.serializer;
-    }
-
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            JavaType type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        if (map != result.map) {
-            _dynamicSerializers = result.map;
-        }
-        return result.serializer;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
deleted file mode 100644
index afc5e4e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
+++ /dev/null
@@ -1,693 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.ObjectIdInfo;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.jsonschema.JsonSerializableSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.*;
-import com.fasterxml.jackson.databind.ser.impl.ObjectIdWriter;
-import com.fasterxml.jackson.databind.ser.impl.PropertyBasedObjectIdGenerator;
-import com.fasterxml.jackson.databind.ser.impl.WritableObjectId;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.NameTransformer;
-
-/**
- * Base class both for the standard bean serializer, and couple
- * of variants that only differ in small details.
- * Can be used for custom bean serializers as well, although that
- * is not the primary design goal.
- */
-public abstract class BeanSerializerBase
-    extends StdSerializer<Object>
-    implements ContextualSerializer, ResolvableSerializer,
-        JsonFormatVisitable, SchemaAware
-{
-    final protected static BeanPropertyWriter[] NO_PROPS = new BeanPropertyWriter[0];
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Writers used for outputting actual property values
-     */
-    final protected BeanPropertyWriter[] _props;
-
-    /**
-     * Optional filters used to suppress output of properties that
-     * are only to be included in certain views
-     */
-    final protected BeanPropertyWriter[] _filteredProps;
-
-    /**
-     * Handler for {@link com.fasterxml.jackson.annotation.JsonAnyGetter}
-     * annotated properties
-     */
-    final protected AnyGetterWriter _anyGetterWriter;
-    
-    /**
-     * Id of the bean property filter to use, if any; null if none.
-     */
-    final protected Object _propertyFilterId;
-
-    /**
-     * If using custom type ids (usually via getter, or field), this is the
-     * reference to that member.
-     */
-    final protected AnnotatedMember _typeId;
-    
-    /**
-     * If this POJO can be alternatively serialized using just an object id
-     * to denote a reference to previously serialized object,
-     * this Object will handle details.
-     */
-    final protected ObjectIdWriter _objectIdWriter;
-
-    /**
-     * Requested shape from bean class annotations.
-     */
-    final protected JsonFormat.Shape _serializationShape;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle: constructors
-    /**********************************************************
-     */
-
-    /**
-     * Constructor used by {@link BeanSerializerBuilder} to create an
-     * instance
-     * 
-     * @param type Nominal type of values handled by this serializer
-     * @param builder Builder for accessing other collected information
-     */
-    protected BeanSerializerBase(JavaType type, BeanSerializerBuilder builder,
-            BeanPropertyWriter[] properties, BeanPropertyWriter[] filteredProperties)
-    {
-        super(type);
-        _props = properties;
-        _filteredProps = filteredProperties;
-        if (builder == null) { // mostly for testing
-            _typeId = null;
-            _anyGetterWriter = null;
-            _propertyFilterId = null;
-            _objectIdWriter = null;
-            _serializationShape = null;
-        } else {
-            _typeId = builder.getTypeId();
-            _anyGetterWriter = builder.getAnyGetter();
-            _propertyFilterId = builder.getFilterId();
-            _objectIdWriter = builder.getObjectIdWriter();
-            JsonFormat.Value format = builder.getBeanDescription().findExpectedFormat(null);
-            _serializationShape = (format == null) ? null : format.getShape();
-        }
-    }
-
-    public BeanSerializerBase(BeanSerializerBase src,
-            BeanPropertyWriter[] properties, BeanPropertyWriter[] filteredProperties)
-    {
-        super(src._handledType);
-        _props = properties;
-        _filteredProps = filteredProperties;
-
-        _typeId = src._typeId;
-        _anyGetterWriter = src._anyGetterWriter;
-        _objectIdWriter = src._objectIdWriter;
-        _propertyFilterId = src._propertyFilterId;
-        _serializationShape = src._serializationShape;
-    }
-
-    protected BeanSerializerBase(BeanSerializerBase src, ObjectIdWriter objectIdWriter)
-    {
-        super(src._handledType);
-        _props = src._props;
-        _filteredProps = src._filteredProps;
-        
-        _typeId = src._typeId;
-        _anyGetterWriter = src._anyGetterWriter;
-        _objectIdWriter = objectIdWriter;
-        _propertyFilterId = src._propertyFilterId;
-        _serializationShape = src._serializationShape;
-    }
-
-    protected BeanSerializerBase(BeanSerializerBase src, String[] toIgnore)
-    {
-        super(src._handledType);
-
-        // Bit clumsy, but has to do:
-        HashSet<String> ignoredSet = ArrayBuilders.arrayToSet(toIgnore);
-        final BeanPropertyWriter[] propsIn = src._props;
-        final BeanPropertyWriter[] fpropsIn = src._filteredProps;
-        final int len = propsIn.length;
-
-        ArrayList<BeanPropertyWriter> propsOut = new ArrayList<BeanPropertyWriter>(len);
-        ArrayList<BeanPropertyWriter> fpropsOut = (fpropsIn == null) ? null : new ArrayList<BeanPropertyWriter>(len);
-
-        for (int i = 0; i < len; ++i) {
-            BeanPropertyWriter bpw = propsIn[i];
-            // should be ignored?
-            if (ignoredSet.contains(bpw.getName())) {
-                continue;
-            }
-            propsOut.add(bpw);
-            if (fpropsIn != null) {
-                fpropsOut.add(fpropsIn[i]);
-            }
-        }
-        _props = propsOut.toArray(new BeanPropertyWriter[propsOut.size()]);
-        _filteredProps = (fpropsOut == null) ? null : fpropsOut.toArray(new BeanPropertyWriter[fpropsOut.size()]);
-        
-        _typeId = src._typeId;
-        _anyGetterWriter = src._anyGetterWriter;
-        _objectIdWriter = src._objectIdWriter;
-        _propertyFilterId = src._propertyFilterId;
-        _serializationShape = src._serializationShape;
-    }
-    
-    /**
-     * Fluent factory used for creating a new instance with different
-     * {@link ObjectIdWriter}.
-     * 
-     * @since 2.0
-     */
-    public abstract BeanSerializerBase withObjectIdWriter(ObjectIdWriter objectIdWriter);
-
-    /**
-     * Fluent factory used for creating a new instance with additional
-     * set of properties to ignore (from properties this instance otherwise has)
-     * 
-     * @since 2.0
-     */
-    protected abstract BeanSerializerBase withIgnorals(String[] toIgnore);
-
-    /**
-     * Fluent factory for creating a variant that output POJO as a
-     * JSON Array. Implementations may ignore this request if output
-     * as array is not possible (either at all, or reliably).
-     * 
-     * @since 2.1
-     */
-    protected abstract BeanSerializerBase asArraySerializer();
-    
-    /**
-     * Copy-constructor that is useful for sub-classes that just want to
-     * copy all super-class properties without modifications.
-     */
-    protected BeanSerializerBase(BeanSerializerBase src) {
-        this(src, src._props, src._filteredProps);
-    }
-
-    /**
-     * Copy-constructor that will also rename properties with given prefix
-     * (if it's non-empty)
-     */
-    protected BeanSerializerBase(BeanSerializerBase src, NameTransformer unwrapper) {
-        this(src, rename(src._props, unwrapper), rename(src._filteredProps, unwrapper));
-    }
-    
-    private final static BeanPropertyWriter[] rename(BeanPropertyWriter[] props,
-            NameTransformer transformer)
-    {
-        if (props == null || props.length == 0 || transformer == null || transformer == NameTransformer.NOP) {
-            return props;
-        }
-        final int len = props.length;
-        BeanPropertyWriter[] result = new BeanPropertyWriter[len];
-        for (int i = 0; i < len; ++i) {
-            BeanPropertyWriter bpw = props[i];
-            if (bpw != null) {
-                result[i] = bpw.rename(transformer);
-            }
-        }
-        return result;
-    }
-
-    /*
-    /**********************************************************
-    /* Post-constriction processing: resolvable, contextual
-    /**********************************************************
-     */
-
-    /**
-     * We need to implement {@link ResolvableSerializer} to be able to
-     * properly handle cyclic type references.
-     */
-//  @Override
-    public void resolve(SerializerProvider provider)
-        throws JsonMappingException
-    {
-        int filteredCount = (_filteredProps == null) ? 0 : _filteredProps.length;
-        for (int i = 0, len = _props.length; i < len; ++i) {
-            BeanPropertyWriter prop = _props[i];
-            // let's start with null serializer resolution actually
-            if (!prop.willSuppressNulls() && !prop.hasNullSerializer()) {
-                JsonSerializer<Object> nullSer = provider.findNullValueSerializer(prop);
-                if (nullSer != null) {
-                    prop.assignNullSerializer(nullSer);
-                    // also: remember to replace filtered property too? (see [JACKSON-364])
-                    if (i < filteredCount) {
-                        BeanPropertyWriter w2 = _filteredProps[i];
-                        if (w2 != null) {
-                            w2.assignNullSerializer(nullSer);
-                        }
-                    }
-                }
-            }
-            
-            if (prop.hasSerializer()) {
-                continue;
-            }
-            // Was the serialization type hard-coded? If so, use it
-            JavaType type = prop.getSerializationType();
-            
-            /* It not, we can use declared return type if and only if
-             * declared type is final -- if not, we don't really know
-             * the actual type until we get the instance.
-             */
-            if (type == null) {
-                type = provider.constructType(prop.getGenericPropertyType());
-                if (!type.isFinal()) {
-                    /* 18-Feb-2010, tatus: But even if it is non-final, we may
-                     *   need to retain some of type information so that we can
-                     *   accurately handle contained types
-                     */
-                    if (type.isContainerType() || type.containedTypeCount() > 0) {
-                        prop.setNonTrivialBaseType(type);
-                    }
-                    continue;
-                }
-            }
-            
-            JsonSerializer<Object> ser = provider.findValueSerializer(type, prop);
-            /* 04-Feb-2010, tatu: We may have stashed type serializer for content types
-             *   too, earlier; if so, it's time to connect the dots here:
-             */
-            if (type.isContainerType()) {
-                TypeSerializer typeSer = type.getContentType().getTypeHandler();
-                if (typeSer != null) {
-                    // for now, can do this only for standard containers...
-                    if (ser instanceof ContainerSerializer<?>) {
-                        // ugly casts... but necessary
-                        @SuppressWarnings("unchecked")
-                        JsonSerializer<Object> ser2 = (JsonSerializer<Object>)((ContainerSerializer<?>) ser).withValueTypeSerializer(typeSer);
-                        ser = ser2;
-                    }
-                }
-            }
-            prop.assignSerializer(ser);
-            // and maybe replace filtered property too? (see [JACKSON-364])
-            if (i < filteredCount) {
-                BeanPropertyWriter w2 = _filteredProps[i];
-                if (w2 != null) {
-                    w2.assignSerializer(ser);
-                }
-            }
-        }
-
-        // also, any-getter may need to be resolved
-        if (_anyGetterWriter != null) {
-            _anyGetterWriter.resolve(provider);
-        }
-    }
-
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        ObjectIdWriter oiw = _objectIdWriter;
-        String[] ignorals = null;
-        final AnnotationIntrospector intr = provider.getAnnotationIntrospector();
-        final AnnotatedMember accessor = (property == null || intr == null)
-                ? null : property.getMember();
-        
-        // First: may have an override for Object Id:
-        if (accessor != null) {
-            ignorals = intr.findPropertiesToIgnore(accessor);
-            ObjectIdInfo objectIdInfo = intr.findObjectIdInfo(accessor);
-            if (objectIdInfo == null) {
-                // no ObjectId override, but maybe ObjectIdRef?
-                if (oiw != null) {
-                    objectIdInfo = intr.findObjectReferenceInfo(accessor, new ObjectIdInfo("", null, null));
-                    oiw = _objectIdWriter.withAlwaysAsId(objectIdInfo.getAlwaysAsId());
-                }
-            } else {
-                /* Ugh: mostly copied from BeanSerializerBase: but can't easily
-                 * change it to be able to move to SerializerProvider (where it
-                 * really belongs)
-                 */
-                
-                // 2.1: allow modifications by "id ref" annotations as well:
-                objectIdInfo = intr.findObjectReferenceInfo(accessor, objectIdInfo);
-                ObjectIdGenerator<?> gen;
-                Class<?> implClass = objectIdInfo.getGeneratorType();
-                JavaType type = provider.constructType(implClass);
-                JavaType idType = provider.getTypeFactory().findTypeParameters(type, ObjectIdGenerator.class)[0];
-                // Property-based generator is trickier
-                if (implClass == ObjectIdGenerators.PropertyGenerator.class) { // most special one, needs extra work
-                    String propName = objectIdInfo.getPropertyName();
-                    BeanPropertyWriter idProp = null;
-
-                    for (int i = 0, len = _props.length ;; ++i) {
-                        if (i == len) {
-                            throw new IllegalArgumentException("Invalid Object Id definition for "+_handledType.getName()
-                                    +": can not find property with name '"+propName+"'");
-                        }
-                        BeanPropertyWriter prop = _props[i];
-                        if (propName.equals(prop.getName())) {
-                            idProp = prop;
-                            /* Let's force it to be the first property to output
-                             * (although it may still get rearranged etc)
-                             */
-                            if (i > 0) { // note: must shuffle both regular properties and filtered
-                                System.arraycopy(_props, 0, _props, 1, i);
-                                _props[0] = idProp;
-                                if (_filteredProps != null) {
-                                    BeanPropertyWriter fp = _filteredProps[i];
-                                    System.arraycopy(_filteredProps, 0, _filteredProps, 1, i);
-                                    _filteredProps[0] = fp;
-                                }
-                            }
-                            break;
-                        }
-                    }
-                    idType = idProp.getType();
-                    gen = new PropertyBasedObjectIdGenerator(objectIdInfo, idProp);
-                    oiw = ObjectIdWriter.construct(idType, null, gen, objectIdInfo.getAlwaysAsId());
-                } else { // other types need to be simpler
-                    gen = provider.objectIdGeneratorInstance(accessor, objectIdInfo);
-                    oiw = ObjectIdWriter.construct(idType, objectIdInfo.getPropertyName(), gen,
-                            objectIdInfo.getAlwaysAsId());
-                }
-            }
-        }
-        // either way, need to resolve serializer:
-        BeanSerializerBase contextual = this;
-        if (oiw != null) {
-            JsonSerializer<?> ser = provider.findValueSerializer(oiw.idType, property);
-            oiw = oiw.withSerializer(ser);
-            if (oiw != _objectIdWriter) {
-                contextual = contextual.withObjectIdWriter(oiw);
-            }
-        }
-        // And possibly add more properties to ignore
-        if (ignorals != null && ignorals.length != 0) {
-            contextual = contextual.withIgnorals(ignorals);
-        }
-        // One more thing: are we asked to serialize POJO as array?
-        JsonFormat.Shape shape = null;
-        if (accessor != null) {
-            JsonFormat.Value format = intr.findFormat((Annotated) accessor);
-
-            if (format != null) {
-                shape = format.getShape();
-            }
-        }
-        if (shape == null) {
-            shape = _serializationShape;
-        }
-        if (shape == JsonFormat.Shape.ARRAY) {
-            contextual = contextual.asArraySerializer();
-        }
-        return contextual;
-    }
-    
-    /*
-    /**********************************************************
-    /* Partial JsonSerializer implementation
-    /**********************************************************
-     */
-
-    @Override
-    public boolean usesObjectId() {
-        return (_objectIdWriter != null);
-    }
-    
-    // Main serialization method left unimplemented
-    @Override
-    public abstract void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException;
-
-    // Type-info-augmented case implemented as it does not usually differ between impls
-    @Override
-    public void serializeWithType(Object bean, JsonGenerator jgen,
-            SerializerProvider provider, TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        if (_objectIdWriter != null) {
-            _serializeWithObjectId(bean, jgen, provider, typeSer);
-            return;
-        }
-
-        String typeStr = (_typeId == null) ? null :_customTypeId(bean);
-        if (typeStr == null) {
-            typeSer.writeTypePrefixForObject(bean, jgen);
-        } else {
-            typeSer.writeCustomTypePrefixForObject(bean, jgen, typeStr);
-        }
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-        if (typeStr == null) {
-            typeSer.writeTypeSuffixForObject(bean, jgen);
-        } else {
-            typeSer.writeCustomTypeSuffixForObject(bean, jgen, typeStr);
-        }
-    }
-
-    private final void _serializeWithObjectId(Object bean,
-            JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        final ObjectIdWriter w = _objectIdWriter;
-        WritableObjectId oid = provider.findObjectId(bean, w.generator);
-        Object id = oid.id;
-        
-        if (id != null) { // have seen before; serialize just id
-            oid.serializer.serialize(id, jgen, provider);
-            return;
-        }
-        // if not, bit more work:
-        oid.serializer = w.serializer;
-        oid.id = id = oid.generator.generateId(bean);
-        
-        String typeStr = (_typeId == null) ? null :_customTypeId(bean);
-        if (typeStr == null) {
-            typeSer.writeTypePrefixForObject(bean, jgen);
-        } else {
-            typeSer.writeCustomTypePrefixForObject(bean, jgen, typeStr);
-        }
-
-        // Very first thing: inject the id property
-        SerializedString name = w.propertyName;
-        if (name != null) {
-            jgen.writeFieldName(name);
-            w.serializer.serialize(id, jgen, provider);
-        }
-
-        if (_propertyFilterId != null) {
-            serializeFieldsFiltered(bean, jgen, provider);
-        } else {
-            serializeFields(bean, jgen, provider);
-        }
-        if (typeStr == null) {
-            typeSer.writeTypeSuffixForObject(bean, jgen);
-        } else {
-            typeSer.writeCustomTypeSuffixForObject(bean, jgen, typeStr);
-        }
-    }
-    
-    private final String _customTypeId(Object bean)
-    {
-        final Object typeId = _typeId.getValue(bean);
-        if (typeId == null) {
-            return "";
-        }
-        return (typeId instanceof String) ? (String) typeId : typeId.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Field serialization methods
-    /**********************************************************
-     */
-
-    protected void serializeFields(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final BeanPropertyWriter[] props;
-        if (_filteredProps != null && provider.getSerializationView() != null) {
-            props = _filteredProps;
-        } else {
-            props = _props;
-        }
-        int i = 0;
-        try {
-            for (final int len = props.length; i < len; ++i) {
-                BeanPropertyWriter prop = props[i];
-                if (prop != null) { // can have nulls in filtered list
-                    prop.serializeAsField(bean, jgen, provider);
-                }
-            }
-            if (_anyGetterWriter != null) {
-                _anyGetterWriter.getAndSerialize(bean, jgen, provider);
-            }
-        } catch (Exception e) {
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            wrapAndThrow(provider, e, bean, name);
-        } catch (StackOverflowError e) {
-            /* 04-Sep-2009, tatu: Dealing with this is tricky, since we do not
-             *   have many stack frames to spare... just one or two; can't
-             *   make many calls.
-             */
-            JsonMappingException mapE = new JsonMappingException("Infinite recursion (StackOverflowError)", e);
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            mapE.prependPath(new JsonMappingException.Reference(bean, name));
-            throw mapE;
-        }
-    }
-
-    /**
-     * Alternative serialization method that gets called when there is a
-     * {@link BeanPropertyFilter} that needs to be called to determine
-     * which properties are to be serialized (and possibly how)
-     */
-    protected void serializeFieldsFiltered(Object bean, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        /* note: almost verbatim copy of "serializeFields"; copied (instead of merged)
-         * so that old method need not add check for existence of filter.
-         */
-        
-        final BeanPropertyWriter[] props;
-        if (_filteredProps != null && provider.getSerializationView() != null) {
-            props = _filteredProps;
-        } else {
-            props = _props;
-        }
-        final BeanPropertyFilter filter = findFilter(provider);
-        // better also allow missing filter actually..
-        if (filter == null) {
-            serializeFields(bean, jgen, provider);
-            return;
-        }
-        
-        int i = 0;
-        try {
-            for (final int len = props.length; i < len; ++i) {
-                BeanPropertyWriter prop = props[i];
-                if (prop != null) { // can have nulls in filtered list
-                    filter.serializeAsField(bean, jgen, provider, prop);
-                }
-            }
-            if (_anyGetterWriter != null) {
-                _anyGetterWriter.getAndSerialize(bean, jgen, provider);
-            }
-        } catch (Exception e) {
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            wrapAndThrow(provider, e, bean, name);
-        } catch (StackOverflowError e) {
-            JsonMappingException mapE = new JsonMappingException("Infinite recursion (StackOverflowError)", e);
-            String name = (i == props.length) ? "[anySetter]" : props[i].getName();
-            mapE.prependPath(new JsonMappingException.Reference(bean, name));
-            throw mapE;
-        }
-    }
-
-    /**
-     * Helper method used to locate filter that is needed, based on filter id
-     * this serializer was constructed with.
-     */
-    protected BeanPropertyFilter findFilter(SerializerProvider provider)
-        throws JsonMappingException
-    {
-        final Object filterId = _propertyFilterId;
-        FilterProvider filters = provider.getFilterProvider();
-        // Not ok to miss the provider, if a filter is declared to be needed.
-        if (filters == null) {
-            throw new JsonMappingException("Can not resolve BeanPropertyFilter with id '"+filterId+"'; no FilterProvider configured");
-        }
-        BeanPropertyFilter filter = filters.findFilter(filterId);
-        // But whether unknown ids are ok just depends on filter provider; if we get null that's fine
-        return filter;
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        ObjectNode o = createSchemaNode("object", true);
-        // [JACKSON-813]: Add optional JSON Schema id attribute, if found
-        // NOTE: not optimal, does NOT go through AnnotationIntrospector etc:
-        JsonSerializableSchema ann = _handledType.getAnnotation(JsonSerializableSchema.class);
-        if (ann != null) {
-            String id = ann.id();
-            if (id != null && id.length() > 0) {
-                o.put("id", id);
-            }
-        }
- 
-        //todo: should the classname go in the title?
-        //o.put("title", _className);
-        ObjectNode propertiesNode = o.objectNode();
-        final BeanPropertyFilter filter;
-        if (_propertyFilterId != null) {
-            filter = findFilter(provider);
-        } else {
-            filter = null;
-        }
-        		
-        for (int i = 0; i < _props.length; i++) {
-            BeanPropertyWriter prop = _props[i];
-            if (filter == null) {
-                prop.depositSchemaProperty(propertiesNode, provider);
-            } else {
-                filter.depositSchemaProperty(prop, propertiesNode, provider);
-            }
-
-        }
-        o.put("properties", propertiesNode);
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
-    	//deposit your output format 
-    	JsonObjectFormatVisitor objectVisitor = visitor.expectObjectFormat(typeHint);
- 
-        if (_propertyFilterId != null) {
-            BeanPropertyFilter filter = findFilter(visitor.getProvider());
-            for (int i = 0; i < _props.length; i++) {
-                filter.depositSchemaProperty(_props[i], objectVisitor, visitor.getProvider());
-            }
-        } else {
-            for (int i = 0; i < _props.length; i++) {
-                _props[i].depositSchemaProperty(objectVisitor);
-            }
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.java
deleted file mode 100644
index 3674d0a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/BooleanSerializer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-
-/**
- * Serializer used for primitive boolean, as well as java.util.Boolean
- * wrapper type.
- *<p>
- * Since this is one of "native" types, no type information is ever
- * included on serialization (unlike for most scalar types as of 1.5)
- */
-@JacksonStdImpl
-public final class BooleanSerializer
-    extends NonTypedScalarSerializerBase<Boolean>
-{
-    /**
-     * Whether type serialized is primitive (boolean) or wrapper
-     * (java.lang.Boolean); if true, former, if false, latter.
-     */
-    final boolean _forPrimitive;
-
-    public BooleanSerializer(boolean forPrimitive)
-    {
-        super(Boolean.class);
-        _forPrimitive = forPrimitive;
-    }
-
-    @Override
-    public void serialize(Boolean value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeBoolean(value.booleanValue());
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        return createSchemaNode("boolean", !_forPrimitive);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        visitor.expectBooleanFormat(typeHint);
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.java
deleted file mode 100644
index 4ec2b1d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CalendarSerializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.Calendar;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-
-/**
- * Standard serializer for {@link java.util.Calendar}.
- * As with other time/date types, is configurable to produce timestamps
- * (standard Java 64-bit timestamp) or textual formats (usually ISO-8601).
- */
-@JacksonStdImpl
-public class CalendarSerializer
-    extends DateTimeSerializerBase<Calendar>
-{
-    public static CalendarSerializer instance = new CalendarSerializer();
-
-    public CalendarSerializer() { this(false, null); }
-
-    public CalendarSerializer(boolean useTimestamp, DateFormat customFormat) {
-        super(Calendar.class, useTimestamp, customFormat);
-    }
-
-    @Override
-    public CalendarSerializer withFormat(boolean timestamp, DateFormat customFormat)
-    {
-        if (timestamp) {
-            return new CalendarSerializer(true, null);
-        }
-        return new CalendarSerializer(false, customFormat);
-    }
-
-    @Override
-    protected long _timestamp(Calendar value) {
-        return (value == null) ? 0L : value.getTimeInMillis();
-    }
-
-    @Override
-    public void serialize(Calendar value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_useTimestamp) {
-            jgen.writeNumber(_timestamp(value));
-        } else if (_customFormat != null) {
-            // 21-Feb-2011, tatu: not optimal, but better than alternatives:
-            synchronized (_customFormat) {
-                jgen.writeString(_customFormat.format(value));
-            }
-        } else {
-            provider.defaultSerializeDateValue(value.getTime(), jgen);
-        }
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java
deleted file mode 100644
index 2e85d39..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-
-
-/**
- * Fallback serializer for cases where Collection is not known to be
- * of type for which more specializer serializer exists (such as
- * index-accessible List).
- * If so, we will just construct an {@link java.util.Iterator}
- * to iterate over elements.
- */
-public class CollectionSerializer
-    extends AsArraySerializerBase<Collection<?>>
-{
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public CollectionSerializer(JavaType elemType, boolean staticTyping, TypeSerializer vts,
-            BeanProperty property, JsonSerializer<Object> valueSerializer)
-    {
-        super(Collection.class, elemType, staticTyping, vts, property, valueSerializer);
-    }
-
-    public CollectionSerializer(CollectionSerializer src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> valueSerializer)
-    {
-        super(src, property, vts, valueSerializer);
-    }
-    
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-        return new CollectionSerializer(_elementType, _staticTyping, vts, _property, _elementSerializer);
-    }
-
-    @Override
-    public CollectionSerializer withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer) {
-        return new CollectionSerializer(this, property, vts, elementSerializer);
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public boolean isEmpty(Collection<?> value) {
-        return (value == null) || value.isEmpty();
-    }
-
-    @Override
-    public boolean hasSingleElement(Collection<?> value) {
-        Iterator<?> it = value.iterator();
-        if (!it.hasNext()) {
-            return false;
-        }
-        it.next();
-        return !it.hasNext();
-    }
-    
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serializeContents(Collection<?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_elementSerializer != null) {
-            serializeContentsUsing(value, jgen, provider, _elementSerializer);
-            return;
-        }
-        Iterator<?> it = value.iterator();
-        if (!it.hasNext()) {
-            return;
-        }
-        PropertySerializerMap serializers = _dynamicSerializers;
-        final TypeSerializer typeSer = _valueTypeSerializer;
-
-        int i = 0;
-        try {
-            do {
-                Object elem = it.next();
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    Class<?> cc = elem.getClass();
-                    JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                    if (serializer == null) {
-                        // To fix [JACKSON-508]
-                        if (_elementType.hasGenericTypes()) {
-                            serializer = _findAndAddDynamic(serializers,
-                                    provider.constructSpecializedType(_elementType, cc), provider);
-                        } else {
-                            serializer = _findAndAddDynamic(serializers, cc, provider);
-                        }
-                        serializers = _dynamicSerializers;
-                    }
-                    if (typeSer == null) {
-                        serializer.serialize(elem, jgen, provider);
-                    } else {
-                        serializer.serializeWithType(elem, jgen, provider, typeSer);
-                    }
-                }
-                ++i;
-            } while (it.hasNext());
-        } catch (Exception e) {
-            // [JACKSON-55] Need to add reference information
-            wrapAndThrow(provider, e, value, i);
-        }
-    }
-
-    public void serializeContentsUsing(Collection<?> value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
-    {
-        Iterator<?> it = value.iterator();
-        if (it.hasNext()) {
-            TypeSerializer typeSer = _valueTypeSerializer;
-            int i = 0;
-            do {
-                Object elem = it.next();
-                try {
-                    if (elem == null) {
-                        provider.defaultSerializeNull(jgen);
-                    } else {
-                        if (typeSer == null) {
-                            ser.serialize(elem, jgen, provider);
-                        } else {
-                            ser.serializeWithType(elem, jgen, provider, typeSer);
-                        }
-                    }
-                    ++i;
-                } catch (Exception e) {
-                    // [JACKSON-55] Need to add reference information
-                    wrapAndThrow(provider, e, value, i);
-                }
-            } while (it.hasNext());
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateSerializer.java
deleted file mode 100644
index 8731b3d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateSerializer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-
-/**
- * For efficiency, we will serialize Dates as longs, instead of
- * potentially more readable Strings.
- */
-@JacksonStdImpl
-public class DateSerializer
-    extends DateTimeSerializerBase<Date>
-{
-    /**
-     * Default instance that is used when no contextual configuration
-     * is needed.
-     */
-    public static DateSerializer instance = new DateSerializer();
-    
-    public DateSerializer() {
-        this(false, null);
-    }
-        
-    public DateSerializer(boolean useTimestamp, DateFormat customFormat) {
-        super(Date.class, useTimestamp, customFormat);
-    }
-
-    @Override
-    public DateSerializer withFormat(boolean timestamp, DateFormat customFormat)
-    {
-        if (timestamp) {
-            return new DateSerializer(true, null);
-        }
-        return new DateSerializer(false, customFormat);
-    }
-
-    @Override
-    protected long _timestamp(Date value) {
-        return (value == null) ? 0L : value.getTime();
-    }
-
-    @Override
-    public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_useTimestamp) {
-            jgen.writeNumber(_timestamp(value));
-        } else if (_customFormat != null) {
-            // 21-Feb-2011, tatu: not optimal, but better than alternatives:
-            synchronized (_customFormat) {
-                jgen.writeString(_customFormat.format(value));
-            }
-        } else {
-            provider.defaultSerializeDateValue(value, jgen);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java
deleted file mode 100644
index 9ca54c8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/DateTimeSerializerBase.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-
-public abstract class DateTimeSerializerBase<T>
-    extends StdScalarSerializer<T>
-    implements ContextualSerializer
-{
-    /**
-     * Flag that indicates that serialization must be done as the
-     * Java timetamp, regardless of other settings.
-     */
-    protected final boolean _useTimestamp;
-    
-    /**
-     * Specific format to use, if not default format: non null value
-     * also indicates that serialization is to be done as JSON String,
-     * not numeric timestamp, unless {@link #_useTimestamp} is true.
-     */
-    protected final DateFormat _customFormat;
-
-    protected DateTimeSerializerBase(Class<T> type,
-            boolean useTimestamp, DateFormat customFormat)
-    {
-        super(type);
-        _useTimestamp = useTimestamp;
-        _customFormat = customFormat;
-    }
-
-    public abstract DateTimeSerializerBase<T> withFormat(boolean timestamp, DateFormat customFormat);
-
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider prov,
-            BeanProperty property) throws JsonMappingException
-    {
-        if (property != null) {
-            JsonFormat.Value format = prov.getAnnotationIntrospector().findFormat((Annotated)property.getMember());
-            if (format != null) {
-                // Simple case first: serialize as numeric timestamp?
-                if (format.getShape().isNumeric()) {
-                    return withFormat(true, null);
-                }
-                // If not, do we have a pattern?
-                TimeZone tz = format.getTimeZone();
-                String pattern = format.getPattern();
-                if (pattern.length() > 0){
-                    Locale loc = format.getLocale();
-                    if (loc == null) {
-                        loc = prov.getLocale();
-                    }
-                    SimpleDateFormat df = new SimpleDateFormat(pattern, loc);
-                    if (tz == null) {
-                        tz = prov.getTimeZone();
-                    }
-                    df.setTimeZone(tz);
-                    return withFormat(false, df);
-                }
-                // If not, do we at least have a custom timezone?
-                if (tz != null) {
-                    DateFormat df = prov.getConfig().getDateFormat();
-                    // one shortcut: with our custom format, can simplify handling a bit
-                    if (df.getClass() == StdDateFormat.class) {
-                        df = StdDateFormat.getISO8601Format(tz);
-                    } else {
-                        // otherwise need to clone, re-set timezone:
-                        df = (DateFormat) df.clone();
-                        df.setTimeZone(tz);
-                    }
-                    return withFormat(false, df);
-                }
-            }
-        }
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isEmpty(T value) {
-        // let's assume "null date" (timestamp 0) qualifies for empty
-        return (value == null) || (_timestamp(value) == 0L);
-    }
-
-    protected abstract long _timestamp(T value);
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        //todo: (ryan) add a format for the date in the schema?
-        boolean asNumber = _useTimestamp;
-        if (!asNumber) {
-            if (_customFormat == null) {
-                asNumber = provider.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-            }
-        }
-        return createSchemaNode(asNumber ? "number" : "string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        //todo: (ryan) add a format for the date in the schema?
-        boolean asNumber = _useTimestamp;
-        if (!asNumber) {
-            if (_customFormat == null) {
-                asNumber = visitor.getProvider().isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-            }
-        }
-        if (asNumber) {
-        	visitor.expectNumberFormat(typeHint).format(JsonValueFormat.UTC_MILLISEC);
-        } else {
-        	visitor.expectStringFormat(typeHint).format(JsonValueFormat.DATE_TIME);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-
-    @Override
-    public abstract void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException;
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumMapSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumMapSerializer.java
deleted file mode 100644
index 1601464..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumMapSerializer.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.util.EnumValues;
-
-/**
- * Specialized serializer for {@link EnumMap}s. Somewhat tricky to
- * implement because actual Enum value type may not be available;
- * and if not, it can only be gotten from actual instance.
- */
-@JacksonStdImpl
-public class EnumMapSerializer
-    extends ContainerSerializer<EnumMap<? extends Enum<?>, ?>>
-    implements ContextualSerializer
-{
-    protected final boolean _staticTyping;
-
-    /**
-     * Propery for which this serializer is being used, if any;
-     * null for root values.
-     */
-    protected final BeanProperty _property;
-    
-    /**
-     * If we know enumeration used as key, this will contain
-     * value set to use for serialization
-     */
-    protected final EnumValues _keyEnums;
-
-    protected final JavaType _valueType;
-    
-    /**
-     * Value serializer to use, if it can be statically determined
-     */
-    protected final JsonSerializer<Object> _valueSerializer;
-
-    /**
-     * Type serializer used for values, if any.
-     */
-    protected final TypeSerializer _valueTypeSerializer;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public EnumMapSerializer(JavaType valueType, boolean staticTyping, EnumValues keyEnums,
-            TypeSerializer vts, JsonSerializer<Object> valueSerializer)
-    {
-        super(EnumMap.class, false);
-        _property = null; // not yet known
-        _staticTyping = staticTyping || (valueType != null && valueType.isFinal());
-        _valueType = valueType;
-        _keyEnums = keyEnums;
-        _valueTypeSerializer = vts;
-        _valueSerializer = valueSerializer;
-    }
-
-    /**
-     * Constructor called when a contextual instance is created.
-     */
-    @SuppressWarnings("unchecked")
-    public EnumMapSerializer(EnumMapSerializer src, BeanProperty property,
-            JsonSerializer<?> ser)
-    {
-        super(src);
-        _property = property;
-        _staticTyping = src._staticTyping;
-        _valueType = src._valueType;
-        _keyEnums = src._keyEnums;
-        _valueTypeSerializer = src._valueTypeSerializer;
-        _valueSerializer = (JsonSerializer<Object>) ser;
-    }
-    
-    @Override
-    public EnumMapSerializer _withValueTypeSerializer(TypeSerializer vts) {
-        return new EnumMapSerializer(_valueType, _staticTyping, _keyEnums, vts,  _valueSerializer);
-    }
-
-    public EnumMapSerializer withValueSerializer(BeanProperty prop, JsonSerializer<?> ser) {
-        if (_property == prop && ser == _valueSerializer) {
-            return this;
-        }
-        return new EnumMapSerializer(this, prop, ser);
-    }
-    
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _valueSerializer;
-        }
-        if (ser == null) {
-            if (_staticTyping) {
-                return withValueSerializer(property, provider.findValueSerializer(_valueType, property));
-            }
-        } else if (_valueSerializer instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        if (ser != _valueSerializer) {
-            return withValueSerializer(property, ser);
-        }
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public JavaType getContentType() {
-        return _valueType;
-    }
-
-    @Override
-    public JsonSerializer<?> getContentSerializer() {
-        return _valueSerializer;
-    }
-    
-    @Override
-    public boolean isEmpty(EnumMap<? extends Enum<?>,?> value) {
-        return (value == null) || value.isEmpty();
-    }
-
-    @Override
-    public boolean hasSingleElement(EnumMap<? extends Enum<?>, ?> value) {
-        return value.size() == 1;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serialize(EnumMap<? extends Enum<?>,?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeStartObject();
-        if (!value.isEmpty()) {
-            serializeContents(value, jgen, provider);
-        }        
-        jgen.writeEndObject();
-    }
-
-    @Override
-    public void serializeWithType(EnumMap<? extends Enum<?>,?> value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForObject(value, jgen);
-        if (!value.isEmpty()) {
-            serializeContents(value, jgen, provider);
-        }
-        typeSer.writeTypeSuffixForObject(value, jgen);
-    }
-    
-    protected void serializeContents(EnumMap<? extends Enum<?>,?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (_valueSerializer != null) {
-            serializeContentsUsing(value, jgen, provider, _valueSerializer);
-            return;
-        }
-        JsonSerializer<Object> prevSerializer = null;
-        Class<?> prevClass = null;
-        EnumValues keyEnums = _keyEnums;
-
-        for (Map.Entry<? extends Enum<?>,?> entry : value.entrySet()) {
-            // First, serialize key
-            Enum<?> key = entry.getKey();
-            if (keyEnums == null) {
-                /* 15-Oct-2009, tatu: This is clumsy, but still the simplest efficient
-                 * way to do it currently, as Serializers get cached. (it does assume we'll always use
-                 * default serializer tho -- so ideally code should be rewritten)
-                 */
-                // ... and lovely two-step casting process too...
-                StdSerializer<?> ser = (StdSerializer<?>) provider.findValueSerializer(
-                        key.getDeclaringClass(), _property);
-                keyEnums = ((EnumSerializer) ser).getEnumValues();
-            }
-            jgen.writeFieldName(keyEnums.serializedValueFor(key));
-            // And then value
-            Object valueElem = entry.getValue();
-            if (valueElem == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                Class<?> cc = valueElem.getClass();
-                JsonSerializer<Object> currSerializer;
-                if (cc == prevClass) {
-                    currSerializer = prevSerializer;
-                } else {
-                    currSerializer = provider.findValueSerializer(cc, _property);
-                    prevSerializer = currSerializer;
-                    prevClass = cc;
-                }
-                try {
-                    currSerializer.serialize(valueElem, jgen, provider);
-                } catch (Exception e) {
-                    // [JACKSON-55] Need to add reference information
-                    wrapAndThrow(provider, e, value, entry.getKey().name());
-                }
-            }
-        }
-    }
-
-    protected void serializeContentsUsing(EnumMap<? extends Enum<?>,?> value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> valueSer)
-        throws IOException, JsonGenerationException
-    {
-        EnumValues keyEnums = _keyEnums;
-        for (Map.Entry<? extends Enum<?>,?> entry : value.entrySet()) {
-            Enum<?> key = entry.getKey();
-            if (keyEnums == null) {
-                // clumsy, but has to do for now:
-                StdSerializer<?> ser = (StdSerializer<?>) provider.findValueSerializer(key.getDeclaringClass(),
-                        _property);
-                keyEnums = ((EnumSerializer) ser).getEnumValues();
-            }
-            jgen.writeFieldName(keyEnums.serializedValueFor(key));
-            Object valueElem = entry.getValue();
-            if (valueElem == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                try {
-                    valueSer.serialize(valueElem, jgen, provider);
-                } catch (Exception e) {
-                    wrapAndThrow(provider, e, value, entry.getKey().name());
-                }
-            }
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        ObjectNode o = createSchemaNode("object", true);
-        if (typeHint instanceof ParameterizedType) {
-            Type[] typeArgs = ((ParameterizedType) typeHint).getActualTypeArguments();
-            if (typeArgs.length == 2) {
-                JavaType enumType = provider.constructType(typeArgs[0]);
-                JavaType valueType = provider.constructType(typeArgs[1]);
-                ObjectNode propsNode = JsonNodeFactory.instance.objectNode();
-                Class<Enum<?>> enumClass = (Class<Enum<?>>) enumType.getRawClass();
-                for (Enum<?> enumValue : enumClass.getEnumConstants()) {
-                    JsonSerializer<Object> ser = provider.findValueSerializer(valueType.getRawClass(), _property);
-                    JsonNode schemaNode = (ser instanceof SchemaAware) ?
-                            ((SchemaAware) ser).getSchema(provider, null) :
-                            JsonSchema.getDefaultSchemaNode();
-                    propsNode.put(provider.getConfig().getAnnotationIntrospector().findEnumValue((Enum<?>)enumValue), schemaNode);
-                }
-                o.put("properties", propsNode);
-            }
-        }
-        return o;
-    }
-
-    /* !!! 03-Oct-2012, tatu: This is total mess, and partly incorrect. MUST be
-     *   rewritten in near future, to work.
-     */
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
-    	JsonObjectFormatVisitor objectVisitor = visitor.expectObjectFormat(typeHint);
-    	/*
-        JavaType enumType = typeHint.containedType(0);
-    	if (enumType == null) {
-    	    enumType = visitor.getProvider().constructType(Object.class);
-    	}
-    	*/
-        JavaType valueType = typeHint.containedType(1);
-    	if (valueType == null) {
-    	    valueType = visitor.getProvider().constructType(Object.class);
-    	}
-        JsonSerializer<Object> ser = _valueSerializer;
-//        Class<Enum<?>> enumClass = (Class<Enum<?>>) enumType.getRawClass();
-        for (Map.Entry<?,SerializedString> entry : _keyEnums.internalMap().entrySet()) {
-            String name = entry.getValue().getValue();
-            // should all have the same type, so:
-            if (ser == null) {
-                ser = visitor.getProvider().findValueSerializer(entry.getKey().getClass(), _property);
-            }
-            objectVisitor.property(name, (JsonFormatVisitable) ser, valueType);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java
deleted file mode 100644
index 3501d81..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.io.SerializedString;
-
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonStringFormatVisitor;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.util.EnumValues;
-
-/**
- * Standard serializer used for {@link java.lang.Enum} types.
- *<p>
- * Based on {@link StdScalarSerializer} since the JSON value is
- * scalar (String).
- * 
- * @author tatu
- */
-@JacksonStdImpl
-public class EnumSerializer
-    extends StdScalarSerializer<Enum<?>>
-    implements ContextualSerializer
-{
-    /**
-     * This map contains pre-resolved values (since there are ways
-     * to customize actual String constants to use) to use as
-     * serializations.
-     */
-    protected final EnumValues _values;
-
-    /**
-     * Flag that is set if we statically know serialization choice
-     * between index and textual format (null if it needs to be dynamically
-     * checked).
-     * 
-     * @since 2.1
-     */
-    protected final Boolean _serializeAsIndex;
-
-    /*
-    /**********************************************************
-    /* Construction, initialization
-    /**********************************************************
-     */
-    
-    /**
-     * @deprecated Since 2.1
-     */
-    @Deprecated
-    public EnumSerializer(EnumValues v) {
-        this(v, null);
-    }
-
-    public EnumSerializer(EnumValues v, Boolean serializeAsIndex)
-    {
-        super(Enum.class, false);
-        _values = v;
-        _serializeAsIndex = serializeAsIndex;
-    }
-    
-    /**
-     * Factory method used by {@link com.fasterxml.jackson.databind.ser.BasicSerializerFactory}
-     * for constructing serializer instance of Enum types.
-     * 
-     * @since 2.1
-     */
-    public static EnumSerializer construct(Class<Enum<?>> enumClass, SerializationConfig config,
-            BeanDescription beanDesc, JsonFormat.Value format)
-    {
-        // [JACKSON-212]: If toString() is to be used instead, leave EnumValues null
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        EnumValues v = config.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
-            ? EnumValues.constructFromToString(enumClass, intr) : EnumValues.constructFromName(enumClass, intr);
-        Boolean serializeAsIndex = _isShapeWrittenUsingIndex(enumClass, format, true);
-        return new EnumSerializer(v, serializeAsIndex);
-    }
-    
-    /**
-     * @deprecated Since 2.1 use the variant that takes in <code>format</code> argument.
-     */
-    @Deprecated
-    public static EnumSerializer construct(Class<Enum<?>> enumClass, SerializationConfig config,
-            BeanDescription beanDesc)
-    {
-        return construct(enumClass, config, beanDesc, beanDesc.findExpectedFormat(null));
-    }
-
-    /**
-     * To support some level of per-property configuration, we will need
-     * to make things contextual. We are limited to "textual vs index"
-     * choice here, however.
-     */
-    public JsonSerializer<?> createContextual(SerializerProvider prov,
-            BeanProperty property) throws JsonMappingException
-    {
-        if (property != null) {
-            JsonFormat.Value format = prov.getAnnotationIntrospector().findFormat((Annotated) property.getMember());
-            if (format != null) {
-                Boolean serializeAsIndex = _isShapeWrittenUsingIndex(property.getType().getRawClass(), format, false);
-                if (serializeAsIndex != _serializeAsIndex) {
-                    return new EnumSerializer(_values, serializeAsIndex);
-                }
-            }
-        }
-        return this;
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API for Jackson databind core
-    /**********************************************************
-     */
-    
-    public EnumValues getEnumValues() { return _values; }
-
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public final void serialize(Enum<?> en, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // [JACKSON-684]: serialize as index?
-        if (_serializeAsIndex(provider)) {
-            jgen.writeNumber(en.ordinal());
-            return;
-        }
-        jgen.writeString(_values.serializedValueFor(en));
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        // [JACKSON-684]: serialize as index?
-        if (_serializeAsIndex(provider)) {
-            return createSchemaNode("integer", true);
-        }
-        ObjectNode objectNode = createSchemaNode("string", true);
-        if (typeHint != null) {
-            JavaType type = provider.constructType(typeHint);
-            if (type.isEnumType()) {
-                ArrayNode enumNode = objectNode.putArray("enum");
-                for (SerializedString value : _values.values()) {
-                    enumNode.add(value.getValue());
-                }
-            }
-        }
-        return objectNode;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        // [JACKSON-684]: serialize as index?
-    	if (visitor.getProvider().isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX)) {
-    		visitor.expectIntegerFormat(typeHint);
-    	} else {
-    		JsonStringFormatVisitor stringVisitor = visitor.expectStringFormat(typeHint);
-    		if (typeHint != null) {
-    			if (typeHint.isEnumType()) {
-    				Set<String> enums = new HashSet<String>();
-    				for (SerializedString value : _values.values()) {
-    					enums.add(value.getValue());
-    				}
-    				stringVisitor.enumTypes(enums);
-    			}
-    		}
-    	}
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    protected final boolean _serializeAsIndex(SerializerProvider provider)
-    {
-        if (_serializeAsIndex != null) {
-            return _serializeAsIndex.booleanValue();
-        }
-        return provider.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX);
-        
-    }
-
-    /**
-     * Helper method called to check whether 
-     */
-    protected static Boolean _isShapeWrittenUsingIndex(Class<?> enumClass,
-            JsonFormat.Value format, boolean fromClass)
-    {
-        JsonFormat.Shape shape = (format == null) ? null : format.getShape();
-        if (shape == null) {
-            return null;
-        }
-        if (shape == Shape.ANY || shape == Shape.SCALAR) { // i.e. "default", check dynamically
-            return null;
-        }
-        if (shape == Shape.STRING) {
-            return Boolean.FALSE;
-        }
-        if (shape.isNumeric()) {
-            return Boolean.TRUE;
-        }
-        throw new IllegalArgumentException("Unsupported serialization shape ("+shape+") for Enum "+enumClass.getName()
-                    +", not supported as "
-                    + (fromClass? "class" : "property")
-                    +" annotation");
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.java
deleted file mode 100644
index e1edbf6..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/EnumSetSerializer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.util.EnumSet;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-public class EnumSetSerializer
-    extends AsArraySerializerBase<EnumSet<? extends Enum<?>>>
-{
-    public EnumSetSerializer(JavaType elemType, BeanProperty property)
-    {
-        super(EnumSet.class, elemType, true, null, property, null);
-    }
-
-    public EnumSetSerializer(EnumSetSerializer src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> valueSerializer)
-    {
-        super(src, property, vts, valueSerializer);
-    }
-    
-    @Override
-    public EnumSetSerializer _withValueTypeSerializer(TypeSerializer vts) {
-        // no typing for enums (always "hard" type)
-        return this;
-    }
-
-    @Override
-    public EnumSetSerializer withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer) {
-        return new EnumSetSerializer(this, property, vts, elementSerializer);
-    }
-    
-    @Override
-    public boolean isEmpty(EnumSet<? extends Enum<?>> value) {
-        return (value == null) || value.isEmpty();
-    }
-
-    @Override
-    public boolean hasSingleElement(EnumSet<? extends Enum<?>> value) {
-        return value.size() == 1;
-    }
-    
-    @Override
-    public void serializeContents(EnumSet<? extends Enum<?>> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        JsonSerializer<Object> enumSer = _elementSerializer;
-        /* Need to dynamically find instance serializer; unfortunately
-         * that seems to be the only way to figure out type (no accessors
-         * to the enum class that set knows)
-         */
-        for (Enum<?> en : value) {
-            if (enumSer == null) {
-                /* 12-Jan-2010, tatu: Since enums can not be polymorphic, let's
-                 *   not bother with typed serializer variant here
-                 */
-                enumSer = provider.findValueSerializer(en.getDeclaringClass(), _property);
-            }
-            enumSer.serialize(en, jgen, provider);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
deleted file mode 100644
index 834a2e7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.net.InetAddress;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Simple serializer for {@link java.net.InetAddress}. Main complexity is
- * with registration, since same serializer is to be used for sub-classes.
- */
-public class InetAddressSerializer
-    extends StdScalarSerializer<InetAddress>
-{
-    public final static InetAddressSerializer instance = new InetAddressSerializer();
-    
-    public InetAddressSerializer() { super(InetAddress.class); }
-
-    @Override
-    public void serialize(InetAddress value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // Ok: get textual description; choose "more specific" part
-        String str = value.toString().trim();
-        int ix = str.indexOf('/');
-        if (ix >= 0) {
-            if (ix == 0) { // missing host name; use address
-                str = str.substring(1);
-            } else { // otherwise use name
-                str = str.substring(0, ix);
-            }
-        }
-        jgen.writeString(str);
-    }
-
-    @Override
-    public void serializeWithType(InetAddress value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        // Better ensure we don't use specific sub-classes...
-        typeSer.writeTypePrefixForScalar(value, jgen, InetAddress.class);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
deleted file mode 100644
index aa65e10..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-
-@JacksonStdImpl
-public class IterableSerializer
-    extends AsArraySerializerBase<Iterable<?>>
-{
-    public IterableSerializer(JavaType elemType, boolean staticTyping,
-            TypeSerializer vts, BeanProperty property)
-    {
-        super(Iterable.class, elemType, staticTyping, vts, property, null);
-    }
-
-    public IterableSerializer(IterableSerializer src, BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> valueSerializer)
-    {
-        super(src, property, vts, valueSerializer);
-    }
-    
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-        return new IterableSerializer(_elementType, _staticTyping, vts, _property);
-    }
-
-    @Override
-    public IterableSerializer withResolved(BeanProperty property,
-            TypeSerializer vts, JsonSerializer<?> elementSerializer) {
-        return new IterableSerializer(this, property, vts, elementSerializer);
-    }
-    
-    @Override
-    public boolean isEmpty(Iterable<?> value) {
-        // Not really good way to implement this, but has to do for now:
-        return (value == null) || !value.iterator().hasNext();
-    }
-
-    @Override
-    public boolean hasSingleElement(Iterable<?> value) {
-        // no really good way to determine (without consuming iterator), so:
-        return false;
-    }
-    
-    @Override
-    public void serializeContents(Iterable<?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        Iterator<?> it = value.iterator();
-        if (it.hasNext()) {
-            final TypeSerializer typeSer = _valueTypeSerializer;
-            JsonSerializer<Object> prevSerializer = null;
-            Class<?> prevClass = null;
-            
-            do {
-                Object elem = it.next();
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                } else {
-                    // Minor optimization to avoid most lookups:
-                    Class<?> cc = elem.getClass();
-                    JsonSerializer<Object> currSerializer;
-                    if (cc == prevClass) {
-                        currSerializer = prevSerializer;
-                    } else {
-                        currSerializer = provider.findValueSerializer(cc, _property);
-                        prevSerializer = currSerializer;
-                        prevClass = cc;
-                    }
-                    if (typeSer == null) {
-                        currSerializer.serialize(elem, jgen, provider);
-                    } else {
-                        currSerializer.serializeWithType(elem, jgen, provider, typeSer);
-                    }
-                }
-            } while (it.hasNext());
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
deleted file mode 100644
index e2a306a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.BeanSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-
-/**
- * Serializer class that can serialize Object that have a
- * {@link com.fasterxml.jackson.annotation.JsonValue} annotation to
- * indicate that serialization should be done by calling the method
- * annotated, and serializing result it returns.
- * <p/>
- * Implementation note: we will post-process resulting serializer
- * (much like what is done with {@link BeanSerializer})
- * to figure out actual serializers for final types.
- *  This must be done from {@link #createContextual} method, and NOT from constructor;
- * otherwise we could end up with an infinite loop.
- */
-@JacksonStdImpl
-public class JsonValueSerializer
-    extends StdSerializer<Object>
-    implements ContextualSerializer, JsonFormatVisitable, SchemaAware
-{
-    protected final Method _accessorMethod;
-
-    protected final JsonSerializer<Object> _valueSerializer;
-
-    protected final BeanProperty _property;
-    
-    /**
-     * This is a flag that is set in rare (?) cases where this serializer
-     * is used for "natural" types (boolean, int, String, double); and where
-     * we actually must force type information wrapping, even though
-     * one would not normally be added.
-     */
-    protected final boolean _forceTypeInformation;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * @param ser Explicit serializer to use, if caller knows it (which
-     *    occurs if and only if the "value method" was annotated with
-     *    {@link com.fasterxml.jackson.databind.annotation.JsonSerialize#using}), otherwise
-     *    null
-     */
-    public JsonValueSerializer(Method valueMethod, JsonSerializer<Object> ser)
-    {
-        super(Object.class);
-        _accessorMethod = valueMethod;
-        _valueSerializer = ser;
-        _property = null;
-        _forceTypeInformation = true; // gets reconsidered when we are contextualized
-    }
-
-    @SuppressWarnings("unchecked")
-    public JsonValueSerializer(JsonValueSerializer src, BeanProperty property,
-            JsonSerializer<?> ser, boolean forceTypeInfo)
-    {
-        super(Object.class);
-        _accessorMethod = src._accessorMethod;
-        _valueSerializer = (JsonSerializer<Object>) ser;
-        _property = property;
-        _forceTypeInformation = forceTypeInfo;
-    }
-
-    public JsonValueSerializer withResolved(BeanProperty property,
-            JsonSerializer<?> ser, boolean forceTypeInfo)
-    {
-        if (_property == property && _valueSerializer == ser
-                && forceTypeInfo == _forceTypeInformation) {
-            return this;
-        }
-        return new JsonValueSerializer(this, property, ser, forceTypeInfo);
-    }
-    
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-
-    /**
-     * We can try to find the actual serializer for value, if we can
-     * statically figure out what the result type must be.
-     */
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        JsonSerializer<?> ser = _valueSerializer;
-        if (ser == null) {
-            /* Can only assign serializer statically if the declared type is final:
-             * if not, we don't really know the actual type until we get the instance.
-             */
-            // 10-Mar-2010, tatu: Except if static typing is to be used
-            if (provider.isEnabled(MapperFeature.USE_STATIC_TYPING)
-                    || Modifier.isFinal(_accessorMethod.getReturnType().getModifiers())) {
-                JavaType t = provider.constructType(_accessorMethod.getGenericReturnType());
-                // false -> no need to cache
-                /* 10-Mar-2010, tatu: Ideally we would actually separate out type
-                 *   serializer from value serializer; but, alas, there's no access
-                 *   to serializer factory at this point... 
-                 */
-                /* 09-Dec-2010, tatu: Turns out we must add special handling for
-                 *   cases where "native" (aka "natural") type is being serialized,
-                 *   using standard serializer
-                 */
-                ser = provider.findTypedValueSerializer(t, false, _property);
-                boolean forceTypeInformation = isNaturalTypeWithStdHandling(t.getRawClass(), ser);
-                return withResolved(property, ser, forceTypeInformation);
-            }
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-            return withResolved(property, ser, _forceTypeInformation);
-        }
-        return this;
-    }
-    
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
-        throws IOException, JsonGenerationException
-    {
-        try {
-            Object value = _accessorMethod.invoke(bean);
-
-            if (value == null) {
-                prov.defaultSerializeNull(jgen);
-                return;
-            }
-            JsonSerializer<Object> ser = _valueSerializer;
-            if (ser == null) {
-                Class<?> c = value.getClass();
-                /* 10-Mar-2010, tatu: Ideally we would actually separate out type
-                 *   serializer from value serializer; but, alas, there's no access
-                 *   to serializer factory at this point... 
-                 */
-                // let's cache it, may be needed soon again
-                ser = prov.findTypedValueSerializer(c, true, _property);
-            }
-            ser.serialize(value, jgen, prov);
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            Throwable t = e;
-            // Need to unwrap this specific type, to see infinite recursion...
-            while (t instanceof InvocationTargetException && t.getCause() != null) {
-                t = t.getCause();
-            }
-            // Errors shouldn't be wrapped (and often can't, as well)
-            if (t instanceof Error) {
-                throw (Error) t;
-            }
-            // let's try to indicate the path best we can...
-            throw JsonMappingException.wrapWithPath(t, bean, _accessorMethod.getName() + "()");
-        }
-    }
-
-    @Override
-    public void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        // Regardless of other parts, first need to find value to serialize:
-        Object value = null;
-        try {
-            value = _accessorMethod.invoke(bean);
-
-            // and if we got null, can also just write it directly
-            if (value == null) {
-                provider.defaultSerializeNull(jgen);
-                return;
-            }
-            JsonSerializer<Object> ser = _valueSerializer;
-            if (ser != null) { // already got a serializer? fabulous, that be easy...
-                /* 09-Dec-2010, tatu: To work around natural type's refusal to add type info, we do
-                 *    this (note: type is for the wrapper type, not enclosed value!)
-                 */
-                if (_forceTypeInformation) {
-                    typeSer.writeTypePrefixForScalar(bean, jgen);
-                } 
-                ser.serializeWithType(value, jgen, provider, typeSer);
-                if (_forceTypeInformation) {
-                    typeSer.writeTypeSuffixForScalar(bean, jgen);
-                } 
-                return;
-            }
-            // But if not, it gets tad trickier (copied from main serialize() method)
-            Class<?> c = value.getClass();
-            ser = provider.findTypedValueSerializer(c, true, _property);
-            // note: now we have bundled type serializer, so should NOT call with typed version
-            ser.serialize(value, jgen, provider);
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            Throwable t = e;
-            // Need to unwrap this specific type, to see infinite recursion...
-            while (t instanceof InvocationTargetException && t.getCause() != null) {
-                t = t.getCause();
-            }
-            // Errors shouldn't be wrapped (and often can't, as well)
-            if (t instanceof Error) {
-                throw (Error) t;
-            }
-            // let's try to indicate the path best we can...
-            throw JsonMappingException.wrapWithPath(t, bean, _accessorMethod.getName() + "()");
-        }
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return (_valueSerializer instanceof SchemaAware) ?
-                ((SchemaAware) _valueSerializer).getSchema(provider, null) :
-                JsonSchema.getDefaultSchemaNode();
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
-        if (_valueSerializer != null) {
-            _valueSerializer.acceptJsonFormatVisitor(visitor, null); 
-        } else {
-            visitor.expectAnyFormat(typeHint);
-    	}
-    }
-
-    protected boolean isNaturalTypeWithStdHandling(Class<?> rawType, JsonSerializer<?> ser)
-    {
-        // First: do we have a natural type being handled?
-        if (rawType.isPrimitive()) {
-            if (rawType != Integer.TYPE && rawType != Boolean.TYPE && rawType != Double.TYPE) {
-                return false;
-            }
-        } else {
-            if (rawType != String.class &&
-                    rawType != Integer.class && rawType != Boolean.class && rawType != Double.class) {
-                return false;
-            }
-        }
-        return isDefaultSerializer(ser);
-    }
-    
-    /*
-    /**********************************************************
-    /* Other methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "(@JsonValue serializer for method " + _accessorMethod.getDeclaringClass() + "#" + _accessorMethod.getName() + ")";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
deleted file mode 100644
index 23a3146..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Standard serializer implementation for serializing {link java.util.Map} types.
- *<p>
- * Note: about the only configurable setting currently is ability to filter out
- * entries with specified names.
- */
-@JacksonStdImpl
-public class MapSerializer
-    extends ContainerSerializer<Map<?,?>>
-    implements ContextualSerializer
-{
-    protected final static JavaType UNSPECIFIED_TYPE = TypeFactory.unknownType();
-    
-    /**
-     * Map-valued property being serialized with this instance
-     */
-    protected final BeanProperty _property;
-    
-    /**
-     * Set of entries to omit during serialization, if any
-     */
-    protected final HashSet<String> _ignoredEntries;
-
-    /**
-     * Whether static types should be used for serialization of values
-     * or not (if not, dynamic runtime type is used)
-     */
-    protected final boolean _valueTypeIsStatic;
-
-    /**
-     * Declared type of keys
-     */
-    protected final JavaType _keyType;
-
-    /**
-     * Declared type of contained values
-     */
-    protected final JavaType _valueType;
-
-    /**
-     * Key serializer to use, if it can be statically determined
-     */
-    protected JsonSerializer<Object> _keySerializer;
-    
-    /**
-     * Value serializer to use, if it can be statically determined
-     */
-    protected JsonSerializer<Object> _valueSerializer;
-
-    /**
-     * Type identifier serializer used for values, if any.
-     */
-    protected final TypeSerializer _valueTypeSerializer;
-
-    /**
-     * If value type can not be statically determined, mapping from
-     * runtime value types to serializers are stored in this object.
-     */
-    protected PropertySerializerMap _dynamicValueSerializers;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    @SuppressWarnings("unchecked")
-    protected MapSerializer(HashSet<String> ignoredEntries,
-            JavaType keyType, JavaType valueType, boolean valueTypeIsStatic,
-            TypeSerializer vts,
-            JsonSerializer<?> keySerializer, JsonSerializer<?> valueSerializer)
-    {
-        super(Map.class, false);
-        _ignoredEntries = ignoredEntries;
-        _keyType = keyType;
-        _valueType = valueType;
-        _valueTypeIsStatic = valueTypeIsStatic;
-        _valueTypeSerializer = vts;
-        _keySerializer = (JsonSerializer<Object>) keySerializer;
-        _valueSerializer = (JsonSerializer<Object>) valueSerializer;
-        _dynamicValueSerializers = PropertySerializerMap.emptyMap();
-        _property = null;
-    }
-
-    @SuppressWarnings("unchecked")
-    protected MapSerializer(MapSerializer src, BeanProperty property,
-            JsonSerializer<?> keySerializer, JsonSerializer<?> valueSerializer,
-            HashSet<String> ignored)
-    {
-        super(Map.class, false);
-        _ignoredEntries = ignored;
-        _keyType = src._keyType;
-        _valueType = src._valueType;
-        _valueTypeIsStatic = src._valueTypeIsStatic;
-        _valueTypeSerializer = src._valueTypeSerializer;
-        _keySerializer = (JsonSerializer<Object>) keySerializer;
-        _valueSerializer = (JsonSerializer<Object>) valueSerializer;
-        _dynamicValueSerializers = src._dynamicValueSerializers;
-        _property = property;
-    }
-
-    protected MapSerializer(MapSerializer src, TypeSerializer vts)
-    {
-        super(Map.class, false);
-        _ignoredEntries = src._ignoredEntries;
-        _keyType = src._keyType;
-        _valueType = src._valueType;
-        _valueTypeIsStatic = src._valueTypeIsStatic;
-        _valueTypeSerializer = vts;
-        _keySerializer = src._keySerializer;
-        _valueSerializer = src._valueSerializer;
-        _dynamicValueSerializers = src._dynamicValueSerializers;
-        _property = src._property;
-    }
-    
-    @Override
-    public MapSerializer _withValueTypeSerializer(TypeSerializer vts)
-    {
-        return new MapSerializer(this, vts);
-    }
-
-    public MapSerializer withResolved(BeanProperty property,
-            JsonSerializer<?> keySerializer, JsonSerializer<?> valueSerializer,
-            HashSet<String> ignored)
-    {
-        return new MapSerializer(this, property, keySerializer, valueSerializer, ignored);
-    }
-    
-    public static MapSerializer construct(String[] ignoredList, JavaType mapType,
-            boolean staticValueType, TypeSerializer vts,
-            JsonSerializer<Object> keySerializer, JsonSerializer<Object> valueSerializer)
-    {
-        HashSet<String> ignoredEntries = toSet(ignoredList);
-        JavaType keyType, valueType;
-        
-        if (mapType == null) {
-            keyType = valueType = UNSPECIFIED_TYPE;
-        } else { 
-            keyType = mapType.getKeyType();
-            valueType = mapType.getContentType();
-        }
-        // If value type is final, it's same as forcing static value typing:
-        if (!staticValueType) {
-            staticValueType = (valueType != null && valueType.isFinal());
-        }
-        return new MapSerializer(ignoredEntries, keyType, valueType, staticValueType, vts,
-                keySerializer, valueSerializer);
-    }
-
-    private static HashSet<String> toSet(String[] ignoredEntries) {
-        if (ignoredEntries == null || ignoredEntries.length == 0) {
-            return null;
-        }
-        HashSet<String> result = new HashSet<String>(ignoredEntries.length);
-        for (String prop : ignoredEntries) {
-            result.add(prop);
-        }
-        return result;
-    }
-    
-    /*
-    /**********************************************************
-    /* Post-processing (contextualization)
-    /**********************************************************
-     */
-
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        JsonSerializer<?> keySer = null;
-
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef;
-                final AnnotationIntrospector intr = provider.getAnnotationIntrospector();
-                serDef = intr.findKeySerializer(m);
-                if (serDef != null) {
-                    keySer = provider.serializerInstance(m, serDef);
-                }
-                serDef = intr.findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _valueSerializer;
-        }
-        if (ser == null) {
-            // 30-Sep-2012, tatu: One more thing -- if explicit content type is annotated,
-            //   we can consider it a static case as well.
-            if (_valueTypeIsStatic || hasContentTypeAnnotation(provider, property)) {
-                ser = provider.findValueSerializer(_valueType, property);
-            }
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) ser).createContextual(provider, property);
-        }
-        if (keySer == null) {
-            keySer = _keySerializer;
-        }
-        if (keySer == null) {
-            keySer = provider.findKeySerializer(_keyType, property);
-        } else if (keySer instanceof ContextualSerializer) {
-            keySer = ((ContextualSerializer) keySer).createContextual(provider, property);
-        }
-        HashSet<String> ignored = this._ignoredEntries;
-        AnnotationIntrospector intr = provider.getAnnotationIntrospector();
-        if (intr != null && property != null) {
-            String[] moreToIgnore = intr.findPropertiesToIgnore(property.getMember());
-            if (moreToIgnore != null) {
-                ignored = (ignored == null) ? new HashSet<String>() : new HashSet<String>(ignored);
-                for (String str : moreToIgnore) {
-                    ignored.add(str);
-                }
-            }
-        }
-        return withResolved(property, keySer, ser, ignored);
-    }
-    
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    @Override
-    public JavaType getContentType() {
-        return _valueType;
-    }
-
-    @Override
-    public JsonSerializer<?> getContentSerializer() {
-        return _valueSerializer;
-    }
-    
-    @Override
-    public boolean isEmpty(Map<?,?> value) {
-        return (value == null) || value.isEmpty();
-    }
-
-    @Override
-    public boolean hasSingleElement(Map<?,?> value) {
-        return (value.size() == 1);
-    }
-    
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Accessor for currently assigned key serializer. Note that
-     * this may return null during construction of <code>MapSerializer</code>:
-     * depedencies are resolved during {@link #createContextual} method
-     * (which can be overridden by custom implementations), but for some
-     * dynamic types, it is possible that serializer is only resolved
-     * during actual serialization.
-     * 
-     * @since 2.0
-     */
-    public JsonSerializer<?> getKeySerializer() {
-        return _keySerializer;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializer implementation
-    /**********************************************************
-     */
-    
-    @Override
-    public void serialize(Map<?,?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeStartObject();
-        if (!value.isEmpty()) {
-            if (provider.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)) {
-                value = _orderEntries(value);
-            }
-            if (_valueSerializer != null) {
-                serializeFieldsUsing(value, jgen, provider, _valueSerializer);
-            } else {
-                serializeFields(value, jgen, provider);
-            }
-        }        
-        jgen.writeEndObject();
-    }
-
-    @Override
-    public void serializeWithType(Map<?,?> value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForObject(value, jgen);
-        if (!value.isEmpty()) {
-            if (provider.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)) {
-                value = _orderEntries(value);
-            }
-            if (_valueSerializer != null) {
-                serializeFieldsUsing(value, jgen, provider, _valueSerializer);
-            } else {
-                serializeFields(value, jgen, provider);
-            }
-        }
-        typeSer.writeTypeSuffixForObject(value, jgen);
-    }
-
-    /*
-    /**********************************************************
-    /* JsonSerializer implementation
-    /**********************************************************
-     */
-    
-    /**
-     * Method called to serialize fields, when the value type is not statically known.
-     */
-    public void serializeFields(Map<?,?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        // If value type needs polymorphic type handling, some more work needed:
-        if (_valueTypeSerializer != null) {
-            serializeTypedFields(value, jgen, provider);
-            return;
-        }
-        final JsonSerializer<Object> keySerializer = _keySerializer;
-        
-        final HashSet<String> ignored = _ignoredEntries;
-        final boolean skipNulls = !provider.isEnabled(SerializationFeature.WRITE_NULL_MAP_VALUES);
-
-        PropertySerializerMap serializers = _dynamicValueSerializers;
-
-        for (Map.Entry<?,?> entry : value.entrySet()) {
-            Object valueElem = entry.getValue();
-            // First, serialize key
-            Object keyElem = entry.getKey();
-            if (keyElem == null) {
-                provider.findNullKeySerializer(_keyType, _property).serialize(null, jgen, provider);
-            } else {
-                // [JACKSON-314] skip entries with null values?
-                if (skipNulls && valueElem == null) continue;
-                // One twist: is entry ignorable? If so, skip
-                if (ignored != null && ignored.contains(keyElem)) continue;
-                keySerializer.serialize(keyElem, jgen, provider);
-            }
-
-            // And then value
-            if (valueElem == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                Class<?> cc = valueElem.getClass();
-                JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                if (serializer == null) {
-                    if (_valueType.hasGenericTypes()) {
-                        serializer = _findAndAddDynamic(serializers,
-                                provider.constructSpecializedType(_valueType, cc), provider);
-                    } else {
-                        serializer = _findAndAddDynamic(serializers, cc, provider);
-                    }
-                    serializers = _dynamicValueSerializers;
-                }
-                try {
-                    serializer.serialize(valueElem, jgen, provider);
-                } catch (Exception e) {
-                    // [JACKSON-55] Need to add reference information
-                    String keyDesc = ""+keyElem;
-                    wrapAndThrow(provider, e, value, keyDesc);
-                }
-            }
-        }
-    }
-
-    /**
-     * Method called to serialize fields, when the value type is statically known,
-     * so that value serializer is passed and does not need to be fetched from
-     * provider.
-     */
-    protected void serializeFieldsUsing(Map<?,?> value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> ser)
-            throws IOException, JsonGenerationException
-    {
-        final JsonSerializer<Object> keySerializer = _keySerializer;
-        final HashSet<String> ignored = _ignoredEntries;
-        final TypeSerializer typeSer = _valueTypeSerializer;
-        final boolean skipNulls = !provider.isEnabled(SerializationFeature.WRITE_NULL_MAP_VALUES);
-
-        for (Map.Entry<?,?> entry : value.entrySet()) {
-            Object valueElem = entry.getValue();
-            Object keyElem = entry.getKey();
-            if (keyElem == null) {
-                provider.findNullKeySerializer(_keyType, _property).serialize(null, jgen, provider);
-            } else {
-                // [JACKSON-314] also may need to skip entries with null values
-                if (skipNulls && valueElem == null) continue;
-                if (ignored != null && ignored.contains(keyElem)) continue;
-                keySerializer.serialize(keyElem, jgen, provider);
-            }
-            if (valueElem == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                try {
-                    if (typeSer == null) {
-                        ser.serialize(valueElem, jgen, provider);
-                    } else {
-                        ser.serializeWithType(valueElem, jgen, provider, typeSer);
-                    }
-                } catch (Exception e) {
-                    // [JACKSON-55] Need to add reference information
-                    String keyDesc = ""+keyElem;
-                    wrapAndThrow(provider, e, value, keyDesc);
-                }
-            }
-        }
-    }
-
-    protected void serializeTypedFields(Map<?,?> value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final JsonSerializer<Object> keySerializer = _keySerializer;
-        JsonSerializer<Object> prevValueSerializer = null;
-        Class<?> prevValueClass = null;
-        final HashSet<String> ignored = _ignoredEntries;
-        final boolean skipNulls = !provider.isEnabled(SerializationFeature.WRITE_NULL_MAP_VALUES);
-    
-        for (Map.Entry<?,?> entry : value.entrySet()) {
-            Object valueElem = entry.getValue();
-            // First, serialize key
-            Object keyElem = entry.getKey();
-            if (keyElem == null) {
-                provider.findNullKeySerializer(_keyType, _property).serialize(null, jgen, provider);
-            } else {
-                // [JACKSON-314] also may need to skip entries with null values
-                if (skipNulls && valueElem == null) continue;
-                // One twist: is entry ignorable? If so, skip
-                if (ignored != null && ignored.contains(keyElem)) continue;
-                keySerializer.serialize(keyElem, jgen, provider);
-            }
-    
-            // And then value
-            if (valueElem == null) {
-                provider.defaultSerializeNull(jgen);
-            } else {
-                Class<?> cc = valueElem.getClass();
-                JsonSerializer<Object> currSerializer;
-                if (cc == prevValueClass) {
-                    currSerializer = prevValueSerializer;
-                } else {
-                    currSerializer = provider.findValueSerializer(cc, _property);
-                    prevValueSerializer = currSerializer;
-                    prevValueClass = cc;
-                }
-                try {
-                    currSerializer.serializeWithType(valueElem, jgen, provider, _valueTypeSerializer);
-                } catch (Exception e) {
-                    // [JACKSON-55] Need to add reference information
-                    String keyDesc = ""+keyElem;
-                    wrapAndThrow(provider, e, value, keyDesc);
-                }
-            }
-        }
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        ObjectNode o = createSchemaNode("object", true);
-        //(ryan) even though it's possible to statically determine the "value" type of the map,
-        // there's no way to statically determine the keys, so the "Entries" can't be determined.
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	//jackphel Aug 17 2012 : this can definitely more more exact. 
-    	visitor.expectObjectFormat(typeHint);
-    }
-
-    /*
-    /**********************************************************
-    /* Internal helper methods
-    /**********************************************************
-     */
-    
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            Class<?> type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        // did we get a new map of serializers? If so, start using it
-        if (map != result.map) {
-            _dynamicValueSerializers = result.map;
-        }
-        return result.serializer;
-    }
-
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            JavaType type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        if (map != result.map) {
-            _dynamicValueSerializers = result.map;
-        }
-        return result.serializer;
-    }
-
-    protected Map<?,?> _orderEntries(Map<?,?> input)
-    {
-        // minor optimization: may already be sorted?
-        if (input instanceof SortedMap<?,?>) {
-            return input;
-        }
-        return new TreeMap<Object,Object>(input);
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java
deleted file mode 100644
index 16050e5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Intermediate base class for limited number of scalar types
- * that should never include type information. These are "native"
- * types that are default mappings for corresponding JSON scalar
- * types: {@link java.lang.String}, {@link java.lang.Integer},
- * {@link java.lang.Double} and {@link java.lang.Boolean}.
- */
-public abstract class NonTypedScalarSerializerBase<T>
-    extends StdScalarSerializer<T>
-{
-    protected NonTypedScalarSerializerBase(Class<T> t) {
-        super(t);
-    }
-
-    @Override
-    public final void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        // no type info, just regular serialization
-        serialize(value, jgen, provider);            
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NullSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NullSerializer.java
deleted file mode 100644
index 0937a4f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NullSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.lang.reflect.Type;
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-
-/**
- * This is a simple dummy serializer that will just output literal
- * JSON null value whenever serialization is requested.
- * Used as the default "null serializer" (which is used for serializing
- * null object references unless overridden), as well as for some
- * more exotic types (java.lang.Void).
- */
-@JacksonStdImpl
-public class NullSerializer
-    extends StdSerializer<Object>
-{
-    public final static NullSerializer instance = new NullSerializer();
-    
-    private NullSerializer() { super(Object.class); }
-    
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeNull();
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return createSchemaNode("null");
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectNullFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NumberSerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NumberSerializers.java
deleted file mode 100644
index 5f00549..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/NumberSerializers.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-
-/**
- * Container class for serializers used for handling standard JDK-provided types.
- */
-public class NumberSerializers
-{
-    protected NumberSerializers() { }
-    
-    public static void addAll(Map<String, JsonSerializer<?>> allDeserializers)
-    {
-        final JsonSerializer<?> intS = new IntegerSerializer();
-        allDeserializers.put(Integer.class.getName(), intS);
-        allDeserializers.put(Integer.TYPE.getName(), intS);
-        allDeserializers.put(Long.class.getName(), LongSerializer.instance);
-        allDeserializers.put(Long.TYPE.getName(), LongSerializer.instance);
-        allDeserializers.put(Byte.class.getName(), IntLikeSerializer.instance);
-        allDeserializers.put(Byte.TYPE.getName(), IntLikeSerializer.instance);
-        allDeserializers.put(Short.class.getName(), IntLikeSerializer.instance);
-        allDeserializers.put(Short.TYPE.getName(), IntLikeSerializer.instance);
-
-        // Numbers, limited length floating point
-        allDeserializers.put(Float.class.getName(), FloatSerializer.instance);
-        allDeserializers.put(Float.TYPE.getName(), FloatSerializer.instance);
-        allDeserializers.put(Double.class.getName(), DoubleSerializer.instance);
-        allDeserializers.put(Double.TYPE.getName(), DoubleSerializer.instance);
-    }
-    
-    /*
-    /**********************************************************
-    /* Concrete serializers
-    /**********************************************************
-     */
-    
-
-
-    /*
-    /**********************************************************
-    /* Concrete serializers, numerics
-    /**********************************************************
-     */
-
-    /**
-     * This is the special serializer for regular {@link java.lang.Integer}s
-     * (and primitive ints)
-     *<p>
-     * Since this is one of "native" types, no type information is ever
-     * included on serialization (unlike for most scalar types as of 1.5)
-     */
-    @JacksonStdImpl
-    public final static class IntegerSerializer
-        extends NonTypedScalarSerializerBase<Integer>
-    {
-        public IntegerSerializer() { super(Integer.class); }
-    
-        @Override
-        public void serialize(Integer value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.intValue());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("integer", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectIntegerFormat(typeHint);
-        }
-    }
-
-    /**
-     * Similar to {@link IntegerSerializer}, but will not cast to Integer:
-     * instead, cast is to {@link java.lang.Number}, and conversion is
-     * by calling {@link java.lang.Number#intValue}.
-     */
-    @JacksonStdImpl
-    public final static class IntLikeSerializer
-        extends StdScalarSerializer<Number>
-    {
-        final static IntLikeSerializer instance = new IntLikeSerializer();
-    
-        public IntLikeSerializer() { super(Number.class); }
-        
-        @Override
-        public void serialize(Number value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.intValue());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("integer", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectIntegerFormat(typeHint);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class LongSerializer
-        extends StdScalarSerializer<Long>
-    {
-        final static LongSerializer instance = new LongSerializer();
-    
-        public LongSerializer() { super(Long.class); }
-        
-        @Override
-        public void serialize(Long value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.longValue());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("number", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectNumberFormat(typeHint);
-        }
-    }
-    
-    @JacksonStdImpl
-    public final static class FloatSerializer
-        extends StdScalarSerializer<Float>
-    {
-        final static FloatSerializer instance = new FloatSerializer();
-    
-        public FloatSerializer() { super(Float.class); }
-        
-        @Override
-        public void serialize(Float value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.floatValue());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("number", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectNumberFormat(typeHint);
-        }
-    }
-
-    /**
-     * This is the special serializer for regular {@link java.lang.Double}s
-     * (and primitive doubles)
-     *<p>
-     * Since this is one of "native" types, no type information is ever
-     * included on serialization (unlike for most scalar types as of 1.5)
-     */
-    @JacksonStdImpl
-    public final static class DoubleSerializer
-        extends NonTypedScalarSerializerBase<Double>
-    {
-        final static DoubleSerializer instance = new DoubleSerializer();
-    
-        public DoubleSerializer() { super(Double.class); }
-    
-        @Override
-        public void serialize(Double value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.doubleValue());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("number", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectNumberFormat(typeHint);
-        }
-    }
-    
-    /**
-     * As a fallback, we may need to use this serializer for other
-     * types of {@link Number}s (custom types).
-     */
-    @JacksonStdImpl
-    public final static class NumberSerializer
-        extends StdScalarSerializer<Number>
-    {
-        public final static NumberSerializer instance = new NumberSerializer();
-    
-        public NumberSerializer() { super(Number.class); }
-    
-        @Override
-        public void serialize(Number value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            // As per [JACKSON-423], handling for BigInteger and BigDecimal was missing!
-            if (value instanceof BigDecimal) {
-                jgen.writeNumber((BigDecimal) value);
-            } else if (value instanceof BigInteger) {
-                jgen.writeNumber((BigInteger) value);
-                
-            /* These shouldn't match (as there are more specific ones),
-             * but just to be sure:
-             */
-            } else if (value instanceof Integer) {
-                jgen.writeNumber(value.intValue());
-            } else if (value instanceof Long) {
-                jgen.writeNumber(value.longValue());
-            } else if (value instanceof Double) {
-                jgen.writeNumber(value.doubleValue());
-            } else if (value instanceof Float) {
-                jgen.writeNumber(value.floatValue());
-            } else if ((value instanceof Byte) || (value instanceof Short)) {
-                jgen.writeNumber(value.intValue()); // doesn't need to be cast to smaller numbers
-            } else {
-                // We'll have to use fallback "untyped" number write method
-                jgen.writeNumber(value.toString());
-            }
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("number", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectNumberFormat(typeHint);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
deleted file mode 100644
index 17a5e98..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSchema;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-import com.fasterxml.jackson.databind.type.ArrayType;
-
-/**
- * Generic serializer for Object arrays (<code>Object[]</code>).
- */
-@JacksonStdImpl
-public class ObjectArraySerializer
-    extends ArraySerializerBase<Object[]>
-    implements ContextualSerializer
-{
-    /**
-     * Whether we are using static typing (using declared types, ignoring
-     * runtime type) or not for elements.
-     */
-    protected final boolean _staticTyping;
-
-    /**
-     * Declared type of element entries
-     */
-    protected final JavaType _elementType;
-
-    /**
-     * Type serializer to use for values, if any.
-     */
-    protected final TypeSerializer _valueTypeSerializer;
-    
-    /**
-     * Value serializer to use, if it can be statically determined.
-     */
-    protected JsonSerializer<Object> _elementSerializer;
-
-    /**
-     * If element type can not be statically determined, mapping from
-     * runtime type to serializer is handled using this object
-     */
-    protected PropertySerializerMap _dynamicSerializers;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    public ObjectArraySerializer(JavaType elemType, boolean staticTyping,
-            TypeSerializer vts, JsonSerializer<Object> elementSerializer)
-    {
-        super(Object[].class, null);
-        _elementType = elemType;
-        _staticTyping = staticTyping;
-        _valueTypeSerializer = vts;
-        _dynamicSerializers = PropertySerializerMap.emptyMap();
-        _elementSerializer = elementSerializer;
-    }
-
-    public ObjectArraySerializer(ObjectArraySerializer src, TypeSerializer vts)
-    {
-        super(src);
-        _elementType = src._elementType;
-        _valueTypeSerializer = vts;
-        _staticTyping = src._staticTyping;
-        _dynamicSerializers = src._dynamicSerializers;
-        _elementSerializer = src._elementSerializer;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public ObjectArraySerializer(ObjectArraySerializer src,
-            BeanProperty property, TypeSerializer vts, JsonSerializer<?> elementSerializer)
-    {
-        super(src,  property);
-        _elementType = src._elementType;
-        _valueTypeSerializer = vts;
-        _staticTyping = src._staticTyping;
-        _dynamicSerializers = src._dynamicSerializers;
-        _elementSerializer = (JsonSerializer<Object>) elementSerializer;
-    }
-    
-    @Override
-    public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts)
-    {
-        return new ObjectArraySerializer(_elementType, _staticTyping, vts, _elementSerializer);
-    }
-
-    public ObjectArraySerializer withResolved(BeanProperty prop,
-            TypeSerializer vts, JsonSerializer<?> ser) {
-        if (_property == prop && ser == _elementSerializer && _valueTypeSerializer == vts) {
-            return this;
-        }
-        return new ObjectArraySerializer(this, prop, vts, ser);
-    }
-
-    /*
-    /**********************************************************
-    /* Post-processing
-    /**********************************************************
-     */
-
-//  @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        TypeSerializer vts = _valueTypeSerializer;
-        if (vts != null) {
-            vts = vts.forProperty(property);
-        }
-        /* 29-Sep-2012, tatu: Actually, we need to do much more contextual
-         *    checking here since we finally know for sure the property,
-         *    and it may have overrides
-         */
-        JsonSerializer<?> ser = null;
-        // First: if we have a property, may have property-annotation overrides
-        if (property != null) {
-            AnnotatedMember m = property.getMember();
-            if (m != null) {
-                Object serDef = provider.getAnnotationIntrospector().findContentSerializer(m);
-                if (serDef != null) {
-                    ser = provider.serializerInstance(m, serDef);
-                }
-            }
-        }
-        if (ser == null) {
-            ser = _elementSerializer;
-        }
-        if (ser == null) {
-            // 30-Sep-2012, tatu: One more thing -- if explicit content type is annotated,
-            //   we can consider it a static case as well.
-            if (_elementType != null) {
-                if (_staticTyping || hasContentTypeAnnotation(provider, property)) {
-                    ser = provider.findValueSerializer(_elementType, property);
-                }
-            }
-        } else if (ser instanceof ContextualSerializer) {
-            ser = ((ContextualSerializer) _elementSerializer).createContextual(provider, property);
-        }
-        return withResolved(property, vts, ser);
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-        
-    @Override
-    public JavaType getContentType() {
-        return _elementType;
-    }
-
-    @Override
-    public JsonSerializer<?> getContentSerializer() {
-        return _elementSerializer;
-    }
-
-    @Override
-    public boolean isEmpty(Object[] value) {
-        return (value == null) || (value.length == 0);
-    }
-
-    @Override
-    public boolean hasSingleElement(Object[] value) {
-        return (value.length == 1);
-    }
-
-    /*
-    /**********************************************************
-    /* Actual serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public void serializeContents(Object[] value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.length;
-        if (len == 0) {
-            return;
-        }
-        if (_elementSerializer != null) {
-            serializeContentsUsing(value, jgen, provider, _elementSerializer);
-            return;
-        }
-        if (_valueTypeSerializer != null) {
-            serializeTypedContents(value, jgen, provider);
-            return;
-        }
-        int i = 0;
-        Object elem = null;
-        try {
-            PropertySerializerMap serializers = _dynamicSerializers;
-            for (; i < len; ++i) {
-                elem = value[i];
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                    continue;
-                }
-                Class<?> cc = elem.getClass();
-                JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                if (serializer == null) {
-                    // To fix [JACKSON-508]
-                    if (_elementType.hasGenericTypes()) {
-                        serializer = _findAndAddDynamic(serializers,
-                                provider.constructSpecializedType(_elementType, cc), provider);
-                    } else {
-                        serializer = _findAndAddDynamic(serializers, cc, provider);
-                    }
-                }
-                serializer.serialize(elem, jgen, provider);
-            }
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            // [JACKSON-55] Need to add reference information
-            /* 05-Mar-2009, tatu: But one nasty edge is when we get
-             *   StackOverflow: usually due to infinite loop. But that gets
-             *   hidden within an InvocationTargetException...
-             */
-            Throwable t = e;
-            while (t instanceof InvocationTargetException && t.getCause() != null) {
-                t = t.getCause();
-            }
-            if (t instanceof Error) {
-                throw (Error) t;
-            }
-            throw JsonMappingException.wrapWithPath(t, elem, i);
-        }
-    }
-
-    public void serializeContentsUsing(Object[] value, JsonGenerator jgen, SerializerProvider provider,
-            JsonSerializer<Object> ser)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.length;
-        final TypeSerializer typeSer = _valueTypeSerializer;
-
-        int i = 0;
-        Object elem = null;
-        try {
-            for (; i < len; ++i) {
-                elem = value[i];
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                    continue;
-                }
-                if (typeSer == null) {
-                    ser.serialize(elem, jgen, provider);
-                } else {
-                    ser.serializeWithType(elem, jgen, provider, typeSer);
-                }
-            }
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            Throwable t = e;
-            while (t instanceof InvocationTargetException && t.getCause() != null) {
-                t = t.getCause();
-            }
-            if (t instanceof Error) {
-                throw (Error) t;
-            }
-            throw JsonMappingException.wrapWithPath(t, elem, i);
-        }
-    }
-
-    public void serializeTypedContents(Object[] value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        final int len = value.length;
-        final TypeSerializer typeSer = _valueTypeSerializer;
-        int i = 0;
-        Object elem = null;
-        try {
-            PropertySerializerMap serializers = _dynamicSerializers;
-            for (; i < len; ++i) {
-                elem = value[i];
-                if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
-                    continue;
-                }
-                Class<?> cc = elem.getClass();
-                JsonSerializer<Object> serializer = serializers.serializerFor(cc);
-                if (serializer == null) {
-                    serializer = _findAndAddDynamic(serializers, cc, provider);
-                }
-                serializer.serializeWithType(elem, jgen, provider, typeSer);
-            }
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            Throwable t = e;
-            while (t instanceof InvocationTargetException && t.getCause() != null) {
-                t = t.getCause();
-            }
-            if (t instanceof Error) {
-                throw (Error) t;
-            }
-            throw JsonMappingException.wrapWithPath(t, elem, i);
-        }
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        ObjectNode o = createSchemaNode("array", true);
-        if (typeHint != null) {
-            JavaType javaType = provider.constructType(typeHint);
-            if (javaType.isArrayType()) {
-                Class<?> componentType = ((ArrayType) javaType).getContentType().getRawClass();
-                // 15-Oct-2010, tatu: We can't serialize plain Object.class; but what should it produce here? Untyped?
-                if (componentType == Object.class) {
-                    o.put("items", JsonSchema.getDefaultSchemaNode());
-                } else {
-                    JsonSerializer<Object> ser = provider.findValueSerializer(componentType, _property);
-                    JsonNode schemaNode = (ser instanceof SchemaAware) ?
-                            ((SchemaAware) ser).getSchema(provider, null) :
-                            JsonSchema.getDefaultSchemaNode();
-                    o.put("items", schemaNode);
-                }
-            }
-        }
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectArrayFormat(typeHint).itemsFormat(_elementType);
-    }
-
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            Class<?> type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        // did we get a new map of serializers? If so, start using it
-        if (map != result.map) {
-            _dynamicSerializers = result.map;
-        }
-        return result.serializer;
-    }
-
-    protected final JsonSerializer<Object> _findAndAddDynamic(PropertySerializerMap map,
-            JavaType type, SerializerProvider provider) throws JsonMappingException
-    {
-        PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSerializer(type, provider, _property);
-        // did we get a new map of serializers? If so, start using it
-        if (map != result.map) {
-            _dynamicSerializers = result.map;
-        }
-        return result.serializer;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/RawSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/RawSerializer.java
deleted file mode 100644
index d7c3191..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/RawSerializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.lang.reflect.Type;
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * This is a simple dummy serializer that will just output raw values by calling
- * toString() on value to serialize.
- */
-@JacksonStdImpl
-public class RawSerializer<T>
-    extends StdSerializer<T>
-{
-    /**
-     * Constructor takes in expected type of values; but since caller
-     * typically can not really provide actual type parameter, we will
-     * just take wild card and coerce type.
-     */
-    public RawSerializer(Class<?> cls) {
-        super(cls, false);
-    }
-
-    @Override
-    public void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeRawValue(value.toString());
-    }
-
-    @Override
-    public void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        typeSer.writeTypePrefixForScalar(value, jgen);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        // type not really known, but since it is a JSON string:
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        visitor.expectStringFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java
deleted file mode 100644
index 1c4cd27..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.fasterxml.jackson.core.*;
-
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializable;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.JsonSerializableSchema;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Generic handler for types that implement {@link JsonSerializable}.
- *<p>
- * Note: given that this is used for anything that implements
- * interface, can not be checked for direct class equivalence.
- */
-@JacksonStdImpl
-public class SerializableSerializer
-    extends StdSerializer<JsonSerializable>
-{
-    public final static SerializableSerializer instance = new SerializableSerializer();
-
-    // Ugh. Should NOT need this...
-    private final static AtomicReference<ObjectMapper> _mapperReference = new AtomicReference<ObjectMapper>();
-    
-    protected SerializableSerializer() { super(JsonSerializable.class); }
-
-    @Override
-    public void serialize(JsonSerializable value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        value.serialize(jgen, provider);
-    }
-
-    @Override
-    public final void serializeWithType(JsonSerializable value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        value.serializeWithType(jgen, provider, typeSer);
-    }
-    
-    @Override
-    @SuppressWarnings("deprecation")
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        ObjectNode objectNode = createObjectNode();
-        String schemaType = "any";
-        String objectProperties = null;
-        String itemDefinition = null;
-        if (typeHint != null) {
-            Class<?> rawClass = TypeFactory.rawClass(typeHint);
-            if (rawClass.isAnnotationPresent(JsonSerializableSchema.class)) {
-                JsonSerializableSchema schemaInfo = rawClass.getAnnotation(JsonSerializableSchema.class);
-                schemaType = schemaInfo.schemaType();
-                if (!JsonSerializableSchema.NO_VALUE.equals(schemaInfo.schemaObjectPropertiesDefinition())) {
-                    objectProperties = schemaInfo.schemaObjectPropertiesDefinition();
-                }
-                if (!JsonSerializableSchema.NO_VALUE.equals(schemaInfo.schemaItemDefinition())) {
-                    itemDefinition = schemaInfo.schemaItemDefinition();
-                }
-            }
-        }
-        /* 19-Mar-2012, tatu: geez, this is butt-ugly abonimation of code...
-         *    really, really should not require back ref to an ObjectMapper.
-         */
-        objectNode.put("type", schemaType);
-        if (objectProperties != null) {
-            try {
-                objectNode.put("properties", _getObjectMapper().readTree(objectProperties));
-            } catch (IOException e) {
-                throw new JsonMappingException("Failed to parse @JsonSerializableSchema.schemaObjectPropertiesDefinition value");
-            }
-        }
-        if (itemDefinition != null) {
-            try {
-                objectNode.put("items", _getObjectMapper().readTree(itemDefinition));
-            } catch (IOException e) {
-                throw new JsonMappingException("Failed to parse @JsonSerializableSchema.schemaItemDefinition value");
-            }
-        }
-        // always optional, no need to specify:
-        //objectNode.put("required", false);
-        return objectNode;
-    }
-    
-    private final static synchronized ObjectMapper _getObjectMapper()
-    {
-        ObjectMapper mapper = _mapperReference.get();
-        if (mapper == null) {
-            mapper = new ObjectMapper();
-            _mapperReference.set(mapper);
-        }
-        return mapper;
-    }
-
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        visitor.expectAnyFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
deleted file mode 100644
index 72cca0b..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
-
-/**
- * Compared to regular {@link java.util.Date} serialization, we do use String
- * representation here. Why? Basically to truncate of time part, since
- * that should not be used by plain SQL date.
- */
-@JacksonStdImpl
-public class SqlDateSerializer
-    extends StdScalarSerializer<java.sql.Date>
-{
-    public SqlDateSerializer() { super(java.sql.Date.class); }
-
-    @Override
-    public void serialize(java.sql.Date value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeString(value.toString());
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        //todo: (ryan) add a format for the date in the schema?
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectStringFormat(typeHint).format(JsonValueFormat.DATE_TIME);
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java
deleted file mode 100644
index ea95c92..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
-
-@JacksonStdImpl
-public class SqlTimeSerializer
-    extends StdScalarSerializer<java.sql.Time>
-{
-    public SqlTimeSerializer() { super(java.sql.Time.class); }
-
-    @Override
-    public void serialize(java.sql.Time value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeString(value.toString());
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectStringFormat(typeHint).format(JsonValueFormat.DATE_TIME);
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java
deleted file mode 100644
index ab34ae5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.lang.reflect.Type;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * Intermediate base class for Lists, Collections and Arrays
- * that contain static (non-dynamic) value types.
- */
-public abstract class StaticListSerializerBase<T extends Collection<?>>
-    extends StdSerializer<T>
-{
-    protected StaticListSerializerBase(Class<?> cls) {
-        super(cls, false);
-    }
-
-    @Override
-    public boolean isEmpty(T value) {
-        return (value == null) || (value.size() == 0);
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        ObjectNode o = createSchemaNode("array", true);
-        o.put("items", contentSchema());
-        return o;
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	acceptContentVisitor(visitor.expectArrayFormat(typeHint));
-    }
-
-    /*
-    /**********************************************************
-    /* Abstract methods for sub-classes to implement
-    /**********************************************************
-     */
-
-    protected abstract JsonNode contentSchema();
-    
-    protected abstract void acceptContentVisitor(JsonArrayFormatVisitor visitor);    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java
deleted file mode 100644
index 209fa5d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdArraySerializers.java
+++ /dev/null
@@ -1,619 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Dummy container class to group standard homogenous array serializer implementations
- * (primitive arrays and String array).
- */
-public class StdArraySerializers
-{
-    protected final static HashMap<String, JsonSerializer<?>> _arraySerializers =
-        new HashMap<String, JsonSerializer<?>>();
-    static {
-        // Arrays of various types (including common object types)
-        _arraySerializers.put(boolean[].class.getName(), new StdArraySerializers.BooleanArraySerializer());
-        _arraySerializers.put(byte[].class.getName(), new StdArraySerializers.ByteArraySerializer());
-        _arraySerializers.put(char[].class.getName(), new StdArraySerializers.CharArraySerializer());
-        _arraySerializers.put(short[].class.getName(), new StdArraySerializers.ShortArraySerializer());
-        _arraySerializers.put(int[].class.getName(), new StdArraySerializers.IntArraySerializer());
-        _arraySerializers.put(long[].class.getName(), new StdArraySerializers.LongArraySerializer());
-        _arraySerializers.put(float[].class.getName(), new StdArraySerializers.FloatArraySerializer());
-        _arraySerializers.put(double[].class.getName(), new StdArraySerializers.DoubleArraySerializer());
-    }
-
-    protected StdArraySerializers() { }
-
-    /**
-     * Accessor for checking to see if there is a standard serializer for
-     * given primitive value type.
-     */
-    public static JsonSerializer<?> findStandardImpl(Class<?> cls)
-    {
-        return _arraySerializers.get(cls.getName());
-    }
-    
-    /*
-     ****************************************************************
-    /* Intermediate base classes
-     ****************************************************************
-     */
-
-    /**
-     * Intermediate base class used for cases where we may add
-     * type information (excludes boolean/int/double arrays).
-     */
-    protected abstract static class TypedPrimitiveArraySerializer<T>
-        extends ArraySerializerBase<T>
-    {
-        /**
-         * Type serializer to use for values, if any.
-         */
-        protected final TypeSerializer _valueTypeSerializer;
-        
-        protected TypedPrimitiveArraySerializer(Class<T> cls) {
-            super(cls);
-            _valueTypeSerializer = null;
-        }
-
-        protected TypedPrimitiveArraySerializer(TypedPrimitiveArraySerializer<T> src,
-                BeanProperty prop, TypeSerializer vts) {
-            super(src, prop);
-            _valueTypeSerializer = vts;
-        }
-    }
-    
-    /*
-    /****************************************************************
-    /* Concrete serializers, arrays
-    /****************************************************************
-     */
-
-    @JacksonStdImpl
-    public final static class BooleanArraySerializer
-        extends ArraySerializerBase<boolean[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Boolean.class);
-
-        public BooleanArraySerializer() { super(boolean[].class, null); }
-
-        /**
-         * Booleans never add type info; hence, even if type serializer is suggested,
-         * we'll ignore it...
-         */
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return this;
-        }
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(boolean[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(boolean[] value) {
-            return (value.length == 1);
-        }
-        
-        @Override
-        public void serializeContents(boolean[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeBoolean(value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("boolean"));
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.BOOLEAN);
-        }
-    }
-
-    /**
-     * Unlike other integral number array serializers, we do not just print out byte values
-     * as numbers. Instead, we assume that it would make more sense to output content
-     * as base64 encoded bytes (using default base64 encoding).
-     *<p>
-     * NOTE: since it is NOT serialized as an array, can not use AsArraySerializer as base
-     */
-    @JacksonStdImpl
-    public final static class ByteArraySerializer
-        extends StdSerializer<byte[]>
-    {
-        public ByteArraySerializer() {
-            super(byte[].class);
-        }
-        
-        @Override
-        public boolean isEmpty(byte[] value) {
-            return (value == null) || (value.length == 0);
-        }
-        
-        @Override
-        public void serialize(byte[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeBinary(provider.getConfig().getBase64Variant(),
-                    value, 0, value.length);
-        }
-
-        @Override
-        public void serializeWithType(byte[] value, JsonGenerator jgen, SerializerProvider provider,
-                TypeSerializer typeSer)
-            throws IOException, JsonGenerationException
-        {
-            typeSer.writeTypePrefixForScalar(value, jgen);
-            jgen.writeBinary(provider.getConfig().getBase64Variant(),
-                    value, 0, value.length);
-            typeSer.writeTypeSuffixForScalar(value, jgen);
-        }
-        
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            ObjectNode itemSchema = createSchemaNode("string"); //binary values written as strings?
-            o.put("items", itemSchema);
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.STRING);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class ShortArraySerializer
-        extends TypedPrimitiveArraySerializer<short[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Short.TYPE);
-
-        public ShortArraySerializer() { super(short[].class); }
-        public ShortArraySerializer(ShortArraySerializer src, BeanProperty prop, TypeSerializer vts) {
-            super(src, prop, vts);
-        }
-
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return new ShortArraySerializer(this, _property, vts);
-        }
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(short[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(short[] value) {
-            return (value.length == 1);
-        }
-        
-        @SuppressWarnings("cast")
-        @Override
-        public void serializeContents(short[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            if (_valueTypeSerializer != null) {
-                for (int i = 0, len = value.length; i < len; ++i) {
-                    _valueTypeSerializer.writeTypePrefixForScalar(null, jgen, Short.TYPE);
-                    jgen.writeNumber(value[i]);
-                    _valueTypeSerializer.writeTypeSuffixForScalar(null, jgen);
-                }
-                return;
-            }
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeNumber((int)value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            //no "short" type defined by json
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("integer"));
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.INTEGER);
-        }
-    }
-
-    /**
-     * Character arrays are different from other integral number arrays in that
-     * they are most likely to be textual data, and should be written as
-     * Strings, not arrays of entries.
-     *<p>
-     * NOTE: since it is NOT serialized as an array, can not use AsArraySerializer as base
-     */
-    @JacksonStdImpl
-    public final static class CharArraySerializer
-        extends StdSerializer<char[]>
-    {
-        public CharArraySerializer() { super(char[].class); }
-        
-        @Override
-        public boolean isEmpty(char[] value) {
-            return (value == null) || (value.length == 0);
-        }
-        
-        @Override
-        public void serialize(char[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            // [JACKSON-289] allows serializing as 'sparse' char array too:
-            if (provider.isEnabled(SerializationFeature.WRITE_CHAR_ARRAYS_AS_JSON_ARRAYS)) {
-                jgen.writeStartArray();
-                _writeArrayContents(jgen, value);
-                jgen.writeEndArray();
-            } else {
-                jgen.writeString(value, 0, value.length);
-            }
-        }
-
-        @Override
-        public void serializeWithType(char[] value, JsonGenerator jgen, SerializerProvider provider,
-                TypeSerializer typeSer)
-            throws IOException, JsonGenerationException
-        {
-            // [JACKSON-289] allows serializing as 'sparse' char array too:
-            if (provider.isEnabled(SerializationFeature.WRITE_CHAR_ARRAYS_AS_JSON_ARRAYS)) {
-                typeSer.writeTypePrefixForArray(value, jgen);
-                _writeArrayContents(jgen, value);
-                typeSer.writeTypeSuffixForArray(value, jgen);
-            } else { // default is to write as simple String
-                typeSer.writeTypePrefixForScalar(value, jgen);
-                jgen.writeString(value, 0, value.length);
-                typeSer.writeTypeSuffixForScalar(value, jgen);
-            }
-        }
-
-        private final void _writeArrayContents(JsonGenerator jgen, char[] value)
-            throws IOException, JsonGenerationException
-        {
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeString(value, i, 1);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            ObjectNode itemSchema = createSchemaNode("string");
-            itemSchema.put("type", "string");
-            o.put("items", itemSchema);
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.STRING);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class IntArraySerializer
-        extends ArraySerializerBase<int[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Integer.TYPE);
-
-        public IntArraySerializer() { super(int[].class, null); }
-
-        /**
-         * Ints never add type info; hence, even if type serializer is suggested,
-         * we'll ignore it...
-         */
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return this;
-        }        
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(int[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(int[] value) {
-            return (value.length == 1);
-        }
-
-        @Override
-        public void serializeContents(int[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeNumber(value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("integer"));
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.INTEGER);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class LongArraySerializer
-        extends TypedPrimitiveArraySerializer<long[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Long.TYPE);
-
-        public LongArraySerializer() { super(long[].class); }
-        public LongArraySerializer(LongArraySerializer src, BeanProperty prop,
-                TypeSerializer vts) {
-            super(src, prop, vts);
-        }
-
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return new LongArraySerializer(this, _property, vts);
-        }
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(long[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(long[] value) {
-            return (value.length == 1);
-        }
-        
-        @Override
-        public void serializeContents(long[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            if (_valueTypeSerializer != null) {
-                for (int i = 0, len = value.length; i < len; ++i) {
-                    _valueTypeSerializer.writeTypePrefixForScalar(null, jgen, Long.TYPE);
-                    jgen.writeNumber(value[i]);
-                    _valueTypeSerializer.writeTypeSuffixForScalar(null, jgen);
-                }
-                return;
-            }
-            
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeNumber(value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("number", true));
-            return o;
-        }
-
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.NUMBER);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class FloatArraySerializer
-        extends TypedPrimitiveArraySerializer<float[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Float.TYPE);
-        
-        public FloatArraySerializer() {
-            super(float[].class);
-        }
-        public FloatArraySerializer(FloatArraySerializer src, BeanProperty prop,
-                TypeSerializer vts) {
-            super(src, prop, vts);
-        }
-
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return new FloatArraySerializer(this, _property, vts);
-        }
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(float[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(float[] value) {
-            return (value.length == 1);
-        }
-        
-        @Override
-        public void serializeContents(float[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            if (_valueTypeSerializer != null) {
-                for (int i = 0, len = value.length; i < len; ++i) {
-                    _valueTypeSerializer.writeTypePrefixForScalar(null, jgen, Float.TYPE);
-                    jgen.writeNumber(value[i]);
-                    _valueTypeSerializer.writeTypeSuffixForScalar(null, jgen);
-                }
-                return;
-            }
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeNumber(value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("number"));
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.NUMBER);
-        }
-    }
-
-    @JacksonStdImpl
-    public final static class DoubleArraySerializer
-        extends ArraySerializerBase<double[]>
-    {
-        // as above, assuming no one re-defines primitive/wrapper types
-        private final static JavaType VALUE_TYPE = TypeFactory.defaultInstance().uncheckedSimpleType(Double.TYPE);
-
-        public DoubleArraySerializer() { super(double[].class, null); }
-
-        /**
-         * Doubles never add type info; hence, even if type serializer is suggested,
-         * we'll ignore it...
-         */
-        @Override
-        public ContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts) {
-            return this;
-        }
-
-        @Override
-        public JavaType getContentType() {
-            return VALUE_TYPE;
-        }
-
-        @Override
-        public JsonSerializer<?> getContentSerializer() {
-            // 14-Jan-2012, tatu: We could refer to an actual serializer if absolutely necessary
-            return null;
-        }
-        
-        @Override
-        public boolean isEmpty(double[] value) {
-            return (value == null) || (value.length == 0);
-        }
-
-        @Override
-        public boolean hasSingleElement(double[] value) {
-            return (value.length == 1);
-        }
-        
-        @Override
-        public void serializeContents(double[] value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            for (int i = 0, len = value.length; i < len; ++i) {
-                jgen.writeNumber(value[i]);
-            }
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            ObjectNode o = createSchemaNode("array", true);
-            o.put("items", createSchemaNode("number"));
-            return o;
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectArrayFormat(typeHint).itemsFormat(JsonFormatTypes.NUMBER);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdContainerSerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdContainerSerializers.java
deleted file mode 100644
index de37a23..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdContainerSerializers.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContainerSerializer;
-import com.fasterxml.jackson.databind.ser.impl.IndexedListSerializer;
-import com.fasterxml.jackson.databind.ser.impl.IteratorSerializer;
-import com.fasterxml.jackson.databind.ser.std.CollectionSerializer;
-
-/**
- * Dummy container class to group standard container serializers: serializers
- * that can serialize things like {@link java.util.List}s,
- * {@link java.util.Map}s and such.
- */
-public class StdContainerSerializers
-{
-    protected StdContainerSerializers() { }
-    
-    /**
-     * @since 2.1
-     */
-    public static ContainerSerializer<?> indexedListSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts, JsonSerializer<Object> valueSerializer)
-    {
-        return new IndexedListSerializer(elemType, staticTyping, vts, null, valueSerializer);
-    }
-    
-    /**
-     * @since 2.1
-     */
-    public static ContainerSerializer<?> collectionSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts, JsonSerializer<Object> valueSerializer)
-    {
-        return new CollectionSerializer(elemType, staticTyping, vts, null, valueSerializer);
-    }
-
-    public static ContainerSerializer<?> iteratorSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts)
-    {
-        return new IteratorSerializer(elemType, staticTyping, vts, null);
-    }
-
-    public static ContainerSerializer<?> iterableSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts)
-    {
-        return new IterableSerializer(elemType, staticTyping, vts, null);
-    }
-
-    public static JsonSerializer<?> enumSetSerializer(JavaType enumType)
-    {
-        return new EnumSetSerializer(enumType, null);
-    }
-
-    /*
-    /**********************************************************
-    /* Deprecated methods
-    /**********************************************************
-     */
-
-    /**
-     * @deprecated Since 2.1; use variant that does not take 'property' argument
-     */
-    @Deprecated
-    public static ContainerSerializer<?> indexedListSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts, BeanProperty property,
-            JsonSerializer<Object> valueSerializer)
-    {
-        return indexedListSerializer(elemType, staticTyping, vts, valueSerializer);
-    }
-
-    /**
-     * @deprecated Since 2.1; use variant that does not take 'property' argument
-     */
-    @Deprecated
-    public static ContainerSerializer<?> collectionSerializer(JavaType elemType,
-            boolean staticTyping, TypeSerializer vts, BeanProperty property,
-            JsonSerializer<Object> valueSerializer)
-    {
-        return collectionSerializer(elemType, staticTyping, vts, valueSerializer);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
deleted file mode 100644
index 7481409..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.Converter;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * Serializer implementation where given Java type is first converted
- * to an intermediate "delegate type" (using a configured
- * {@link Converter}, and then this delegate value is serialized by Jackson.
- *<p>
- * Note that although types may be related, they must not be same; trying
- * to do this will result in an exception.
- * 
- * @since 2.1
- */
-public class StdDelegatingSerializer
-    extends StdSerializer<Object>
-    implements ContextualSerializer,
-        JsonFormatVisitable, SchemaAware
-{
-    protected final Converter<Object,?> _converter;
-    
-    /**
-     * Fully resolved delegate type, with generic information if any available.
-     */
-    protected final JavaType _delegateType;
-    
-    /**
-     * Underlying serializer for type <code>T<.code>.
-     */
-    protected final JsonSerializer<Object> _delegateSerializer;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    @SuppressWarnings("unchecked")
-    public StdDelegatingSerializer(Converter<?,?> converter)
-    {
-        super(Object.class);
-        _converter = (Converter<Object,?>)converter;
-        _delegateType = null;
-        _delegateSerializer = null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> StdDelegatingSerializer(Class<T> cls, Converter<T,?> converter)
-    {
-        super(cls, false);
-        _converter = (Converter<Object,?>)converter;
-        _delegateType = null;
-        _delegateSerializer = null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected StdDelegatingSerializer(Converter<Object,?> converter,
-            JavaType delegateType, JsonSerializer<?> delegateSerializer)
-    {
-        super(delegateType);
-        _converter = converter;
-        _delegateType = delegateType;
-        _delegateSerializer = (JsonSerializer<Object>) delegateSerializer;
-    }
-
-    /**
-     * Method used for creating resolved contextual instances. Must be
-     * overridden when sub-classing.
-     */
-    protected StdDelegatingSerializer withDelegate(Converter<Object,?> converter,
-            JavaType delegateType, JsonSerializer<?> delegateSerializer)
-    {
-        if (getClass() != StdDelegatingSerializer.class) {
-            throw new IllegalStateException("Sub-class "+getClass().getName()+" must override 'withDelegate'");
-        }
-        return new StdDelegatingSerializer(converter, delegateType, delegateSerializer);
-    }
-    
-    /*
-    /**********************************************************
-    /* Contextualization
-    /**********************************************************
-     */
-    
-    // @Override
-    public JsonSerializer<?> createContextual(SerializerProvider provider, BeanProperty property)
-        throws JsonMappingException
-    {
-        // First: figure out what is the fully generic delegate type:
-        TypeFactory tf = provider.getTypeFactory();
-        JavaType implType = tf.constructType(_converter.getClass());
-        JavaType[] params = tf.findTypeParameters(implType, Converter.class);
-        if (params == null || params.length != 2) {
-            throw new JsonMappingException("Could not determine Converter parameterization for "
-                    +implType);
-        }
-        // and then we can find serializer to delegate to, construct a new instance:
-        JavaType delegateType = params[1];
-        return withDelegate(_converter, delegateType,
-                provider.findValueSerializer(delegateType, property));
-    }
-
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-
-    protected Converter<Object, ?> getConverter() {
-        return _converter;
-    }
-
-    @Override
-    public JsonSerializer<?> getDelegatee() {
-        return _delegateSerializer;
-    }
-    
-    /*
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonProcessingException
-    {
-        Object delegateValue = convertValue(value);
-        // should we accept nulls?
-        if (delegateValue == null) {
-            provider.defaultSerializeNull(jgen);
-            return;
-        }
-        _delegateSerializer.serialize(delegateValue, jgen, provider);
-    }
-
-    @Override
-    public void serializeWithType(Object value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        /* 03-Oct-2012, tatu: This is actually unlikely to work ok... but for now,
-         *    let's give it a chance?
-         */
-        Object delegateValue = convertValue(value);
-        _delegateSerializer.serializeWithType(delegateValue, jgen, provider, typeSer);
-    }
-
-    @Override
-    public boolean isEmpty(Object value)
-    {
-        Object delegateValue = convertValue(value);
-        return _delegateSerializer.isEmpty(delegateValue);
-    }
-    
-    /*
-    /**********************************************************
-    /* Schema functionality
-    /**********************************************************
-     */
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        if (_delegateSerializer instanceof SchemaAware) {
-            return ((SchemaAware) _delegateSerializer).getSchema(provider, typeHint);
-        }
-        return super.getSchema(provider, typeHint);
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint,
-        boolean isOptional) throws JsonMappingException
-    {
-        if (_delegateSerializer instanceof SchemaAware) {
-            return ((SchemaAware) _delegateSerializer).getSchema(provider, typeHint, isOptional);
-        }
-        return super.getSchema(provider, typeHint);
-    }
-
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
-        /* 03-Sep-2012, tatu: Not sure if this can be made to really work
-         *    properly... but for now, try this:
-         */
-        _delegateSerializer.acceptJsonFormatVisitor(visitor, typeHint);
-    }
-
-    /*
-    /**********************************************************
-    /* Overridable methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called to convert from source Java value into delegate
-     * value (which will be serialized using standard Jackson serializer for delegate type)
-     *<P>
-     * The default implementation uses configured {@link Converter} to do
-     * conversion.
-     * 
-     * @param delegateValue
-     * @return
-     */
-    protected Object convertValue(Object value) {
-        return _converter.convert(value);
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java
deleted file mode 100644
index 20f417f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.*;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.concurrent.atomic.*;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.ser.BasicSerializerFactory;
-import com.fasterxml.jackson.databind.util.Provider;
-
-/**
- * Class that providers access to serializers user for non-structured JDK types that
- * are serializer as scalars; some using basic {@link ToStringSerializer},
- * others explicit serializers.
- */
-public class StdJdkSerializers
-    implements Provider<Map.Entry<Class<?>,Object>>
-{
-    /**
-     * Method called by {@link BasicSerializerFactory} to access
-     * all serializers this class provides.
-     */
-//  @Override
-    public Collection<Map.Entry<Class<?>, Object>> provide()
-    {
-        HashMap<Class<?>,Object> sers = new HashMap<Class<?>,Object>();
-
-        // First things that 'toString()' can handle
-        final ToStringSerializer sls = ToStringSerializer.instance;
-
-        sers.put(java.net.URL.class, sls);
-        sers.put(java.net.URI.class, sls);
-
-        sers.put(Currency.class, sls);
-        sers.put(UUID.class, sls);
-        sers.put(java.util.regex.Pattern.class, sls);
-        sers.put(Locale.class, sls);
-
-        // starting with 1.7, use compact String for Locale
-        sers.put(Locale.class, sls);
-        
-        // then atomic types
-        sers.put(AtomicReference.class, AtomicReferenceSerializer.class);
-        sers.put(AtomicBoolean.class, AtomicBooleanSerializer.class);
-        sers.put(AtomicInteger.class, AtomicIntegerSerializer.class);
-        sers.put(AtomicLong.class, AtomicLongSerializer.class);
-        
-        // then types that need specialized serializers
-        sers.put(File.class, FileSerializer.class);
-        sers.put(Class.class, ClassSerializer.class);
-
-        // And then some stranger types... not 100% they are needed but:
-        sers.put(Void.TYPE, NullSerializer.class);
-        
-        return sers.entrySet();
-    }
-
-    /*
-     ********************************************************
-     * Serializers for atomic types
-     ********************************************************
-     */
-
-    public final static class AtomicBooleanSerializer
-        extends StdScalarSerializer<AtomicBoolean>
-    {
-        public AtomicBooleanSerializer() { super(AtomicBoolean.class, false); }
-    
-        @Override
-        public void serialize(AtomicBoolean value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeBoolean(value.get());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("boolean", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectBooleanFormat(typeHint);
-        }
-    }
-    
-    public final static class AtomicIntegerSerializer
-        extends StdScalarSerializer<AtomicInteger>
-    {
-        public AtomicIntegerSerializer() { super(AtomicInteger.class, false); }
-    
-        @Override
-        public void serialize(AtomicInteger value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.get());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("integer", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectIntegerFormat(typeHint);
-        }
-    }
-
-    public final static class AtomicLongSerializer
-        extends StdScalarSerializer<AtomicLong>
-    {
-        public AtomicLongSerializer() { super(AtomicLong.class, false); }
-    
-        @Override
-        public void serialize(AtomicLong value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeNumber(value.get());
-        }
-    
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("integer", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectIntegerFormat(typeHint);
-        }
-    }
-    
-    public final static class AtomicReferenceSerializer
-        extends StdSerializer<AtomicReference<?>>
-    {
-        public AtomicReferenceSerializer() { super(AtomicReference.class, false); }
-
-        @Override
-        public void serialize(AtomicReference<?> value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            provider.defaultSerializeValue(value.get(), jgen);
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("any", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectAnyFormat(typeHint);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Specialized serializers, referential types
-    /**********************************************************
-     */
-
-    /**
-     * For now, File objects get serialized by just outputting
-     * absolute (but not canonical) name as String value
-     */
-    public final static class FileSerializer
-        extends StdScalarSerializer<File>
-    {
-        public FileSerializer() { super(File.class); }
-
-        @Override
-        public void serialize(File value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeString(value.getAbsolutePath());
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("string", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectStringFormat(typeHint);
-        }
-    }
-
-    /**
-     * Also: default bean access will not do much good with Class.class. But
-     * we can just serialize the class name and that should be enough.
-     */
-    public final static class ClassSerializer
-        extends StdScalarSerializer<Class<?>>
-    {
-        public ClassSerializer() { super(Class.class, false); }
-
-        @Override
-        public void serialize(Class<?> value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeString(value.getName());
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        {
-            return createSchemaNode("string", true);
-        }
-        
-        @Override
-        public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        {
-        	visitor.expectStringFormat(typeHint);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java
deleted file mode 100644
index b2cacd8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Date;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-
-/**
- * Specialized serializer that can be used as the generic key
- * serializer, when serializing {@link java.util.Map}s to JSON
- * Objects.
- */
-public class StdKeySerializer
-    extends StdSerializer<Object>
-{
-    final static StdKeySerializer instace = new StdKeySerializer();
-
-    public StdKeySerializer() { super(Object.class); }
-    
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        if (value instanceof Date) {
-            provider.defaultSerializeDateKey((Date) value, jgen);
-        } else {
-            jgen.writeFieldName(value.toString());
-        }
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return createSchemaNode("string");
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectStringFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.java
deleted file mode 100644
index fe73e80..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class StdKeySerializers
-{
-    protected final static JsonSerializer<Object> DEFAULT_KEY_SERIALIZER = new StdKeySerializer();
-
-    @SuppressWarnings("unchecked")
-    protected final static JsonSerializer<Object> DEFAULT_STRING_SERIALIZER
-        = (JsonSerializer<Object>)(JsonSerializer<?>) new StringKeySerializer();
-    
-    private StdKeySerializers() { }
-
-    @SuppressWarnings("unchecked")
-    public static JsonSerializer<Object> getStdKeySerializer(JavaType keyType)
-    {
-        if (keyType == null) {
-            return DEFAULT_KEY_SERIALIZER;
-        }
-        Class<?> cls = keyType.getRawClass();
-        if (cls == String.class) {
-            return DEFAULT_STRING_SERIALIZER;
-        }
-        if (cls == Object.class) {
-            return DEFAULT_KEY_SERIALIZER;
-        }
-        // [JACKSON-606] special handling for dates...
-        if (Date.class.isAssignableFrom(cls)) {
-            return (JsonSerializer<Object>) DateKeySerializer.instance;
-        }
-        if (Calendar.class.isAssignableFrom(cls)) {
-            return (JsonSerializer<Object>) CalendarKeySerializer.instance;
-        }
-        // If no match, just use default one:
-        return DEFAULT_KEY_SERIALIZER;
-    }
-
-    /*
-    /**********************************************************
-    /* Standard implementations
-    /**********************************************************
-     */
-
-    public static class StringKeySerializer
-        extends StdSerializer<String>
-    {
-        public StringKeySerializer() { super(String.class); }
-        
-        @Override
-        public void serialize(String value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            jgen.writeFieldName(value);
-        }
-    }
-
-    public static class DateKeySerializer
-        extends StdSerializer<Date>
-    {
-        protected final static JsonSerializer<?> instance = new DateKeySerializer();
-
-        public DateKeySerializer() { super(Date.class); }
-        
-        @Override
-        public void serialize(Date value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            provider.defaultSerializeDateKey(value, jgen);
-        }
-    }
-
-    public static class CalendarKeySerializer
-        extends StdSerializer<Calendar>
-    {
-        protected final static JsonSerializer<?> instance = new CalendarKeySerializer();
-
-        public CalendarKeySerializer() { super(Calendar.class); }
-        
-        @Override
-        public void serialize(Calendar value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException
-        {
-            provider.defaultSerializeDateKey(value.getTimeInMillis(), jgen);
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java
deleted file mode 100644
index 23c13e3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-public abstract class StdScalarSerializer<T>
-    extends StdSerializer<T>
-{
-    protected StdScalarSerializer(Class<T> t) {
-        super(t);
-    }
-
-    /**
-     * Alternate constructor that is (alas!) needed to work
-     * around kinks of generic type handling
-     */
-    @SuppressWarnings("unchecked")
-    protected StdScalarSerializer(Class<?> t, boolean dummy) {
-        super((Class<T>) t);
-    }
-    
-    /**
-     * Default implementation will write type prefix, call regular serialization
-     * method (since assumption is that value itself does not need JSON
-     * Array or Object start/end markers), and then write type suffix.
-     * This should work for most cases; some sub-classes may want to
-     * change this behavior.
-     */
-    @Override
-    public void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForScalar(value, jgen);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        visitor.expectAnyFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdSerializer.java
deleted file mode 100644
index 4796da3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StdSerializer.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsonschema.SchemaAware;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * Base class used by all standard serializers, and can also
- * be used for custom serializers (in fact, this is the recommended
- * base class to use).
- * Provides convenience methods for implementing {@link SchemaAware}
- */
-public abstract class StdSerializer<T>
-    extends JsonSerializer<T>
-    implements JsonFormatVisitable, SchemaAware
-{
-    /**
-     * Nominal type supported, usually declared type of
-     * property for which serializer is used.
-     */
-    protected final Class<T> _handledType;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-    
-    protected StdSerializer(Class<T> t) {
-        _handledType = t;
-    }
-
-    @SuppressWarnings("unchecked")
-    protected StdSerializer(JavaType type) {
-        _handledType = (Class<T>) type.getRawClass();
-    }
-    
-    /**
-     * Alternate constructor that is (alas!) needed to work
-     * around kinks of generic type handling
-     */
-    @SuppressWarnings("unchecked")
-    protected StdSerializer(Class<?> t, boolean dummy) {
-        _handledType = (Class<T>) t;
-    }
-    /*
-    /**********************************************************
-    /* Accessors
-    /**********************************************************
-     */
-    
-    @Override
-    public Class<T> handledType() { return _handledType; }
-
-    /*
-    /**********************************************************
-    /* Serialization
-    /**********************************************************
-     */
-    
-    @Override
-    public abstract void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException;
-
-    /*
-    /**********************************************************
-    /* Helper methods for JSON Schema generation
-    /**********************************************************
-     */
-    
-    /**
-     * Default implementation simply claims type is "string"; usually
-     * overriden by custom serializers.
-     */
-//  @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return createSchemaNode("string");
-    }
-    
-    /**
-     * Default implementation simply claims type is "string"; usually
-     * overriden by custom serializers.
-     */
-//    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint, boolean isOptional)
-        throws JsonMappingException
-    {
-    	ObjectNode schema = (ObjectNode) getSchema(provider, typeHint);
-    	if (!isOptional) {
-    		schema.put("required", !isOptional);
-    	}
-        return schema;
-    }
-    
-    protected ObjectNode createObjectNode() {
-        return JsonNodeFactory.instance.objectNode();
-    }
-    
-    protected ObjectNode createSchemaNode(String type)
-    {
-        ObjectNode schema = createObjectNode();
-        schema.put("type", type);
-        return schema;
-    }
-    
-    protected ObjectNode createSchemaNode(String type, boolean isOptional)
-    {
-        ObjectNode schema = createSchemaNode(type);
-        // as per [JACKSON-563]. Note that 'required' defaults to false
-        if (!isOptional) {
-            schema.put("required", !isOptional);
-        }
-        return schema;
-    }
-    
-    /**
-     * Default implementation specifies no format. This behavior is usually
-     * overriden by custom serializers.
-     */
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
-    	visitor.expectAnyFormat(typeHint);
-    }
-            
-    /*
-    /**********************************************************
-    /* Helper methods for exception handling
-    /**********************************************************
-     */
-    
-    /**
-     * Method that will modify caught exception (passed in as argument)
-     * as necessary to include reference information, and to ensure it
-     * is a subtype of {@link IOException}, or an unchecked exception.
-     *<p>
-     * Rules for wrapping and unwrapping are bit complicated; essentially:
-     *<ul>
-     * <li>Errors are to be passed as is (if uncovered via unwrapping)
-     * <li>"Plain" IOExceptions (ones that are not of type
-     *   {@link JsonMappingException} are to be passed as is
-     *</ul>
-     */
-    public void wrapAndThrow(SerializerProvider provider,
-            Throwable t, Object bean, String fieldName)
-        throws IOException
-    {
-        /* 05-Mar-2009, tatu: But one nasty edge is when we get
-         *   StackOverflow: usually due to infinite loop. But that
-         *   usually gets hidden within an InvocationTargetException...
-         */
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors and "plain" IOExceptions to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        // Ditto for IOExceptions... except for mapping exceptions!
-        boolean wrap = (provider == null) || provider.isEnabled(SerializationFeature.WRAP_EXCEPTIONS);
-        if (t instanceof IOException) {
-            if (!wrap || !(t instanceof JsonMappingException)) {
-                throw (IOException) t;
-            }
-        } else if (!wrap) { // [JACKSON-407] -- allow disabling wrapping for unchecked exceptions
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            }
-        }
-        // [JACKSON-55] Need to add reference information
-        throw JsonMappingException.wrapWithPath(t, bean, fieldName);
-    }
-
-    public void wrapAndThrow(SerializerProvider provider,
-            Throwable t, Object bean, int index)
-        throws IOException
-    {
-        while (t instanceof InvocationTargetException && t.getCause() != null) {
-            t = t.getCause();
-        }
-        // Errors are to be passed as is
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        // Ditto for IOExceptions... except for mapping exceptions!
-        boolean wrap = (provider == null) || provider.isEnabled(SerializationFeature.WRAP_EXCEPTIONS);
-        if (t instanceof IOException) {
-            if (!wrap || !(t instanceof JsonMappingException)) {
-                throw (IOException) t;
-            }
-        } else if (!wrap) { // [JACKSON-407] -- allow disabling wrapping for unchecked exceptions
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            }
-        }
-        // [JACKSON-55] Need to add reference information
-        throw JsonMappingException.wrapWithPath(t, bean, index);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods, other
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to determine if given serializer is the default
-     * serializer Jackson uses; as opposed to a custom serializer installed by
-     * a module or calling application. Determination is done using
-     * {@link JacksonStdImpl} annotation on serializer class.
-     */
-    protected boolean isDefaultSerializer(JsonSerializer<?> serializer) {
-        return (serializer != null && serializer.getClass().getAnnotation(JacksonStdImpl.class) != null);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StringSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StringSerializer.java
deleted file mode 100644
index a60d8d6..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/StringSerializer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-
-/**
- * This is the special serializer for regular {@link java.lang.String}s.
- *<p>
- * Since this is one of "native" types, no type information is ever
- * included on serialization (unlike for most scalar types as of 1.5)
- */
-@JacksonStdImpl
-public final class StringSerializer
-    extends NonTypedScalarSerializerBase<String>
-{
-    public StringSerializer() { super(String.class); }
-
-    /**
-     * For Strings, both null and Empty String qualify for emptiness.
-     */
-    @Override
-    public boolean isEmpty(String value) {
-        return (value == null) || (value.length() == 0);
-    }
-    
-    @Override
-    public void serialize(String value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeString(value);
-    }
-
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectStringFormat(typeHint);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java
deleted file mode 100644
index 71f2bf5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-public class TimeZoneSerializer
-    extends StdScalarSerializer<TimeZone>
-{
-    public final static TimeZoneSerializer instance = new TimeZoneSerializer();
-    
-    public TimeZoneSerializer() { super(TimeZone.class); }
-
-    @Override
-    public void serialize(TimeZone value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeString(value.getID());
-    }
-
-    @Override
-    public void serializeWithType(TimeZone value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        // Better ensure we don't use specific sub-classes:
-        typeSer.writeTypePrefixForScalar(value, jgen, TimeZone.class);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java
deleted file mode 100644
index b57f242..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Simple general purpose serializer, useful for any
- * type for which {@link Object#toString} returns the desired JSON
- * value.
- */
-@JacksonStdImpl
-public class ToStringSerializer
-    extends StdSerializer<Object>
-{
-    /**
-     * Singleton instance to use.
-     */
-    public final static ToStringSerializer instance = new ToStringSerializer();
-
-    /**
-     *<p>
-     * Note: usually you should NOT create new instances, but instead use
-     * {@link #instance} which is stateless and fully thread-safe. However,
-     * there are cases where constructor is needed; for example,
-     * when using explicit serializer annotations like
-     * {@link com.fasterxml.jackson.databind.annotation.JsonSerialize#using}.
-     */
-    public ToStringSerializer() { super(Object.class); }
-
-    @Override
-    public boolean isEmpty(Object value) {
-        if (value == null) {
-            return true;
-        }
-        String str = value.toString();
-        // would use String.isEmpty(), but that's JDK 1.6
-        return (str == null) || (str.length() == 0);
-    }
-    
-    @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        jgen.writeString(value.toString());
-    }
-
-    /* 01-Mar-2011, tatu: We were serializing as "raw" String; but generally that
-     *   is not what we want, since lack of type information would imply real
-     *   String type.
-     */
-    /**
-     * Default implementation will write type prefix, call regular serialization
-     * method (since assumption is that value itself does not need JSON
-     * Array or Object start/end markers), and then write type suffix.
-     * This should work for most cases; some sub-classes may want to
-     * change this behavior.
-     */
-    @Override
-    public void serializeWithType(Object value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForScalar(value, jgen);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
-        return createSchemaNode("string", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-    	visitor.expectStringFormat(typeHint);
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java
deleted file mode 100644
index 27d514d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.fasterxml.jackson.databind.ser.std;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.util.TokenBuffer;
-
-/**
- * We also want to directly support serialization of {@link TokenBuffer};
- * and since it is part of core package, it can not implement
- * {@link com.fasterxml.jackson.databind.JsonSerializable}
- * (which is only included in the mapper package)
- */
-@JacksonStdImpl
-public class TokenBufferSerializer
-    extends StdSerializer<TokenBuffer>
-{
-    public TokenBufferSerializer() { super(TokenBuffer.class); }
-
-    @Override
-    public void serialize(TokenBuffer value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
-        value.serialize(jgen);
-    }
-
-    /**
-     * Implementing typed output for contents of a TokenBuffer is very tricky,
-     * since we do not know for sure what its contents might look like (or, rather,
-     * we do know when serializing, but not necessarily when deserializing!)
-     * One possibility would be to check the current token, and use that to
-     * determine if we would output JSON Array, Object or scalar value.
-     * Jackson 1.5 did NOT include any type information; but this seems wrong,
-     * and so 1.6 WILL include type information.
-     *<p>
-     * Note that we just claim it is scalar; this should work ok and is simpler
-     * than doing introspection on both serialization and deserialization.
-     */
-    @Override
-    public final void serializeWithType(TokenBuffer value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
-        typeSer.writeTypePrefixForScalar(value, jgen);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-    
-    @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
-        /* 01-Jan-2010, tatu: Not 100% sure what we should say here:
-         *   type is basically not known. This seems closest
-         *   approximation
-         */
-        return createSchemaNode("any", true);
-    }
-    
-    @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-    {
-        /* 01-Jan-2010, tatu: Not 100% sure what we should say here:
-         *   type is basically not known. This seems closest
-         *   approximation
-         */
-    	visitor.expectAnyFormat(typeHint);
-    }
-}    
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/ArrayType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/ArrayType.java
deleted file mode 100644
index 620fe31..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/ArrayType.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.lang.reflect.Array;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Array types represent Java arrays, both primitive and object valued.
- * Further, Object-valued arrays can have element type of any other
- * legal {@link JavaType}.
- */
-public final class ArrayType
-    extends TypeBase
-{
-    private static final long serialVersionUID = -6866628807166594553L;
-
-    /**
-     * Type of elements in the array.
-     */
-    protected final JavaType _componentType;
-
-    /**
-     * We will also keep track of shareable instance of empty array,
-     * since it usually needs to be constructed any way; and because
-     * it is essentially immutable and thus can be shared.
-     */
-    protected final Object _emptyArray;
-
-    private ArrayType(JavaType componentType, Object emptyInstance,
-            Object valueHandler, Object typeHandler)
-    {
-        super(emptyInstance.getClass(), componentType.hashCode(),
-                valueHandler, typeHandler);
-        _componentType = componentType;
-        _emptyArray = emptyInstance;
-    }
-
-    public static ArrayType construct(JavaType componentType,
-            Object valueHandler, Object typeHandler)
-    {
-        /* This is bit messy: there is apparently no other way to
-         * reconstruct actual concrete/raw array class from component
-         * type, than to construct an instance, get class (same is
-         * true for GenericArracyType as well; hence we won't bother
-         * passing that in).
-         */
-        Object emptyInstance = Array.newInstance(componentType.getRawClass(), 0);
-        return new ArrayType(componentType, emptyInstance, null, null);
-    }                                   
-    
-    @Override
-    public ArrayType withTypeHandler(Object h)
-    {
-        if (h == _typeHandler) {
-            return this;
-        }
-        return new ArrayType(_componentType, _emptyArray, _valueHandler, h);
-    }
-
-    @Override
-    public ArrayType withContentTypeHandler(Object h)
-    {
-        if (h == _componentType.<Object>getTypeHandler()) {
-            return this;
-        }
-        return new ArrayType(_componentType.withTypeHandler(h), _emptyArray,
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public ArrayType withValueHandler(Object h) {
-        if (h == _valueHandler) {
-            return this;
-        }
-        return new ArrayType(_componentType, _emptyArray, h, _typeHandler);
-    }
-
-    @Override
-    public ArrayType withContentValueHandler(Object h) {
-        if (h == _componentType.<Object>getValueHandler()) {
-            return this;
-        }
-        return new ArrayType(_componentType.withValueHandler(h), _emptyArray,
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    protected String buildCanonicalName() {
-        return _class.getName();
-    }
-    
-    /*
-    /**********************************************************
-    /* Methods for narrowing conversions
-    /**********************************************************
-     */
-
-    /**
-     * Handling of narrowing conversions for arrays is trickier: for now,
-     * it is not even allowed.
-     */
-    @Override
-    protected JavaType _narrow(Class<?> subclass)
-    {
-        /* Ok: need a bit of indirection here. First, must replace component
-         * type (and check that it is compatible), then re-construct.
-         */
-        if (!subclass.isArray()) { // sanity check, should never occur
-            throw new IllegalArgumentException("Incompatible narrowing operation: trying to narrow "+toString()+" to class "+subclass.getName());
-        }
-        /* Hmmh. This is an awkward back reference... but seems like the
-         * only simple way to do it.
-         */
-        Class<?> newCompClass = subclass.getComponentType();
-        /* 14-Mar-2011, tatu: it gets even worse, as we do not have access to
-         *   currently configured TypeFactory. This could theoretically cause
-         *   problems (when narrowing from array of Objects, to array of non-standard
-         *   Maps, for example); but for now need to defer solving this until
-         *   it actually becomes a real problem, not just potential one.
-         *   (famous last words?)
-         */
-        JavaType newCompType = TypeFactory.defaultInstance().constructType(newCompClass);
-        return construct(newCompType, _valueHandler, _typeHandler);
-    }
-
-    /**
-     * For array types, both main type and content type can be modified;
-     * but ultimately they are interchangeable.
-     */
-    @Override
-    public JavaType narrowContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _componentType.getRawClass()) {
-            return this;
-        }
-        return construct(_componentType.narrowBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _componentType.getRawClass()) {
-            return this;
-        }
-        return construct(_componentType.widenBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-    
-    /*
-    /**********************************************************
-    /* Overridden methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isArrayType() { return true; }
-    
-    /**
-     * For some odd reason, modifiers for array classes would
-     * claim they are abstract types. Not so, at least for our
-     * purposes.
-     */
-    @Override
-    public boolean isAbstract() { return false; }
-
-    /**
-     * For some odd reason, modifiers for array classes would
-     * claim they are abstract types. Not so, at least for our
-     * purposes.
-     */
-    @Override
-    public boolean isConcrete() { return true; }
-
-    @Override
-    public boolean hasGenericTypes() {
-        // arrays are not parameterized, but element type may be:
-        return _componentType.hasGenericTypes();
-    }
-    
-    /**
-     * Not sure what symbolic name is used internally, if any;
-     * let's follow naming of Collection types here.
-     * Should not really matter since array types have no
-     * super types.
-     */
-    @Override
-    public String containedTypeName(int index) {
-        if (index == 0) return "E";
-        return null;
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isContainerType() { return true; }
-
-    @Override
-    public JavaType getContentType() { return  _componentType; }
-
-    @Override
-    public int containedTypeCount() { return 1; }
-    @Override
-    public JavaType containedType(int index) {
-            return (index == 0) ? _componentType : null;
-    }
-    
-    @Override
-    public StringBuilder getGenericSignature(StringBuilder sb) {
-        sb.append('[');
-        return _componentType.getGenericSignature(sb);
-    }
-
-    @Override
-    public StringBuilder getErasedSignature(StringBuilder sb) {
-        sb.append('[');
-        return _componentType.getErasedSignature(sb);
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[array type, component type: "+_componentType+"]";
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-
-        ArrayType other = (ArrayType) o;
-        return _componentType.equals(other._componentType);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/ClassKey.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/ClassKey.java
deleted file mode 100644
index 4a70d9c..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/ClassKey.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-/**
- * Key class, used as an efficient and accurate key
- * for locating per-class values, such as
- * {@link com.fasterxml.jackson.databind.JsonSerializer}s.
- *<p>
- * The reason for having a separate key class instead of
- * directly using {@link Class} as key is mostly
- * to allow for redefining <code>hashCode</code> method --
- * for some strange reason, {@link Class} does not
- * redefine {@link Object#hashCode} and thus uses identity
- * hash, which is pretty slow. This makes key access using
- * {@link Class} unnecessarily slow.
- *<p>
- * Note: since class is not strictly immutable, caller must
- * know what it is doing, if changing field values.
- */
-public final class ClassKey
-    implements Comparable<ClassKey>,
-        java.io.Serializable // since 2.1
-{
-    private static final long serialVersionUID = 1L;
-
-    private String _className;
-
-    private Class<?> _class;
-
-    /**
-     * Let's cache hash code straight away, since we are
-     * almost certain to need it.
-     */
-    private int _hashCode;
-
-    public ClassKey() 
-    {
-        _class = null;
-        _className = null;
-        _hashCode = 0;
-    }
-
-    public ClassKey(Class<?> clz)
-    {
-        _class = clz;
-        _className = clz.getName();
-        _hashCode = _className.hashCode();
-    }
-
-    public void reset(Class<?> clz)
-    {
-        _class = clz;
-        _className = clz.getName();
-        _hashCode = _className.hashCode();
-    }
-
-    /*
-    /**********************************************************
-    /* Comparable
-    /**********************************************************
-     */
-
-//  @Override
-    public int compareTo(ClassKey other)
-    {
-        // Just need to sort by name, ok to collide (unless used in TreeMap/Set!)
-        return _className.compareTo(other._className);
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-        public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-        ClassKey other = (ClassKey) o;
-
-        /* Is it possible to have different Class object for same name + class loader combo?
-         * Let's assume answer is no: if this is wrong, will need to uncomment following functionality
-         */
-        /*
-        return (other._className.equals(_className))
-            && (other._class.getClassLoader() == _class.getClassLoader());
-        */
-        return other._class == _class;
-    }
-
-    @Override public int hashCode() { return _hashCode; }
-
-    @Override public String toString() { return _className; }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionLikeType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionLikeType.java
deleted file mode 100644
index 0a8d6ae..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionLikeType.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Type that represents things that act similar to {@link java.util.Collection};
- * but may or may not be instances of that interface.
- * This specifically allows framework to check for configuration and annotation
- * settings used for Map types, and pass these to custom handlers that may be more
- * familiar with actual type.
- */
-public class CollectionLikeType extends TypeBase
-{
-    private static final long serialVersionUID = -2079769185110719683L;
-
-    /**
-     * Type of elements in collection
-     */
-    protected final JavaType _elementType;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected CollectionLikeType(Class<?> collT, JavaType elemT,
-            Object valueHandler, Object typeHandler)
-    {
-        super(collT, elemT.hashCode(), valueHandler, typeHandler);
-        _elementType = elemT;
-    }
-    
-    @Override
-    protected JavaType _narrow(Class<?> subclass) {
-        return new CollectionLikeType(subclass, _elementType,
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType narrowContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _elementType.getRawClass()) {
-            return this;
-        }
-        return new CollectionLikeType(_class, _elementType.narrowBy(contentClass),
-                _valueHandler, _typeHandler);    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _elementType.getRawClass()) {
-            return this;
-        }
-        return new CollectionLikeType(_class, _elementType.widenBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-    
-    public static CollectionLikeType construct(Class<?> rawType, JavaType elemT)
-    {
-        // nominally component types will be just Object.class
-        return new CollectionLikeType(rawType, elemT, null, null);
-    }
-
-    @Override
-    public CollectionLikeType withTypeHandler(Object h)
-    {
-        return new CollectionLikeType(_class, _elementType, _valueHandler, h);
-    }
-
-    @Override
-    public CollectionLikeType withContentTypeHandler(Object h)
-    {
-        return new CollectionLikeType(_class, _elementType.withTypeHandler(h),
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public CollectionLikeType withValueHandler(Object h) {
-        return new CollectionLikeType(_class, _elementType, h, _typeHandler);
-    }
-
-    @Override
-    public CollectionLikeType withContentValueHandler(Object h) {
-        return new CollectionLikeType(_class, _elementType.withValueHandler(h),
-                _valueHandler, _typeHandler);
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isContainerType() { return true; }
-
-    @Override
-    public boolean isCollectionLikeType() { return true; }
-    
-    @Override
-    public JavaType getContentType() { return _elementType; }
-
-    @Override
-    public int containedTypeCount() { return 1; }
-
-    @Override
-    public JavaType containedType(int index) {
-            return (index == 0) ? _elementType : null;
-    }
-
-    /**
-     * Not sure if we should count on this, but type names
-     * for core interfaces use "E" for element type
-     */
-    @Override
-    public String containedTypeName(int index) {
-        if (index == 0) return "E";
-        return null;
-    }
-
-    @Override
-    public StringBuilder getErasedSignature(StringBuilder sb) {
-        return _classSignature(_class, sb, true);
-    }
-    
-    @Override
-    public StringBuilder getGenericSignature(StringBuilder sb) {
-        _classSignature(_class, sb, false);
-        sb.append('<');
-        _elementType.getGenericSignature(sb);
-        sb.append(">;");
-        return sb;
-    }
-    
-    @Override
-    protected String buildCanonicalName() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(_class.getName());
-        if (_elementType != null) {
-            sb.append('<');
-            sb.append(_elementType.toCanonical());
-            sb.append('>');
-        }
-        return sb.toString();
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used for checking whether this type is a
-     * "real" Collection type; meaning whether it represents a parameterized
-     * subtype of {@link java.util.Collection} or just something that acts
-     * like one.
-     */
-    public boolean isTrueCollectionType() {
-        return Collection.class.isAssignableFrom(_class);
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-
-        CollectionLikeType other = (CollectionLikeType) o;
-        return  (_class == other._class) && _elementType.equals(other._elementType);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "[collection-like type; class "+_class.getName()+", contains "+_elementType+"]";
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionType.java
deleted file mode 100644
index 6f91f01..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/CollectionType.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Type that represents Java Collection types (Lists, Sets).
- */
-public final class CollectionType
-    extends CollectionLikeType
-{
-    private static final long serialVersionUID = 7218006718717444365L;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    private CollectionType(Class<?> collT, JavaType elemT,
-            Object valueHandler, Object typeHandler)
-    {
-        super(collT,  elemT, valueHandler, typeHandler);
-    }
-
-    @Override
-    protected JavaType _narrow(Class<?> subclass) {
-        return new CollectionType(subclass, _elementType, null, null);
-    }
-
-    @Override
-    public JavaType narrowContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _elementType.getRawClass()) {
-            return this;
-        }
-        return new CollectionType(_class, _elementType.narrowBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _elementType.getRawClass()) {
-            return this;
-        }
-        return new CollectionType(_class, _elementType.widenBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-    
-    public static CollectionType construct(Class<?> rawType, JavaType elemT)
-    {
-        // nominally component types will be just Object.class
-        return new CollectionType(rawType, elemT, null, null);
-    }
-
-    // Since 1.7:
-    @Override
-    public CollectionType withTypeHandler(Object h) {
-        return new CollectionType(_class, _elementType, _valueHandler, h);
-    }
-
-    // Since 1.7:
-    @Override
-    public CollectionType withContentTypeHandler(Object h)
-    {
-        return new CollectionType(_class, _elementType.withTypeHandler(h),
-                _valueHandler, _typeHandler);
-    }
-
-    // Since 1.9:
-    @Override
-    public CollectionType withValueHandler(Object h) {
-        return new CollectionType(_class, _elementType, h, _typeHandler);
-    }
-
-    // Since 1.9:
-    @Override
-    public  CollectionType withContentValueHandler(Object h) {
-        return new CollectionType(_class, _elementType.withValueHandler(h),
-                _valueHandler, _typeHandler);
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[collection type; class "+_class.getName()+", contains "+_elementType+"]";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/HierarchicType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/HierarchicType.java
deleted file mode 100644
index 56518fe..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/HierarchicType.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.lang.reflect.*;
-
-/**
- * Simple replacement for {@link java.lang.Class} (and/or various Type subtypes)
- * that is used as part of single-path extends/implements chain to express
- * specific relationship between one subtype and one supertype. This is needed
- * for resolving type parameters. Instances are doubly-linked so that chain
- * can be traversed in both directions
- */
-public class HierarchicType
-{
-    /**
-     * Type which will be either plain {@link java.lang.Class} or
-     * {@link java.lang.reflect.ParameterizedType}.
-     */
-    protected final Type _actualType;
-    
-    protected final Class<?> _rawClass;
-
-    protected final ParameterizedType _genericType;
-    
-    protected HierarchicType _superType;
-
-    protected HierarchicType _subType;
-    
-    public HierarchicType(Type type)
-    {
-        this._actualType = type;
-        if (type instanceof Class<?>) {
-            _rawClass = (Class<?>) type;
-            _genericType = null;
-        } else if (type instanceof ParameterizedType) {
-            _genericType = (ParameterizedType) type;
-            _rawClass = (Class<?>) _genericType.getRawType();
-        } else { // should never happen... can't extend GenericArrayType?
-            throw new IllegalArgumentException("Type "+type.getClass().getName()+" can not be used to construct HierarchicType");
-        }
-    }
-
-    private HierarchicType(Type actualType, Class<?> rawClass, ParameterizedType genericType,
-        HierarchicType superType, HierarchicType subType)
-    {
-        _actualType = actualType;
-        _rawClass = rawClass;
-        _genericType = genericType;
-        _superType = superType;
-        _subType = subType;
-    }
-    
-    /**
-     * Method that can be used to create a deep clone of this hierarchic type, including
-     * super types (but not subtypes)
-     */
-    public HierarchicType deepCloneWithoutSubtype()
-    {
-        HierarchicType sup = (_superType == null) ? null : _superType.deepCloneWithoutSubtype();
-        HierarchicType result = new HierarchicType(_actualType, _rawClass, _genericType, sup, null);
-        if (sup != null) {
-            sup.setSubType(result);
-        }
-        return result;
-    }
-    
-    public void setSuperType(HierarchicType sup) { _superType = sup; }
-    public final HierarchicType getSuperType() { return _superType; }
-    public void setSubType(HierarchicType sub) { _subType = sub; }
-    public final HierarchicType getSubType() { return _subType; }
-    
-    public final boolean isGeneric() { return _genericType != null; }
-    public final ParameterizedType asGeneric() { return _genericType; }
-
-    public final Class<?> getRawClass() { return _rawClass; }
-    
-    @Override
-    public String toString() {
-        if (_genericType != null) {
-            return _genericType.toString();
-        }
-        return _rawClass.getName();
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapLikeType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapLikeType.java
deleted file mode 100644
index 97b3de8..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapLikeType.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Type that represents Map-like types; things that consist of key/value pairs but that
- * do not necessarily implement {@link java.util.Map}, but that do not have enough
- * introspection functionality to allow for some level of generic handling.
- * This specifically allows framework to check for configuration and annotation
- * settings used for Map types, and pass these to custom handlers that may be more
- * familiar with actual type.
- */
-public class MapLikeType extends TypeBase
-{
-    private static final long serialVersionUID = -4720638149668688793L;
-
-    /**
-     * Type of keys of Map.
-     */
-    protected final JavaType _keyType;
-
-    /**
-     * Type of values of Map.
-     */
-    protected final JavaType _valueType;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected MapLikeType(Class<?> mapType, JavaType keyT, JavaType valueT,
-            Object valueHandler, Object typeHandler)
-    {
-        super(mapType, keyT.hashCode() ^ valueT.hashCode(), valueHandler, typeHandler);
-        _keyType = keyT;
-        _valueType = valueT;
-    }
-    
-    public static MapLikeType construct(Class<?> rawType, JavaType keyT, JavaType valueT)
-    {
-        // nominally component types will be just Object.class
-        return new MapLikeType(rawType, keyT, valueT, null, null);
-    }
-
-    @Override
-    protected JavaType _narrow(Class<?> subclass)
-    {
-        return new MapLikeType(subclass, _keyType, _valueType, _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType narrowContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _valueType.getRawClass()) {
-            return this;
-        }
-        return new MapLikeType(_class, _keyType, _valueType.narrowBy(contentClass),
-               _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> contentClass)
-    {
-        if (contentClass == _valueType.getRawClass()) {
-            return this;
-        }
-        return new MapLikeType(_class, _keyType, _valueType.widenBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-    
-    public JavaType narrowKey(Class<?> keySubclass)
-    {
-        // Can do a quick check first:
-        if (keySubclass == _keyType.getRawClass()) {
-            return this;
-        }
-        return new MapLikeType(_class, _keyType.narrowBy(keySubclass), _valueType,
-                _valueHandler, _typeHandler);
-    }
-
-    public JavaType widenKey(Class<?> keySubclass)
-    {
-        // Can do a quick check first:
-        if (keySubclass == _keyType.getRawClass()) {
-            return this;
-        }
-        return new MapLikeType(_class, _keyType.widenBy(keySubclass), _valueType,
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    public MapLikeType withTypeHandler(Object h)
-    {
-        return new MapLikeType(_class, _keyType, _valueType, _valueHandler, h);
-    }
-
-    @Override
-    public MapLikeType withContentTypeHandler(Object h)
-    {
-        return new MapLikeType(_class, _keyType, _valueType.withTypeHandler(h),
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public MapLikeType withValueHandler(Object h) {
-        return new MapLikeType(_class, _keyType, _valueType, h, _typeHandler);
-    }
-
-    @Override
-    public MapLikeType withContentValueHandler(Object h) {
-        return new MapLikeType(_class, _keyType, _valueType.withValueHandler(h),
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    protected String buildCanonicalName() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(_class.getName());
-        if (_keyType != null) {
-            sb.append('<');
-            sb.append(_keyType.toCanonical());
-            sb.append(',');
-            sb.append(_valueType.toCanonical());
-            sb.append('>');
-        }
-        return sb.toString();
-    }
- 
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isContainerType() { return true; }
-
-    @Override
-    public boolean isMapLikeType() { return true; }
-    
-    @Override
-    public JavaType getKeyType() { return _keyType; }
-
-    @Override
-    public JavaType getContentType() { return _valueType; }
-
-    @Override
-    public int containedTypeCount() { return 2; }
-    
-    @Override
-    public JavaType containedType(int index) {
-        if (index == 0) return _keyType;
-        if (index == 1) return _valueType;
-        return null;
-    }
-
-    /**
-     * Not sure if we should count on this, but type names
-     * for core interfaces are "K" and "V" respectively.
-     * For now let's assume this should work.
-     */
-    @Override
-    public String containedTypeName(int index) {
-        if (index == 0) return "K";
-        if (index == 1) return "V";
-        return null;
-    }
-
-    @Override
-    public StringBuilder getErasedSignature(StringBuilder sb) {
-        return _classSignature(_class, sb, true);
-    }
-    
-    @Override
-    public StringBuilder getGenericSignature(StringBuilder sb)
-    {
-        _classSignature(_class, sb, false);
-        sb.append('<');
-        _keyType.getGenericSignature(sb);
-        _valueType.getGenericSignature(sb);
-        sb.append(">;");
-        return sb;
-    }
- 
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-
-    public MapLikeType withKeyTypeHandler(Object h)
-    {
-        return new MapLikeType(_class, _keyType.withTypeHandler(h), _valueType,
-                _valueHandler, _typeHandler);
-    }
-
-    public MapLikeType withKeyValueHandler(Object h) {
-        return new MapLikeType(_class, _keyType.withValueHandler(h), _valueType,
-                _valueHandler, _typeHandler);
-    }
-    
-    /**
-     * Method that can be used for checking whether this type is a
-     * "real" Collection type; meaning whether it represents a parameterized
-     * subtype of {@link java.util.Collection} or just something that acts
-     * like one.
-     */
-    public boolean isTrueMapType() {
-        return Map.class.isAssignableFrom(_class);
-    }
-
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[map-like type; class "+_class.getName()+", "+_keyType+" -> "+_valueType+"]";
-    }
-    
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-
-        MapLikeType other = (MapLikeType) o;
-        return (_class == other._class)
-            && _keyType.equals(other._keyType)
-            && _valueType.equals(other._valueType);
-    }
-    
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapType.java
deleted file mode 100644
index 36f397f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/MapType.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Type that represents "true" Java Map types.
- */
-public final class MapType extends MapLikeType
-{
-    private static final long serialVersionUID = 2276544408153191774L;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    private MapType(Class<?> mapType, JavaType keyT, JavaType valueT,
-            Object valueHandler, Object typeHandler) {
-        super(mapType, keyT, valueT, valueHandler, typeHandler);
-    }
-    
-    public static MapType construct(Class<?> rawType, JavaType keyT, JavaType valueT) {
-        // nominally component types will be just Object.class
-        return new MapType(rawType, keyT, valueT, null, null);
-    }
-
-    @Override
-    protected JavaType _narrow(Class<?> subclass) {
-        return new MapType(subclass, _keyType, _valueType,
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType narrowContentsBy(Class<?> contentClass)
-    {
-        // Can do a quick check first:
-        if (contentClass == _valueType.getRawClass()) {
-            return this;
-        }
-        return new MapType(_class, _keyType, _valueType.narrowBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> contentClass)
-    {
-        if (contentClass == _valueType.getRawClass()) {
-            return this;
-        }
-        return new MapType(_class, _keyType, _valueType.widenBy(contentClass),
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    public JavaType narrowKey(Class<?> keySubclass)
-    {
-        // Can do a quick check first:
-        if (keySubclass == _keyType.getRawClass()) {
-            return this;
-        }
-        return new MapType(_class, _keyType.narrowBy(keySubclass), _valueType,
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType widenKey(Class<?> keySubclass)
-    {
-        // Can do a quick check first:
-        if (keySubclass == _keyType.getRawClass()) {
-            return this;
-        }
-        return new MapType(_class, _keyType.widenBy(keySubclass), _valueType,
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    public MapType withTypeHandler(Object h) {
-        return new MapType(_class, _keyType, _valueType, _valueHandler, h);
-    }
-
-    @Override
-    public MapType withContentTypeHandler(Object h)
-    {
-        return new MapType(_class, _keyType, _valueType.withTypeHandler(h),
-                _valueHandler, _typeHandler);
-    }
-    
-    @Override
-    public MapType withValueHandler(Object h) {
-        return new MapType(_class, _keyType, _valueType, h, _typeHandler);
-    }
-
-    @Override
-    public MapType withContentValueHandler(Object h) {
-        return new MapType(_class, _keyType, _valueType.withValueHandler(h),
-                _valueHandler, _typeHandler);
-    }
-
-    /*
-    /**********************************************************
-    /* Extended API
-    /**********************************************************
-     */
-    
-    @Override
-    public MapType withKeyTypeHandler(Object h)
-    {
-        return new MapType(_class, _keyType.withTypeHandler(h), _valueType,
-                _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public MapType withKeyValueHandler(Object h) {
-        return new MapType(_class, _keyType.withValueHandler(h), _valueType,
-                _valueHandler, _typeHandler);
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        return "[map type; class "+_class.getName()+", "+_keyType+" -> "+_valueType+"]";
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/SimpleType.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/SimpleType.java
deleted file mode 100644
index 17a8a4a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/SimpleType.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Simple types are defined as anything other than one of recognized
- * container types (arrays, Collections, Maps). For our needs we
- * need not know anything further, since we have no way of dealing
- * with generic types other than Collections and Maps.
- */
-public final class SimpleType
-    extends TypeBase
-{
-    private static final long serialVersionUID = -800374828948534376L;
-
-    /**
-     * Generic type arguments for this type.
-     */
-    protected final JavaType[] _typeParameters;
-
-    /**
-     * Names of generic type arguments for this type; will
-     * match values in {@link #_typeParameters}
-     */
-    protected final String[] _typeNames;
-    
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    protected SimpleType(Class<?> cls) {
-        this(cls, null, null, null, null);
-    }
-
-    protected SimpleType(Class<?> cls, String[] typeNames, JavaType[] typeParams,
-            Object valueHandler, Object typeHandler)
-    {
-        super(cls, 0, valueHandler, typeHandler);
-        if (typeNames == null || typeNames.length == 0) {
-            _typeNames = null;
-            _typeParameters = null;
-        } else {
-            _typeNames = typeNames;
-            _typeParameters = typeParams;
-        }
-    }
-
-    /**
-     * Method used by core Jackson classes: NOT to be used by application code.
-     *<p>
-     * NOTE: public only because it is called by <code>ObjectMapper</code> which is
-     * not in same package
-     */
-    public static SimpleType constructUnsafe(Class<?> raw) {
-        return new SimpleType(raw, null, null, null, null);
-    }
-    
-    @Override
-    protected JavaType _narrow(Class<?> subclass)
-    {
-        // Should we check that there is a sub-class relationship?
-        return new SimpleType(subclass, _typeNames, _typeParameters, _valueHandler, _typeHandler);
-    }
-
-    @Override
-    public JavaType narrowContentsBy(Class<?> subclass)
-    {
-        // should never get called
-        throw new IllegalArgumentException("Internal error: SimpleType.narrowContentsBy() should never be called");
-    }
-
-    @Override
-    public JavaType widenContentsBy(Class<?> subclass)
-    {
-        // should never get called
-        throw new IllegalArgumentException("Internal error: SimpleType.widenContentsBy() should never be called");
-    }
-    
-    public static SimpleType construct(Class<?> cls)
-    {
-        /* Let's add sanity checks, just to ensure no
-         * Map/Collection entries are constructed
-         */
-        if (Map.class.isAssignableFrom(cls)) {
-            throw new IllegalArgumentException("Can not construct SimpleType for a Map (class: "+cls.getName()+")");
-        }
-        if (Collection.class.isAssignableFrom(cls)) {
-            throw new IllegalArgumentException("Can not construct SimpleType for a Collection (class: "+cls.getName()+")");
-        }
-        // ... and while we are at it, not array types either
-        if (cls.isArray()) {
-            throw new IllegalArgumentException("Can not construct SimpleType for an array (class: "+cls.getName()+")");
-        }
-        return new SimpleType(cls);
-    }
-
-    // Since 1.7:
-    @Override
-    public SimpleType withTypeHandler(Object h)
-    {
-        return new SimpleType(_class, _typeNames, _typeParameters, _valueHandler, h);
-    }
-
-    // Since 1.7:
-    @Override
-    public JavaType withContentTypeHandler(Object h) {
-        // no content type, so:
-        throw new IllegalArgumentException("Simple types have no content types; can not call withContenTypeHandler()");
-    }
-
-    // Since 1.9:
-    @Override
-    public SimpleType withValueHandler(Object h) {
-        if (h == _valueHandler) {
-            return this;
-        }
-        return new SimpleType(_class, _typeNames, _typeParameters, h, _typeHandler);
-    }
-    
-    // Since 1.9:
-    @Override
-    public  SimpleType withContentValueHandler(Object h) {
-        // no content type, so:
-        throw new IllegalArgumentException("Simple types have no content types; can not call withContenValueHandler()");
-    }
-    
-    @Override
-    protected String buildCanonicalName()
-    {
-        StringBuilder sb = new StringBuilder();
-        sb.append(_class.getName());
-        if (_typeParameters != null && _typeParameters.length > 0) {
-            sb.append('<');
-            boolean first = true;
-            for (JavaType t : _typeParameters) {
-                if (first) {
-                    first = false;
-                } else {
-                    sb.append(',');
-                }
-                sb.append(t.toCanonical());
-            }
-            sb.append('>');
-        }
-        return sb.toString();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override
-    public boolean isContainerType() { return false; }
-    
-    @Override
-    public int containedTypeCount() {
-        return (_typeParameters == null) ? 0 : _typeParameters.length;
-    }
-
-    @Override
-    public JavaType containedType(int index)
-    {
-        if (index < 0 || _typeParameters == null || index >= _typeParameters.length) {
-            return null;
-        }
-        return _typeParameters[index];
-    }
-
-    @Override
-    public String containedTypeName(int index)
-    {
-        if (index < 0 || _typeNames == null || index >= _typeNames.length) {
-            return null;
-        }
-        return _typeNames[index];
-    }
-    
-    @Override
-    public StringBuilder getErasedSignature(StringBuilder sb) {
-        return _classSignature(_class, sb, true);
-    }
-    
-    @Override
-    public StringBuilder getGenericSignature(StringBuilder sb)
-    {
-        _classSignature(_class, sb, false);
-        if (_typeParameters != null) {
-            sb.append('<');
-            for (JavaType param : _typeParameters) {
-                sb = param.getGenericSignature(sb);
-            }
-            sb.append('>');
-        }
-        sb.append(';');
-        return sb;
-    }
-    
-    /*
-    /**********************************************************
-    /* Standard methods
-    /**********************************************************
-     */
-
-    @Override
-    public String toString()
-    {
-        StringBuilder sb = new StringBuilder(40);
-        sb.append("[simple type, class ").append(buildCanonicalName()).append(']');
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (o == this) return true;
-        if (o == null) return false;
-        if (o.getClass() != getClass()) return false;
-
-        SimpleType other = (SimpleType) o;
-
-        // Classes must be identical... 
-        if (other._class != this._class) return false;
-
-        // And finally, generic bindings, if any
-        JavaType[] p1 = _typeParameters;
-        JavaType[] p2 = other._typeParameters;
-        if (p1 == null) {
-            return (p2 == null) || p2.length == 0;
-        }
-        if (p2 == null) return false;
-
-        if (p1.length != p2.length) return false;
-        for (int i = 0, len = p1.length; i < len; ++i) {
-            if (!p1[i].equals(p2[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBase.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBase.java
deleted file mode 100644
index b109aec..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBase.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonSerializable;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-public abstract class TypeBase
-    extends JavaType
-    implements JsonSerializable
-{
-    private static final long serialVersionUID = -3581199092426900829L;
-
-    /**
-     * Lazily initialized external representation of the type
-     */
-    volatile transient String _canonicalName;
-
-    /**
-     * Main constructor to use by extending classes.
-     */
-    protected TypeBase(Class<?> raw, int hash,
-            Object valueHandler, Object typeHandler)
-    {
-        super(raw, hash, valueHandler, typeHandler);
-    }
-
-    @Override
-    public String toCanonical()
-    {
-    	String str = _canonicalName;
-    	if (str == null) {
-            str = buildCanonicalName();
-    	}
-    	return str;
-    }
-    
-    protected abstract String buildCanonicalName();
-
-    @Override
-    public abstract StringBuilder getGenericSignature(StringBuilder sb);
-
-    @Override
-    public abstract StringBuilder getErasedSignature(StringBuilder sb);
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T getValueHandler() { return (T) _valueHandler; }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T getTypeHandler() { return (T) _typeHandler; }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializableWithType base implementation
-    /**********************************************************
-     */
-
-//  @Override
-    public void serializeWithType(JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
-    {
-        typeSer.writeTypePrefixForScalar(this, jgen);
-        this.serialize(jgen, provider);
-        typeSer.writeTypeSuffixForScalar(this, jgen);
-    }
-
-//  @Override
-    public void serialize(JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonProcessingException
-    {
-        jgen.writeString(toCanonical());
-    } 
-    
-    /*
-    /**********************************************************
-    /* Methods for sub-classes to use
-    /**********************************************************
-     */
-
-    /**
-     * @param trailingSemicolon Whether to add trailing semicolon for non-primitive
-     *   (reference) types or not
-     */
-    protected static StringBuilder _classSignature(Class<?> cls, StringBuilder sb,
-           boolean trailingSemicolon)
-    {
-        if (cls.isPrimitive()) {
-            if (cls == Boolean.TYPE) {                
-                sb.append('Z');
-            } else if (cls == Byte.TYPE) {
-                sb.append('B');
-            }
-            else if (cls == Short.TYPE) {
-                sb.append('S');
-            }
-            else if (cls == Character.TYPE) {
-                sb.append('C');
-            }
-            else if (cls == Integer.TYPE) {
-                sb.append('I');
-            }
-            else if (cls == Long.TYPE) {
-                sb.append('J');
-            }
-            else if (cls == Float.TYPE) {
-                sb.append('F');
-            }
-            else if (cls == Double.TYPE) {
-                sb.append('D');
-            }
-            else if (cls == Void.TYPE) {
-                sb.append('V');
-            } else {
-                throw new IllegalStateException("Unrecognized primitive type: "+cls.getName());
-            }
-        } else {
-            sb.append('L');
-            String name = cls.getName();
-            for (int i = 0, len = name.length(); i < len; ++i) {
-                char c = name.charAt(i);
-                if (c == '.') c = '/';
-                sb.append(c);
-            }
-            if (trailingSemicolon) {
-                sb.append(';');
-            }
-        }
-        return sb;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBindings.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBindings.java
deleted file mode 100644
index 39fc9ec..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeBindings.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Helper class used for resolving type parameters for given class
- */
-public class TypeBindings
-{
-    private final static JavaType[] NO_TYPES = new JavaType[0];
-    
-    /**
-     * Marker to use for (temporarily) unbound references.
-     */
-    public final static JavaType UNBOUND = new SimpleType(Object.class);
-
-    /**
-     * Factory to use for constructing resolved related types.
-     */
-    protected final TypeFactory _typeFactory;
-    
-    /**
-     * Context type used for resolving all types, if specified. May be null,
-     * in which case {@link #_contextClass} is used instead.
-     */
-    protected final JavaType _contextType;
-
-    /**
-     * Specific class to use for resolving all types, for methods and fields
-     * class and its superclasses and -interfaces contain.
-     */
-    protected final Class<?> _contextClass;
-
-    /**
-     * Lazily-instantiated bindings of resolved type parameters
-     */
-    protected Map<String,JavaType> _bindings;
-
-    /**
-     * Also: we may temporarily want to mark certain named types
-     * as resolved (but without exact type); if so, we'll just store
-     * names here.
-     */
-    protected HashSet<String> _placeholders;
-
-    /**
-     * Sometimes it is necessary to allow hierarchic resolution of types: specifically
-     * in cases where there are local bindings (for methods, constructors). If so,
-     * we'll just use simple delegation model.
-     */
-    private final TypeBindings _parentBindings;
-
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-    
-    public TypeBindings(TypeFactory typeFactory, Class<?> cc)
-    {
-        this(typeFactory, null, cc, null);
-    }
-
-    public TypeBindings(TypeFactory typeFactory, JavaType type)
-    {
-        this(typeFactory, null, type.getRawClass(), type);
-    }
-
-    /**
-     * Constructor used to create "child" instances; mostly to
-     * allow delegation from explicitly defined local overrides
-     * (local type variables for methods, constructors) to
-     * contextual (class-defined) ones.
-     */
-    public TypeBindings childInstance() {
-        return new TypeBindings(_typeFactory, this, _contextClass, _contextType);
-    }
-
-    private TypeBindings(TypeFactory tf, TypeBindings parent,
-            Class<?> cc, JavaType type)
-    {
-        _typeFactory = tf;
-        _parentBindings = parent;
-        _contextClass = cc;
-        _contextType = type;
-    }
-
-    /*
-    /**********************************************************
-    /* Pass-through type resolution methods
-    /**********************************************************
-     */
-
-    public JavaType resolveType(Class<?> cls) {
-        return _typeFactory._constructType(cls, this);
-    }
-
-    public JavaType resolveType(Type type) {
-        return _typeFactory._constructType(type, this);
-    }
-    
-    /*
-    /**********************************************************
-    /* Accesors
-    /**********************************************************
-     */
-
-    public int getBindingCount() {
-        if (_bindings == null) {
-            _resolve();
-        }
-        return _bindings.size();
-    }
-    
-    public JavaType findType(String name)
-    {
-        if (_bindings == null) {
-            _resolve();
-        }
-        JavaType t = _bindings.get(name);
-        if (t != null) {
-            return t;
-        }
-        if (_placeholders != null && _placeholders.contains(name)) {
-            return UNBOUND;
-        }
-        if (_parentBindings != null) {
-            return _parentBindings.findType(name);
-        }
-        // nothing found, so...
-        // Should we throw an exception or just return null?
-        
-        /* [JACKSON-499] 18-Feb-2011, tatu: There are some tricky type bindings within
-         *   java.util, such as HashMap$KeySet; so let's punt the problem
-         *   (honestly not sure what to do -- they are unbound for good, I think)
-         */
-        if (_contextClass != null) {
-            Class<?> enclosing = _contextClass.getEnclosingClass();
-            if (enclosing != null) {
-                // [JACKSON-572]: Actually, let's skip this for all non-static inner classes
-                //   (which will also cover 'java.util' type cases...
-                if (!Modifier.isStatic(_contextClass.getModifiers())) {
-                    return UNBOUND;
-                }
-
-                // ... so this piece of code should not be needed any more
-                /*
-                Package pkg = enclosing.getPackage();
-                if (pkg != null) {
-                    // as per [JACKSON-533], also include "java.util.concurrent":
-                    if (pkg.getName().startsWith("java.util")) {
-                        return UNBOUND;
-                    }
-                }
-                */
-            }
-        }
-        
-        String className;
-        if (_contextClass != null) {
-            className = _contextClass.getName();
-        } else if (_contextType != null) {
-            className = _contextType.toString();
-        } else {
-            className = "UNKNOWN";
-        }
-        throw new IllegalArgumentException("Type variable '"+name
-                +"' can not be resolved (with context of class "+className+")");
-        //t = UNBOUND;                
-    }
-
-    public void addBinding(String name, JavaType type)
-    {
-        // note: emptyMap() is unmodifiable, hence second check is needed:
-        if (_bindings == null || _bindings.size() == 0) {
-            _bindings = new LinkedHashMap<String,JavaType>();
-        }
-        _bindings.put(name, type);
-    }
-
-    public JavaType[] typesAsArray()
-    {
-        if (_bindings == null) {
-            _resolve();
-        }
-        if (_bindings.size() == 0) {
-            return NO_TYPES;
-        }
-        return _bindings.values().toArray(new JavaType[_bindings.size()]);
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    
-    protected void _resolve()
-    {
-        _resolveBindings(_contextClass);
-
-        // finally: may have root level type info too
-        if (_contextType != null) {
-            int count = _contextType.containedTypeCount();
-            if (count > 0) {
-                for (int i = 0; i < count; ++i) {
-                    String name = _contextType.containedTypeName(i);
-                    JavaType type = _contextType.containedType(i);
-                    addBinding(name, type);
-                }
-            }
-        }
-
-        // nothing bound? mark with empty map to prevent further calls
-        if (_bindings == null) {
-            _bindings = Collections.emptyMap();
-        }
-    }
-
-    public void _addPlaceholder(String name) {
-        if (_placeholders == null) {
-            _placeholders = new HashSet<String>();
-        }
-        _placeholders.add(name);
-    }
-
-    protected void _resolveBindings(Type t)
-    {
-        if (t == null) return;
-        
-        Class<?> raw;
-        if (t instanceof ParameterizedType) {
-            ParameterizedType pt = (ParameterizedType) t;
-            Type[] args = pt.getActualTypeArguments();
-            if (args  != null && args.length > 0) {
-                Class<?> rawType = (Class<?>) pt.getRawType();    
-                TypeVariable<?>[] vars = rawType.getTypeParameters();
-                if (vars.length != args.length) {
-                    throw new IllegalArgumentException("Strange parametrized type (in class "+rawType.getName()+"): number of type arguments != number of type parameters ("+args.length+" vs "+vars.length+")");
-                }
-                for (int i = 0, len = args.length; i < len; ++i) {
-                    TypeVariable<?> var = vars[i];
-                    String name = var.getName();
-                    if (_bindings == null) {
-                        _bindings = new LinkedHashMap<String,JavaType>();
-                    } else {
-                        /* 24-Mar-2010, tatu: Better ensure that we do not overwrite something
-                         *  collected earlier (since we descend towards super-classes):
-                         */
-                        if (_bindings.containsKey(name)) continue;
-                    }
-                    // first: add a placeholder to prevent infinite loops
-                    _addPlaceholder(name);
-                    // then resolve type
-                    _bindings.put(name, _typeFactory._constructType(args[i], this));
-                }
-            }
-            raw = (Class<?>)pt.getRawType();
-        } else if (t instanceof Class<?>) {
-            raw = (Class<?>) t;
-            /* [JACKSON-677]: If this is an inner class then the generics are defined on the 
-             * enclosing class so we have to check there as well.  We don't
-             * need to call getEnclosingClass since anonymous classes declare 
-             * generics
-             */
-            _resolveBindings(raw.getDeclaringClass());
-            /* 24-Mar-2010, tatu: Can not have true generics definitions, but can
-             *   have lower bounds ("<T extends BeanBase>") in declaration itself
-             */
-            TypeVariable<?>[] vars = raw.getTypeParameters();
-            if (vars != null && vars.length > 0) {
-                JavaType[] typeParams = null;
-
-                if (_contextType != null && raw.isAssignableFrom(_contextType.getRawClass())) {
-                    typeParams = _typeFactory.findTypeParameters(_contextType, raw);
-                }
-
-                for (int i = 0; i < vars.length; i++) {
-                    TypeVariable<?> var = vars[i];
-
-                    String name = var.getName();
-                    Type varType = var.getBounds()[0];
-                    if (varType != null) {
-                        if (_bindings == null) {
-                            _bindings = new LinkedHashMap<String,JavaType>();
-                        } else { // and no overwriting...
-                            if (_bindings.containsKey(name)) continue;
-                        }
-                        _addPlaceholder(name); // to prevent infinite loops
-
-                        if (typeParams != null) {
-                            _bindings.put(name, typeParams[i]);
-                        } else {
-                            _bindings.put(name, _typeFactory._constructType(varType, this));
-                        }
-                    }
-                }
-            }
-        } else { // probably can't be any of these... so let's skip for now
-            //if (type instanceof GenericArrayType) {
-            //if (type instanceof TypeVariable<?>) {
-            // if (type instanceof WildcardType) {
-            return;
-        }
-        // but even if it's not a parameterized type, its super types may be:
-        _resolveBindings(raw.getGenericSuperclass());
-        for (Type intType : raw.getGenericInterfaces()) {
-            _resolveBindings(intType);
-        }
-    }
-
-    @Override
-    public String toString()
-    {
-        if (_bindings == null) {
-            _resolve();
-        }
-        StringBuilder sb = new StringBuilder("[TypeBindings for ");
-        if (_contextType != null) {
-            sb.append(_contextType.toString());
-        } else {
-            sb.append(_contextClass.getName());
-        }
-        sb.append(": ").append(_bindings).append("]");
-        return sb.toString();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeFactory.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeFactory.java
deleted file mode 100644
index 37925b4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ /dev/null
@@ -1,1021 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.util.*;
-import java.lang.reflect.*;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.util.ArrayBuilders;
-import com.fasterxml.jackson.databind.util.LRUMap;
-
-
-/**
- * Class used for creating concrete {@link JavaType} instances,
- * given various inputs.
- *<p>
- * Instances of this class are accessible using {@link com.fasterxml.jackson.databind.ObjectMapper}
- * as well as many objects it constructs (like
-* {@link com.fasterxml.jackson.databind.DeserializationConfig} and
- * {@link com.fasterxml.jackson.databind.SerializationConfig})),
- * but usually those objects also 
- * expose convenience methods (<code>constructType</code>).
- * So, you can do for example:
- *<pre>
- *   JavaType stringType = mapper.constructType(String.class);
- *</pre>
- * However, more advanced methods are only exposed by factory so that you
- * may need to use:
- *<pre>
- *   JavaType stringCollection = mapper.getTypeFactory().constructCollectionType(List.class, String.class);
- *</pre>
- */
-@SuppressWarnings({"rawtypes", "unchecked"})
-public final class TypeFactory
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    private final static JavaType[] NO_TYPES = new JavaType[0];
-
-    /**
-     * Globally shared singleton. Not accessed directly; non-core
-     * code should use per-ObjectMapper instance (via configuration objects).
-     * Core Jackson code uses {@link #defaultInstance} for accessing it.
-     */
-    protected final static TypeFactory instance = new TypeFactory();
-    
-    /*
-    /**********************************************************
-    /* Caching
-    /**********************************************************
-     */
-
-    // // // Let's assume that a small set of core primitive/basic types
-    // // // will not be modified, and can be freely shared to streamline
-    // // // parts of processing
-    
-    protected final static SimpleType CORE_TYPE_STRING = new SimpleType(String.class);
-    protected final static SimpleType CORE_TYPE_BOOL = new SimpleType(Boolean.TYPE);
-    protected final static SimpleType CORE_TYPE_INT = new SimpleType(Integer.TYPE);
-    protected final static SimpleType CORE_TYPE_LONG = new SimpleType(Long.TYPE);
-    
-    /**
-     * Since type resolution can be expensive (specifically when resolving
-     * actual generic types), we will use small cache to avoid repetitive
-     * resolution of core types
-     */
-    protected final LRUMap<ClassKey, JavaType> _typeCache = new LRUMap<ClassKey, JavaType>(16, 100);
-
-    /*
-     * Looks like construction of {@link JavaType} instances can be
-     * a bottleneck, esp. for root-level Maps, so we better do bit
-     * of low-level component caching here...
-     */
-    
-    /**
-     * Lazily constructed copy of type hierarchy from {@link java.util.HashMap}
-     * to its supertypes.
-     */
-    protected transient HierarchicType _cachedHashMapType;
-
-    /**
-     * Lazily constructed copy of type hierarchy from {@link java.util.ArrayList}
-     * to its supertypes.
-     */
-    protected transient HierarchicType _cachedArrayListType;
-    
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-    
-    /**
-     * Registered {@link TypeModifier}s: objects that can change details
-     * of {@link JavaType} instances factory constructs.
-     */
-    protected final TypeModifier[] _modifiers;
-    
-    protected final TypeParser _parser;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    private TypeFactory() {
-        _parser = new TypeParser(this);
-        _modifiers = null;
-    }
-
-    protected TypeFactory(TypeParser p, TypeModifier[] mods) {
-        _parser = p;
-        _modifiers = mods;
-    }
-
-    public TypeFactory withModifier(TypeModifier mod) 
-    {
-        if (_modifiers == null) {
-            return new TypeFactory(_parser, new TypeModifier[] { mod });
-        }
-        return new TypeFactory(_parser, ArrayBuilders.insertInListNoDup(_modifiers, mod));
-    }
-
-    /**
-     * Method used to access the globally shared instance, which has
-     * no custom configuration. Used by <code>ObjectMapper</code> to
-     * get the default factory when constructed.
-     */
-    public static TypeFactory defaultInstance() { return instance; }
-
-    /*
-    /**********************************************************
-    /* Overrides for supporting Serializable
-    /**********************************************************
-     */
-    
-    /*
-    /**********************************************************
-    /* Static methods for non-instance-specific functionality
-    /**********************************************************
-     */
-    
-    /**
-     * Method for constructing a marker type that indicates missing generic
-     * type information, which is handled same as simple type for
-     * <code>java.lang.Object</code>.
-     */
-    public static JavaType unknownType() {
-        return defaultInstance()._unknownType();
-    }
-
-    /**
-     * Static helper method that can be called to figure out type-erased
-     * call for given JDK type. It can be called statically since type resolution
-     * process can never change actual type-erased class; thereby static
-     * default instance is used for determination.
-     */
-    public static Class<?> rawClass(Type t) {
-        if (t instanceof Class<?>) {
-            return (Class<?>) t;
-        }
-        // Shouldbe able to optimize bit more in future...
-        return defaultInstance().constructType(t).getRawClass();
-    }
-    
-    /*
-    /* Type conversion, parameterization resolution methods
-    /**********************************************************
-     */
-
-    /**
-     * Factory method for creating a subtype of given base type, as defined
-     * by specified subclass; but retaining generic type information if any.
-     * Can be used, for example, to get equivalent of "HashMap&lt;String,Integer>"
-     * from "Map&ltString,Integer>" by giving <code>HashMap.class</code>
-     * as subclass.
-     */
-    public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass)
-    {
-        // Currently only SimpleType instances can become something else
-        if (baseType instanceof SimpleType) {
-            // and only if subclass is an array, Collection or Map
-            if (subclass.isArray()
-                || Map.class.isAssignableFrom(subclass)
-                || Collection.class.isAssignableFrom(subclass)) {
-                // need to assert type compatibility...
-                if (!baseType.getRawClass().isAssignableFrom(subclass)) {
-                    throw new IllegalArgumentException("Class "+subclass.getClass().getName()+" not subtype of "+baseType);
-                }
-                // this _should_ work, right?
-                JavaType subtype = _fromClass(subclass, new TypeBindings(this, baseType.getRawClass()));
-                // one more thing: handlers to copy?
-                Object h = baseType.getValueHandler();
-                if (h != null) {
-                    subtype = subtype.withValueHandler(h);
-                }
-                h = baseType.getTypeHandler();
-                if (h != null) {
-                    subtype = subtype.withTypeHandler(h);
-                }
-                return subtype;
-            }
-        }
-        // otherwise regular narrowing should work just fine
-        return baseType.narrowBy(subclass);
-    }
-
-    /**
-     * Factory method for constructing a {@link JavaType} out of its canonical
-     * representation (see {@link JavaType#toCanonical()}).
-     * 
-     * @param canonical Canonical string representation of a type
-     * 
-     * @throws IllegalArgumentException If canonical representation is malformed,
-     *   or class that type represents (including its generic parameters) is
-     *   not found
-     */
-    public JavaType constructFromCanonical(String canonical) throws IllegalArgumentException
-    {
-        return _parser.parse(canonical);
-    }
-    
-    /**
-     * Method that is to figure out actual type parameters that given
-     * class binds to generic types defined by given (generic)
-     * interface or class.
-     * This could mean, for example, trying to figure out
-     * key and value types for Map implementations.
-     * 
-     * @param type Sub-type (leaf type) that implements <code>expType</code>
-     */
-    public JavaType[] findTypeParameters(JavaType type, Class<?> expType)
-    {
-        /* Tricky part here is that some JavaType instances have been constructed
-         * from generic type (usually via TypeReference); and in those case
-         * types have been resolved. Alternative is that the leaf type is type-erased
-         * class, in which case this has not been done.
-         * For now simplest way to handle this is to split processing in two: latter
-         * case actually fully works; and former mostly works. In future may need to
-         * rewrite former part, which requires changes to JavaType as well.
-         */
-        Class<?> raw = type.getRawClass();
-        if (raw == expType) {
-            // Direct type info; good since we can return it as is
-            int count = type.containedTypeCount();
-            if (count == 0) return null;
-            JavaType[] result = new JavaType[count];
-            for (int i = 0; i < count; ++i) {
-                result[i] = type.containedType(i);
-            }
-            return result;
-        }
-        /* Otherwise need to go through type-erased class. This may miss cases where
-         * we get generic type; ideally JavaType/SimpleType would retain information
-         * about generic declaration at main level... but let's worry about that
-         * if/when there are problems; current handling is an improvement over earlier
-         * code.
-         */
-        return findTypeParameters(raw, expType, new TypeBindings(this, type));
-    }
-
-    public JavaType[] findTypeParameters(Class<?> clz, Class<?> expType) {
-        return findTypeParameters(clz, expType, new TypeBindings(this, clz));
-    }
-    
-    public JavaType[] findTypeParameters(Class<?> clz, Class<?> expType, TypeBindings bindings)
-    {
-        // First: find full inheritance chain
-        HierarchicType subType = _findSuperTypeChain(clz, expType);
-        // Caller is supposed to ensure this never happens, so:
-        if (subType == null) {
-            throw new IllegalArgumentException("Class "+clz.getName()+" is not a subtype of "+expType.getName());
-        }
-        // Ok and then go to the ultimate super-type:
-        HierarchicType superType = subType;
-        while (superType.getSuperType() != null) {
-            superType = superType.getSuperType();
-            Class<?> raw = superType.getRawClass();
-            TypeBindings newBindings = new TypeBindings(this, raw);
-            if (superType.isGeneric()) { // got bindings, need to resolve
-                ParameterizedType pt = superType.asGeneric();
-                Type[] actualTypes = pt.getActualTypeArguments();
-                TypeVariable<?>[] vars = raw.getTypeParameters();
-                int len = actualTypes.length;
-                for (int i = 0; i < len; ++i) {
-                    String name = vars[i].getName();
-                    JavaType type = _constructType(actualTypes[i], bindings);
-                    newBindings.addBinding(name, type);
-                }
-            }
-            bindings = newBindings;
-        }
-
-        // which ought to be generic (if not, it's raw type)
-        if (!superType.isGeneric()) {
-            return null;
-        }
-        return bindings.typesAsArray();
-    }
-    
-    /*
-    /**********************************************************
-    /* Public factory methods
-    /**********************************************************
-     */
-
-    public JavaType constructType(Type type) {
-        return _constructType(type, null);
-    }
-
-    public JavaType constructType(Type type, TypeBindings bindings) {
-        return _constructType(type, bindings);
-    }
-    
-    public JavaType constructType(TypeReference<?> typeRef) {
-        return _constructType(typeRef.getType(), null);
-    }
-    
-    public JavaType constructType(Type type, Class<?> context) {
-        TypeBindings b = (context == null) ? null : new TypeBindings(this, context);
-        return _constructType(type, b);
-    }
-
-    public JavaType constructType(Type type, JavaType context) {
-        TypeBindings b = (context == null) ? null : new TypeBindings(this, context);
-        return _constructType(type, b);
-    }
-    
-    /**
-     * Factory method that can be used if type information is passed
-     * as Java typing returned from <code>getGenericXxx</code> methods
-     * (usually for a return or argument type).
-     */
-    public JavaType _constructType(Type type, TypeBindings context)
-    {
-        JavaType resultType;
-
-        // simple class?
-        if (type instanceof Class<?>) {
-            Class<?> cls = (Class<?>) type;
-            resultType = _fromClass(cls, context);
-        }
-        // But if not, need to start resolving.
-        else if (type instanceof ParameterizedType) {
-            resultType = _fromParamType((ParameterizedType) type, context);
-        }
-        else if (type instanceof GenericArrayType) {
-            resultType = _fromArrayType((GenericArrayType) type, context);
-        }
-        else if (type instanceof TypeVariable<?>) {
-            resultType = _fromVariable((TypeVariable<?>) type, context);
-        }
-        else if (type instanceof WildcardType) {
-            resultType = _fromWildcard((WildcardType) type, context);
-        } else {
-            // sanity check
-            throw new IllegalArgumentException("Unrecognized Type: "+((type == null) ? "[null]" : type.toString()));
-        }
-        /* [JACKSON-521]: Need to allow TypeModifiers to alter actual type; however,
-         * for now only call for simple types (i.e. not for arrays, map or collections).
-         * Can be changed in future it necessary
-         */
-        if (_modifiers != null && !resultType.isContainerType()) {
-            for (TypeModifier mod : _modifiers) {
-                resultType = mod.modifyType(resultType, type, context, this);
-            }
-        }
-        return resultType;
-    }
-
-    /*
-    /**********************************************************
-    /* Direct factory methods
-    /**********************************************************
-     */
-
-    /**
-     * Method for constructing an {@link ArrayType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on array type itself; but are called
-     * for element type (and other contained types)
-     */
-    public ArrayType constructArrayType(Class<?> elementType) {
-        return ArrayType.construct(_constructType(elementType, null), null, null);
-    }
-    
-    /**
-     * Method for constructing an {@link ArrayType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on array type itself; but are called
-     * for contained types.
-     */
-    public ArrayType constructArrayType(JavaType elementType) {
-        return ArrayType.construct(elementType, null, null);
-    }
-
-    /**
-     * Method for constructing a {@link CollectionType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on Collection type itself; but are called
-     * for contained types.
-     */
-    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass, Class<?> elementClass) {
-        return CollectionType.construct(collectionClass, constructType(elementClass));
-    }
-    
-    /**
-     * Method for constructing a {@link CollectionType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on Collection type itself; but are called
-     * for contained types.
-     */
-    public CollectionType constructCollectionType(Class<? extends Collection> collectionClass, JavaType elementType) {
-        return CollectionType.construct(collectionClass, elementType);
-    }
-
-    /**
-     * Method for constructing a {@link CollectionLikeType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public CollectionLikeType constructCollectionLikeType(Class<?> collectionClass, Class<?> elementClass) {
-        return CollectionLikeType.construct(collectionClass, constructType(elementClass));
-    }
-    
-    /**
-     * Method for constructing a {@link CollectionLikeType}.
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public CollectionLikeType constructCollectionLikeType(Class<?> collectionClass, JavaType elementType) {
-        return CollectionLikeType.construct(collectionClass, elementType);
-    }
-    
-    /**
-     * Method for constructing a {@link MapType} instance
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public MapType constructMapType(Class<? extends Map> mapClass, JavaType keyType, JavaType valueType) {
-        return MapType.construct(mapClass, keyType, valueType);
-    }
-
-    /**
-     * Method for constructing a {@link MapType} instance
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public MapType constructMapType(Class<? extends Map> mapClass, Class<?> keyClass, Class<?> valueClass) {
-        return MapType.construct(mapClass, constructType(keyClass), constructType(valueClass));
-    }
-
-    /**
-     * Method for constructing a {@link MapLikeType} instance
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public MapLikeType constructMapLikeType(Class<?> mapClass, JavaType keyType, JavaType valueType) {
-        return MapLikeType.construct(mapClass, keyType, valueType);
-    }
-    
-    /**
-     * Method for constructing a {@link MapLikeType} instance
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public MapLikeType constructMapLikeType(Class<?> mapClass, Class<?> keyClass, Class<?> valueClass) {
-        return MapType.construct(mapClass, constructType(keyClass), constructType(valueClass));
-    }
-    
-    /**
-     * Method for constructing a type instance with specified parameterization.
-     */
-    public JavaType constructSimpleType(Class<?> rawType, JavaType[] parameterTypes)
-    {
-        // Quick sanity check: must match numbers of types with expected...
-        TypeVariable<?>[] typeVars = rawType.getTypeParameters();
-        if (typeVars.length != parameterTypes.length) {
-            throw new IllegalArgumentException("Parameter type mismatch for "+rawType.getName()
-                    +": expected "+typeVars.length+" parameters, was given "+parameterTypes.length);
-        }
-        String[] names = new String[typeVars.length];
-        for (int i = 0, len = typeVars.length; i < len; ++i) {
-            names[i] = typeVars[i].getName();
-        }
-        JavaType resultType = new SimpleType(rawType, names, parameterTypes, null, null);
-        return resultType;
-    } 
-
-    /**
-     * Method that will force construction of a simple type, without trying to
-     * check for more specialized types.
-     *<p> 
-     * NOTE: no type modifiers are called on type either, so calling this method
-     * should only be used if caller really knows what it's doing...
-     */
-    public JavaType uncheckedSimpleType(Class<?> cls) {
-        return new SimpleType(cls);
-    }
-    
-    /**
-     * Factory method for constructing {@link JavaType} that
-     * represents a parameterized type. For example, to represent
-     * type <code>List&lt;Set&lt;Integer>></code>, you could
-     * call
-     *<pre>
-     *  TypeFactory.parametricType(List.class, Integer.class);
-     *</pre>
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public JavaType constructParametricType(Class<?> parametrized, Class<?>... parameterClasses)
-    {
-        int len = parameterClasses.length;
-        JavaType[] pt = new JavaType[len];
-        for (int i = 0; i < len; ++i) {
-            pt[i] = _fromClass(parameterClasses[i], null);
-        }
-        return constructParametricType(parametrized, pt);
-    }
-
-    /**
-     * Factory method for constructing {@link JavaType} that
-     * represents a parameterized type. For example, to represent
-     * type <code>List&lt;Set&lt;Integer>></code>, you could
-     * call
-     *<pre>
-     *  JavaType inner = TypeFactory.parametricType(Set.class, Integer.class);
-     *  TypeFactory.parametricType(List.class, inner);
-     *</pre>
-     *<p>
-     * NOTE: type modifiers are NOT called on constructed type itself; but are called
-     * for contained types.
-     */
-    public JavaType constructParametricType(Class<?> parametrized, JavaType... parameterTypes)
-    {
-        JavaType resultType;
-        
-        // Need to check kind of class we are dealing with...
-        if (parametrized.isArray()) {
-            // 19-Jan-2010, tatus: should we support multi-dimensional arrays directly?
-            if (parameterTypes.length != 1) {
-                throw new IllegalArgumentException("Need exactly 1 parameter type for arrays ("+parametrized.getName()+")");
-            }
-            resultType = constructArrayType(parameterTypes[0]);
-        }
-        else if (Map.class.isAssignableFrom(parametrized)) {
-            if (parameterTypes.length != 2) {
-                throw new IllegalArgumentException("Need exactly 2 parameter types for Map types ("+parametrized.getName()+")");
-            }
-            resultType = constructMapType((Class<Map<?,?>>)parametrized, parameterTypes[0], parameterTypes[1]);
-        }
-        else if (Collection.class.isAssignableFrom(parametrized)) {
-            if (parameterTypes.length != 1) {
-                throw new IllegalArgumentException("Need exactly 1 parameter type for Collection types ("+parametrized.getName()+")");
-            }
-            resultType = constructCollectionType((Class<Collection<?>>)parametrized, parameterTypes[0]);
-        } else {
-            resultType = constructSimpleType(parametrized, parameterTypes);
-        }
-        return resultType;
-    }
-
-    /*
-    /**********************************************************
-    /* Direct factory methods for "raw" variants, used when
-    /* parameterization is unknown
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to construct "raw" Collection type; meaning that its
-     * parameterization is unknown.
-     * This is similar to using <code>Object.class</code> parameterization,
-     * and is equivalent to calling:
-     *<pre>
-     *  typeFactory.constructCollectionType(collectionClass, typeFactory.unknownType());
-     *<pre>
-     *<p>
-     * This method should only be used if parameterization is completely unavailable.
-     */
-    public CollectionType constructRawCollectionType(Class<? extends Collection> collectionClass) {
-        return CollectionType.construct(collectionClass, unknownType());
-    }
-
-    /**
-     * Method that can be used to construct "raw" Collection-like type; meaning that its
-     * parameterization is unknown.
-     * This is similar to using <code>Object.class</code> parameterization,
-     * and is equivalent to calling:
-     *<pre>
-     *  typeFactory.constructCollectionLikeType(collectionClass, typeFactory.unknownType());
-     *<pre>
-     *<p>
-     * This method should only be used if parameterization is completely unavailable.
-     */
-    public CollectionLikeType constructRawCollectionLikeType(Class<?> collectionClass) {
-        return CollectionLikeType.construct(collectionClass, unknownType());
-    }
-
-    /**
-     * Method that can be used to construct "raw" Map type; meaning that its
-     * parameterization is unknown.
-     * This is similar to using <code>Object.class</code> parameterization,
-     * and is equivalent to calling:
-     *<pre>
-     *  typeFactory.constructMapType(collectionClass, typeFactory.unknownType(), typeFactory.unknownType());
-     *<pre>
-     *<p>
-     * This method should only be used if parameterization is completely unavailable.
-     */
-    public MapType constructRawMapType(Class<? extends Map> mapClass) {
-        return MapType.construct(mapClass, unknownType(), unknownType());
-    }
-
-    /**
-     * Method that can be used to construct "raw" Map-like type; meaning that its
-     * parameterization is unknown.
-     * This is similar to using <code>Object.class</code> parameterization,
-     * and is equivalent to calling:
-     *<pre>
-     *  typeFactory.constructMapLikeType(collectionClass, typeFactory.unknownType(), typeFactory.unknownType());
-     *<pre>
-     *<p>
-     * This method should only be used if parameterization is completely unavailable.
-     */
-    public MapLikeType constructRawMapLikeType(Class<?> mapClass) {
-        return MapLikeType.construct(mapClass, unknownType(), unknownType());
-    }
-
-    /*
-    /**********************************************************
-    /* Actual factory methods
-    /**********************************************************
-     */
-
-    /**
-     * @param context Mapping of formal parameter declarations (for generic
-     *   types) into actual types
-     */
-    protected JavaType _fromClass(Class<?> clz, TypeBindings context)
-    {
-        // Very first thing: small set of core types we know well:
-        if (clz == String.class) return CORE_TYPE_STRING;
-        if (clz == Boolean.TYPE) return CORE_TYPE_BOOL;
-        if (clz == Integer.TYPE) return CORE_TYPE_INT;
-        if (clz == Long.TYPE) return CORE_TYPE_LONG;
-        
-        // Barring that, we may have recently constructed an instance:
-        ClassKey key = new ClassKey(clz);
-        JavaType result;
-        
-        synchronized (_typeCache) {
-            result = _typeCache.get(key);
-        }
-        if (result != null) {
-            return result;
-        }
-
-        // If context was needed, weed do:
-        /*
-        if (context == null) {
-            context = new TypeBindings(this, cls);
-        }
-        */
-        
-        // First: do we have an array type?
-        if (clz.isArray()) {
-            result = ArrayType.construct(_constructType(clz.getComponentType(), null), null, null);
-        /* Also: although enums can also be fully resolved, there's little
-         * point in doing so (T extends Enum<T>) etc.
-         */
-        } else if (clz.isEnum()) {
-            result = new SimpleType(clz);
-        /* Maps and Collections aren't quite as hot; problem is, due
-         * to type erasure we often do not know typing and can only assume
-         * base Object.
-         */
-        } else if (Map.class.isAssignableFrom(clz)) {
-            result = _mapType(clz);
-        } else if (Collection.class.isAssignableFrom(clz)) {
-            result =  _collectionType(clz);
-        } else {
-            result = new SimpleType(clz);
-        }
-        
-        synchronized (_typeCache) {
-            _typeCache.put(key, result);
-        }
-        
-        return result;
-    }
-    
-    /**
-     * Method used by {@link TypeParser} when generics-aware version
-     * is constructed.
-     */
-    protected JavaType _fromParameterizedClass(Class<?> clz, List<JavaType> paramTypes)
-    {
-        if (clz.isArray()) { // ignore generics (should never have any)
-            return ArrayType.construct(_constructType(clz.getComponentType(), null), null, null);
-        }
-        if (clz.isEnum()) { // ditto for enums
-            return new SimpleType(clz);
-        }
-        if (Map.class.isAssignableFrom(clz)) {
-            // First: if we do have param types, use them
-            JavaType keyType, contentType;
-            if (paramTypes.size() > 0) {
-                keyType = paramTypes.get(0);
-                contentType = (paramTypes.size() >= 2) ?
-                        paramTypes.get(1) : _unknownType();
-                return MapType.construct(clz, keyType, contentType);
-            }
-            return _mapType(clz);
-        }
-        if (Collection.class.isAssignableFrom(clz)) {
-            if (paramTypes.size() >= 1) {
-                return CollectionType.construct(clz, paramTypes.get(0));
-            }
-            return _collectionType(clz);
-        }
-        if (paramTypes.size() == 0) {
-            return new SimpleType(clz);
-        }
-        JavaType[] pt = paramTypes.toArray(new JavaType[paramTypes.size()]);
-        return constructSimpleType(clz, pt);
-    }
-    
-    /**
-     * This method deals with parameterized types, that is,
-     * first class generic classes.
-     */
-    protected JavaType _fromParamType(ParameterizedType type, TypeBindings context)
-    {
-        /* First: what is the actual base type? One odd thing
-         * is that 'getRawType' returns Type, not Class<?> as
-         * one might expect. But let's assume it is always of
-         * type Class: if not, need to add more code to resolve
-         * it to Class.
-         */
-        Class<?> rawType = (Class<?>) type.getRawType();
-        Type[] args = type.getActualTypeArguments();
-        int paramCount = (args == null) ? 0 : args.length;
-
-        JavaType[] pt;
-        
-        if (paramCount == 0) {
-            pt = NO_TYPES;
-        } else {
-            pt = new JavaType[paramCount];
-            for (int i = 0; i < paramCount; ++i) {
-                pt[i] = _constructType(args[i], context);
-            }
-        }
-
-        // Ok: Map or Collection?
-        if (Map.class.isAssignableFrom(rawType)) {
-            JavaType subtype = constructSimpleType(rawType, pt);
-            JavaType[] mapParams = findTypeParameters(subtype, Map.class);
-            if (mapParams.length != 2) {
-                throw new IllegalArgumentException("Could not find 2 type parameters for Map class "+rawType.getName()+" (found "+mapParams.length+")");
-            }
-            return MapType.construct(rawType, mapParams[0], mapParams[1]);
-        }
-        if (Collection.class.isAssignableFrom(rawType)) {
-            JavaType subtype = constructSimpleType(rawType, pt);
-            JavaType[] collectionParams = findTypeParameters(subtype, Collection.class);
-            if (collectionParams.length != 1) {
-                throw new IllegalArgumentException("Could not find 1 type parameter for Collection class "+rawType.getName()+" (found "+collectionParams.length+")");
-            }
-            return CollectionType.construct(rawType, collectionParams[0]);
-        }
-        if (paramCount == 0) { // no generics
-            return new SimpleType(rawType);
-        }
-        return constructSimpleType(rawType, pt);
-    }
-
-    
-    protected JavaType _fromArrayType(GenericArrayType type, TypeBindings context)
-    {
-        JavaType compType = _constructType(type.getGenericComponentType(), context);
-        return ArrayType.construct(compType, null, null);
-    }
-
-    protected JavaType _fromVariable(TypeVariable<?> type, TypeBindings context)
-    {
-        /* 26-Sep-2009, tatus: It should be possible to try "partial"
-         *  resolution; meaning that it is ok not to find bindings.
-         *  For now this is indicated by passing null context.
-         */
-        if (context == null) {
-            return _unknownType();
-        }
-
-        // Ok: here's where context might come in handy!
-        String name = type.getName();
-        JavaType actualType = context.findType(name);
-        if (actualType != null) {
-            return actualType;
-        }
-
-        /* 29-Jan-2010, tatu: We used to throw exception here, if type was
-         *   bound: but the problem is that this can occur for generic "base"
-         *   method, overridden by sub-class. If so, we will want to ignore
-         *   current type (for method) since it will be masked.
-         */
-        Type[] bounds = type.getBounds();
-
-        // With type variables we must use bound information.
-        // Theoretically this gets tricky, as there may be multiple
-        // bounds ("... extends A & B"); and optimally we might
-        // want to choose the best match. Also, bounds are optional;
-        // but here we are lucky in that implicit "Object" is
-        // added as bounds if so.
-        // Either way let's just use the first bound, for now, and
-        // worry about better match later on if there is need.
-
-        /* 29-Jan-2010, tatu: One more problem are recursive types
-         *   (T extends Comparable<T>). Need to add "placeholder"
-         *   for resolution to catch those.
-         */
-        context._addPlaceholder(name);        
-        return _constructType(bounds[0], context);
-    }
-
-    protected JavaType _fromWildcard(WildcardType type, TypeBindings context)
-    {
-        /* Similar to challenges with TypeVariable, we may have
-         * multiple upper bounds. But it is also possible that if
-         * upper bound defaults to Object, we might want to consider
-         * lower bounds instead.
-         *
-         * For now, we won't try anything more advanced; above is
-         * just for future reference.
-         */
-        return _constructType(type.getUpperBounds()[0], context);
-    }
-
-    private JavaType _mapType(Class<?> rawClass)
-    {
-        JavaType[] typeParams = findTypeParameters(rawClass, Map.class);
-        // ok to have no types ("raw")
-        if (typeParams == null) {
-            return MapType.construct(rawClass, _unknownType(), _unknownType());
-        }
-        // but exactly 2 types if any found
-        if (typeParams.length != 2) {
-            throw new IllegalArgumentException("Strange Map type "+rawClass.getName()+": can not determine type parameters");
-        }
-        return MapType.construct(rawClass, typeParams[0], typeParams[1]);
-    }
-
-    private JavaType _collectionType(Class<?> rawClass)
-    {
-        JavaType[] typeParams = findTypeParameters(rawClass, Collection.class);
-        // ok to have no types ("raw")
-        if (typeParams == null) {
-            return CollectionType.construct(rawClass, _unknownType());
-        }
-        // but exactly 2 types if any found
-        if (typeParams.length != 1) {
-            throw new IllegalArgumentException("Strange Collection type "+rawClass.getName()+": can not determine type parameters");
-        }
-        return CollectionType.construct(rawClass, typeParams[0]);
-    }    
-
-    protected JavaType _resolveVariableViaSubTypes(HierarchicType leafType, String variableName, TypeBindings bindings)
-    {
-        // can't resolve raw types; possible to have as-of-yet-unbound types too:
-        if (leafType != null && leafType.isGeneric()) {
-            TypeVariable<?>[] typeVariables = leafType.getRawClass().getTypeParameters();
-            for (int i = 0, len = typeVariables.length; i < len; ++i) {
-                TypeVariable<?> tv = typeVariables[i];
-                if (variableName.equals(tv.getName())) {
-                    // further resolution needed?
-                    Type type = leafType.asGeneric().getActualTypeArguments()[i];
-                    if (type instanceof TypeVariable<?>) {
-                        return _resolveVariableViaSubTypes(leafType.getSubType(), ((TypeVariable<?>) type).getName(), bindings);
-                    }
-                    // no we're good for the variable (but it may have parameterization of its own)
-                    return _constructType(type, bindings);
-                }
-            }
-        }
-        return _unknownType();
-    }
-    
-    protected JavaType _unknownType() {
-        return new SimpleType(Object.class);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /**
-     * Helper method used to find inheritance (implements, extends) path
-     * between given types, if one exists (caller generally checks before
-     * calling this method). Returned type represents given <b>subtype</b>,
-     * with supertype linkage extending to <b>supertype</b>.
-     */
-    protected HierarchicType  _findSuperTypeChain(Class<?> subtype, Class<?> supertype)
-    {
-        // If super-type is a class (not interface), bit simpler
-        if (supertype.isInterface()) {
-            return _findSuperInterfaceChain(subtype, supertype);
-        }
-        return _findSuperClassChain(subtype, supertype);
-    }
-
-    protected HierarchicType _findSuperClassChain(Type currentType, Class<?> target)
-    {
-        HierarchicType current = new HierarchicType(currentType);
-        Class<?> raw = current.getRawClass();
-        if (raw == target) {
-            return current;
-        }
-        // Otherwise, keep on going down the rat hole...
-        Type parent = raw.getGenericSuperclass();
-        if (parent != null) {
-            HierarchicType sup = _findSuperClassChain(parent, target);
-            if (sup != null) {
-                sup.setSubType(current);
-                current.setSuperType(sup);
-                return current;
-            }
-        }
-        return null;
-    }
-
-    protected HierarchicType _findSuperInterfaceChain(Type currentType, Class<?> target)
-    {
-        HierarchicType current = new HierarchicType(currentType);
-        Class<?> raw = current.getRawClass();
-        if (raw == target) {
-            return new HierarchicType(currentType);
-        }
-        // Otherwise, keep on going down the rat hole; first implemented interfaces
-        /* 16-Aug-2011, tatu: Minor optimization based on profiled hot spot; let's
-         *   try caching certain commonly needed cases
-         */
-        if (raw == HashMap.class) {
-            if (target == Map.class) {
-                return _hashMapSuperInterfaceChain(current);
-            }
-        }
-        if (raw == ArrayList.class) {
-            if (target == List.class) {
-                return _arrayListSuperInterfaceChain(current);
-            }
-        }
-        return _doFindSuperInterfaceChain(current, target);
-    }
-    
-    protected HierarchicType _doFindSuperInterfaceChain(HierarchicType current, Class<?> target)
-    {
-        Class<?> raw = current.getRawClass();
-        Type[] parents = raw.getGenericInterfaces();
-        // as long as there are superclasses
-        // and unless we have already seen the type (<T extends X<T>>)
-        if (parents != null) {
-            for (Type parent : parents) {
-                HierarchicType sup = _findSuperInterfaceChain(parent, target);
-                if (sup != null) {
-                    sup.setSubType(current);
-                    current.setSuperType(sup);
-                    return current;
-                }
-            }
-        }
-        // and then super-class if any
-        Type parent = raw.getGenericSuperclass();
-        if (parent != null) {
-            HierarchicType sup = _findSuperInterfaceChain(parent, target);
-            if (sup != null) {
-                sup.setSubType(current);
-                current.setSuperType(sup);
-                return current;
-            }
-        }
-        return null;
-    }
-
-    protected synchronized HierarchicType _hashMapSuperInterfaceChain(HierarchicType current)
-    {
-        if (_cachedHashMapType == null) {
-            HierarchicType base = current.deepCloneWithoutSubtype();
-            _doFindSuperInterfaceChain(base, Map.class);
-            _cachedHashMapType = base.getSuperType();
-        }
-        HierarchicType t = _cachedHashMapType.deepCloneWithoutSubtype();
-        current.setSuperType(t);
-        t.setSubType(current);
-        return current;
-    }
-
-    protected synchronized HierarchicType _arrayListSuperInterfaceChain(HierarchicType current)
-    {
-        if (_cachedArrayListType == null) {
-            HierarchicType base = current.deepCloneWithoutSubtype();
-            _doFindSuperInterfaceChain(base, List.class);
-            _cachedArrayListType = base.getSuperType();
-        }
-        HierarchicType t = _cachedArrayListType.deepCloneWithoutSubtype();
-        current.setSuperType(t);
-        t.setSubType(current);
-        return current;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeModifier.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeModifier.java
deleted file mode 100644
index 0b59011..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeModifier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.lang.reflect.Type;
-
-import com.fasterxml.jackson.databind.JavaType;
-
-/**
- * Class that defines API that can be used to modify details of
- * {@link JavaType} instances constructed using {@link TypeFactory}.
- * Registered modifiers are called in order, to let them modify (or
- * replace) basic type instance factory constructs.
- * This is typically needed to support creation of
- * {@link MapLikeType} and {@link CollectionLikeType} instances,
- * as those can not be constructed in generic fashion.
- */
-public abstract class TypeModifier
-{
-    /**
-     * Method called to let modifier change constructed type definition.
-     * Note that this is only guaranteed to be called for
-     * non-container types ("simple" types not recognized as arrays,
-     * <code>java.util.Collection</code> or <code>java.util.Map</code>).
-     * 
-     * @param type Instance to modify
-     * @param jdkType JDK type that was used to construct instance to modify
-     * @param context Type resolution context used for the type
-     * @param typeFactory Type factory that can be used to construct parameter type; note,
-     *   however, that care must be taken to avoid infinite loops -- specifically, do not
-     *   construct instance of primary type itself
-     * 
-     * @return Actual type instance to use; usually either <code>type</code> (as is or with
-     *    modifications), or a newly constructed type instance based on it. Can not be null.
-     */
-    public abstract JavaType modifyType(JavaType type, Type jdkType, TypeBindings context,
-            TypeFactory typeFactory);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeParser.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeParser.java
deleted file mode 100644
index 4f47048..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/TypeParser.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.fasterxml.jackson.databind.type;
-
-import java.util.*;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.util.ClassUtil;
-
-/**
- * Simple recursive-descent parser for parsing canonical {@link JavaType}
- * representations and constructing type instances.
- * 
- * @author tatu
- */
-public class TypeParser
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final TypeFactory _factory;
-        
-    public TypeParser(TypeFactory f) {
-        _factory = f;
-    }
-
-    public JavaType parse(String canonical)
-        throws IllegalArgumentException
-    {
-        canonical = canonical.trim();
-        MyTokenizer tokens = new MyTokenizer(canonical);
-        JavaType type = parseType(tokens);
-        // must be end, now
-        if (tokens.hasMoreTokens()) {
-            throw _problem(tokens, "Unexpected tokens after complete type");
-        }
-        return type;
-    }
-
-    protected JavaType parseType(MyTokenizer tokens)
-        throws IllegalArgumentException
-    {
-        if (!tokens.hasMoreTokens()) {
-            throw _problem(tokens, "Unexpected end-of-string");
-        }
-        Class<?> base = findClass(tokens.nextToken(), tokens);
-        // either end (ok, non generic type), or generics
-        if (tokens.hasMoreTokens()) {
-            String token = tokens.nextToken();
-            if ("<".equals(token)) {
-                return _factory._fromParameterizedClass(base, parseTypes(tokens));
-            }
-            // can be comma that separates types, or closing '>'
-            tokens.pushBack(token);
-        }
-        return _factory._fromClass(base, null);
-    }
-
-    protected List<JavaType> parseTypes(MyTokenizer tokens)
-        throws IllegalArgumentException
-    {
-        ArrayList<JavaType> types = new ArrayList<JavaType>();
-        while (tokens.hasMoreTokens()) {
-            types.add(parseType(tokens));
-            if (!tokens.hasMoreTokens()) break;
-            String token = tokens.nextToken();
-            if (">".equals(token)) return types;
-            if (!",".equals(token)) {
-                throw _problem(tokens, "Unexpected token '"+token+"', expected ',' or '>')");
-            }
-        }
-        throw _problem(tokens, "Unexpected end-of-string");
-    }
-
-    protected Class<?> findClass(String className, MyTokenizer tokens)
-    {
-        try {
-            return ClassUtil.findClass(className);
-        } catch (Exception e) {
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            }
-            throw _problem(tokens, "Can not locate class '"+className+"', problem: "+e.getMessage());
-        }
-    }
-
-    protected IllegalArgumentException _problem(MyTokenizer tokens, String msg)
-    {
-        return new IllegalArgumentException("Failed to parse type '"+tokens.getAllInput()
-                +"' (remaining: '"+tokens.getRemainingInput()+"'): "+msg);
-    }
-
-    final static class MyTokenizer
-        extends StringTokenizer
-    {
-        protected final String _input;
-
-        protected int _index;
-
-        protected String _pushbackToken;
-        
-        public MyTokenizer(String str) {            
-            super(str, "<,>", true);
-            _input = str;
-        }
-
-        @Override
-        public boolean hasMoreTokens() {
-            return (_pushbackToken != null) || super.hasMoreTokens();
-        }
-        
-        @Override
-        public String nextToken() {
-            String token;
-            if (_pushbackToken != null) {
-                token = _pushbackToken;
-                _pushbackToken = null;
-            } else {
-                token = super.nextToken();
-            }
-            _index += token.length();
-            return token;
-        }
-
-        public void pushBack(String token) {
-            _pushbackToken = token;
-            _index -= token.length();
-        }
-        
-        public String getAllInput() { return _input; }
-        public String getUsedInput() { return _input.substring(0, _index); }
-        public String getRemainingInput() { return _input.substring(_index); }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/type/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/type/package-info.java
deleted file mode 100644
index 13b6d33..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/type/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Package that contains concrete implementations of
- * {@link com.fasterxml.jackson.databind.JavaType}, as
- * well as the factory ({@link com.fasterxml.jackson.databind.type.TypeFactory}) for
- * constructing instances from various input data types
- * (like {@link java.lang.Class}, {@link java.lang.reflect.Type})
- * and programmatically (for structured types, arrays,
- * {@link java.util.List}s and {@link java.util.Map}s).
- */
-package com.fasterxml.jackson.databind.type;
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Annotations.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Annotations.java
deleted file mode 100644
index cdb7ea9..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Annotations.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Interface that defines interface for accessing contents of a
- * collection of annotations. This is needed when introspecting
- * annotation-based features from different kinds of things, not
- * just objects that Java Reflection interface exposes.
- *<p>
- * Standard mutable implementation is {@link com.fasterxml.jackson.databind.introspect.AnnotationMap}
- */
-public interface Annotations
-{
-    /**
-     * Main access method used to find value for given annotation.
-     */
-    public <A extends Annotation> A get(Class<A> cls);
-
-    /**
-     * Returns number of annotation entries in this collection.
-     */
-    public int size();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ArrayBuilders.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ArrayBuilders.java
deleted file mode 100644
index ba0c560..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ArrayBuilders.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.lang.reflect.Array;
-import java.util.*;
-
-/**
- * Helper class that contains set of distinct builders for different
- * arrays of primitive values. It also provides trivially simple
- * reuse scheme, which assumes that caller knows not to use instances
- * concurrently (which works ok with primitive arrays since they can
- * not contain other non-primitive types).
- */
-public final class ArrayBuilders
-{
-    BooleanBuilder _booleanBuilder = null;
-
-    // note: no need for char[] builder, assume they are Strings
-
-    ByteBuilder _byteBuilder = null;
-    ShortBuilder _shortBuilder = null;
-    IntBuilder _intBuilder = null;
-    LongBuilder _longBuilder = null;
-    
-    FloatBuilder _floatBuilder = null;
-    DoubleBuilder _doubleBuilder = null;
-
-    public ArrayBuilders() { }
-
-    public BooleanBuilder getBooleanBuilder()
-    {
-        if (_booleanBuilder == null) {
-            _booleanBuilder = new BooleanBuilder();
-        }
-        return _booleanBuilder;
-    }
-
-    public ByteBuilder getByteBuilder()
-    {
-        if (_byteBuilder == null) {
-            _byteBuilder = new ByteBuilder();
-        }
-        return _byteBuilder;
-    }
-    public ShortBuilder getShortBuilder()
-    {
-        if (_shortBuilder == null) {
-            _shortBuilder = new ShortBuilder();
-        }
-        return _shortBuilder;
-    }
-    public IntBuilder getIntBuilder()
-    {
-        if (_intBuilder == null) {
-            _intBuilder = new IntBuilder();
-        }
-        return _intBuilder;
-    }
-    public LongBuilder getLongBuilder()
-    {
-        if (_longBuilder == null) {
-            _longBuilder = new LongBuilder();
-        }
-        return _longBuilder;
-    }
-
-    public FloatBuilder getFloatBuilder()
-    {
-        if (_floatBuilder == null) {
-            _floatBuilder = new FloatBuilder();
-        }
-        return _floatBuilder;
-    }
-    public DoubleBuilder getDoubleBuilder()
-    {
-        if (_doubleBuilder == null) {
-            _doubleBuilder = new DoubleBuilder();
-        }
-        return _doubleBuilder;
-    }
-
-    /*
-    /**********************************************************
-    /* Impl classes
-    /**********************************************************
-     */
-
-    public final static class BooleanBuilder
-        extends PrimitiveArrayBuilder<boolean[]>
-    {
-        public BooleanBuilder() { }
-        @Override
-        public final boolean[] _constructArray(int len) { return new boolean[len]; }
-    }
-
-    public final static class ByteBuilder
-        extends PrimitiveArrayBuilder<byte[]>
-    {
-        public ByteBuilder() { }
-        @Override
-        public final byte[] _constructArray(int len) { return new byte[len]; }
-    }
-    public final static class ShortBuilder
-        extends PrimitiveArrayBuilder<short[]>
-    {
-        public ShortBuilder() { }
-        @Override
-        public final short[] _constructArray(int len) { return new short[len]; }
-    }
-    public final static class IntBuilder
-        extends PrimitiveArrayBuilder<int[]>
-    {
-        public IntBuilder() { }
-        @Override
-        public final int[] _constructArray(int len) { return new int[len]; }
-    }
-    public final static class LongBuilder
-        extends PrimitiveArrayBuilder<long[]>
-    {
-        public LongBuilder() { }
-        @Override
-        public final long[] _constructArray(int len) { return new long[len]; }
-    }
-
-    public final static class FloatBuilder
-        extends PrimitiveArrayBuilder<float[]>
-    {
-        public FloatBuilder() { }
-        @Override
-        public final float[] _constructArray(int len) { return new float[len]; }
-    }
-    public final static class DoubleBuilder
-        extends PrimitiveArrayBuilder<double[]>
-    {
-        public DoubleBuilder() { }
-        @Override
-        public final double[] _constructArray(int len) { return new double[len]; }
-    }
-    
-    /*
-    /**********************************************************
-    /* Static helper methods
-    /**********************************************************
-     */
-
-    public static <T> HashSet<T> arrayToSet(T[] elements)
-    {
-        HashSet<T> result = new HashSet<T>();
-        if (elements != null) {
-            for (T elem : elements) {
-                result.add(elem);
-            }
-        }
-        return result;
-    }
-
-    public static <T> ArrayList<T> arrayToList(T[] elements)
-    {
-        ArrayList<T> result = new ArrayList<T>();
-        if (elements != null) {
-            for (T elem : elements) {
-                result.add(elem);
-            }
-        }
-        return result;
-    }
-
-    public static <T> HashSet<T> setAndArray(Set<T> set, T[] elements)
-    {
-        HashSet<T> result = new HashSet<T>();
-        if (set != null) {
-            result.addAll(set);
-        }
-        if (elements != null) {
-            for (T value : elements) {
-                result.add(value);
-            }
-        }
-        return result;
-    }
-    
-    /**
-     * Helper method for adding specified element to a List, but also
-     * considering case where the List may not have been yet constructed
-     * (that is, null is passed instead).
-     * 
-     * @param list List to add to; may be null to indicate that a new
-     *    List is to be constructed
-     * @param element Element to add to list
-     * 
-     * @return List in which element was added; either <code>list</code>
-     *   (if it was not null), or a newly constructed List.
-     */
-    public static <T> List<T> addToList(List<T> list, T element)
-    {
-        if (list == null) {
-            list = new ArrayList<T>();
-        }
-        list.add(element);
-        return list;
-    }
-
-    /**
-     * Helper method for constructing a new array that contains specified
-     * element followed by contents of the given array. No checking is done
-     * to see if element being inserted is duplicate.
-     */
-    public static <T> T[] insertInList(T[] array, T element)
-    {
-        int len = array.length;
-        @SuppressWarnings("unchecked")
-        T[] result = (T[]) Array.newInstance(array.getClass().getComponentType(), len+1);
-        if (len > 0) {
-            System.arraycopy(array, 0, result, 1, len);
-        }
-        result[0] = element;
-        return result;
-    }
-
-    /**
-     * Helper method for constructing a new array that contains specified
-     * element followed by contents of the given array but never contains
-     * duplicates.
-     * If element already existed, one of two things happens: if the element
-     * was already the first one in array, array is returned as is; but
-     * if not, a new copy is created in which element has moved as the head.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> T[] insertInListNoDup(T[] array, T element)
-    {
-        final int len = array.length;
-        
-        // First: see if the element already exists
-        for (int ix = 0; ix < len; ++ix) {
-            if (array[ix] == element) {
-                // if at head already, return as is
-                if (ix == 0) {
-                    return array;
-                }
-                // otherwise move things around
-                T[] result = (T[]) Array.newInstance(array.getClass().getComponentType(), len);
-                System.arraycopy(array, 0, result, 1, ix);
-                array[0] = element;
-                return result;
-            }
-        }
-
-        // but if not, allocate new array, move
-        T[] result = (T[]) Array.newInstance(array.getClass().getComponentType(), len+1);
-        if (len > 0) {
-            System.arraycopy(array, 0, result, 1, len);
-        }
-        result[0] = element;
-        return result;
-    }
-    
-    /**
-     * Helper method for exposing contents of arrays using a read-only iterator
-     */
-    public static <T> Iterator<T> arrayAsIterator(T[] array)
-    {
-        return new ArrayIterator<T>(array);
-    }
-
-    public static <T> Iterable<T> arrayAsIterable(T[] array)
-    {
-        return new ArrayIterator<T>(array);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Iterator implementation used to efficiently expose contents of an
-     * Array as read-only iterator.
-     */
-    private final static class ArrayIterator<T>
-        implements Iterator<T>, Iterable<T>
-    {
-        private final T[] _array;
-        
-        private int _index;
-
-        public ArrayIterator(T[] array) {
-            _array = array;
-            _index = 0;
-        }
-        
-//      @Override
-        public boolean hasNext() {
-            return _index < _array.length;
-        }
-
-//      @Override
-        public T next()
-        {
-            if (_index >= _array.length) {
-                throw new NoSuchElementException();
-            }
-            return _array[_index++];
-        }
-
-//      @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-//      @Override
-        public Iterator<T> iterator() {
-            return this;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/BeanUtil.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/BeanUtil.java
deleted file mode 100644
index 5c61f35..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/BeanUtil.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-
-/**
- * Helper class that contains functionality needed by both serialization
- * and deserialization side.
- */
-public class BeanUtil
-{
-    /*
-    /**********************************************************
-    /* Handling "getter" names
-    /**********************************************************
-     */
-
-    public static String okNameForGetter(AnnotatedMethod am)
-    {
-        String name = am.getName();
-        String str = okNameForIsGetter(am, name);
-        if (str == null) {
-            str = okNameForRegularGetter(am, name);
-        }
-        return str;
-    }
-
-    public static String okNameForRegularGetter(AnnotatedMethod am, String name)
-    {
-        if (name.startsWith("get")) {
-            /* 16-Feb-2009, tatu: To handle [JACKSON-53], need to block
-             *   CGLib-provided method "getCallbacks". Not sure of exact
-             *   safe criteria to get decent coverage without false matches;
-             *   but for now let's assume there's no reason to use any 
-             *   such getter from CGLib.
-             *   But let's try this approach...
-             */
-            if ("getCallbacks".equals(name)) {
-                if (isCglibGetCallbacks(am)) {
-                    return null;
-                }
-            } else if ("getMetaClass".equals(name)) {
-                /* 30-Apr-2009, tatu: [JACKSON-103], need to suppress
-                 *    serialization of a cyclic (and useless) reference
-                 */
-                if (isGroovyMetaClassGetter(am)) {
-                    return null;
-                }
-            }
-            return manglePropertyName(name.substring(3));
-        }
-        return null;
-    }
-
-    public static String okNameForIsGetter(AnnotatedMethod am, String name)
-    {
-        if (name.startsWith("is")) {
-            // plus, must return boolean...
-            Class<?> rt = am.getRawType();
-            if (rt != Boolean.class && rt != Boolean.TYPE) {
-                return null;
-            }
-            return manglePropertyName(name.substring(2));
-        }
-        // no, not a match by name
-        return null;
-    }
-
-    public static String okNameForSetter(AnnotatedMethod am)
-    {
-    	String name = okNameForMutator(am, "set");
-    	if (name != null) {
-	        // 26-Nov-2009 [JACSON-103], need to suppress this internal groovy method
-	        if ("metaClass".equals(name)) {
-	            if (isGroovyMetaClassSetter(am)) {
-	                return null;
-	            }
-	        }
-	        return name;
-    	}
-    	return null;
-    }
-
-    public static String okNameForMutator(AnnotatedMethod am, String prefix)
-    {
-	    String name = am.getName();
-        if (name.startsWith(prefix)) {
-        	return manglePropertyName(name.substring(prefix.length()));
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods for bean property name handling
-    /**********************************************************
-     */
-
-    /**
-     * This method was added to address [JACKSON-53]: need to weed out
-     * CGLib-injected "getCallbacks". 
-     * At this point caller has detected a potential getter method
-     * with name "getCallbacks" and we need to determine if it is
-     * indeed injectect by Cglib. We do this by verifying that the
-     * result type is "net.sf.cglib.proxy.Callback[]"
-     *<p>
-     * Also, see [JACKSON-177]; Hibernate may repackage cglib
-     * it uses, so we better catch that too
-     */
-    protected static boolean isCglibGetCallbacks(AnnotatedMethod am)
-    {
-        Class<?> rt = am.getRawType();
-        // Ok, first: must return an array type
-        if (rt == null || !rt.isArray()) {
-            return false;
-        }
-        /* And that type needs to be "net.sf.cglib.proxy.Callback".
-         * Theoretically could just be a type that implements it, but
-         * for now let's keep things simple, fix if need be.
-         */
-        Class<?> compType = rt.getComponentType();
-        // Actually, let's just verify it's a "net.sf.cglib.*" class/interface
-        Package pkg = compType.getPackage();
-        if (pkg != null) {
-            String pname = pkg.getName();
-            if (pname.startsWith("net.sf.cglib")
-                // also, as per [JACKSON-177]
-                || pname.startsWith("org.hibernate.repackage.cglib")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Similar to {@link #isCglibGetCallbacks}, need to suppress
-     * a cyclic reference to resolve [JACKSON-103]
-     */
-    protected static boolean isGroovyMetaClassSetter(AnnotatedMethod am)
-    {
-        Class<?> argType = am.getRawParameterType(0);
-        Package pkg = argType.getPackage();
-        if (pkg != null && pkg.getName().startsWith("groovy.lang")) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Another helper method to deal with rest of [JACKSON-103]
-     */
-    protected static boolean isGroovyMetaClassGetter(AnnotatedMethod am)
-    {
-        Class<?> rt = am.getRawType();
-        if (rt == null || rt.isArray()) {
-            return false;
-        }
-        Package pkg = rt.getPackage();
-        if (pkg != null && pkg.getName().startsWith("groovy.lang")) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Method called to figure out name of the property, given 
-     * corresponding suggested name based on a method or field name.
-     *
-     * @param basename Name of accessor/mutator method, not including prefix
-     *  ("get"/"is"/"set")
-     */
-    protected static String manglePropertyName(String basename)
-    {
-        int len = basename.length();
-
-        // First things first: empty basename is no good
-        if (len == 0) {
-            return null;
-        }
-        // otherwise, lower case initial chars
-        StringBuilder sb = null;
-        for (int i = 0; i < len; ++i) {
-            char upper = basename.charAt(i);
-            char lower = Character.toLowerCase(upper);
-            if (upper == lower) {
-                break;
-            }
-            if (sb == null) {
-                sb = new StringBuilder(basename);
-            }
-            sb.setCharAt(i, lower);
-        }
-        return (sb == null) ? basename : sb.toString();
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ClassUtil.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ClassUtil.java
deleted file mode 100644
index c7bf18f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ClassUtil.java
+++ /dev/null
@@ -1,688 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-
-public final class ClassUtil
-{
-    /*
-    /**********************************************************
-    /* Methods that deal with inheritance
-    /**********************************************************
-     */
-
-    /**
-     * Method that will find all sub-classes and implemented interfaces
-     * of a given class or interface. Classes are listed in order of
-     * precedence, starting with the immediate super-class, followed by
-     * interfaces class directly declares to implemented, and then recursively
-     * followed by parent of super-class and so forth.
-     * Note that <code>Object.class</code> is not included in the list
-     * regardless of whether <code>endBefore</code> argument is defined or not.
-     *
-     * @param endBefore Super-type to NOT include in results, if any; when
-     *    encountered, will be ignored (and no super types are checked).
-     */
-    public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore)
-    {
-        return findSuperTypes(cls, endBefore, new ArrayList<Class<?>>(8));
-    }
-    
-    public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore, List<Class<?>> result)
-    {
-        _addSuperTypes(cls, endBefore, result, false);
-        return result;
-    }
-    
-    private static void _addSuperTypes(Class<?> cls, Class<?> endBefore, Collection<Class<?>> result, boolean addClassItself)
-    {
-        if (cls == endBefore || cls == null || cls == Object.class) {
-            return;
-        }
-        if (addClassItself) {
-            if (result.contains(cls)) { // already added, no need to check supers
-                return;
-            }
-            result.add(cls);
-        }
-        for (Class<?> intCls : cls.getInterfaces()) {
-            _addSuperTypes(intCls, endBefore, result, true);
-        }
-        _addSuperTypes(cls.getSuperclass(), endBefore, result, true);
-    }
-    
-    /*
-    /**********************************************************
-    /* Class type detection methods
-    /**********************************************************
-     */
-
-    /**
-     * @return Null if class might be a bean; type String (that identifies
-     *   why it's not a bean) if not
-     */
-    public static String canBeABeanType(Class<?> type)
-    {
-        // First: language constructs that ain't beans:
-        if (type.isAnnotation()) {
-            return "annotation";
-        }
-        if (type.isArray()) {
-            return "array";
-        }
-        if (type.isEnum()) {
-            return "enum";
-        }
-        if (type.isPrimitive()) {
-            return "primitive";
-        }
-
-        // Anything else? Seems valid, then
-        return null;
-    }
-    
-    public static String isLocalType(Class<?> type, boolean allowNonStatic)
-    {
-        /* As per [JACKSON-187], GAE seems to throw SecurityExceptions
-         * here and there... and GAE itself has a bug, too
-         * (see []). Bah. So we need to catch some wayward exceptions on GAE
-         */
-        try {
-            // one more: method locals, anonymous, are not good:
-            if (type.getEnclosingMethod() != null) {
-                return "local/anonymous";
-            }
-            
-            /* But how about non-static inner classes? Can't construct
-             * easily (theoretically, we could try to check if parent
-             * happens to be enclosing... but that gets convoluted)
-             */
-            if (!allowNonStatic) {
-                if (type.getEnclosingClass() != null) {
-                    if (!Modifier.isStatic(type.getModifiers())) {
-                        return "non-static member class";
-                    }
-                }
-            }
-        }
-        catch (SecurityException e) { }
-        catch (NullPointerException e) { }
-        return null;
-    }
-
-    /**
-     * Method for finding enclosing class for non-static inner classes
-     */
-    public static Class<?> getOuterClass(Class<?> type)
-    {
-        // as above, GAE has some issues...
-        try {
-            // one more: method locals, anonymous, are not good:
-            if (type.getEnclosingMethod() != null) {
-                return null;
-            }
-            if (!Modifier.isStatic(type.getModifiers())) {
-                return type.getEnclosingClass();
-            }
-        } catch (SecurityException e) { }
-        catch (NullPointerException e) { }
-        return null;
-    }
-    
-    
-    /**
-     * Helper method used to weed out dynamic Proxy types; types that do
-     * not expose concrete method API that we could use to figure out
-     * automatic Bean (property) based serialization.
-     */
-    public static boolean isProxyType(Class<?> type)
-    {
-        // As per [Issue#57], should NOT disqualify JDK proxy:
-        /*
-        // Then: well-known proxy (etc) classes
-        if (Proxy.isProxyClass(type)) {
-            return true;
-        }
-        */
-        String name = type.getName();
-        // Hibernate uses proxies heavily as well:
-        if (name.startsWith("net.sf.cglib.proxy.")
-            || name.startsWith("org.hibernate.proxy.")) {
-            return true;
-        }
-        // Not one of known proxies, nope:
-        return false;
-    }
-
-    /**
-     * Helper method that checks if given class is a concrete one;
-     * that is, not an interface or abstract class.
-     */
-    public static boolean isConcrete(Class<?> type)
-    {
-        int mod = type.getModifiers();
-        return (mod & (Modifier.INTERFACE | Modifier.ABSTRACT)) == 0;
-    }
-
-    public static boolean isConcrete(Member member)
-    {
-        int mod = member.getModifiers();
-        return (mod & (Modifier.INTERFACE | Modifier.ABSTRACT)) == 0;
-    }
-    
-    public static boolean isCollectionMapOrArray(Class<?> type)
-    {
-        if (type.isArray()) return true;
-        if (Collection.class.isAssignableFrom(type)) return true;
-        if (Map.class.isAssignableFrom(type)) return true;
-        return false;
-    }
-
-    /*
-    /**********************************************************
-    /* Type name handling methods
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method used to construct appropriate description
-     * when passed either type (Class) or an instance; in latter
-     * case, class of instance is to be used.
-     */
-    public static String getClassDescription(Object classOrInstance)
-    {
-        if (classOrInstance == null) {
-            return "unknown";
-        }
-        Class<?> cls = (classOrInstance instanceof Class<?>) ?
-            (Class<?>) classOrInstance : classOrInstance.getClass();
-        return cls.getName();
-    }
-
-    /*
-    /**********************************************************
-    /* Class loading
-    /**********************************************************
-     */
-
-    public static Class<?> findClass(String className) throws ClassNotFoundException
-    {
-        // [JACKSON-597]: support primitive types (and void)
-        if (className.indexOf('.') < 0) {
-            if ("int".equals(className)) return Integer.TYPE;
-            if ("long".equals(className)) return Long.TYPE;
-            if ("float".equals(className)) return Float.TYPE;
-            if ("double".equals(className)) return Double.TYPE;
-            if ("boolean".equals(className)) return Boolean.TYPE;
-            if ("byte".equals(className)) return Byte.TYPE;
-            if ("char".equals(className)) return Character.TYPE;
-            if ("short".equals(className)) return Short.TYPE;
-            if ("void".equals(className)) return Void.TYPE;
-        }
-        // Two-phase lookup: first using context ClassLoader; then default
-        Throwable prob = null;
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        
-        if (loader != null) {
-            try {
-                return Class.forName(className, true, loader);
-            } catch (Exception e) {
-                prob = getRootCause(e);
-            }
-        }
-        try {
-            return Class.forName(className);
-        } catch (Exception e) {
-            if (prob == null) {
-                prob = getRootCause(e);
-            }
-        }
-        if (prob instanceof RuntimeException) {
-            throw (RuntimeException) prob;
-        }
-        throw new ClassNotFoundException(prob.getMessage(), prob);
-    }
-    
-    /*
-    /**********************************************************
-    /* Method type detection methods
-    /**********************************************************
-     */
-
-    public static boolean hasGetterSignature(Method m)
-    {
-        // First: static methods can't be getters
-        if (Modifier.isStatic(m.getModifiers())) {
-            return false;
-        }
-        // Must take no args
-        Class<?>[] pts = m.getParameterTypes();
-        if (pts != null && pts.length != 0) {
-            return false;
-        }
-        // Can't be a void method
-        if (Void.TYPE == m.getReturnType()) {
-            return false;
-        }
-        // Otherwise looks ok:
-        return true;
-    }
-
-    /*
-    /**********************************************************
-    /* Exception handling
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be used to find the "root cause", innermost
-     * of chained (wrapped) exceptions.
-     */
-    public static Throwable getRootCause(Throwable t)
-    {
-        while (t.getCause() != null) {
-            t = t.getCause();
-        }
-        return t;
-    }
-
-    /**
-     * Method that will unwrap root causes of given Throwable, and throw
-     * the innermost {@link Exception} or {@link Error} as is.
-     * This is useful in cases where mandatory wrapping is added, which
-     * is often done by Reflection API.
-     */
-    public static void throwRootCause(Throwable t) throws Exception
-    {
-        t = getRootCause(t);
-        if (t instanceof Exception) {
-            throw (Exception) t;
-        }
-        throw (Error) t;
-    }
-    
-    /**
-     * Method that will wrap 't' as an {@link IllegalArgumentException} if it
-     * is a checked exception; otherwise (runtime exception or error) throw as is
-     */
-    public static void throwAsIAE(Throwable t)
-    {
-        throwAsIAE(t, t.getMessage());
-    }
-
-    /**
-     * Method that will wrap 't' as an {@link IllegalArgumentException} (and with
-     * specified message) if it
-     * is a checked exception; otherwise (runtime exception or error) throw as is
-     */
-    public static void throwAsIAE(Throwable t, String msg)
-    {
-        if (t instanceof RuntimeException) {
-            throw (RuntimeException) t;
-        }
-        if (t instanceof Error) {
-            throw (Error) t;
-        }
-        throw new IllegalArgumentException(msg, t);
-    }
-
-    /**
-     * Method that will locate the innermost exception for given Throwable;
-     * and then wrap it as an {@link IllegalArgumentException} if it
-     * is a checked exception; otherwise (runtime exception or error) throw as is
-     */
-    public static void unwrapAndThrowAsIAE(Throwable t)
-    {
-        throwAsIAE(getRootCause(t));
-    }
-
-    /**
-     * Method that will locate the innermost exception for given Throwable;
-     * and then wrap it as an {@link IllegalArgumentException} if it
-     * is a checked exception; otherwise (runtime exception or error) throw as is
-     */
-    public static void unwrapAndThrowAsIAE(Throwable t, String msg)
-    {
-        throwAsIAE(getRootCause(t), msg);
-    }
-
-    /*
-    /**********************************************************
-    /* Instantiation
-    /**********************************************************
-     */
-
-    /**
-     * Method that can be called to try to create an instantiate of
-     * specified type. Instantiation is done using default no-argument
-     * constructor.
-     *
-     * @param canFixAccess Whether it is possible to try to change access
-     *   rights of the default constructor (in case it is not publicly
-     *   accessible) or not.
-     *
-     * @throws IllegalArgumentException If instantiation fails for any reason;
-     *    except for cases where constructor throws an unchecked exception
-     *    (which will be passed as is)
-     */
-    public static <T> T createInstance(Class<T> cls, boolean canFixAccess)
-        throws IllegalArgumentException
-    {
-        Constructor<T> ctor = findConstructor(cls, canFixAccess);
-        if (ctor == null) {
-            throw new IllegalArgumentException("Class "+cls.getName()+" has no default (no arg) constructor");
-        }
-        try {
-            return ctor.newInstance();
-        } catch (Exception e) {
-            ClassUtil.unwrapAndThrowAsIAE(e, "Failed to instantiate class "+cls.getName()+", problem: "+e.getMessage());
-            return null;
-        }
-    }
-
-    public static <T> Constructor<T> findConstructor(Class<T> cls, boolean canFixAccess)
-        throws IllegalArgumentException
-    {
-        try {
-            Constructor<T> ctor = cls.getDeclaredConstructor();
-            if (canFixAccess) {
-                checkAndFixAccess(ctor);
-            } else {
-                // Has to be public...
-                if (!Modifier.isPublic(ctor.getModifiers())) {
-                    throw new IllegalArgumentException("Default constructor for "+cls.getName()+" is not accessible (non-public?): not allowed to try modify access via Reflection: can not instantiate type");
-                }
-            }
-            return ctor;
-        } catch (NoSuchMethodException e) {
-            ;
-        } catch (Exception e) {
-            ClassUtil.unwrapAndThrowAsIAE(e, "Failed to find default constructor of class "+cls.getName()+", problem: "+e.getMessage());
-        }
-        return null;
-    }
-
-    /*
-    /**********************************************************
-    /* Primitive type support
-    /**********************************************************
-     */
-    
-    /**
-     * Helper method used to get default value for wrappers used for primitive types
-     * (0 for Integer etc)
-     */
-    public static Object defaultValue(Class<?> cls)
-    {
-        if (cls == Integer.TYPE) {
-            return Integer.valueOf(0);
-        }
-        if (cls == Long.TYPE) {
-            return Long.valueOf(0L);
-        }
-        if (cls == Boolean.TYPE) {
-            return Boolean.FALSE;
-        }
-        if (cls == Double.TYPE) {
-            return Double.valueOf(0.0);
-        }
-        if (cls == Float.TYPE) {
-            return Float.valueOf(0.0f);
-        }
-        if (cls == Byte.TYPE) {
-            return Byte.valueOf((byte) 0);
-        }
-        if (cls == Short.TYPE) {
-            return Short.valueOf((short) 0);
-        }
-        if (cls == Character.TYPE) {
-            return '\0';
-        }
-        throw new IllegalArgumentException("Class "+cls.getName()+" is not a primitive type");
-    }
-
-    /**
-     * Helper method for finding wrapper type for given primitive type (why isn't
-     * there one in JDK?)
-     */
-    public static Class<?> wrapperType(Class<?> primitiveType)
-    {
-        if (primitiveType == Integer.TYPE) {
-            return Integer.class;
-        }
-        if (primitiveType == Long.TYPE) {
-            return Long.class;
-        }
-        if (primitiveType == Boolean.TYPE) {
-            return Boolean.class;
-        }
-        if (primitiveType == Double.TYPE) {
-            return Double.class;
-        }
-        if (primitiveType == Float.TYPE) {
-            return Float.class;
-        }
-        if (primitiveType == Byte.TYPE) {
-            return Byte.class;
-        }
-        if (primitiveType == Short.TYPE) {
-            return Short.class;
-        }
-        if (primitiveType == Character.TYPE) {
-            return Character.class;
-        }
-        throw new IllegalArgumentException("Class "+primitiveType.getName()+" is not a primitive type");
-    }
-    
-    /*
-    /**********************************************************
-    /* Access checking/handling methods
-    /**********************************************************
-     */
-
-    /**
-     * Method called to check if we can use the passed method or constructor
-     * (wrt access restriction -- public methods can be called, others
-     * usually not); and if not, if there is a work-around for
-     * the problem.
-     */
-    public static void checkAndFixAccess(Member member)
-    {
-        // We know all members are also accessible objects...
-        AccessibleObject ao = (AccessibleObject) member;
-
-        /* 14-Jan-2009, tatu: It seems safe and potentially beneficial to
-         *   always to make it accessible (latter because it will force
-         *   skipping checks we have no use for...), so let's always call it.
-         */
-        //if (!ao.isAccessible()) {
-        try {
-            ao.setAccessible(true);
-        } catch (SecurityException se) {
-            /* 17-Apr-2009, tatu: Related to [JACKSON-101]: this can fail on
-             *    platforms like EJB and Google App Engine); so let's
-             *    only fail if we really needed it...
-             */
-            if (!ao.isAccessible()) {
-                Class<?> declClass = member.getDeclaringClass();
-                throw new IllegalArgumentException("Can not access "+member+" (from class "+declClass.getName()+"; failed to set access: "+se.getMessage());
-            }
-        }
-        //}
-    }
-
-    /*
-    /**********************************************************
-    /* Enum type detection
-    /**********************************************************
-     */
-
-    /**
-     * Helper method that can be used to dynamically figure out
-     * enumeration type of given {@link EnumSet}, without having
-     * access to its declaration.
-     * Code is needed to work around design flaw in JDK.
-     */
-    public static Class<? extends Enum<?>> findEnumType(EnumSet<?> s)
-    {
-    	// First things first: if not empty, easy to determine
-    	if (!s.isEmpty()) {
-    		return findEnumType(s.iterator().next());
-    	}
-    	// Otherwise need to locate using an internal field
-    	return EnumTypeLocator.instance.enumTypeFor(s);
-    }
-
-    /**
-     * Helper method that can be used to dynamically figure out
-     * enumeration type of given {@link EnumSet}, without having
-     * access to its declaration.
-     * Code is needed to work around design flaw in JDK.
-     */
-    public static Class<? extends Enum<?>> findEnumType(EnumMap<?,?> m)
-    {
-    	if (!m.isEmpty()) {
-    		return findEnumType(m.keySet().iterator().next());
-    	}
-    	// Otherwise need to locate using an internal field
-    	return EnumTypeLocator.instance.enumTypeFor(m);
-    }
-
-    /**
-     * Helper method that can be used to dynamically figure out formal
-     * enumeration type (class) for given enumeration. This is either
-     * class of enum instance (for "simple" enumerations), or its
-     * superclass (for enums with instance fields or methods)
-     */
-    @SuppressWarnings("unchecked")
-	public static Class<? extends Enum<?>> findEnumType(Enum<?> en)
-    {
-        // enums with "body" are sub-classes of the formal type
-    	Class<?> ec = en.getClass();
-    	if (ec.getSuperclass() != Enum.class) {
-    	    ec = ec.getSuperclass();
-    	}
-    	return (Class<? extends Enum<?>>) ec;
-    }
-
-    /**
-     * Helper method that can be used to dynamically figure out formal
-     * enumeration type (class) for given class of an enumeration value.
-     * This is either class of enum instance (for "simple" enumerations),
-     * or its superclass (for enums with instance fields or methods)
-     */
-    @SuppressWarnings("unchecked")
-    public static Class<? extends Enum<?>> findEnumType(Class<?> cls)
-    {
-        // enums with "body" are sub-classes of the formal type
-        if (cls.getSuperclass() != Enum.class) {
-            cls = cls.getSuperclass();
-        }
-        return (Class<? extends Enum<?>>) cls;
-    }
-
-    /*
-    /**********************************************************
-    /* Jackson-specific stuff
-    /**********************************************************
-     */
-    
-    /**
-     * Method that can be called to determine if given Object is the default
-     * implementation Jackson uses; as opposed to a custom serializer installed by
-     * a module or calling application. Determination is done using
-     * {@link JacksonStdImpl} annotation on handler (serializer, deserializer etc)
-     * class.
-     */
-    public static boolean isJacksonStdImpl(Object impl) {
-        return (impl != null) && isJacksonStdImpl(impl.getClass());
-    }
-
-    public static boolean isJacksonStdImpl(Class<?> implClass) {
-        return (implClass.getAnnotation(JacksonStdImpl.class) != null);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Inner class used to contain gory details of how we can determine
-     * details of instances of common JDK types like {@link EnumMap}s.
-     */
-    private static class EnumTypeLocator
-    {
-    	final static EnumTypeLocator instance = new EnumTypeLocator();
-
-    	private final Field enumSetTypeField;
-    	private final Field enumMapTypeField;
-    	
-    	private EnumTypeLocator() {
-    	    /* JDK uses following fields to store information about actual Enumeration
-    	     * type for EnumSets, EnumMaps...
-    	     */
-    	    enumSetTypeField = locateField(EnumSet.class, "elementType", Class.class);
-    	    enumMapTypeField = locateField(EnumMap.class, "elementType", Class.class);
-    	}
-
-    	@SuppressWarnings("unchecked")
-    	public Class<? extends Enum<?>> enumTypeFor(EnumSet<?> set)
-    	{
-    	    if (enumSetTypeField != null) {
-    	        return (Class<? extends Enum<?>>) get(set, enumSetTypeField);
-    	    }
-    	    throw new IllegalStateException("Can not figure out type for EnumSet (odd JDK platform?)");
-    	}
-
-    	@SuppressWarnings("unchecked")
-    	public Class<? extends Enum<?>> enumTypeFor(EnumMap<?,?> set)
-        {
-    	    if (enumMapTypeField != null) {
-    	        return (Class<? extends Enum<?>>) get(set, enumMapTypeField);
-    	    }
-    	    throw new IllegalStateException("Can not figure out type for EnumMap (odd JDK platform?)");
-        }
-    	
-    	private Object get(Object bean, Field field)
-    	{
-    	    try {
-    	        return field.get(bean);
-    	    } catch (Exception e) {
-    	        throw new IllegalArgumentException(e);
-    	    }
-    	}
-    	
-    	private static Field locateField(Class<?> fromClass, String expectedName, Class<?> type)
-    	{
-    	    Field found = null;
-    	    // First: let's see if we can find exact match:
-    	    Field[] fields = fromClass.getDeclaredFields();
-    	    for (Field f : fields) {
-    	        if (expectedName.equals(f.getName()) && f.getType() == type) {
-    	            found = f;
-    	            break;
-    	        }
-    	    }
-    	    // And if not, if there is just one field with the type, that field
-    	    if (found == null) {
-    	        for (Field f : fields) {
-    	            if (f.getType() == type) {
-    	                // If more than one, can't choose
-    	                if (found != null) return null;
-    	                found = f;
-    	            }
-    	        }
-    	    }
-    	    if (found != null) { // it's non-public, need to force accessible
-    	        try {
-    	            found.setAccessible(true);
-    	        } catch (Throwable t) { }
-    	    }
-    	    return found;
-    	}
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Comparators.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Comparators.java
deleted file mode 100644
index 46dc6ce..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Comparators.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.lang.reflect.Array;
-
-/**
- * Helper class for constructing objects for comparing content values
- */
-public class Comparators
-{
-    /**
-     * Helper method used for constructing simple value comparator used for
-     * comparing arrays for content equality.
-     *<p>
-     * Note: current implementation is not optimized for speed; if performance
-     * ever becomes an issue, it is possible to construct much more efficient
-     * typed instances (one for Object[] and sub-types; one per primitive type).
-     */
-    public static Object getArrayComparator(final Object defaultValue)
-    {
-        final int length = Array.getLength(defaultValue);
-        return new Object() {
-            @Override
-            public boolean equals(Object other) {
-                if (other == this) return true;
-                if (other == null || other.getClass() != defaultValue.getClass()) {
-                    return false;
-                }
-                if (Array.getLength(other) != length) return false;
-                // so far so good: compare actual equality; but only shallow one
-                for (int i = 0; i < length; ++i) {
-                    Object value1 = Array.get(defaultValue, i);
-                    Object value2 = Array.get(other, i);
-                    if (value1 == value2) continue;
-                    if (value1 != null) {
-                        if (!value1.equals(value2)) {
-                            return false;
-                        }
-                    }
-                }
-                return true;
-            }
-        };
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Converter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Converter.java
deleted file mode 100644
index 281dca2..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Converter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Helper interface for things that convert Objects of
- * one type to another.
- *
- * @param <IN>
- * @param <OUT>
- * 
- * @seealso {@link com.fasterxml.jackson.databind.ser.std.StdDelegatingSerializer}
- * 
- * @since 2.1
- */
-public interface Converter<IN,OUT>
-{
-    /**
-     * Main conversion methods
-     */
-    public OUT convert(IN value);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumResolver.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumResolver.java
deleted file mode 100644
index 9fe550a..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumResolver.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * Helper class used to resolve String values (either JSON Object field
- * names or regular String values) into Java Enum instances.
- */
-public class EnumResolver<T extends Enum<T>>
-{
-    protected final Class<T> _enumClass;
-
-    protected final T[] _enums;
-
-    protected final HashMap<String, T> _enumsById;
-
-    protected EnumResolver(Class<T> enumClass, T[] enums, HashMap<String, T> map)
-    {
-        _enumClass = enumClass;
-        _enums = enums;
-        _enumsById = map;
-    }
-
-    /**
-     * Factory method for constructing resolver that maps from Enum.name() into
-     * Enum value
-     */
-    public static <ET extends Enum<ET>> EnumResolver<ET> constructFor(Class<ET> enumCls, AnnotationIntrospector ai)
-    {
-        ET[] enumValues = enumCls.getEnumConstants();
-        if (enumValues == null) {
-            throw new IllegalArgumentException("No enum constants for class "+enumCls.getName());
-        }
-        HashMap<String, ET> map = new HashMap<String, ET>();
-        for (ET e : enumValues) {
-            map.put(ai.findEnumValue(e), e);
-        }
-        return new EnumResolver<ET>(enumCls, enumValues, map);
-    }
-
-    /**
-     * Factory method for constructing resolver that maps from Enum.toString() into
-     * Enum value
-     */
-    public static <ET extends Enum<ET>> EnumResolver<ET> constructUsingToString(Class<ET> enumCls)
-    {
-        ET[] enumValues = enumCls.getEnumConstants();
-        HashMap<String, ET> map = new HashMap<String, ET>();
-        // from last to first, so that in case of duplicate values, first wins
-        for (int i = enumValues.length; --i >= 0; ) {
-            ET e = enumValues[i];
-            map.put(e.toString(), e);
-        }
-        return new EnumResolver<ET>(enumCls, enumValues, map);
-    }    
-
-    public static <ET extends Enum<ET>> EnumResolver<ET> constructUsingMethod(Class<ET> enumCls,
-            Method accessor)
-    {
-        ET[] enumValues = enumCls.getEnumConstants();
-        HashMap<String, ET> map = new HashMap<String, ET>();
-        // from last to first, so that in case of duplicate values, first wins
-        for (int i = enumValues.length; --i >= 0; ) {
-            ET en = enumValues[i];
-            try {
-                Object o = accessor.invoke(en);
-                if (o != null) {
-                    map.put(o.toString(), en);
-                }
-            } catch (Exception e) {
-                throw new IllegalArgumentException("Failed to access @JsonValue of Enum value "+en+": "+e.getMessage());
-            }
-        }
-        return new EnumResolver<ET>(enumCls, enumValues, map);
-    }    
-    
-    /**
-     * This method is needed because of the dynamic nature of constructing Enum
-     * resolvers.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static EnumResolver<?> constructUnsafe(Class<?> rawEnumCls, AnnotationIntrospector ai)
-    {            
-        /* This is oh so wrong... but at least ugliness is mostly hidden in just
-         * this one place.
-         */
-        Class<Enum> enumCls = (Class<Enum>) rawEnumCls;
-        return constructFor(enumCls, ai);
-    }
-
-    /**
-     * Method that needs to be used instead of {@link #constructUsingToString}
-     * if static type of enum is not known.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static EnumResolver<?> constructUnsafeUsingToString(Class<?> rawEnumCls)
-    {            
-        // oh so wrong... not much that can be done tho
-        Class<Enum> enumCls = (Class<Enum>) rawEnumCls;
-        return constructUsingToString(enumCls);
-    }
-
-    /**
-     * Method used when actual String serialization is indicated using @JsonValue
-     * on a method.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static EnumResolver<?> constructUnsafeUsingMethod(Class<?> rawEnumCls, Method accessor)
-    {            
-        // wrong as ever but:
-        Class<Enum> enumCls = (Class<Enum>) rawEnumCls;
-        return constructUsingMethod(enumCls, accessor);
-    }
-    
-    public T findEnum(String key)
-    {
-        return _enumsById.get(key);
-    }
-
-    public T getEnum(int index)
-    {
-        if (index < 0 || index >= _enums.length) {
-            return null;
-        }
-        return _enums[index];
-    }
-
-    public Class<T> getEnumClass() { return _enumClass; }
-
-    public int lastValidIndex() { return _enums.length-1; }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumValues.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumValues.java
deleted file mode 100644
index d8b9ddc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/EnumValues.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.util.*;
-
-import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.databind.*;
-
-/**
- * Helper class used for storing String serializations of
- * enumerations.
- */
-public final class EnumValues
-{
-    /**
-     * Since 1.7, we are storing values as SerializedStrings, to further
-     * speed up serialization.
-     */
-    private final EnumMap<?,SerializedString> _values;
-
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private EnumValues(Map<Enum<?>,SerializedString> v) {
-        _values = new EnumMap(v);
-    }
-
-    public static EnumValues construct(Class<Enum<?>> enumClass, AnnotationIntrospector intr)
-    {
-        return constructFromName(enumClass, intr);
-    }
-
-    public static EnumValues constructFromName(Class<Enum<?>> enumClass, AnnotationIntrospector intr)
-    {
-        /* [JACKSON-214]: Enum types with per-instance sub-classes
-         *   need special handling
-         */
-    	Class<? extends Enum<?>> cls = ClassUtil.findEnumType(enumClass);
-        Enum<?>[] values = cls.getEnumConstants();
-        if (values != null) {
-            // Type juggling... unfortunate
-            Map<Enum<?>,SerializedString> map = new HashMap<Enum<?>,SerializedString>();
-            for (Enum<?> en : values) {
-                String value = intr.findEnumValue(en);
-                map.put(en, new SerializedString(value));
-            }
-            return new EnumValues(map);
-        }
-        throw new IllegalArgumentException("Can not determine enum constants for Class "+enumClass.getName());
-    }
-
-    public static EnumValues constructFromToString(Class<Enum<?>> enumClass, AnnotationIntrospector intr)
-    {
-        Class<? extends Enum<?>> cls = ClassUtil.findEnumType(enumClass);
-        Enum<?>[] values = cls.getEnumConstants();
-        if (values != null) {
-            // Type juggling... unfortunate
-            Map<Enum<?>,SerializedString> map = new HashMap<Enum<?>,SerializedString>();
-            for (Enum<?> en : values) {
-                map.put(en, new SerializedString(en.toString()));
-            }
-            return new EnumValues(map);
-        }
-        throw new IllegalArgumentException("Can not determine enum constants for Class "+enumClass.getName());
-    }
-
-    public SerializedString serializedValueFor(Enum<?> key)
-    {
-        return _values.get(key);
-    }
-    
-    public Collection<SerializedString> values() {
-        return _values.values();
-    }
-
-    /**
-     * Method used for serialization and introspection by core Jackson
-     * code.
-     * 
-     * @since 2.1
-     */
-    public EnumMap<?,SerializedString> internalMap() {
-        return _values;
-    }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
deleted file mode 100644
index 8f240fc..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.text.*;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-/**
- * Provide a fast thread-safe formatter/parser DateFormat for ISO8601 dates ONLY.
- * It was mainly done to be used with Jackson JSON Processor.
- * <p/>
- * Watch out for clone implementation that returns itself.
- * <p/>
- * All other methods but parse and format and clone are undefined behavior.
- *
- * @see ISO8601Utils
- */
-public class ISO8601DateFormat extends DateFormat
-{
-    private static final long serialVersionUID = 1L;
-
-    // those classes are to try to allow a consistent behavior for hascode/equals and other methods
-    private static Calendar CALENDAR = new GregorianCalendar();
-    private static NumberFormat NUMBER_FORMAT = new DecimalFormat();
-
-    public ISO8601DateFormat() {
-        this.numberFormat = NUMBER_FORMAT;
-        this.calendar = CALENDAR;
-    }
-
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition)
-    {
-        String value = ISO8601Utils.format(date);
-        toAppendTo.append(value);
-        return toAppendTo;
-    }
-
-    @Override
-    public Date parse(String source, ParsePosition pos)
-    {
-        // index must be set to other than 0, I would swear this requirement is not there in
-        // some version of jdk 6.
-        pos.setIndex(source.length());
-        return ISO8601Utils.parse(source);
-    }
-
-    @Override
-    public Object clone() {
-        return this;    // jackson calls clone everytime. We are threadsafe so just returns the instance
-    }
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601Utils.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601Utils.java
deleted file mode 100644
index 293dd5e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ISO8601Utils.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.util.*;
-
-/**
- * Utilities methods for manipulating dates in iso8601 format. This is much much faster and GC friendly than
- * using SimpleDateFormat so highly suitable if you (un)serialize lots of date objects.
- */
-public class ISO8601Utils {
-
-    /**
-     * ID to represent the 'GMT' string
-     */
-    private static final String GMT_ID = "GMT";
-
-    /**
-     * The GMT timezone
-     */
-    private static final TimeZone TIMEZONE_GMT = TimeZone.getTimeZone(GMT_ID);
-
-    /*
-    /**********************************************************
-    /* Static factories
-    /**********************************************************
-     */
-    
-    /**
-     * Accessor for static GMT timezone instance.
-     */
-    public static TimeZone timeZoneGMT() {
-        return TIMEZONE_GMT;
-    }
-
-    /*
-    /**********************************************************
-    /* Formatting
-    /**********************************************************
-     */
-    
-    /**
-     * Format a date into 'yyyy-MM-ddThh:mm:ssZ' (GMT timezone, no milliseconds precision)
-     *
-     * @param date the date to format
-     * @return the date formatted as 'yyyy-MM-ddThh:mm:ssZ'
-     */
-    public static String format(Date date) {
-        return format(date, false, TIMEZONE_GMT);
-    }
-
-    /**
-     * Format a date into 'yyyy-MM-ddThh:mm:ss[.sss]Z' (GMT timezone)
-     *
-     * @param date   the date to format
-     * @param millis true to include millis precision otherwise false
-     * @return the date formatted as 'yyyy-MM-ddThh:mm:ss[.sss]Z'
-     */
-    public static String format(Date date, boolean millis) {
-        return format(date, millis, TIMEZONE_GMT);
-    }
-
-    /**
-     * Format date into yyyy-MM-ddThh:mm:ss[.sss][Z|[+-]hh:mm]
-     *
-     * @param date   the date to format
-     * @param millis true to include millis precision otherwise false
-     * @param tz     timezone to use for the formatting (GMT will produce 'Z')
-     * @return the date formatted as yyyy-MM-ddThh:mm:ss[.sss][Z|[+-]hh:mm]
-     */
-    public static String format(Date date, boolean millis, TimeZone tz) {
-        Calendar calendar = new GregorianCalendar(tz, Locale.US);
-        calendar.setTime(date);
-
-        // estimate capacity of buffer as close as we can (yeah, that's pedantic ;)
-        int capacity = "yyyy-MM-ddThh:mm:ss".length();
-        capacity += millis ? ".sss".length() : 0;
-        capacity += tz.getRawOffset() == 0 ? "Z".length() : "+hh:mm".length();
-        StringBuilder formatted = new StringBuilder(capacity);
-
-        padInt(formatted, calendar.get(Calendar.YEAR), "yyyy".length());
-        formatted.append('-');
-        padInt(formatted, calendar.get(Calendar.MONTH) + 1, "MM".length());
-        formatted.append('-');
-        padInt(formatted, calendar.get(Calendar.DAY_OF_MONTH), "dd".length());
-        formatted.append('T');
-        padInt(formatted, calendar.get(Calendar.HOUR_OF_DAY), "hh".length());
-        formatted.append(':');
-        padInt(formatted, calendar.get(Calendar.MINUTE), "mm".length());
-        formatted.append(':');
-        padInt(formatted, calendar.get(Calendar.SECOND), "ss".length());
-        if (millis) {
-            formatted.append('.');
-            padInt(formatted, calendar.get(Calendar.MILLISECOND), "sss".length());
-        }
-
-        int offset = tz.getOffset(calendar.getTimeInMillis());
-        if (offset != 0) {
-            int hours = Math.abs((offset / (60 * 1000)) / 60);
-            int minutes = Math.abs((offset / (60 * 1000)) % 60);
-            formatted.append(offset < 0 ? '-' : '+');
-            padInt(formatted, hours, "hh".length());
-            formatted.append(':');
-            padInt(formatted, minutes, "mm".length());
-        } else {
-            formatted.append('Z');
-        }
-
-        return formatted.toString();
-    }
-
-    /*
-    /**********************************************************
-    /* Parsing
-    /**********************************************************
-     */
-
-    /**
-     * Parse a date from ISO-8601 formatted string. It expects a format yyyy-MM-ddThh:mm:ss[.sss][Z|[+-]hh:mm]
-     *
-     * @param date ISO string to parse in the appropriate format.
-     * @return the parsed date
-     * @throws IllegalArgumentException if the date is not in the appropriate format
-     */
-    public static Date parse(String date) {
-        try {
-            int offset = 0;
-
-            // extract year
-            int year = parseInt(date, offset, offset += 4);
-            checkOffset(date, offset, '-');
-
-            // extract month
-            int month = parseInt(date, offset += 1, offset += 2);
-            checkOffset(date, offset, '-');
-
-            // extract day
-            int day = parseInt(date, offset += 1, offset += 2);
-            checkOffset(date, offset, 'T');
-
-            // extract hours, minutes, seconds and milliseconds
-            int hour = parseInt(date, offset += 1, offset += 2);
-            checkOffset(date, offset, ':');
-
-            int minutes = parseInt(date, offset += 1, offset += 2);
-            checkOffset(date, offset, ':');
-
-            int seconds = parseInt(date, offset += 1, offset += 2);
-            // milliseconds can be optional in the format
-            int milliseconds = 0; // always use 0 otherwise returned date will include millis of current time
-            if (date.charAt(offset) == '.') {
-                checkOffset(date, offset, '.');
-                milliseconds = parseInt(date, offset += 1, offset += 3);
-            }
-
-            // extract timezone
-            String timezoneId;
-            char timezoneIndicator = date.charAt(offset);
-            if (timezoneIndicator == '+' || timezoneIndicator == '-') {
-                timezoneId = GMT_ID + date.substring(offset);
-            } else if (timezoneIndicator == 'Z') {
-                timezoneId = GMT_ID;
-            } else {
-                throw new IndexOutOfBoundsException("Invalid time zone indicator " + timezoneIndicator);
-            }
-            TimeZone timezone = TimeZone.getTimeZone(timezoneId);
-            if (!timezone.getID().equals(timezoneId)) {
-                throw new IndexOutOfBoundsException();
-            }
-
-            Calendar calendar = new GregorianCalendar(timezone);
-            calendar.setLenient(false);
-            calendar.set(Calendar.YEAR, year);
-            calendar.set(Calendar.MONTH, month - 1);
-            calendar.set(Calendar.DAY_OF_MONTH, day);
-            calendar.set(Calendar.HOUR_OF_DAY, hour);
-            calendar.set(Calendar.MINUTE, minutes);
-            calendar.set(Calendar.SECOND, seconds);
-            calendar.set(Calendar.MILLISECOND, milliseconds);
-
-            return calendar.getTime();
-        } catch (IndexOutOfBoundsException e) {
-            throw new IllegalArgumentException("Failed to parse date " + date, e);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException("Failed to parse date " + date, e);
-        } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("Failed to parse date " + date, e);
-        }
-    }
-
-    /**
-     * Check if the expected character exist at the given offset of the
-     *
-     * @param value    the string to check at the specified offset
-     * @param offset   the offset to look for the expected character
-     * @param expected the expected character
-     * @throws IndexOutOfBoundsException if the expected character is not found
-     */
-    private static void checkOffset(String value, int offset, char expected) throws IndexOutOfBoundsException {
-        char found = value.charAt(offset);
-        if (found != expected) {
-            throw new IndexOutOfBoundsException("Expected '" + expected + "' character but found '" + found + "'");
-        }
-    }
-
-    /**
-     * Parse an integer located between 2 given offsets in a string
-     *
-     * @param value      the string to parse
-     * @param beginIndex the start index for the integer in the string
-     * @param endIndex   the end index for the integer in the string
-     * @return the int
-     * @throws NumberFormatException if the value is not a number
-     */
-    private static int parseInt(String value, int beginIndex, int endIndex) throws NumberFormatException {
-        if (beginIndex < 0 || endIndex > value.length() || beginIndex > endIndex) {
-            throw new NumberFormatException(value);
-        }
-        // use same logic as in Integer.parseInt() but less generic we're not supporting negative values
-        int i = beginIndex;
-        int result = 0;
-        int digit;
-        if (i < endIndex) {
-            digit = Character.digit(value.charAt(i++), 10);
-            if (digit < 0) {
-                throw new NumberFormatException("Invalid number: " + value);
-            }
-            result = -digit;
-        }
-        while (i < endIndex) {
-            digit = Character.digit(value.charAt(i++), 10);
-            if (digit < 0) {
-                throw new NumberFormatException("Invalid number: " + value);
-            }
-            result *= 10;
-            result -= digit;
-        }
-        return -result;
-    }
-
-    /**
-     * Zero pad a number to a specified length
-     *
-     * @param buffer buffer to use for padding
-     * @param value  the integer value to pad if necessary.
-     * @param length the length of the string we should zero pad
-     */
-    private static void padInt(StringBuilder buffer, int value, int length) {
-        String strValue = Integer.toString(value);
-        for (int i = length - strValue.length(); i > 0; i--) {
-            buffer.append('0');
-        }
-        buffer.append(strValue);
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONPObject.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONPObject.java
deleted file mode 100644
index 9f7807d..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONPObject.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * Container class that can be used to wrap any Object instances (including
- * nulls), and will serialize embedded in
- * <a href="http://en.wikipedia.org/wiki/JSONP">JSONP</a> wrapping.
- * 
- * @see com.fasterxml.jackson.databind.util.JSONWrappedObject
- * 
- * @author tatu
- */
-public class JSONPObject
-    implements JsonSerializable
-{
-    /**
-     * JSONP function name to use for serialization
-     */
-    protected final String _function;
-    
-    /**
-     * Value to be serialized as JSONP padded; can be null.
-     */
-    protected final Object _value;
-
-    /**
-     * Optional static type to use for serialization; if null, runtime
-     * type is used. Can be used to specify declared type which defines
-     * serializer to use, as well as aspects of extra type information
-     * to include (if any).
-     */
-    protected final JavaType _serializationType;
-
-    public JSONPObject(String function, Object value) {
-        this(function, value, (JavaType) null);
-    }
-
-    public JSONPObject(String function, Object value, JavaType asType)
-    {
-        _function = function;
-        _value = value;
-        _serializationType = asType;
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonSerializable(WithType) implementation
-    /**********************************************************
-     */
-    
-//  @Override
-    public void serializeWithType(JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
-            throws IOException, JsonProcessingException
-    {
-        // No type for JSONP wrapping: value serializer will handle typing for value:
-        serialize(jgen, provider);
-    }
-
-//  @Override
-    public void serialize(JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonProcessingException
-    {
-        // First, wrapping:
-        jgen.writeRaw(_function);
-        jgen.writeRaw('(');
-        if (_value == null) {
-            provider.defaultSerializeNull(jgen);
-        } else if (_serializationType != null) {
-            provider.findTypedValueSerializer(_serializationType, true, null).serialize(_value, jgen, provider);
-        } else {
-            Class<?> cls = _value.getClass();
-            provider.findTypedValueSerializer(cls, true, null).serialize(_value, jgen, provider);
-        }
-        jgen.writeRaw(')');
-    }
-
-    /*
-    /**************************************************************
-    /* Accessors
-    /**************************************************************
-     */
-    
-    public String getFunction() { return _function; }
-    public Object getValue() { return _value; }
-    public JavaType getSerializationType() { return _serializationType; }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONWrappedObject.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
deleted file mode 100644
index 0b72166..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.*;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-
-/**
- * General-purpose wrapper class that can be used to decorate serialized
- * value with arbitrary literal prefix and suffix. This can be used for
- * example to construct arbitrary Javascript values (similar to how basic
- * function name and parenthesis are used with JSONP).
- * 
- * @see com.fasterxml.jackson.databind.util.JSONPObject
- * 
- * @author tatu
- */
-public class JSONWrappedObject
-    implements JsonSerializable
-{
-    /**
-     * Literal String to output before serialized value.
-     * Will not be quoted when serializing value.
-     */
-    protected final String _prefix;
-
-    /**
-     * Literal String to output after serialized value.
-     * Will not be quoted when serializing value.
-     */
-    protected final String _suffix;
-    
-    /**
-     * Value to be serialized as JSONP padded; can be null.
-     */
-    protected final Object _value;
-
-    /**
-     * Optional static type to use for serialization; if null, runtime
-     * type is used. Can be used to specify declared type which defines
-     * serializer to use, as well as aspects of extra type information
-     * to include (if any).
-     */
-    protected final JavaType _serializationType;
-    
-    public JSONWrappedObject(String prefix, String suffix, Object value) {
-        this(prefix, suffix, value, (JavaType) null);
-    }
-
-    /**
-     * Constructor that should be used when specific serialization type to use
-     * is important, and needs to be passed instead of just using runtime
-     * (type-erased) type of the value.
-     */
-    public JSONWrappedObject(String prefix, String suffix, Object value, JavaType asType)
-    {
-        _prefix = prefix;
-        _suffix = suffix;
-        _value = value;
-        _serializationType = asType;
-    }
-    
-    /*
-    /**************************************************************
-    /* JsonSerializable(WithType) implementation
-    /**************************************************************
-     */
-    
-//  @Override
-    public void serializeWithType(JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
-            throws IOException, JsonProcessingException
-    {
-        // No type for JSONP wrapping: value serializer will handle typing for value:
-        serialize(jgen, provider);
-    }
-
-//  @Override
-    public void serialize(JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonProcessingException
-    {
-        // First, wrapping:
-    	if (_prefix != null) jgen.writeRaw(_prefix);
-        if (_value == null) {
-            provider.defaultSerializeNull(jgen);
-        } else if (_serializationType != null) {
-            provider.findTypedValueSerializer(_serializationType, true, null).serialize(_value, jgen, provider);
-        } else {
-            Class<?> cls = _value.getClass();
-            provider.findTypedValueSerializer(cls, true, null).serialize(_value, jgen, provider);
-        }
-        if (_suffix != null) jgen.writeRaw(_suffix);
-    }
-
-    /*
-    /**************************************************************
-    /* Accessors
-    /**************************************************************
-     */
-    
-    public String getPrefix() { return _prefix; }
-    public String getSuffix() { return _suffix; }
-    public Object getValue() { return _value; }
-    public JavaType getSerializationType() { return _serializationType; }
-
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/LRUMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/LRUMap.java
deleted file mode 100644
index 64247c9..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/LRUMap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.io.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Helper for simple bounded LRU maps used for reusing lookup values.
- *<p>
- * Note that serialization behavior is such that contents are NOT serialized,
- * on assumption that all use cases are for caching where persistence
- * does not make sense. The only thing serialized is the cache size of Map.
- */
-public class LRUMap<K,V> extends LinkedHashMap<K,V>
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    protected final int _maxEntries;
-    
-    public LRUMap(int initialEntries, int maxEntries)
-    {
-        super(initialEntries, 0.8f, true);
-        _maxEntries = maxEntries;
-    }
-
-    @Override
-    protected boolean removeEldestEntry(Map.Entry<K,V> eldest)
-    {
-        return size() > _maxEntries;
-    }
-
-    /*
-    /**********************************************************
-    /* Serializable overrides
-    /**********************************************************
-     */
-
-    /**
-     * Ugly hack, to work through the requirement that _value is indeed final,
-     * and that JDK serialization won't call ctor(s) if Serializable is implemented.
-     * 
-     * @since 2.1
-     */
-    protected transient int _jdkSerializeMaxEntries;
-
-    private void readObject(ObjectInputStream in) throws IOException {
-        _jdkSerializeMaxEntries = in.readInt();
-    }
-
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        out.writeInt(_jdkSerializeMaxEntries);
-    }
-
-    protected Object readResolve() {
-        return new LRUMap<Object,Object>(_jdkSerializeMaxEntries, _jdkSerializeMaxEntries);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/LinkedNode.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/LinkedNode.java
deleted file mode 100644
index 8031bbd..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/LinkedNode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Node of a forward-only linked list.
- * 
- * @author tatu
- *
- * @param <T> Type of contained object
- */
-public final class LinkedNode<T>
-{
-    final T _value;
-    final LinkedNode<T> _next;
-    
-    public LinkedNode(T value, LinkedNode<T> next)
-    {
-        _value = value;
-        _next = next;
-    }
-    
-    public LinkedNode<T> next() { return _next; }
-    
-    public T value() { return _value; }
-    
-    /**
-     * Convenience method that can be used to check if a linked list
-     * with given head node (which may be null to indicate empty list)
-     * contains given value
-     * 
-     * @param <ST> Type argument that defines contents of the linked list parameter
-     * @param node Head node of the linked list
-     * @param value Value to look for
-     * @return True if linked list contains the value, false otherwise
-     */
-    public static <ST> boolean contains(LinkedNode<ST> node, ST value)
-    {
-        while (node != null) {
-            if (node.value() == value) {
-                return true;
-            }
-            node = node.next();
-        }
-        return false;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/NameTransformer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/NameTransformer.java
deleted file mode 100644
index 79767a9..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/NameTransformer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Helper class used to encapsulate details of name mangling, transforming
- * of names using different strategies (prefixes, suffixes).
- * Default implementation is "no-operation" (aka identity transformation).
- */
-public abstract class NameTransformer
-{
-    /**
-     * Singleton "no-operation" transformer which simply returns given
-     * name as is. Used commonly as placeholder or marker.
-     */
-    public final static NameTransformer NOP = new NameTransformer() {
-        @Override
-        public String transform(String name) {
-            return name;
-        }
-        @Override
-        public String reverse(String transformed) {
-            // identity transformation is always reversible:
-            return transformed;
-        }
-    };
-
-    protected NameTransformer() { }
-    
-    /**
-     * Factory method for constructing a simple transformer based on
-     * prefix and/or suffix.
-     */
-    public static NameTransformer simpleTransformer(final String prefix, final String suffix)
-    {
-        boolean hasPrefix = (prefix != null) && (prefix.length() > 0);
-        boolean hasSuffix = (suffix != null) && (suffix.length() > 0);
-
-        if (hasPrefix) {
-            if (hasSuffix) {
-                return new NameTransformer() {
-                    @Override
-                    public String transform(String name) { return prefix + name + suffix; }
-                    @Override
-                    public String reverse(String transformed) {
-                        if (transformed.startsWith(prefix)) {
-                            String str = transformed.substring(prefix.length());
-                            if (str.endsWith(suffix)) {
-                                return str.substring(0, str.length() - suffix.length());
-                            }
-                        }
-                        return null;
-                    }
-                    @Override
-                    public String toString() { return "[PreAndSuffixTransformer('"+prefix+"','"+suffix+"')]"; }
-                };
-            }
-            return new NameTransformer() {
-                @Override
-                public String transform(String name) { return prefix + name; }
-                @Override
-                public String reverse(String transformed) {
-                    if (transformed.startsWith(prefix)) {
-                        return transformed.substring(prefix.length());
-                    }
-                    return null;
-                }
-                @Override
-                public String toString() { return "[PrefixTransformer('"+prefix+"')]"; }
-            };
-        }
-        if (hasSuffix) {
-            return new NameTransformer() {
-                @Override
-                public String transform(String name) { return name + suffix; }
-                @Override
-                public String reverse(String transformed) {
-                    if (transformed.endsWith(suffix)) {
-                        return transformed.substring(0, transformed.length() - suffix.length());
-                    }
-                    return null;
-                }
-                @Override
-                public String toString() { return "[SuffixTransformer('"+suffix+"')]"; }
-            };
-        }
-        return NOP;
-    }
-
-    /**
-     * Method that constructs transformer that applies given transformers
-     * as a sequence; essentially combines separate transform operations
-     * into one logical transformation.
-     */
-    public static NameTransformer chainedTransformer(NameTransformer t1, NameTransformer t2) {
-        return new Chained(t1, t2);
-    }
-    
-    /**
-     * Method called when (forward) transformation is needed.
-     */
-    public abstract String transform(String name);
-
-    /**
-     * Method called when reversal of transformation is needed; should return
-     * null if this is not possible, that is, given name can not have been
-     * result of calling {@link #transform} of this object.
-     */
-    public abstract String reverse(String transformed);
-
-    public static class Chained extends NameTransformer
-    {
-        protected final NameTransformer _t1, _t2;
-        
-        public Chained(NameTransformer t1, NameTransformer t2) {
-            _t1 = t1;
-            _t2 = t2;
-        }
-
-        @Override
-        public String transform(String name) {
-            return _t1.transform(_t2.transform(name));
-        }
-
-        @Override
-        public String reverse(String transformed) {
-            transformed = _t1.reverse(transformed);
-            if (transformed != null) {
-                transformed = _t2.reverse(transformed);
-            }
-            return transformed;
-        }
-
-        @Override
-        public String toString() { return "[ChainedTransformer("+_t1+", "+_t2+")]"; }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Named.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Named.java
deleted file mode 100644
index b3f9eb0..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Named.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Simple tag interface mostly to allow sorting by name.
- */
-public interface Named {
-    public String getName();
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectBuffer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectBuffer.java
deleted file mode 100644
index 9115881..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectBuffer.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.lang.reflect.Array;
-import java.util.List;
-
-/**
- * Helper class to use for constructing Object arrays by appending entries
- * to create arrays of various lengths (length that is not known a priori). 
- */
-public final class ObjectBuffer
-{
-    // // // Config constants
-
-    /**
-     * Let's start with small chunks; typical usage is for small arrays anyway.
-     */
-    final static int INITIAL_CHUNK_SIZE = 12;
-
-    /**
-     * Also: let's expand by doubling up until 64k chunks (which is 16k entries for
-     * 32-bit machines)
-     */
-    final static int SMALL_CHUNK_SIZE = (1 << 14);
-
-    /**
-     * Let's limit maximum size of chunks we use; helps avoid excessive allocation
-     * overhead for huge data sets.
-     * For now, let's limit to quarter million entries, 1 meg chunks for 32-bit
-     * machines.
-     */
-    final static int MAX_CHUNK_SIZE = (1 << 18);
-
-    // // // Data storage
-
-    private Node _bufferHead;
-
-    private Node _bufferTail;
-
-    /**
-     * Number of total buffered entries in this buffer, counting all instances
-     * within linked list formed by following {@link #_bufferHead}.
-     */
-    private int _bufferedEntryCount;
-
-    // // // Simple reuse
-
-    /**
-     * Reusable Object array, stored here after buffer has been released having
-     * been used previously.
-     */
-    private Object[] _freeBuffer;
-
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-
-    public ObjectBuffer() { }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    /**
-     * Method called to start buffering process. Will ensure that the buffer
-     * is empty, and then return an object array to start chunking content on
-     */
-    public Object[] resetAndStart()
-    {
-        _reset();
-        if (_freeBuffer == null) {
-            return new Object[INITIAL_CHUNK_SIZE];
-        }
-        return _freeBuffer;
-    }
-
-    /**
-     * Method called to add a full Object array as a chunk buffered within
-     * this buffer, and to obtain a new array to fill. Caller is not to use
-     * the array it gives; but to use the returned array for continued
-     * buffering.
-     *
-     * @param fullChunk Completed chunk that the caller is requesting
-     *   to append to this buffer. It is generally chunk that was
-     *   returned by an earlier call to {@link #resetAndStart} or
-     *   {@link #appendCompletedChunk} (although this is not required or
-     *   enforced)
-     *
-     * @return New chunk buffer for caller to fill
-     */
-    public Object[] appendCompletedChunk(Object[] fullChunk)
-    {
-        Node next = new Node(fullChunk);
-        if (_bufferHead == null) { // first chunk
-            _bufferHead = _bufferTail = next;
-        } else { // have something already
-            _bufferTail.linkNext(next);
-            _bufferTail = next;
-        }
-        int len = fullChunk.length;
-        _bufferedEntryCount += len;
-        // double the size for small chunks
-        if (len < SMALL_CHUNK_SIZE) {
-            len += len;
-        } else { // but by +25% for larger (to limit overhead)
-            len += (len >> 2);
-        }
-        return new Object[len];
-    }
-
-    /**
-     * Method called to indicate that the buffering process is now
-     * complete; and to construct a combined exactly-sized result
-     * array. Additionally the buffer itself will be reset to
-     * reduce memory retention.
-     *<p>
-     * Resulting array will be of generic <code>Object[]</code> type:
-     * if a typed array is needed, use the method with additional
-     * type argument.
-     */
-    public Object[] completeAndClearBuffer(Object[] lastChunk, int lastChunkEntries)
-    {
-        int totalSize = lastChunkEntries + _bufferedEntryCount;
-        Object[] result = new Object[totalSize];
-        _copyTo(result, totalSize, lastChunk, lastChunkEntries);
-        return result;
-    }
-
-    /**
-     * Type-safe alternative to
-     * {@link #completeAndClearBuffer(Object[], int)}, to allow
-     * for constructing explicitly typed result array.
-     *
-     * @param componentType Type of elements included in the buffer. Will be
-     *   used for constructing the result array.
-     */
-    public <T> T[] completeAndClearBuffer(Object[] lastChunk, int lastChunkEntries, Class<T> componentType)
-    {
-       int totalSize = lastChunkEntries + _bufferedEntryCount;
- 	   @SuppressWarnings("unchecked")
-        T[] result = (T[]) Array.newInstance(componentType, totalSize);
-        _copyTo(result, totalSize, lastChunk, lastChunkEntries);
-        _reset();
-        return result;
-    }
-
-    public void completeAndClearBuffer(Object[] lastChunk, int lastChunkEntries, List<Object> resultList)
-    {
-        for (Node n = _bufferHead; n != null; n = n.next()) {
-            Object[] curr = n.getData();
-            for (int i = 0, len = curr.length; i < len; ++i) {
-                resultList.add(curr[i]);
-            }
-        }
-        // and then the last one
-        for (int i = 0; i < lastChunkEntries; ++i) {
-            resultList.add(lastChunk[i]);
-        }
-    }
-    
-    /**
-     * Helper method that can be used to check how much free capacity
-     * will this instance start with. Can be used to choose the best
-     * instance to reuse, based on size of reusable object chunk
-     * buffer holds reference to.
-     */
-    public int initialCapacity()
-    {
-        return (_freeBuffer == null) ? 0 : _freeBuffer.length;
-    }
-
-    /**
-     * Method that can be used to check how many Objects have been buffered
-     * within this buffer.
-     */
-    public int bufferedSize() { return _bufferedEntryCount; }
-
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-
-    protected void _reset()
-    {
-        // can we reuse the last (and thereby biggest) array for next time?
-        if (_bufferTail != null) {
-            _freeBuffer = _bufferTail.getData();
-        }
-        // either way, must discard current contents
-        _bufferHead = _bufferTail = null;
-        _bufferedEntryCount = 0;
-    }
-
-    protected final void _copyTo(Object resultArray, int totalSize,
-                                 Object[] lastChunk, int lastChunkEntries)
-    {
-        int ptr = 0;
-
-        for (Node n = _bufferHead; n != null; n = n.next()) {
-            Object[] curr = n.getData();
-            int len = curr.length;
-            System.arraycopy(curr, 0, resultArray, ptr, len);
-            ptr += len;
-        }
-        System.arraycopy(lastChunk, 0, resultArray, ptr, lastChunkEntries);
-        ptr += lastChunkEntries;
-
-        // sanity check (could have failed earlier due to out-of-bounds, too)
-        if (ptr != totalSize) {
-            throw new IllegalStateException("Should have gotten "+totalSize+" entries, got "+ptr);
-        }
-    }
-
-    /*
-    /**********************************************************
-    /* Helper classes
-    /**********************************************************
-     */
-
-    /**
-     * Helper class used to store actual data, in a linked list.
-     */
-    final static class Node
-    {
-        /**
-         * Data stored in this node. Array is considered to be full.
-         */
-        final Object[] _data;
-
-        Node _next;
-
-        public Node(Object[] data) {
-            _data = data;
-        }
-
-        public Object[] getData() { return _data; }
-
-        public Node next() { return _next; }
-
-        public void linkNext(Node next)
-        {
-            if (_next != null) { // sanity check
-                throw new IllegalStateException();
-            }
-            _next = next;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectIdMap.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectIdMap.java
deleted file mode 100644
index 0d558b7..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ObjectIdMap.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.util.IdentityHashMap;
-
-/**
- * Map used during serialization, to keep track of referable Objects
- * along with lazily evaluated ids.
- */
-@SuppressWarnings("serial")
-public class ObjectIdMap extends IdentityHashMap<Object,Object>
-{
-    public ObjectIdMap()
-    {
-        super(16);
-    }
-
-    /*
-    /**********************************************************
-    /* API
-    /**********************************************************
-     */
-
-    /**
-     * Method that is called to figure out whether we have already
-     * seen given POJO: if yes, we will return its id (first looking
-     * it up as necessary); if not, we will mark down that we have
-     * seen it but return null.
-     */
-    public Object findId(Object pojo)
-    {
-        return get(pojo);
-    }
-    
-    public void insertId(Object pojo, Object id)
-    {
-        put(pojo, id);
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder.java
deleted file mode 100644
index e1ed26f..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/PrimitiveArrayBuilder.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Base class for specialized primitive array builders.
- */
-public abstract class PrimitiveArrayBuilder<T>
-{
-    /**
-     * Let's start with small chunks; typical usage is for small arrays anyway.
-     */
-    final static int INITIAL_CHUNK_SIZE = 12;
-
-    /**
-     * Also: let's expand by doubling up until 64k chunks (which is 16k entries for
-     * 32-bit machines)
-     */
-    final static int SMALL_CHUNK_SIZE = (1 << 14);
-
-    /**
-     * Let's limit maximum size of chunks we use; helps avoid excessive allocation
-     * overhead for huge data sets.
-     * For now, let's limit to quarter million entries, 1 meg chunks for 32-bit
-     * machines.
-     */
-    final static int MAX_CHUNK_SIZE = (1 << 18);
-
-    // // // Data storage
-
-    T _freeBuffer;
-
-    Node<T> _bufferHead;
-
-    Node<T> _bufferTail;
-
-    /**
-     * Number of total buffered entries in this buffer, counting all instances
-     * within linked list formed by following {@link #_bufferHead}.
-     */
-    int _bufferedEntryCount;
-
-    // // // Recycled instances of sub-classes
-
-    // // // Life-cycle
-
-    protected PrimitiveArrayBuilder() { }
-
-    /*
-    ////////////////////////////////////////////////////////////////////////
-    // Public API
-    ////////////////////////////////////////////////////////////////////////
-     */
-
-    public T resetAndStart()
-    {
-        _reset();
-        return (_freeBuffer == null) ?
-            _constructArray(INITIAL_CHUNK_SIZE) : _freeBuffer;
-    }
-
-    /**
-     * @return Length of the next chunk to allocate
-     */
-    public final T appendCompletedChunk(T fullChunk, int fullChunkLength)
-    {
-        Node<T> next = new Node<T>(fullChunk, fullChunkLength);
-        if (_bufferHead == null) { // first chunk
-            _bufferHead = _bufferTail = next;
-        } else { // have something already
-            _bufferTail.linkNext(next);
-            _bufferTail = next;
-        }
-        _bufferedEntryCount += fullChunkLength;
-        int nextLen = fullChunkLength; // start with last chunk size
-        // double the size for small chunks
-        if (nextLen < SMALL_CHUNK_SIZE) {
-            nextLen += nextLen;
-        } else { // but by +25% for larger (to limit overhead)
-            nextLen += (nextLen >> 2);
-        }
-        return _constructArray(nextLen);
-    }
-
-    public T completeAndClearBuffer(T lastChunk, int lastChunkEntries)
-    {
-        int totalSize = lastChunkEntries + _bufferedEntryCount;
-        T resultArray = _constructArray(totalSize);
-
-        int ptr = 0;
-
-        for (Node<T> n = _bufferHead; n != null; n = n.next()) {
-            ptr = n.copyData(resultArray, ptr);
-        }
-        System.arraycopy(lastChunk, 0, resultArray, ptr, lastChunkEntries);
-        ptr += lastChunkEntries;
-
-        // sanity check (could have failed earlier due to out-of-bounds, too)
-        if (ptr != totalSize) {
-            throw new IllegalStateException("Should have gotten "+totalSize+" entries, got "+ptr);
-        }
-        return resultArray;
-    }
-
-    /*
-    ////////////////////////////////////////////////////////////////////////
-    // Abstract methods for sub-classes to implement
-    ////////////////////////////////////////////////////////////////////////
-     */
-
-    protected abstract T _constructArray(int len);
-
-    /*
-    ////////////////////////////////////////////////////////////////////////
-    // Internal methods
-    ////////////////////////////////////////////////////////////////////////
-     */
-
-    protected void _reset()
-    {
-        // can we reuse the last (and thereby biggest) array for next time?
-        if (_bufferTail != null) {
-            _freeBuffer = _bufferTail.getData();
-        }
-        // either way, must discard current contents
-        _bufferHead = _bufferTail = null;
-        _bufferedEntryCount = 0;
-    }
-
-    /*
-    ////////////////////////////////////////////////////////////////////////
-    // Helper classes
-    ////////////////////////////////////////////////////////////////////////
-     */
-
-    /**
-     * For actual buffering beyond the current buffer, we can actually
-     * use shared class which only deals with opaque "untyped" chunks.
-     * This works because {@link java.lang.System#arraycopy} does not
-     * take type; hence we can implement some aspects of primitive data
-     * handling in generic fashion.
-     */
-    final static class Node<T>
-    {
-        /**
-         * Data stored in this node.
-         */
-        final T _data;
-
-        /**
-         * Number entries in the (untyped) array. Offset is assumed to be 0.
-         */
-        final int _dataLength;
-
-        Node<T> _next;
-
-        public Node(T data, int dataLen)
-        {
-            _data = data;
-            _dataLength = dataLen;
-        }
-
-        public T getData() { return _data; }
-
-        public int copyData(T dst, int ptr)
-        {
-            System.arraycopy(_data, 0, dst, ptr, _dataLength);
-            ptr += _dataLength;
-            return ptr;
-        }
-
-        public Node<T> next() { return _next; }
-
-        public void linkNext(Node<T> next)
-        {
-            if (_next != null) { // sanity check
-                throw new IllegalStateException();
-            }
-            _next = next;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Provider.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Provider.java
deleted file mode 100644
index 05e98f3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Provider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.util.*;
-
-/**
-* Simple helper class used for decoupling instantiation of
-* optionally loaded handlers, like deserializers and deserializers
-* for libraries that are only present on some platforms.
- * 
- * @author tatu
- *
- * @param <T> Type of objects provided
- */
-public interface Provider<T>
-{
-    /**
-     * Method used to request provider to provide entries it has
-     */
-    public Collection<T> provide();
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/RootNameLookup.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/RootNameLookup.java
deleted file mode 100644
index b1c347e..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/RootNameLookup.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import com.fasterxml.jackson.core.io.SerializedString;
-
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
-import com.fasterxml.jackson.databind.type.ClassKey;
-
-/**
- * Helper class for caching resolved root names.
- */
-public class RootNameLookup
-    implements java.io.Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * For efficient operation, let's try to minimize number of times we
-     * need to introspect root element name to use.
-     */
-    protected LRUMap<ClassKey,SerializedString> _rootNames;
-
-    public RootNameLookup() { }
-
-    public SerializedString findRootName(JavaType rootType, MapperConfig<?> config)
-    {
-        return findRootName(rootType.getRawClass(), config);
-    }
-
-    public synchronized SerializedString findRootName(Class<?> rootType, MapperConfig<?> config)
-    {
-        ClassKey key = new ClassKey(rootType);
-
-        if (_rootNames == null) {
-            _rootNames = new LRUMap<ClassKey,SerializedString>(20, 200);
-        } else {
-            SerializedString name = _rootNames.get(key);
-            if (name != null) {
-                return name;
-            }
-        }
-        BeanDescription beanDesc = config.introspectClassAnnotations(rootType);
-        AnnotationIntrospector intr = config.getAnnotationIntrospector();
-        AnnotatedClass ac = beanDesc.getClassInfo();
-        PropertyName pname = intr.findRootName(ac);
-        String nameStr;
-        // No answer so far? Let's just default to using simple class name
-        if (pname == null || !pname.hasSimpleName()) {
-            // Should we strip out enclosing class tho? For now, nope:
-            nameStr = rootType.getSimpleName();
-        } else {
-            nameStr = pname.getSimpleName();
-        }
-        SerializedString name = new SerializedString(nameStr);
-        _rootNames.put(key, name);
-        return name;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Setter.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/Setter.java
deleted file mode 100644
index d7fffaa..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/Setter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Mix-in interface exposed by things that expose a single
- * property whose value can be set.
- * 
- * @since 2.0
- */
-public interface Setter
-{
-    public void setValue(Object pojo, Object value);
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
deleted file mode 100644
index 819fae4..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import com.fasterxml.jackson.databind.introspect.AnnotatedField;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
-import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
-import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
-
-/**
- * Simple immutable {@link BeanPropertyDefinition} implementation that can
- * be wrapped around a {@link AnnotatedMember} that is a simple
- * accessor (getter) or mutator (setter, constructor parameter)
- * (or both, for fields).
- */
-public class SimpleBeanPropertyDefinition
-    extends BeanPropertyDefinition
-{
-    /**
-     * Member that defines logical property. Assumption is that it
-     * should be a 'simple' accessor; meaning a zero-argument getter,
-     * single-argument setter or constructor parameter.
-     */
-    protected final AnnotatedMember _member;
-
-    protected final String _name;
-    
-    /*
-    /**********************************************************
-    /* Construction
-    /**********************************************************
-     */
-    
-    public SimpleBeanPropertyDefinition(AnnotatedMember member) {
-        this(member, member.getName());
-    }
-
-    public SimpleBeanPropertyDefinition(AnnotatedMember member, String name) {
-        _member = member;
-        _name = name;
-    }
-
-    /*
-    /**********************************************************
-    /* Fluent factories
-    /**********************************************************
-     */
-
-    @Override
-    public SimpleBeanPropertyDefinition withName(String newName) {
-        if (_name.equals(newName)) {
-            return this;
-        }
-        return new SimpleBeanPropertyDefinition(_member, newName);
-    }
-    
-    /*
-    /**********************************************************
-    /* Basic property information, name, type
-    /**********************************************************
-     */
-
-    @Override
-    public String getName() { return _name; }
-
-    @Override
-    public String getInternalName() { return getName(); }
-
-    // hmmh. what should we claim here?
-    @Override
-    public boolean isExplicitlyIncluded() { return false; }
-    
-    /*
-    /**********************************************************
-    /* Access to accessors (fields, methods etc)
-    /**********************************************************
-     */
-
-    @Override
-    public boolean hasGetter() {
-        return (getGetter() != null);
-    }
-
-    @Override
-    public boolean hasSetter() {
-        return (getSetter() != null);
-    }
-
-    @Override
-    public boolean hasField() {
-        return (_member instanceof AnnotatedField);
-    }
-
-    @Override
-    public boolean hasConstructorParameter() {
-        return (_member instanceof AnnotatedParameter);
-    }
-    
-    @Override
-    public AnnotatedMethod getGetter() {
-        if ((_member instanceof AnnotatedMethod)
-                && ((AnnotatedMethod) _member).getParameterCount() == 0) {
-            return (AnnotatedMethod) _member;
-        }
-        return null;
-    }
-        
-    @Override
-    public AnnotatedMethod getSetter() {
-        if ((_member instanceof AnnotatedMethod)
-                && ((AnnotatedMethod) _member).getParameterCount() == 1) {
-            return (AnnotatedMethod) _member;
-        }
-        return null;
-    }
-
-    @Override
-    public AnnotatedField getField() {
-        return (_member instanceof AnnotatedField) ?
-                (AnnotatedField) _member : null;
-    }
-
-    @Override
-    public AnnotatedParameter getConstructorParameter() {
-        return (_member instanceof AnnotatedParameter) ?
-                (AnnotatedParameter) _member : null;
-    }
-
-    /**
-     * Method used to find accessor (getter, field to access) to use for accessing
-     * value of the property.
-     * Null if no such member exists.
-     */
-    @Override
-    public AnnotatedMember getAccessor() {
-        AnnotatedMember acc = getGetter();
-        if (acc == null) {
-            acc = getField();
-        }
-        return acc;
-    }
-
-    /**
-     * Method used to find mutator (constructor parameter, setter, field) to use for
-     * changing value of the property.
-     * Null if no such member exists.
-     */
-    @Override
-    public AnnotatedMember getMutator() {
-        AnnotatedMember acc = getConstructorParameter();
-        if (acc == null) {
-            acc = getSetter();
-            if (acc == null) {
-                acc = getField();
-            }
-        }
-        return acc;
-    }
-
-    @Override
-    public AnnotatedMember getPrimaryMember() {
-        return _member;
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/StdDateFormat.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/StdDateFormat.java
deleted file mode 100644
index 0fee254..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/StdDateFormat.java
+++ /dev/null
@@ -1,400 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.text.DateFormat;
-import java.text.FieldPosition;
-import java.text.ParseException;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.core.io.NumberInput;
-
-/**
- * Default {@link DateFormat} implementation used by standard Date
- * serializers and deserializers. For serialization defaults to using
- * an ISO-8601 compliant format (format String "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
- * and for deserialization, both ISO-8601 and RFC-1123.
- */
-@SuppressWarnings("serial")
-public class StdDateFormat
-    extends DateFormat
-{
-    /* TODO !!! 24-Nov-2009, tatu: Need to rewrite this class:
-     * JDK date parsing is awfully brittle, and ISO-8601 is quite
-     * permissive. The two don't mix, need to write a better one.
-     */
-    // Note: [JACKSON-697] is the issue for rewrite
-
-    /**
-     * Defines a commonly used date format that conforms
-     * to ISO-8601 date formatting standard, when it includes basic undecorated
-     * timezone definition
-     */
-    protected final static String DATE_FORMAT_STR_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-
-    /**
-     * Same as 'regular' 8601, but handles 'Z' as an alias for "+0000"
-     * (or "GMT")
-     */
-    protected final static String DATE_FORMAT_STR_ISO8601_Z = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-
-    /**
-     * ISO-8601 with just the Date part, no time
-     */
-    protected final static String DATE_FORMAT_STR_PLAIN = "yyyy-MM-dd";
-
-    /**
-     * This constant defines the date format specified by
-     * RFC 1123 / RFC 822.
-     */
-    protected final static String DATE_FORMAT_STR_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
-
-    /**
-     * For error messages we'll also need a list of all formats.
-     */
-    protected final static String[] ALL_FORMATS = new String[] {
-        DATE_FORMAT_STR_ISO8601,
-        DATE_FORMAT_STR_ISO8601_Z,
-        DATE_FORMAT_STR_RFC1123,
-        DATE_FORMAT_STR_PLAIN
-    };
-
-    /**
-     * By default we use GMT for everything.
-     */
-    private final static TimeZone DEFAULT_TIMEZONE;
-    static {
-        DEFAULT_TIMEZONE = TimeZone.getTimeZone("GMT");
-    }
-    
-    protected final static DateFormat DATE_FORMAT_RFC1123;
-
-    protected final static DateFormat DATE_FORMAT_ISO8601;
-    protected final static DateFormat DATE_FORMAT_ISO8601_Z;
-
-    protected final static DateFormat DATE_FORMAT_PLAIN;
-
-    /* Let's construct "blueprint" date format instances: can not be used
-     * as is, due to thread-safety issues, but can be used for constructing
-     * actual instances more cheaply (avoids re-parsing).
-     */
-    static {
-        /* Another important thing: let's force use of GMT for
-         * baseline DataFormat objects
-         */
-        DATE_FORMAT_RFC1123 = new SimpleDateFormat(DATE_FORMAT_STR_RFC1123, Locale.US);
-        DATE_FORMAT_RFC1123.setTimeZone(DEFAULT_TIMEZONE);
-        DATE_FORMAT_ISO8601 = new SimpleDateFormat(DATE_FORMAT_STR_ISO8601);
-        DATE_FORMAT_ISO8601.setTimeZone(DEFAULT_TIMEZONE);
-        DATE_FORMAT_ISO8601_Z = new SimpleDateFormat(DATE_FORMAT_STR_ISO8601_Z);
-        DATE_FORMAT_ISO8601_Z.setTimeZone(DEFAULT_TIMEZONE);
-        DATE_FORMAT_PLAIN = new SimpleDateFormat(DATE_FORMAT_STR_PLAIN);
-        DATE_FORMAT_PLAIN.setTimeZone(DEFAULT_TIMEZONE);
-    }
-    
-    /**
-     * A singleton instance can be used for cloning purposes.
-     */
-    public final static StdDateFormat instance = new StdDateFormat();
-    
-    /**
-     * Caller may want to explicitly override timezone to use; if so,
-     * we will have non-null value here.
-     */
-    protected transient TimeZone _timezone;
-    
-    protected transient DateFormat _formatRFC1123;
-    protected transient DateFormat _formatISO8601;
-    protected transient DateFormat _formatISO8601_z;
-    protected transient DateFormat _formatPlain;
-
-    /*
-    /**********************************************************
-    /* Life cycle, accessing singleton "standard" formats
-    /**********************************************************
-     */
-
-    public StdDateFormat() { }
-    public StdDateFormat(TimeZone tz) {
-        _timezone = tz;
-    }
-
-    public static TimeZone getDefaultTimeZone() {
-        return DEFAULT_TIMEZONE;
-    }
-    
-    /**
-     * Method used for creating a new instance with specified timezone;
-     * if no timezone specified, defaults to the default timezone (UTC).
-     */
-    public StdDateFormat withTimeZone(TimeZone tz) {
-        if (tz == null) {
-            tz = DEFAULT_TIMEZONE;
-        }
-        return new StdDateFormat(tz);
-    }
-    
-    @Override
-    public StdDateFormat clone() {
-        /* Although there is that much state to share, we do need to
-         * orchestrate a bit, mostly since timezones may be changed
-         */
-        return new StdDateFormat();
-    }
-
-    /**
-     * Method for getting the globally shared DateFormat instance
-     * that uses GMT timezone and can handle simple ISO-8601
-     * compliant date format.
-     */
-    public static DateFormat getBlueprintISO8601Format() {
-        return DATE_FORMAT_ISO8601;
-    }
-
-    /**
-     * Method for getting a non-shared DateFormat instance
-     * that uses specified timezone and can handle simple ISO-8601
-     * compliant date format.
-     */
-    public static DateFormat getISO8601Format(TimeZone tz) {
-        return _cloneFormat(DATE_FORMAT_ISO8601, tz);
-    }
-
-    /**
-     * Method for getting the globally shared DateFormat instance
-     * that uses GMT timezone and can handle RFC-1123
-     * compliant date format.
-     */
-    public static DateFormat getBlueprintRFC1123Format() {
-        return DATE_FORMAT_RFC1123;
-    }
-
-
-    /**
-     * Method for getting a non-shared DateFormat instance
-     * that uses specific timezone and can handle RFC-1123
-     * compliant date format.
-     */
-    public static DateFormat getRFC1123Format(TimeZone tz) {
-        return _cloneFormat(DATE_FORMAT_RFC1123, tz);
-    }
-
-    /*
-    /**********************************************************
-    /* Public API
-    /**********************************************************
-     */
-
-    @Override
-    public void setTimeZone(TimeZone tz)
-    {
-        /* DateFormats are timezone-specific (via Calendar contained),
-         * so need to reset instances if timezone changes:
-         */
-        if (tz != _timezone) {
-            _formatRFC1123 = null;
-            _formatISO8601 = null;
-            _formatISO8601_z = null;
-            _formatPlain = null;
-            _timezone = tz;
-        }
-    }
-    
-    @Override
-    public Date parse(String dateStr) throws ParseException
-    {
-        dateStr = dateStr.trim();
-        ParsePosition pos = new ParsePosition(0);
-        Date result = parse(dateStr, pos);
-        if (result != null) {
-            return result;
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for (String f : ALL_FORMATS) {
-            if (sb.length() > 0) {
-                sb.append("\", \"");
-            } else {
-                sb.append('"');
-            }
-            sb.append(f);
-        }
-        sb.append('"');
-        throw new ParseException
-            (String.format("Can not parse date \"%s\": not compatible with any of standard forms (%s)",
-                           dateStr, sb.toString()), pos.getErrorIndex());
-    }
-
-    @Override
-    public Date parse(String dateStr, ParsePosition pos)
-    {
-        if (looksLikeISO8601(dateStr)) { // also includes "plain"
-            return parseAsISO8601(dateStr, pos);
-        }
-        /* 14-Feb-2010, tatu: As per [JACKSON-236], better also
-         *   consider "stringified" simple time stamp
-         */
-        int i = dateStr.length();
-        while (--i >= 0) {
-            char ch = dateStr.charAt(i);
-            if (ch < '0' || ch > '9') break;
-        }
-        if (i < 0) { // all digits
-            if (NumberInput.inLongRange(dateStr, false)) {
-                return new Date(Long.parseLong(dateStr));
-            }
-        }
-        // Otherwise, fall back to using RFC 1123
-        return parseAsRFC1123(dateStr, pos);
-    }
-
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo,
-            FieldPosition fieldPosition)
-    {
-        if (_formatISO8601 == null) {
-            _formatISO8601 = _cloneFormat(DATE_FORMAT_ISO8601);
-        }
-        return _formatISO8601.format(date, toAppendTo, fieldPosition);
-    }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-
-    /**
-     * Overridable helper method used to figure out which of supported
-     * formats is the likeliest match.
-     */
-    protected boolean looksLikeISO8601(String dateStr)
-    {
-        if (dateStr.length() >= 5
-            && Character.isDigit(dateStr.charAt(0))
-            && Character.isDigit(dateStr.charAt(3))
-            && dateStr.charAt(4) == '-'
-            ) {
-            return true;
-        }
-        return false;
-    }
-
-    protected Date parseAsISO8601(String dateStr, ParsePosition pos)
-    {
-        /* 21-May-2009, tatu: DateFormat has very strict handling of
-         * timezone  modifiers for ISO-8601. So we need to do some scrubbing.
-         */
-
-        /* First: do we have "zulu" format ('Z' == "GMT")? If yes, that's
-         * quite simple because we already set date format timezone to be
-         * GMT, and hence can just strip out 'Z' altogether
-         */
-        int len = dateStr.length();
-        char c = dateStr.charAt(len-1);
-        DateFormat df;
-
-        // [JACKSON-200]: need to support "plain" date...
-        if (len <= 10 && Character.isDigit(c)) {
-           df = _formatPlain;
-            if (df == null) {
-                df = _formatPlain = _cloneFormat(DATE_FORMAT_PLAIN);
-            }
-        } else if (c == 'Z') {
-            df = _formatISO8601_z;
-            if (df == null) {
-                df = _formatISO8601_z = _cloneFormat(DATE_FORMAT_ISO8601_Z);
-            }
-            // [JACKSON-334]: may be missing milliseconds... if so, add
-            if (dateStr.charAt(len-4) == ':') {
-                StringBuilder sb = new StringBuilder(dateStr);
-                sb.insert(len-1, ".000");
-                dateStr = sb.toString();
-            }
-        } else {
-            // Let's see if we have timezone indicator or not...
-            if (hasTimeZone(dateStr)) {
-                c = dateStr.charAt(len-3);
-                if (c == ':') { // remove optional colon
-                    // remove colon
-                    StringBuilder sb = new StringBuilder(dateStr);
-                    sb.delete(len-3, len-2);
-                    dateStr = sb.toString();
-                } else if (c == '+' || c == '-') { // missing minutes
-                    // let's just append '00'
-                    dateStr += "00";
-                }
-                // [JACKSON-334]: may be missing milliseconds... if so, add
-                len = dateStr.length();
-                // '+0000' (5 chars); should come after '.000' (4 chars) of milliseconds, so:
-                c = dateStr.charAt(len-9);
-                if (Character.isDigit(c)) {
-                    StringBuilder sb = new StringBuilder(dateStr);
-                    sb.insert(len-5, ".000");
-                    dateStr = sb.toString();
-                }
-                
-                df = _formatISO8601;
-                if (_formatISO8601 == null) {
-                    df = _formatISO8601 = _cloneFormat(DATE_FORMAT_ISO8601);
-                }
-            } else {
-                /* 24-Nov-2009, tatu: Ugh. This is getting pretty
-                 *   ugly. Need to rewrite soon!
-                 */
-
-                // If not, plain date. Easiest to just patch 'Z' in the end?
-                StringBuilder sb = new StringBuilder(dateStr);
-                // And possible also millisecond part if missing
-                int timeLen = len - dateStr.lastIndexOf('T') - 1;
-                if (timeLen <= 8) {
-                    sb.append(".000");
-                }
-                sb.append('Z');
-                dateStr = sb.toString();
-                df = _formatISO8601_z;
-                if (df == null) {
-                    df = _formatISO8601_z = _cloneFormat(DATE_FORMAT_ISO8601_Z);
-                }
-            }
-        }
-        return df.parse(dateStr, pos);
-    }
-
-    protected Date parseAsRFC1123(String dateStr, ParsePosition pos)
-    {
-        if (_formatRFC1123 == null) {
-            _formatRFC1123 = _cloneFormat(DATE_FORMAT_RFC1123);
-        }
-        return _formatRFC1123.parse(dateStr, pos);
-    }
-
-    private final static boolean hasTimeZone(String str)
-    {
-        // Only accept "+hh", "+hhmm" and "+hh:mm" (and with minus), so
-        int len = str.length();
-        if (len >= 6) {
-            char c = str.charAt(len-6);
-            if (c == '+' || c == '-') return true;
-            c = str.charAt(len-5);
-            if (c == '+' || c == '-') return true;
-            c = str.charAt(len-3);
-            if (c == '+' || c == '-') return true;
-        }
-        return false;
-    }
-
-    private final DateFormat _cloneFormat(DateFormat df) {
-        return _cloneFormat(df, _timezone);
-    }
-
-    private final static DateFormat _cloneFormat(DateFormat df, TimeZone tz)
-    {
-        df = (DateFormat) df.clone();
-        if (tz != null) {
-            df.setTimeZone(tz);
-        }
-        return df;
-    }
-}
-
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/TokenBuffer.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/TokenBuffer.java
deleted file mode 100644
index 7c2d8e3..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/TokenBuffer.java
+++ /dev/null
@@ -1,1330 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.base.ParserMinimalBase;
-import com.fasterxml.jackson.core.json.JsonReadContext;
-import com.fasterxml.jackson.core.json.JsonWriteContext;
-import com.fasterxml.jackson.core.util.ByteArrayBuilder;
-
-import com.fasterxml.jackson.databind.cfg.DatabindVersion;
-
-/**
- * Utility class used for efficient storage of {@link JsonToken}
- * sequences, needed for temporary buffering.
- * Space efficient for different sequence lengths (especially so for smaller
- * ones; but not significantly less efficient for larger), highly efficient
- * for linear iteration and appending. Implemented as segmented/chunked
- * linked list of tokens; only modifications are via appends.
- *<p>
- * Note that before version 2.0, this class was located in the "core"
- * bundle, not data-binding; but since it was only used by data binding,
- * was moved here to reduce size of core package
- */
-public class TokenBuffer
-/* Won't use JsonGeneratorBase, to minimize overhead for validity
- * checking
- */
-    extends JsonGenerator
-{
-    protected final static int DEFAULT_PARSER_FEATURES = JsonParser.Feature.collectDefaults();
-
-    /*
-    /**********************************************************
-    /* Configuration
-    /**********************************************************
-     */
-
-    /**
-     * Object codec to use for stream-based object
-     * conversion through parser/generator interfaces. If null,
-     * such methods can not be used.
-     */
-    protected ObjectCodec _objectCodec;
-
-    /**
-     * Bit flag composed of bits that indicate which
-     * {@link com.fasterxml.jackson.core.JsonGenerator.Feature}s
-     * are enabled.
-     *<p>
-     * NOTE: most features have no effect on this class
-     */
-    protected int _generatorFeatures;
-
-    protected boolean _closed;
-    
-    /*
-    /**********************************************************
-    /* Token buffering state
-    /**********************************************************
-     */
-
-    /**
-     * First segment, for contents this buffer has
-     */
-    protected Segment _first;
-
-    /**
-     * Last segment of this buffer, one that is used
-     * for appending more tokens
-     */
-    protected Segment _last;
-    
-    /**
-     * Offset within last segment, 
-     */
-    protected int _appendOffset;
-
-    /*
-    /**********************************************************
-    /* Output state
-    /**********************************************************
-     */
-
-    protected JsonWriteContext _writeContext;
-
-    /*
-    /**********************************************************
-    /* Life-cycle
-    /**********************************************************
-     */
-
-    /**
-     * @param codec Object codec to use for stream-based object
-     *   conversion through parser/generator interfaces. If null,
-     *   such methods can not be used.
-     */
-    public TokenBuffer(ObjectCodec codec)
-    {
-        _objectCodec = codec;
-        _generatorFeatures = DEFAULT_PARSER_FEATURES;
-        _writeContext = JsonWriteContext.createRootContext();
-        // at first we have just one segment
-        _first = _last = new Segment();
-        _appendOffset = 0;
-    }
-
-    @Override
-    public Version version() {
-        return DatabindVersion.instance.version();
-    }
-
-    /**
-     * Method used to create a {@link JsonParser} that can read contents
-     * stored in this buffer. Will use default <code>_objectCodec</code> for
-     * object conversions.
-     *<p>
-     * Note: instances are not synchronized, that is, they are not thread-safe
-     * if there are concurrent appends to the underlying buffer.
-     * 
-     * @return Parser that can be used for reading contents stored in this buffer
-     */
-    public JsonParser asParser()
-    {
-        return asParser(_objectCodec);
-    }
-
-    /**
-     * Method used to create a {@link JsonParser} that can read contents
-     * stored in this buffer.
-     *<p>
-     * Note: instances are not synchronized, that is, they are not thread-safe
-     * if there are concurrent appends to the underlying buffer.
-     *
-     * @param codec Object codec to use for stream-based object
-     *   conversion through parser/generator interfaces. If null,
-     *   such methods can not be used.
-     * 
-     * @return Parser that can be used for reading contents stored in this buffer
-     */
-    public JsonParser asParser(ObjectCodec codec)
-    {
-        return new Parser(_first, codec);
-    }
-
-    /**
-     * @param src Parser to use for accessing source information
-     *    like location, configured codec
-     */
-    public JsonParser asParser(JsonParser src)
-    {
-        Parser p = new Parser(_first, src.getCodec());
-        p.setLocation(src.getTokenLocation());
-        return p;
-    }
-    
-    /*
-    /**********************************************************
-    /* Other custom methods not needed for implementing interfaces
-    /**********************************************************
-     */
-
-    /**
-     * Helper method that will append contents of given buffer into this
-     * buffer.
-     * Not particularly optimized; can be made faster if there is need.
-     * 
-     * @return This buffer
-     */
-    public TokenBuffer append(TokenBuffer other)
-        throws IOException, JsonGenerationException
-    {
-        JsonParser jp = other.asParser();
-        while (jp.nextToken() != null) {
-            this.copyCurrentEvent(jp);
-        }
-        return this;
-    }
-    
-    /**
-     * Helper method that will write all contents of this buffer
-     * using given {@link JsonGenerator}.
-     *<p>
-     * Note: this method would be enough to implement
-     * <code>JsonSerializer</code>  for <code>TokenBuffer</code> type;
-     * but we can not have upwards
-     * references (from core to mapper package); and as such we also
-     * can not take second argument.
-     */
-    public void serialize(JsonGenerator jgen)
-        throws IOException, JsonGenerationException
-    {
-        Segment segment = _first;
-        int ptr = -1;
-
-        while (true) {
-            if (++ptr >= Segment.TOKENS_PER_SEGMENT) {
-                ptr = 0;
-                segment = segment.next();
-                if (segment == null) break;
-            }
-            JsonToken t = segment.type(ptr);
-            if (t == null) break;
-
-            // Note: copied from 'copyCurrentEvent'...
-            switch (t) {
-            case START_OBJECT:
-                jgen.writeStartObject();
-                break;
-            case END_OBJECT:
-                jgen.writeEndObject();
-                break;
-            case START_ARRAY:
-                jgen.writeStartArray();
-                break;
-            case END_ARRAY:
-                jgen.writeEndArray();
-                break;
-            case FIELD_NAME:
-            {
-                // 13-Dec-2010, tatu: Maybe we should start using different type tokens to reduce casting?
-                Object ob = segment.get(ptr);
-                if (ob instanceof SerializableString) {
-                    jgen.writeFieldName((SerializableString) ob);
-                } else {
-                    jgen.writeFieldName((String) ob);
-                }
-            }
-                break;
-            case VALUE_STRING:
-                {
-                    Object ob = segment.get(ptr);
-                    if (ob instanceof SerializableString) {
-                        jgen.writeString((SerializableString) ob);
-                    } else {
-                        jgen.writeString((String) ob);
-                    }
-                }
-                break;
-            case VALUE_NUMBER_INT:
-                {
-                    Number n = (Number) segment.get(ptr);
-                    if (n instanceof BigInteger) {
-                        jgen.writeNumber((BigInteger) n);
-                    } else if (n instanceof Long) {
-                        jgen.writeNumber(n.longValue());
-                    } else {
-                        jgen.writeNumber(n.intValue());
-                    }
-                }
-                break;
-            case VALUE_NUMBER_FLOAT:
-                {
-                    Object n = segment.get(ptr);
-                    if (n instanceof BigDecimal) {
-                        jgen.writeNumber((BigDecimal) n);
-                    } else if (n instanceof Float) {
-                        jgen.writeNumber(((Float) n).floatValue());
-                    } else if (n instanceof Double) {
-                        jgen.writeNumber(((Double) n).doubleValue());
-                    } else if (n == null) {
-                        jgen.writeNull();
-                    } else if (n instanceof String) {
-                        jgen.writeNumber((String) n);
-                    } else {
-                        throw new JsonGenerationException("Unrecognized value type for VALUE_NUMBER_FLOAT: "+n.getClass().getName()+", can not serialize");
-                    }
-                }
-                break;
-            case VALUE_TRUE:
-                jgen.writeBoolean(true);
-                break;
-            case VALUE_FALSE:
-                jgen.writeBoolean(false);
-                break;
-            case VALUE_NULL:
-                jgen.writeNull();
-                break;
-            case VALUE_EMBEDDED_OBJECT:
-                jgen.writeObject(segment.get(ptr));
-                break;
-            default:
-                throw new RuntimeException("Internal error: should never end up through this code path");
-            }
-        }
-    }
-
-    @Override
-    public String toString()
-    {
-        // Let's print up to 100 first tokens...
-        final int MAX_COUNT = 100;
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("[TokenBuffer: ");
-        JsonParser jp = asParser();
-        int count = 0;
-
-        while (true) {
-            JsonToken t;
-            try {
-                t = jp.nextToken();
-                if (t == null) break;
-                if (count < MAX_COUNT) {
-                    if (count > 0) {
-                        sb.append(", ");
-                    }
-                    sb.append(t.toString());
-                    if (t == JsonToken.FIELD_NAME) {
-                        sb.append('(');
-                        sb.append(jp.getCurrentName());
-                        sb.append(')');
-                    }
-                }
-            } catch (IOException ioe) { // should never occur
-                throw new IllegalStateException(ioe);
-            }
-            ++count;
-        }
-
-        if (count >= MAX_COUNT) {
-            sb.append(" ... (truncated ").append(count-MAX_COUNT).append(" entries)");
-        }
-        sb.append(']');
-        return sb.toString();
-    }
-        
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation: configuration
-    /**********************************************************
-     */
-
-    @Override
-    public JsonGenerator enable(Feature f) {
-        _generatorFeatures |= f.getMask();
-        return this;
-    }
-
-    @Override
-    public JsonGenerator disable(Feature f) {
-        _generatorFeatures &= ~f.getMask();
-        return this;
-    }
-
-    //public JsonGenerator configure(SerializationFeature f, boolean state) { }
-
-    @Override
-    public boolean isEnabled(Feature f) {
-        return (_generatorFeatures & f.getMask()) != 0;
-    }
-
-    @Override
-    public JsonGenerator useDefaultPrettyPrinter() {
-        // No-op: we don't indent
-        return this;
-    }
-
-    @Override
-    public JsonGenerator setCodec(ObjectCodec oc) {
-        _objectCodec = oc;
-        return this;
-    }
-
-    @Override
-    public ObjectCodec getCodec() { return _objectCodec; }
-
-    @Override
-    public final JsonWriteContext getOutputContext() { return _writeContext; }
-
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation: low-level output handling
-    /**********************************************************
-     */
-
-    @Override
-    public void flush() throws IOException { /* NOP */ }
-
-    @Override
-    public void close() throws IOException {
-        _closed = true;
-    }
-
-    @Override
-    public boolean isClosed() { return _closed; }
-
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation: write methods, structural
-    /**********************************************************
-     */
-
-    @Override
-    public final void writeStartArray()
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.START_ARRAY);
-        _writeContext = _writeContext.createChildArrayContext();
-    }
-
-    @Override
-    public final void writeEndArray()
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.END_ARRAY);
-        // Let's allow unbalanced tho... i.e. not run out of root level, ever
-        JsonWriteContext c = _writeContext.getParent();
-        if (c != null) {
-            _writeContext = c;
-        }
-    }
-
-    @Override
-    public final void writeStartObject()
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.START_OBJECT);
-        _writeContext = _writeContext.createChildObjectContext();
-    }
-
-    @Override
-    public final void writeEndObject()
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.END_OBJECT);
-        // Let's allow unbalanced tho... i.e. not run out of root level, ever
-        JsonWriteContext c = _writeContext.getParent();
-        if (c != null) {
-            _writeContext = c;
-        }
-    }
-
-    @Override
-    public final void writeFieldName(String name)
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.FIELD_NAME, name);
-        _writeContext.writeFieldName(name);
-    }
-
-    @Override
-    public void writeFieldName(SerializableString name)
-        throws IOException, JsonGenerationException
-    {
-        _append(JsonToken.FIELD_NAME, name);
-        _writeContext.writeFieldName(name.getValue());
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation: write methods, textual
-    /**********************************************************
-     */
-
-    @Override
-    public void writeString(String text) throws IOException,JsonGenerationException {
-        if (text == null) {
-            writeNull();
-        } else {
-            _append(JsonToken.VALUE_STRING, text);
-        }
-    }
-
-    @Override
-    public void writeString(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-        writeString(new String(text, offset, len));
-    }
-
-    @Override
-    public void writeString(SerializableString text) throws IOException, JsonGenerationException {
-        if (text == null) {
-            writeNull();
-        } else {
-            _append(JsonToken.VALUE_STRING, text);
-        }
-    }
-    
-    @Override
-    public void writeRawUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        // could add support for buffering if we really want it...
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeUTF8String(byte[] text, int offset, int length)
-        throws IOException, JsonGenerationException
-    {
-        // could add support for buffering if we really want it...
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRaw(String text) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRaw(String text, int offset, int len) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRaw(SerializableString text) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-    
-    @Override
-    public void writeRaw(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRaw(char c) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRawValue(String text) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRawValue(String text, int offset, int len) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    @Override
-    public void writeRawValue(char[] text, int offset, int len) throws IOException, JsonGenerationException {
-        _reportUnsupportedOperation();
-    }
-
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation: write methods, primitive types
-    /**********************************************************
-     */
-
-    @Override
-    public void writeNumber(int i) throws IOException, JsonGenerationException {
-        _append(JsonToken.VALUE_NUMBER_INT, Integer.valueOf(i));
-    }
-
-    @Override
-    public void writeNumber(long l) throws IOException, JsonGenerationException {
-        _append(JsonToken.VALUE_NUMBER_INT, Long.valueOf(l));
-    }
-
-    @Override
-    public void writeNumber(double d) throws IOException,JsonGenerationException {
-        _append(JsonToken.VALUE_NUMBER_FLOAT, Double.valueOf(d));
-    }
-
-    @Override
-    public void writeNumber(float f) throws IOException, JsonGenerationException {
-        _append(JsonToken.VALUE_NUMBER_FLOAT, Float.valueOf(f));
-    }
-
-    @Override
-    public void writeNumber(BigDecimal dec) throws IOException,JsonGenerationException {
-        if (dec == null) {
-            writeNull();
-        } else {
-            _append(JsonToken.VALUE_NUMBER_FLOAT, dec);
-        }
-    }
-
-    @Override
-    public void writeNumber(BigInteger v) throws IOException, JsonGenerationException {
-        if (v == null) {
-            writeNull();
-        } else {
-            _append(JsonToken.VALUE_NUMBER_INT, v);
-        }
-    }
-
-    @Override
-    public void writeNumber(String encodedValue) throws IOException, JsonGenerationException {
-        /* 03-Dec-2010, tatu: related to [JACKSON-423], should try to keep as numeric
-         *   identity as long as possible
-         */
-        _append(JsonToken.VALUE_NUMBER_FLOAT, encodedValue);
-    }
-
-    @Override
-    public void writeBoolean(boolean state) throws IOException,JsonGenerationException {
-        _append(state ? JsonToken.VALUE_TRUE : JsonToken.VALUE_FALSE);
-    }
-
-    @Override
-    public void writeNull() throws IOException, JsonGenerationException {
-        _append(JsonToken.VALUE_NULL);
-    }
-
-    /*
-    /***********************************************************
-    /* JsonGenerator implementation: write methods for POJOs/trees
-    /***********************************************************
-     */
-
-    @Override
-    public void writeObject(Object value)
-        throws IOException, JsonProcessingException
-    {
-        // embedded means that no conversions should be done...
-        _append(JsonToken.VALUE_EMBEDDED_OBJECT, value);
-    }
-
-    @Override
-    public void writeTree(TreeNode rootNode)
-        throws IOException, JsonProcessingException
-    {
-        /* 31-Dec-2009, tatu: no need to convert trees either is there?
-         *  (note: may need to re-evaluate at some point)
-         */
-        _append(JsonToken.VALUE_EMBEDDED_OBJECT, rootNode);
-    }
-
-    /*
-    /***********************************************************
-    /* JsonGenerator implementation; binary
-    /***********************************************************
-     */
-
-    @Override
-    public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int len)
-        throws IOException, JsonGenerationException
-    {
-        /* 31-Dec-2009, tatu: can do this using multiple alternatives; but for
-         *   now, let's try to limit number of conversions.
-         *   The only (?) tricky thing is that of whether to preserve variant,
-         *   seems pointless, so let's not worry about it unless there's some
-         *   compelling reason to.
-         */
-        byte[] copy = new byte[len];
-        System.arraycopy(data, offset, copy, 0, len);
-        writeObject(copy);
-    }
-
-    /**
-     * Although we could support this method, it does not necessarily make
-     * sense: we can not make good use of streaming because buffer must
-     * hold all the data. Because of this, currently this will simply
-     * throw {@link UnsupportedOperationException}
-     */
-    @Override
-    public int writeBinary(Base64Variant b64variant, InputStream data, int dataLength) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /*
-    /**********************************************************
-    /* JsonGenerator implementation; pass-through copy
-    /**********************************************************
-     */
-
-    @Override
-    public void copyCurrentEvent(JsonParser jp) throws IOException, JsonProcessingException
-    {
-        switch (jp.getCurrentToken()) {
-        case START_OBJECT:
-            writeStartObject();
-            break;
-        case END_OBJECT:
-            writeEndObject();
-            break;
-        case START_ARRAY:
-            writeStartArray();
-            break;
-        case END_ARRAY:
-            writeEndArray();
-            break;
-        case FIELD_NAME:
-            writeFieldName(jp.getCurrentName());
-            break;
-        case VALUE_STRING:
-            if (jp.hasTextCharacters()) {
-                writeString(jp.getTextCharacters(), jp.getTextOffset(), jp.getTextLength());
-            } else {
-                writeString(jp.getText());
-            }
-            break;
-        case VALUE_NUMBER_INT:
-            switch (jp.getNumberType()) {
-            case INT:
-                writeNumber(jp.getIntValue());
-                break;
-            case BIG_INTEGER:
-                writeNumber(jp.getBigIntegerValue());
-                break;
-            default:
-                writeNumber(jp.getLongValue());
-            }
-            break;
-        case VALUE_NUMBER_FLOAT:
-            switch (jp.getNumberType()) {
-            case BIG_DECIMAL:
-                writeNumber(jp.getDecimalValue());
-                break;
-            case FLOAT:
-                writeNumber(jp.getFloatValue());
-                break;
-            default:
-                writeNumber(jp.getDoubleValue());
-            }
-            break;
-        case VALUE_TRUE:
-            writeBoolean(true);
-            break;
-        case VALUE_FALSE:
-            writeBoolean(false);
-            break;
-        case VALUE_NULL:
-            writeNull();
-            break;
-        case VALUE_EMBEDDED_OBJECT:
-            writeObject(jp.getEmbeddedObject());
-            break;
-        default:
-            throw new RuntimeException("Internal error: should never end up through this code path");
-        }
-    }
-
-    @Override
-    public void copyCurrentStructure(JsonParser jp) throws IOException, JsonProcessingException {
-        JsonToken t = jp.getCurrentToken();
-
-        // Let's handle field-name separately first
-        if (t == JsonToken.FIELD_NAME) {
-            writeFieldName(jp.getCurrentName());
-            t = jp.nextToken();
-            // fall-through to copy the associated value
-        }
-
-        switch (t) {
-        case START_ARRAY:
-            writeStartArray();
-            while (jp.nextToken() != JsonToken.END_ARRAY) {
-                copyCurrentStructure(jp);
-            }
-            writeEndArray();
-            break;
-        case START_OBJECT:
-            writeStartObject();
-            while (jp.nextToken() != JsonToken.END_OBJECT) {
-                copyCurrentStructure(jp);
-            }
-            writeEndObject();
-            break;
-        default: // others are simple:
-            copyCurrentEvent(jp);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Internal methods
-    /**********************************************************
-     */
-    protected final void _append(JsonToken type) {
-        Segment next = _last.append(_appendOffset, type);
-        if (next == null) {
-            ++_appendOffset;
-        } else {
-            _last = next;
-            _appendOffset = 1; // since we added first at 0
-        }
-    }
-
-    protected final void _append(JsonToken type, Object value) {
-        Segment next = _last.append(_appendOffset, type, value);
-        if (next == null) {
-            ++_appendOffset;
-        } else {
-            _last = next;
-            _appendOffset = 1;
-        }
-    }
-
-    protected final void _appendRaw(int rawType, Object value) {
-        Segment next = _last.appendRaw(_appendOffset, rawType, value);
-        if (next == null) {
-            ++_appendOffset;
-        } else {
-            _last = next;
-            _appendOffset = 1;
-        }
-    }
-    
-    protected void _reportUnsupportedOperation() {
-        throw new UnsupportedOperationException("Called operation not supported for TokenBuffer");
-    }
-    
-    /*
-    /**********************************************************
-    /* Supporting classes
-    /**********************************************************
-     */
-
-    protected final static class Parser
-        extends ParserMinimalBase
-    {
-        protected ObjectCodec _codec;
-
-        /*
-        /**********************************************************
-        /* Parsing state
-        /**********************************************************
-         */
-
-        /**
-         * Currently active segment
-         */
-        protected Segment _segment;
-
-        /**
-         * Pointer to current token within current segment
-         */
-        protected int _segmentPtr;
-
-        /**
-         * Information about parser context, context in which
-         * the next token is to be parsed (root, array, object).
-         */
-        protected JsonReadContext _parsingContext;
-        
-        protected boolean _closed;
-
-        protected transient ByteArrayBuilder _byteBuilder;
-
-        protected JsonLocation _location = null;
-        
-        /*
-        /**********************************************************
-        /* Construction, init
-        /**********************************************************
-         */
-        
-        public Parser(Segment firstSeg, ObjectCodec codec)
-        {
-            super(0);
-            _segment = firstSeg;
-            _segmentPtr = -1; // not yet read
-            _codec = codec;
-            _parsingContext = JsonReadContext.createRootContext(-1, -1);
-        }
-
-        public void setLocation(JsonLocation l) {
-            _location = l;
-        }
-        
-        @Override
-        public ObjectCodec getCodec() { return _codec; }
-
-        @Override
-        public void setCodec(ObjectCodec c) { _codec = c; }
-
-        @Override
-        public Version version() {
-            return DatabindVersion.instance.version();
-        }
-        
-        /*
-        /**********************************************************
-        /* Extended API beyond JsonParser
-        /**********************************************************
-         */
-        
-        public JsonToken peekNextToken()
-            throws IOException, JsonParseException
-        {
-            // closed? nothing more to peek, either
-            if (_closed) return null;
-            Segment seg = _segment;
-            int ptr = _segmentPtr+1;
-            if (ptr >= Segment.TOKENS_PER_SEGMENT) {
-                ptr = 0;
-                seg = (seg == null) ? null : seg.next();
-            }
-            return (seg == null) ? null : seg.type(ptr);
-        }
-        
-        /*
-        /**********************************************************
-        /* Closeable implementation
-        /**********************************************************
-         */
-
-        @Override
-        public void close() throws IOException {
-            if (!_closed) {
-                _closed = true;
-            }
-        }
-
-        /*
-        /**********************************************************
-        /* Public API, traversal
-        /**********************************************************
-         */
-        
-        @Override
-        public JsonToken nextToken() throws IOException, JsonParseException
-        {
-            // If we are closed, nothing more to do
-            if (_closed || (_segment == null)) return null;
-
-            // Ok, then: any more tokens?
-            if (++_segmentPtr >= Segment.TOKENS_PER_SEGMENT) {
-                _segmentPtr = 0;
-                _segment = _segment.next();
-                if (_segment == null) {
-                    return null;
-                }
-            }
-            _currToken = _segment.type(_segmentPtr);
-            // Field name? Need to update context
-            if (_currToken == JsonToken.FIELD_NAME) {
-                Object ob = _currentObject();
-                String name = (ob instanceof String) ? ((String) ob) : ob.toString();
-                _parsingContext.setCurrentName(name);
-            } else if (_currToken == JsonToken.START_OBJECT) {
-                _parsingContext = _parsingContext.createChildObjectContext(-1, -1);
-            } else if (_currToken == JsonToken.START_ARRAY) {
-                _parsingContext = _parsingContext.createChildArrayContext(-1, -1);
-            } else if (_currToken == JsonToken.END_OBJECT
-                    || _currToken == JsonToken.END_ARRAY) {
-                // Closing JSON Object/Array? Close matching context
-                _parsingContext = _parsingContext.getParent();
-                // but allow unbalanced cases too (more close markers)
-                if (_parsingContext == null) {
-                    _parsingContext = JsonReadContext.createRootContext(-1, -1);
-                }
-            }
-            return _currToken;
-        }
-
-        @Override
-        public boolean isClosed() { return _closed; }
-
-        /*
-        /**********************************************************
-        /* Public API, token accessors
-        /**********************************************************
-         */
-        
-        @Override
-        public JsonStreamContext getParsingContext() { return _parsingContext; }
-
-        @Override
-        public JsonLocation getTokenLocation() { return getCurrentLocation(); }
-
-        @Override
-        public JsonLocation getCurrentLocation() {
-            return (_location == null) ? JsonLocation.NA : _location;
-        }
-
-        @Override
-        public String getCurrentName() { return _parsingContext.getCurrentName(); }
-
-        @Override
-        public void overrideCurrentName(String name)
-        {
-            // Simple, but need to look for START_OBJECT/ARRAY's "off-by-one" thing:
-            JsonReadContext ctxt = _parsingContext;
-            if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
-                ctxt = ctxt.getParent();
-            }
-            ctxt.setCurrentName(name);
-        }
-        
-        /*
-        /**********************************************************
-        /* Public API, access to token information, text
-        /**********************************************************
-         */
-        
-        @Override
-        public String getText()
-        {
-            // common cases first:
-            if (_currToken == JsonToken.VALUE_STRING
-                    || _currToken == JsonToken.FIELD_NAME) {
-                Object ob = _currentObject();
-                if (ob instanceof String) {
-                    return (String) ob;
-                }
-                return (ob == null) ? null : ob.toString();
-            }
-            if (_currToken == null) {
-                return null;
-            }
-            switch (_currToken) {
-            case VALUE_NUMBER_INT:
-            case VALUE_NUMBER_FLOAT:
-                Object ob = _currentObject();
-                return (ob == null) ? null : ob.toString();
-            }
-            return _currToken.asString();
-        }
-
-        @Override
-        public char[] getTextCharacters() {
-            String str = getText();
-            return (str == null) ? null : str.toCharArray();
-        }
-
-        @Override
-        public int getTextLength() {
-            String str = getText();
-            return (str == null) ? 0 : str.length();
-        }
-
-        @Override
-        public int getTextOffset() { return 0; }
-
-        @Override
-        public boolean hasTextCharacters() {
-            // We never have raw buffer available, so:
-            return false;
-        }
-        
-        /*
-        /**********************************************************
-        /* Public API, access to token information, numeric
-        /**********************************************************
-         */
-
-        @Override
-        public BigInteger getBigIntegerValue() throws IOException, JsonParseException
-        {
-            Number n = getNumberValue();
-            if (n instanceof BigInteger) {
-                return (BigInteger) n;
-            }
-            switch (getNumberType()) {
-            case BIG_DECIMAL:
-                return ((BigDecimal) n).toBigInteger();
-            }
-            // int/long is simple, but let's also just truncate float/double:
-            return BigInteger.valueOf(n.longValue());
-        }
-
-        @Override
-        public BigDecimal getDecimalValue() throws IOException, JsonParseException
-        {
-            Number n = getNumberValue();
-            if (n instanceof BigDecimal) {
-                return (BigDecimal) n;
-            }
-            switch (getNumberType()) {
-            case INT:
-            case LONG:
-                return BigDecimal.valueOf(n.longValue());
-            case BIG_INTEGER:
-                return new BigDecimal((BigInteger) n);
-            }
-            // float or double
-            return BigDecimal.valueOf(n.doubleValue());
-        }
-
-        @Override
-        public double getDoubleValue() throws IOException, JsonParseException {
-            return getNumberValue().doubleValue();
-        }
-
-        @Override
-        public float getFloatValue() throws IOException, JsonParseException {
-            return getNumberValue().floatValue();
-        }
-
-        @Override
-        public int getIntValue() throws IOException, JsonParseException
-        {
-            // optimize common case:
-            if (_currToken == JsonToken.VALUE_NUMBER_INT) {
-                return ((Number) _currentObject()).intValue();
-            }
-            return getNumberValue().intValue();
-        }
-
-        @Override
-        public long getLongValue() throws IOException, JsonParseException {
-            return getNumberValue().longValue();
-        }
-
-        @Override
-        public NumberType getNumberType() throws IOException, JsonParseException
-        {
-            Number n = getNumberValue();
-            if (n instanceof Integer) return NumberType.INT;
-            if (n instanceof Long) return NumberType.LONG;
-            if (n instanceof Double) return NumberType.DOUBLE;
-            if (n instanceof BigDecimal) return NumberType.BIG_DECIMAL;
-            if (n instanceof Float) return NumberType.FLOAT;
-            if (n instanceof BigInteger) return NumberType.BIG_INTEGER;
-            return null;
-        }
-
-        @Override
-        public final Number getNumberValue() throws IOException, JsonParseException {
-            _checkIsNumber();
-            return (Number) _currentObject();
-        }
-        
-        /*
-        /**********************************************************
-        /* Public API, access to token information, other
-        /**********************************************************
-         */
-
-        @Override
-        public Object getEmbeddedObject()
-        {
-            if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                return _currentObject();
-            }
-            return null;
-        }
-
-        @Override
-        public byte[] getBinaryValue(Base64Variant b64variant) throws IOException, JsonParseException
-        {
-            // First: maybe we some special types?
-            if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT) {
-                // Embedded byte array would work nicely...
-                Object ob = _currentObject();
-                if (ob instanceof byte[]) {
-                    return (byte[]) ob;
-                }
-                // fall through to error case
-            }
-            if (_currToken != JsonToken.VALUE_STRING) {
-                throw _constructError("Current token ("+_currToken+") not VALUE_STRING (or VALUE_EMBEDDED_OBJECT with byte[]), can not access as binary");
-            }
-            final String str = getText();
-            if (str == null) {
-                return null;
-            }
-            ByteArrayBuilder builder = _byteBuilder;
-            if (builder == null) {
-                _byteBuilder = builder = new ByteArrayBuilder(100);
-            } else {
-                _byteBuilder.reset();
-            }
-            _decodeBase64(str, builder, b64variant);
-            return builder.toByteArray();
-        }
-
-        @Override
-        public int readBinaryValue(Base64Variant b64variant, OutputStream out) throws IOException, JsonParseException
-        {
-            byte[] data = getBinaryValue(b64variant);
-            if (data != null) {
-                out.write(data, 0, data.length);
-                return data.length;
-            }
-            return 0;
-        }
-        
-        /*
-        /**********************************************************
-        /* Internal methods
-        /**********************************************************
-         */
-
-        protected final Object _currentObject() {
-            return _segment.get(_segmentPtr);
-        }
-
-        protected final void _checkIsNumber() throws JsonParseException
-        {
-            if (_currToken == null || !_currToken.isNumeric()) {
-                throw _constructError("Current token ("+_currToken+") not numeric, can not use numeric value accessors");
-            }
-        }
-
-        @Override
-        protected void _handleEOF() throws JsonParseException {
-            _throwInternal();
-        }
-    }
-    
-    /**
-     * Individual segment of TokenBuffer that can store up to 16 tokens
-     * (limited by 4 bits per token type marker requirement).
-     * Current implementation uses fixed length array; could alternatively
-     * use 16 distinct fields and switch statement (slightly more efficient
-     * storage, slightly slower access)
-     */
-    protected final static class Segment 
-    {
-        public final static int TOKENS_PER_SEGMENT = 16;
-        
-        /**
-         * Static array used for fast conversion between token markers and
-         * matching {@link JsonToken} instances
-         */
-        private final static JsonToken[] TOKEN_TYPES_BY_INDEX;
-        static {
-            // ... here we know that there are <= 16 values in JsonToken enum
-            TOKEN_TYPES_BY_INDEX = new JsonToken[16];
-            JsonToken[] t = JsonToken.values();
-            System.arraycopy(t, 1, TOKEN_TYPES_BY_INDEX, 1, Math.min(15, t.length - 1));
-        }
-
-        // // // Linking
-        
-        protected Segment _next;
-        
-        // // // State
-
-        /**
-         * Bit field used to store types of buffered tokens; 4 bits per token.
-         * Value 0 is reserved for "not in use"
-         */
-        protected long _tokenTypes;
-
-        
-        // Actual tokens
-
-        protected final Object[] _tokens = new Object[TOKENS_PER_SEGMENT];
-
-        public Segment() { }
-
-        // // // Accessors
-
-        public JsonToken type(int index)
-        {
-            long l = _tokenTypes;
-            if (index > 0) {
-                l >>= (index << 2);
-            }
-            int ix = ((int) l) & 0xF;
-            return TOKEN_TYPES_BY_INDEX[ix];
-        }
-
-        public int rawType(int index)
-        {
-            long l = _tokenTypes;
-            if (index > 0) {
-                l >>= (index << 2);
-            }
-            int ix = ((int) l) & 0xF;
-            return ix;
-        }
-        
-        public Object get(int index) {
-            return _tokens[index];
-        }
-
-        public Segment next() { return _next; }
-        
-        // // // Mutators
-
-        public Segment append(int index, JsonToken tokenType)
-        {
-            if (index < TOKENS_PER_SEGMENT) {
-                set(index, tokenType);
-                return null;
-            }
-            _next = new Segment();
-            _next.set(0, tokenType);
-            return _next;
-        }
-
-        public Segment append(int index, JsonToken tokenType, Object value)
-        {
-            if (index < TOKENS_PER_SEGMENT) {
-                set(index, tokenType, value);
-                return null;
-            }
-            _next = new Segment();
-            _next.set(0, tokenType, value);
-            return _next;
-        }
-
-        public Segment appendRaw(int index, int rawTokenType, Object value)
-        {
-            if (index < TOKENS_PER_SEGMENT) {
-                set(index, rawTokenType, value);
-                return null;
-            }
-            _next = new Segment();
-            _next.set(0, rawTokenType, value);
-            return _next;
-        }
-        
-        public void set(int index, JsonToken tokenType)
-        {
-            /* Assumption here is that there are no overwrites, just appends;
-             * and so no masking is needed (nor explicit setting of null)
-             */
-            long typeCode = tokenType.ordinal();
-            if (index > 0) {
-                typeCode <<= (index << 2);
-            }
-            _tokenTypes |= typeCode;
-        }
-
-        public void set(int index, JsonToken tokenType, Object value)
-        {
-            _tokens[index] = value;
-            long typeCode = tokenType.ordinal();
-            /* Assumption here is that there are no overwrites, just appends;
-             * and so no masking is needed
-             */
-            if (index > 0) {
-                typeCode <<= (index << 2);
-            }
-            _tokenTypes |= typeCode;
-        }
-
-        private void set(int index, int rawTokenType, Object value)
-        {
-            _tokens[index] = value;
-            long typeCode = (long) rawTokenType;
-            if (index > 0) {
-                typeCode <<= (index << 2);
-            }
-            _tokenTypes |= typeCode;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ViewMatcher.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/ViewMatcher.java
deleted file mode 100644
index 89c81b5..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/ViewMatcher.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-/**
- * Helper class used for checking whether a property is visible
- * in the active view
- */
-public abstract class ViewMatcher
-{
-    public abstract boolean isVisibleForView(Class<?> activeView);
-
-    public static ViewMatcher construct(Class<?>[] views)
-    {
-        if (views == null) {
-            return Empty.instance;
-        }
-        switch (views.length) {
-        case 0:
-            return Empty.instance;
-        case 1:
-            return new Single(views[0]);
-        }
-        return new Multi(views);
-    } 
-    
-    /*
-    /**********************************************************
-    /* Concrete sub-classes
-    /**********************************************************
-     */
-
-    private final static class Empty extends ViewMatcher
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        final static Empty instance = new Empty();
-        @Override
-        public boolean isVisibleForView(Class<?> activeView) {
-            return false;
-        }
-    }
-
-    private final static class Single extends ViewMatcher
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        private final Class<?> _view;
-        public Single(Class<?> v) { _view = v; }
-        @Override
-        public boolean isVisibleForView(Class<?> activeView) {
-            return (activeView == _view) || _view.isAssignableFrom(activeView);
-        }
-    }
-
-    private final static class Multi extends ViewMatcher
-        implements java.io.Serializable
-    {
-        private static final long serialVersionUID = 1L;
-
-        private final Class<?>[] _views;
-
-        public Multi(Class<?>[] v) { _views = v; }
-
-        @Override
-        public boolean isVisibleForView(Class<?> activeView)
-        {
-            for (int i = 0, len = _views.length; i < len; ++i) {
-                Class<?> view = _views[i];
-                if ((activeView == view) || view.isAssignableFrom(activeView)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/showkeyHelper/src/com/fasterxml/jackson/databind/util/package-info.java b/showkeyHelper/src/com/fasterxml/jackson/databind/util/package-info.java
deleted file mode 100644
index b965a85..0000000
--- a/showkeyHelper/src/com/fasterxml/jackson/databind/util/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Utility classes for Mapper package.
- */
-package com.fasterxml.jackson.databind.util;
diff --git a/showkeyHelper/src/com/joyplus/ArcView.java b/showkeyHelper/src/com/joyplus/ArcView.java
new file mode 100644
index 0000000..8082e41
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ArcView.java
@@ -0,0 +1,83 @@
+package com.joyplus;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class ArcView extends View {
+
+//	 int r1 = 20;
+	int r1 = 12;
+	private int mAngle = 180;
+	private Paint mPaints;
+    //private boolean mUseCenters;
+    private RectF mBigOval;
+    private float mStart;
+
+	public ArcView(Context context) {
+		super(context);
+		start();
+		// TODO Auto-generated constructor stub
+	}
+
+	public ArcView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		start();
+		// TODO Auto-generated constructor stub
+	}
+	
+	public ArcView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		start();
+		// TODO Auto-generated constructor stub
+	}
+	
+	private void start(){
+              
+       mPaints = new Paint();
+       mPaints.setAntiAlias(true);
+       mPaints.setStyle(Paint.Style.STROKE);
+       mPaints.setStrokeWidth(r1);
+       mPaints.setColor(0xFFF18C21);
+      // mUseCenters = true;
+
+	}
+    private void drawArcs(Canvas canvas, RectF oval, boolean useCenter,
+                          Paint paint) {
+//        canvas.drawRect(oval, mFramePaint);
+        canvas.drawArc(oval, mStart, mAngle, useCenter, paint);
+    
+    }
+    public void SetAngle(int mAngle) {
+   	 this.mAngle = mAngle;
+   	 invalidate();
+		
+	}
+    public void SetRingWidth(int ringWidth) {
+   	 this.r1 = ringWidth;
+   	 invalidate();
+		
+	}
+    @Override protected void onDraw(Canvas canvas) {
+        canvas.drawColor(Color.TRANSPARENT);
+
+//        float left = 0+r1-1;
+//        float top = 0+r1-2;
+//        float right =this.getWidth()-r1+1;
+//        float bottom = this.getHeight()-r1;
+        float left = 0+r1-6;
+        float top = 0+r1-6;
+        float right =this.getWidth()-r1+6;
+        float bottom = this.getHeight()-r1+6;
+           
+        mBigOval = new RectF(left, top, right, bottom);
+             
+        mStart = -90;
+        canvas.drawArc(mBigOval, mStart, mAngle, false, mPaints);
+
+    }
+}
diff --git a/showkeyHelper/src/com/joyplus/Feature.java b/showkeyHelper/src/com/joyplus/Feature.java
new file mode 100644
index 0000000..4d5fd51
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/Feature.java
@@ -0,0 +1,9 @@
+package com.joyplus;
+
+public class Feature {
+     
+	 /*Its feature of control seekbar fast speed
+	  * when  longpress 3s  the speed change to 2 from 1
+	  * after longpress 5s  the speed change to 3 from 2*/
+	 public final static boolean SEEKBAR_LONGPRESS_ADJUST = true;
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerActivity.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerActivity.java
new file mode 100644
index 0000000..6f45ce3
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerActivity.java
@@ -0,0 +1,3057 @@
+package com.joyplus;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.StringEntity;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.provider.MediaStore.Video;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.webkit.MimeTypeMap;
+import android.webkit.URLUtil;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.androidquery.AQuery;
+import com.androidquery.callback.AjaxCallback;
+import com.androidquery.callback.AjaxStatus;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.joyplus.manager.URLManager;
+import com.joyplus.manager.URLManager.Quality;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerListener;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerScreenManager;
+import com.joyplus.mediaplayer.MediaInfo;
+import com.joyplus.mediaplayer.VideoViewInterface;
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.sub.JoyplusSubManager;
+import com.joyplus.sub.SUBTYPE;
+import com.joyplus.sub.SubURI;
+import com.joyplus.tvhelper.MyApp;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.WebViewActivity;
+import com.joyplus.tvhelper.db.DBServices;
+import com.joyplus.tvhelper.entity.BTEpisode;
+import com.joyplus.tvhelper.entity.CurrentPlayDetailData;
+import com.joyplus.tvhelper.entity.MoviePlayHistoryInfo;
+import com.joyplus.tvhelper.entity.URLS_INDEX;
+import com.joyplus.tvhelper.entity.VideoPlayUrl;
+import com.joyplus.tvhelper.entity.XLLXFileInfo;
+import com.joyplus.tvhelper.entity.service.ReturnProgramView;
+import com.joyplus.tvhelper.utils.Constant;
+import com.joyplus.tvhelper.utils.DefinationComparatorIndex;
+import com.joyplus.tvhelper.utils.DesUtils;
+import com.joyplus.tvhelper.utils.Global;
+import com.joyplus.tvhelper.utils.HttpTools;
+import com.joyplus.tvhelper.utils.Log;
+import com.joyplus.tvhelper.utils.PreferencesUtils;
+import com.joyplus.tvhelper.utils.Utils;
+import com.joyplus.tvhelper.utils.XunLeiLiXianUtil;
+import com.umeng.analytics.MobclickAgent;
+
+
+public class JoyplusMediaPlayerActivity extends Activity implements JoyplusMediaPlayerListener{
+	
+	private boolean Debug   = true;
+	
+	private String  TAG     = "JoyplusMediaPlayerActivity";
+	/*videoview layout      msg 100-199  level 3*/
+	public JoyplusMediaPlayerVideoView     mVideoView;
+	/*middle control layout msg 200-299  level 2*/
+	public JoyplusMediaPlayerMiddleControl mMiddleControl;
+	/*Top and bottom layout msg 300-399  level 1*/   
+	public JoyplusMediaPlayerBar           mTopBottomController;
+	//private Handler mHandler = new Handler(){};
+	public JoyplusMediaPlayerScreenManager mScreenManager;
+	//Setting msg 400-450  
+	public JoyplusMediaPlayerPreference    mPreference;
+	/*SubTitle TextView Control   level 4*/
+	private SubTitleView                   mSubTitleView;	
+	
+	private JoyplusMediaPlayerMenuDialog menuDialog;
+	/*ad */
+	private JoyplusMediaPlayerAd           mAd;
+	
+	public static final int   DELAY_SHOWVIEW        = 10*1000; //10s
+	/*msg 0-99*/
+	public static final int   MSG_MEDIAINFO         = 0;
+	public static final int   MSG_UPDATEPLAYERINFO  = 1;
+	public static final int   MSG_REQUSETPLAYERINFO = 2;
+	
+	public static final int   MSG_REQUESTPLAY       = 3;
+	public static final int   MSG_REQUESTPAUSE      = 4;
+	public static final int   MSG_REQUESTFORWARD    = 5;
+	public static final int   MSG_REQUESTBACKWARD   = 6;
+	
+	public static final int   MSG_UPDATECURRENTINFO = 7;
+	
+	//use to ad
+	public static final int   MSG_FROM_AD           = 8;//play commend come from
+	public static final int   MSG_FROM_SELF         = 9;//play commend come from
+	public static final int   MSG_AD_START          = 10;
+	public static final int   MSG_AD_FINISH         = 11;
+	public static final int   MSG_PLAYER_PLAY       = 12;
+	public static final int   MSG_PLAYER_WAIT       = 13;
+	public Handler PlayerHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case MSG_PLAYER_PLAY:
+				String path    = (String) msg.obj;
+				int   seekto  = msg.arg1;
+				if(!(path==null || "".equals(path))){
+					if(mAd.isPlaying()){
+						PlayerHandler.removeMessages(MSG_PLAYER_WAIT);
+						Message m = new Message();
+						m.what   = MSG_PLAYER_WAIT;
+						m.obj    = path;
+						m.arg1 = (int) seekto;
+						PlayerHandler.sendMessage(m);
+					}else{
+						mVideoView.getPlayer().SetVideoPaths(path);
+						if(lastTime>0){
+							mVideoView.getPlayer().SeekVideo(seekto);
+						}
+					}
+					
+				}
+				break;
+			case MSG_PLAYER_WAIT:
+				if(mAd.isPlaying()){
+					PlayerHandler.removeMessages(MSG_PLAYER_WAIT);
+					Message m = new Message();
+					m.what   = MSG_PLAYER_WAIT;
+					m.obj    = msg.obj;
+					m.arg1   = msg.arg1;
+					PlayerHandler.sendMessageDelayed(m,500);
+				}else{
+					PlayerHandler.removeMessages(MSG_PLAYER_PLAY);
+					Message m = new Message();
+					m.what   = MSG_PLAYER_PLAY;
+					m.obj    = msg.obj;
+					m.arg1   = msg.arg1;
+					PlayerHandler.sendMessage(m);
+				}
+				break;
+			}
+		}		
+	};
+	
+    private void PlayerPlay(String path,int seek){
+    	if(!(path==null || "".equals(path))){
+	    	PlayerHandler.removeMessages(MSG_PLAYER_PLAY);
+			Message m = new Message();
+			m.what = MSG_PLAYER_PLAY;
+			m.obj  = path;
+			m.arg1 = seek;
+			PlayerHandler.sendMessage(m);
+    	}
+    }
+	enum URLTYPE{
+		UNKNOW (0), NETWORK (1), LOCAL (2);
+		private int type;
+		URLTYPE(int Type){
+			type = Type;
+		}
+		public int toInt(){
+			return type;
+		}
+	}
+	
+	public  static CurrentPlayerInfo mInfo;
+	public  static boolean StateOk = false;//flog of player in loading or others
+	public  static Animation mAlphaDispear ;
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.joyplusvideoview);
+		new Runnable(){
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				InitResource();
+				initFromIntent(getIntent());
+			}			
+		}.run();		
+	}
+	
+	private class JoyplusFinish implements Runnable{
+		@Override 
+        public void run() {
+			finish();
+			JoyplusMediaPlayerManager.getInstance().unregisterListener(JoyplusMediaPlayerActivity.this);
+			mTopBottomController.JoyplussetVisible(false, 0);
+        	mMiddleControl.JoyplussetVisible(false, 0);
+        	mVideoView.JoyplussetVisible(false, 0);
+        }
+	};
+	private void finishActivity(){
+		new JoyplusFinish().run();
+	}
+	private Handler MiniHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case JoyplusMediaPlayerMiddleControlMini.MSG_PAUSEPLAY:
+				mVideoView.getPlayer().PauseVideo();
+				return;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_CENTER:
+				finishActivity();
+				break;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_LEFT:
+				if(mInfo.mType == URLTYPE.NETWORK && mInfo.getHavePre()){
+					InitUI();
+					JoyplusMediaPlayerManager.getInstance().ResetURLAndSub();
+					if (mProd_type == 3) 
+					    mEpisodeIndex +=1;
+					else
+						mEpisodeIndex -=1;
+					mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+				}
+				break;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_TOP:
+				if(mVideoView.getPlayer() != null){
+					mVideoView.getPlayer().StartVideo();
+				}
+				mMiddleControl.JoyplussetVisible(false, JoyplusMediaPlayerMiddleControl.LAYOUT_MINI);
+				break;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_RIGHT:
+				if(mInfo.mType == URLTYPE.NETWORK && mInfo.getHaveNext()){
+					InitUI();
+					JoyplusMediaPlayerManager.getInstance().ResetURLAndSub();
+					if (mProd_type == 3)
+						mEpisodeIndex -= 1;
+					else
+						mEpisodeIndex += 1;
+					mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+				}
+				break;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_BOTTOM:
+				if(mInfo.mCollection!=0)
+				    mInfo.setCollection(false);
+				else 
+					mInfo.setCollection(true);
+				if(mVideoView.getPlayer() != null){
+					mVideoView.getPlayer().StartVideo();
+				}
+				mMiddleControl.JoyplussetVisible(false, JoyplusMediaPlayerMiddleControl.LAYOUT_MINI);
+				break;
+			case JoyplusMediaPlayerMiddleControlMini.MSG_KEYDOWN_PAUSEPLAY:
+				if(mVideoView.getPlayer() != null){
+					mVideoView.getPlayer().StartVideo();
+				}
+				mMiddleControl.JoyplussetVisible(false, JoyplusMediaPlayerMiddleControl.LAYOUT_MINI);
+				mTopBottomController.JoyplussetVisible(true, 0);//Controller should be hide next.
+				break;
+			}			
+		}
+	};
+	private Handler PreferenceHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			Log.i(TAG, "handleMessage msg.what-->" + msg.what);
+			switch(msg.what){
+			case JoyplusMediaPlayerPreference.MSG_QUALITY_CHANGE:
+				if(msg.obj == null) return;
+				Quality currQuality= (Quality) msg.obj;
+				if(currQuality != null){
+					InitUI();
+					Log.i(TAG, "handleMessage currQuality-->" + currQuality.toInt());
+					mURLManager.setDefaultQuality(currQuality);
+					mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+				}
+				break;
+			case JoyplusMediaPlayerPreference.MSG_SUB_CHANGE:
+				final int currIndex = msg.arg1;
+				mSubTitleView.hiddenSubtitle();
+				if(currIndex == 0) {
+					mJoyplusSubManager.setSubEnable(false);
+					return;
+				}
+				new Thread(new Runnable() {					
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						mJoyplusSubManager.setSubEnable(true);
+						mJoyplusSubManager.SwitchSub(currIndex -1);
+					}
+				}).start();				
+				break;
+			}
+		}
+	};
+	
+    @Override
+	protected void onNewIntent(Intent intent) {
+		// TODO Auto-generated method stub
+		mHandler.removeCallbacksAndMessages(null);
+		m_ReturnProgramView = null;
+		initFromIntent(intent);
+	}
+
+	private void InitResource() {
+		// TODO Auto-generated method stub
+    	mInfo  = new CurrentPlayerInfo();
+    	JoyplusMediaPlayerMiddleControlMini.setHandler(MiniHandler);
+    	try {
+			JoyplusMediaPlayerManager.Init(JoyplusMediaPlayerActivity.this);
+			JoyplusMediaPlayerManager.getInstance().registerListener(JoyplusMediaPlayerActivity.this);
+			mScreenManager = new JoyplusMediaPlayerScreenManager(JoyplusMediaPlayerActivity.this);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    	mVideoView           = new JoyplusMediaPlayerVideoView(this);
+    	mMiddleControl       = (JoyplusMediaPlayerMiddleControl) this.findViewById(R.id.JoyplusMediaPlayerMiddleControl);
+    	mTopBottomController = new JoyplusMediaPlayerBar(this);
+    	mNoticeNearNendLayout = (LinearLayout) findViewById(R.id.joyplus_videoview_notify_near_end);
+    	mNextName = (TextView) findViewById(R.id.bt_next_ep_name);
+    	IntentFilter filter = new IntentFilter();
+    	filter.addAction(Constant.VIDEOPLAYERCMD);
+    	filter.addAction(Global.ACTION_RECIVE_NEW_PUSH_MOVIE);
+    	registerReceiver(mReceiver, filter);
+    	mAlphaDispear        = AnimationUtils.loadAnimation(this, R.anim.alpha_disappear);
+    	mHandler.post(new Runnable() {
+			
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mPreference          = new JoyplusMediaPlayerPreference(JoyplusMediaPlayerActivity.this);
+		    	mPreference.setHandler(PreferenceHandler);
+			}
+		});
+    	mSubTitleView        = (SubTitleView) findViewById(R.id.tv_subtitle);
+    	mSubTitleView.Init(this);
+    	ResetURLAndSub();
+    	menuDialog = new JoyplusMediaPlayerMenuDialog(this);
+    	//add ad 
+    	mAd = new JoyplusMediaPlayerAd(this);
+	}
+	
+	private void ResetURLAndSub(){
+		JoyplusMediaPlayerManager.getInstance().ResetURLAndSub();
+    	mURLManager = JoyplusMediaPlayerManager.getInstance().getURLManager();
+    	mJoyplusSubManager = (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
+    	mJoyplusSubManager.registerListener(mSubTitleView);
+    	if(mSubTitleView != null)mSubTitleView.hiddenSubtitle();
+	}
+	
+	public void InitUI(){
+		StateOk = false;
+		isNearEnd = false;
+		mNoticeNearNendLayout.setVisibility(View.GONE);
+		mVideoView.Init();
+    	mTopBottomController.Init();
+    	mMiddleControl.Init();
+    	CurrentPlayerInfo Info  = new CurrentPlayerInfo(mInfo);
+    	mInfo = null;
+    	mInfo = new CurrentPlayerInfo();
+    	mInfo.mType = Info.mType;
+    	mInfo.NotifyPlayerInfo(); 
+    	if(mVideoView.getPlayer() == null){
+    		finishActivity();
+    		return;
+    	}
+    	mAd.startAD();
+	}
+
+    private void initFromIntent(Intent intent){
+    	Log.i(TAG, "initFromIntent--->");
+    	InitUI();
+    	ResetURLAndSub();
+    	if(intent != null && intent.getData() != null){
+    		mInfo.mType = URLTYPE.LOCAL;
+    		CreateLocal(intent.getData());
+    	}else{
+    		mInfo.mType = URLTYPE.NETWORK;
+    		Create();
+    	}
+    }
+    
+    /*Interface of get the videoview of which used*/
+    public VideoViewInterface getPlayer(){
+    	return mVideoView.getPlayer();
+    }
+	private boolean JoyplusdispatchMessage(Message msg){
+		//if(Debug)Log.d(TAG,"JoyplusdispatchMessage()");
+		if(!mVideoView.JoyplusdispatchMessage(msg))
+			if(!mMiddleControl.JoyplusdispatchMessage(msg))
+				if(!mTopBottomController.JoyplusdispatchMessage(msg))
+				       return false;
+		return true;
+	}
+	
+	private boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event){
+		if(Debug)Log.d(TAG,"JoyplusonKeyLongPress() "+keyCode);
+		if(!mMiddleControl.JoyplusonKeyLongPress(keyCode, event))
+		    if(!mTopBottomController.JoyplusonKeyLongPress(keyCode, event))
+			   return false;
+		return true;
+	}
+
+	private boolean JoyplusonKeyDown(int keyCode, KeyEvent event){
+		if(Debug)Log.d(TAG,"JoyplusonKeyDown() "+keyCode);
+		if(!mMiddleControl.JoyplusonKeyDown(keyCode, event))
+		    if(!mTopBottomController.JoyplusonKeyDown(keyCode, event))
+			   return false;
+		return true;
+	}
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub	
+		if(!event.isTracking())event.startTracking();//now we can listener to omKeyLongPress	
+		return true;
+	}
+	@Override
+	public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(!StateOk ){
+			return true;
+		}
+		if(JoyplusonKeyLongPress(keyCode,event))return true;
+		switch(keyCode){
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			 Message msg = new Message();
+			 msg.what    = JoyplusMediaPlayerBar.MSG_SHOWANDKEYLONGPRESS;
+			 msg.obj     = keyCode;
+		     mTopBottomController.JoyplusdispatchMessage(msg);
+		     break;
+		}
+		return super.onKeyLongPress(keyCode, event);
+	}
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(!StateOk){
+			//when loading ,we only can finish it.
+			if(keyCode == KeyEvent.KEYCODE_BACK || keyCode == 111){
+				finishActivity();
+			}else if(keyCode == KeyEvent.KEYCODE_DPAD_CENTER||keyCode == KeyEvent.KEYCODE_ENTER){
+				if(lastTime>0){
+					mInfo.mLastTime = (int) (lastTime = 0);
+					mVideoView.getPlayer().StopVideo();
+					PlayerPlay(mInfo.mPlayerUri , (int)lastTime);
+					//mVideoView.getPlayer().SetVideoPaths(video)
+//					mVideoView.getPlayer().SeekVideo(0);
+				}
+			}
+			return true;
+		}
+		if(JoyplusonKeyDown(keyCode,event))return true;
+		switch(keyCode){
+		case KeyEvent.KEYCODE_BACK:
+		case 111:
+			if((mProd_type == TYPE_PUSH || mProd_type == TYPE_XUNLEI || 
+				mProd_type == TYPE_PUSH_BT_EPISODE || mProd_type == TYPE_XUNLEI_BT_EPISODE) 
+					|| mInfo.mType == URLTYPE.LOCAL){//movie
+				finishActivity();return true; 
+			}
+			JoyplusMediaPlayerMiddleControlMini.setLayout(JoyplusMediaPlayerMiddleControlMini.LAYOUT_SWITCH);
+			mMiddleControl.JoyplussetVisible(true, JoyplusMediaPlayerMiddleControl.LAYOUT_MINI);
+			RequestMediaPlayerBarShowandHold();
+			return true;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			Message msg = new Message();
+			msg.what    = JoyplusMediaPlayerBar.MSG_SHOWANDKEYDOWN;
+			msg.obj     = keyCode;
+		    mTopBottomController.JoyplusdispatchMessage(msg);
+			return true;
+		case KeyEvent.KEYCODE_DPAD_UP:
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+		case KeyEvent.KEYCODE_VOLUME_DOWN:
+		case KeyEvent.KEYCODE_VOLUME_UP:
+		case KeyEvent.KEYCODE_VOLUME_MUTE:
+			mMiddleControl.JoyplussetVisible(true, JoyplusMediaPlayerMiddleControl.LAYOUT_AUDIO);
+			if(mMiddleControl.JoyplusonKeyDown(keyCode, event))return true;			
+			break;
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+		case KeyEvent.KEYCODE_ENTER:
+			if(isNearEnd&&(mProd_type==TYPE_PUSH_BT_EPISODE || mProd_type == TYPE_XUNLEI_BT_EPISODE)){
+				playNextBt();
+			}else{
+				JoyplusMediaPlayerMiddleControlMini.setLayout(JoyplusMediaPlayerMiddleControlMini.LAYOUT_PAUSEPLAY);
+				mMiddleControl.JoyplussetVisible(true, JoyplusMediaPlayerMiddleControl.LAYOUT_MINI);
+				RequestMediaPlayerBarShowandHold();
+			}
+			break;
+		case KeyEvent.KEYCODE_MENU:
+//			if(mProd_type < 0) return true;
+//			if(mPreference.isShowing()){
+//				mPreference.setVisible(false);
+//				return true;
+//			}
+//			mPreference.setVisible(true);
+			if(!mTopBottomController.JoyplusonKeyDown(keyCode, event)){
+				if(menuDialog.isShowing()){
+					menuDialog.dismiss();
+				}else{
+					menuDialog.init();
+					menuDialog.show();
+				}
+			}
+			break;
+		}
+		return super.onKeyUp(keyCode, event);
+	}
+	private void RequestMediaPlayerBarShowandHold(){
+		Message m = new Message();
+		m.what    = JoyplusMediaPlayerBar.MSG_SHOWANDHOLD;
+		mTopBottomController.JoyplusdispatchMessage(m);
+	}
+	private Handler VIDEOPLAYERCMD_Handler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case MSG_REQUESTPLAY:
+				break;
+			case MSG_REQUESTPAUSE:
+				break;
+			case MSG_REQUESTFORWARD:
+				break;
+			case MSG_REQUESTBACKWARD:
+				finishActivity();
+				break;
+			}
+		}
+	};
+	
+	@Override
+	public void MediaInfo(MediaInfo info) {
+		// TODO Auto-generated method stub
+		if((info.getState().toInt()>=STATE.MEDIA_STATE_INITED.toInt()&&!StateOk)){ 
+			mVideoView.getPlayer().StartVideo();
+			if(mVideoView.hasMediaInfoChange()){
+				mMiddleControl.JoyplussetVisible(false, 0);
+				mTopBottomController.JoyplussetVisible(true, 0);
+//				if(mJoyplusSubManager.CheckSubAviable())mSubTitleView.displaySubtitle();
+				StateOk = true;//now we can dispatch keydown or others operation
+			}
+		}
+		if(StateOk){
+			checkNearEnd(info);
+		}
+		mInfo.mState = info.CreateMediaInfo().getState();
+		//if(mInfo.mState == STATE.MEDIA_STATE_FINISH)MediaCompletion();
+		Message m = new Message();
+		m.what    = MSG_MEDIAINFO;
+		m.obj     = info;
+		JoyplusdispatchMessage(m);
+	}
+	private void checkNearEnd(MediaInfo info) {
+		// TODO Auto-generated method stub
+		if(info.getTotleTime()-info.getCurrentTime()<=Constant.END_TIME*1000&&info.getTotleTime()>Constant.END_TIME){
+			if(mProd_type == TYPE_PUSH_BT_EPISODE){
+				if(!isNearEnd&&mEpisodeIndex<play_info.getBtEpisodes().size()-1){
+					mNoticeNearNendLayout.setVisibility(View.VISIBLE);
+					mNextName.setText(play_info.getBtEpisodes().get(mEpisodeIndex+1).getName());
+					isNearEnd = true;
+				}
+			}else if(mProd_type==TYPE_XUNLEI_BT_EPISODE){
+				if(!isNearEnd&&mXLLXFileInfArray != null&&mEpisodeIndex<mXLLXFileInfArray.length-1){
+					mNoticeNearNendLayout.setVisibility(View.VISIBLE);
+					mNextName.setText(mXLLXFileInfArray[mEpisodeIndex+1].file_name);
+					isNearEnd = true;
+				}
+			}
+		}else{
+			mNoticeNearNendLayout.setVisibility(View.GONE);
+			isNearEnd = false;
+		}
+	}
+
+	@Override
+	public void MediaCompletion() {
+		// TODO Auto-generated method stub
+		Log.i(TAG, "MediaCompletion-->" + mInfo.mType);
+		if(mInfo.mType == URLTYPE.NETWORK){
+			autoPlayNext();			
+		}else{//local media should be exit
+			finishActivity();
+		}
+	}
+	@Override
+	public void ErrorInfo() {
+		// TODO Auto-generated method stub
+		Log.e(TAG,"+++++++++++++++++ERROR+++++++++++++++");
+		InitUI();
+		mHandler.sendEmptyMessage(MESSAGE_URL_NEXT);
+//		finishActivity();
+	}
+	@Override
+	public void NoProcess(String commend) {
+		// TODO Auto-generated method stub
+		Log.i(TAG,"Commend ("+commend+") is no disptch !!!");
+	} 
+	
+	
+	public void SaveCurrentRecord(){
+		if (mVideoView.CurrentMediaInfo != null && mInfo.mType == URLTYPE.NETWORK) {
+			MediaInfo info       = mVideoView.CurrentMediaInfo.CreateMediaInfo();
+			long duration        = info.getTotleTime();
+			long curretnPosition = info.getCurrentTime();
+			Log.d(TAG, "duration ->" + duration);
+			Log.d(TAG, "curretnPosition ->" + curretnPosition);
+//			if(duration<=curretnPosition || curretnPosition<=0)return;
+			if(duration-curretnPosition<Constant.END_TIME*1000){
+				saveToDB(duration / 1000, (duration / 1000) -Constant.END_TIME);
+			}else{
+				saveToDB(duration / 1000, curretnPosition / 1000);
+			}
+		}
+	}
+	/* follow was use to handle the local resource
+	 * 
+	 * */
+	private void CreateLocal( Uri uri){
+		String scheme = uri.getScheme();
+        if (scheme.equals("content")) {
+			try {
+				initFromContentUri(uri);
+				PlayerPlay(uri.toString(),0);
+				//mVideoView.getPlayer().SetVideoPaths(uri.toString());
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				onCreateDialog(0);//the uri was bad we can finish this.
+				e.printStackTrace();
+			}
+        } else if (uri.getScheme().equals("file")) {
+        	mInfo.mPlayerName = getMediaName(uri);
+        	PlayerPlay(uri.toString(),0);
+        	//mVideoView.getPlayer().SetVideoPaths(uri.toString());
+        }
+        mInfo.NotifyPlayerInfo();
+	}
+	private String getMediaName(Uri uri){
+		String extension = uri.getPath();
+		if(!TextUtils.isEmpty(extension)){
+			int dotPos = extension.lastIndexOf('.');
+            if (0 <= dotPos) {
+                extension = extension.substring(dotPos + 1);
+            }
+		}
+		return extension;
+	}
+	private String getMediaType(String string){
+		String extension = MimeTypeMap.getFileExtensionFromUrl(string);
+        if (TextUtils.isEmpty(extension)) {
+            // getMimeTypeFromExtension() doesn't handle spaces in filenames nor can it handle
+            // urlEncoded strings. Let's try one last time at finding the extension.
+            int dotPos = string.lastIndexOf('.');
+            if (0 <= dotPos) {
+                extension = string.substring(dotPos + 1);
+            }
+        }
+        return extension;
+	}
+	 private void initFromContentUri(Uri uri) throws Exception {
+	        ContentResolver cr = this.getContentResolver();
+	        Cursor c = cr.query(uri, new String[] {Video.Media.DATA}, null, null, null);
+	        if (c != null) {
+	            try {
+	                if (c.moveToFirst()) {
+	                    String path;
+	                    try {
+	                        // Local videos will have a data column
+	                        path = c.getString(0);
+	                    } catch (IllegalArgumentException e) {
+	                        // For non-local videos, the path is the uri
+	                        path = uri.toString();
+	                    }
+	                    mInfo.mPlayerName = path.substring(path.lastIndexOf('/') + 1);
+	                } else {
+	                    throw new Exception("Nothing found: " + uri);
+	                }
+	            } finally {
+	                c.close();
+	            }
+	        } else {
+	            throw new Exception("Bad URI: " + uri);
+	        }
+	    }
+
+	/*
+	 * this class was use to interface the player param before (VideoPlayerJPActivity)
+	 * 
+	 */
+	public class CurrentPlayerInfo  implements Parcelable{
+		public String  mPlayerUri  = "";             //the uri which was use to play
+		public String  mPlayerName = "";             //the name of media
+		public String  mQua        = "Unknow";       //the qua of madia 720P/1080P/Unknow
+		public URLTYPE mType       = URLTYPE.UNKNOW; //the flog of this resource from
+		public int     mCollection = 0 ;             //false =0 else true
+		public STATE   mState      = STATE.MEDIA_STATE_UNKNOW;//current state
+	    
+		public int     mLastTime   = 0 ;
+		public String  mFrom       = "";
+		@Override
+		public int describeContents() {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		public CurrentPlayerInfo(){
+		}
+		public CurrentPlayerInfo(CurrentPlayerInfo info){
+			if(info != null){
+				mPlayerUri  = info.mPlayerUri;
+				mPlayerName = info.mPlayerName;
+				mQua        = info.mQua;
+				mType       = info.mType;
+				mCollection = info.mCollection;
+				mState      = info.mState;
+				mLastTime   = info.mLastTime;
+				mFrom       = info.mFrom;
+			}
+		}
+		public CurrentPlayerInfo CreateInfo(){
+			return new CurrentPlayerInfo(this);
+		}
+		@Override
+		public void writeToParcel(Parcel dest, int flags) {
+			// TODO Auto-generated method stub
+			dest.writeString(mPlayerUri);
+			dest.writeString(mPlayerName);
+			dest.writeString(mQua);
+			dest.writeInt(mType.toInt());
+			dest.writeInt(mCollection);
+			dest.writeInt(mState.toInt());
+			dest.writeInt(mLastTime);
+			dest.writeString(mFrom);
+		}
+		@Override
+		public String toString() {
+			// TODO Auto-generated method stub
+			StringBuffer sb = new StringBuffer();
+	        sb.append("CurrentPlayerInfo{ mPlayerUri: ").append(mPlayerUri).
+	           append(", mPlayerName: ").append(mPlayerName).
+	           append(", mQua: ").append(mQua).
+	           append(", mType: ").append(mType.toInt()).
+	           append(", mCollection: ").append((mCollection==0)?false:true).
+	           append(", mLastTime: ").append(mLastTime).
+	           append(", mFrom: ").append(mFrom).
+	           append("} ");
+	        return sb.toString();
+		}
+		public boolean getHaveNext(){
+			if(m_ReturnProgramView ==null )return false;
+			if (mProd_type == 3){
+				if (mEpisodeIndex > 0&&m_ReturnProgramView.show.episodes[mEpisodeIndex-1].down_urls!=null) {
+					return true;
+				}
+			}else if(mProd_type == 2 || mProd_type == 131){
+				if (mEpisodeIndex < (m_ReturnProgramView.tv.episodes.length - 1)&&m_ReturnProgramView.tv.episodes[mEpisodeIndex+1].down_urls!=null) {
+					return true;
+				}
+			}
+			return false;
+		}
+		public boolean getHavePre(){
+			if (mProd_type == 3){
+				if (mEpisodeIndex < (m_ReturnProgramView.show.episodes.length - 1)&&m_ReturnProgramView.show.episodes[mEpisodeIndex+1].down_urls!=null) {
+					return true;
+				}
+			}else if(mProd_type == 2 || mProd_type == 131){
+				if (mEpisodeIndex > 0&&m_ReturnProgramView.tv.episodes[mEpisodeIndex-1].down_urls!=null) {
+					return true;
+				}
+			}
+			return false;
+		}
+		public void setCollection(boolean collection){
+//			String url = "";
+//			if(collection)
+//				url = Constant.BASE_URL + "program/favority";
+//			else
+//				url = Constant.BASE_URL + "program/unfavority";
+//			Map<String, Object> params = new HashMap<String, Object>();
+//			params.put("prod_id", mProd_id);
+//			AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+//			cb.SetHeader(app.getHeaders());
+//			if(collection)
+//			    cb.params(params).url(url).type(JSONObject.class).weakHandler(JoyplusMediaPlayerActivity.this, "favorityResult");
+//			else 
+//				cb.params(params).url(url).type(JSONObject.class).weakHandler(JoyplusMediaPlayerActivity.this, "unfavorityResult");
+//			aq.ajax(url,JSONObject.class,cb);
+		}
+		private void NotifyPlayerInfo(){
+			Message m = new Message();
+			m.what    = MSG_UPDATEPLAYERINFO;
+			m.obj     = new CurrentPlayerInfo(this);
+			JoyplusdispatchMessage(m);
+		}
+	}
+	
+	
+	
+	/***********************************************************
+	 * follow was copy from VideoPlayerJPActivity
+	 * it don't want to change 
+	 * ************************************************************/
+	private static final int MESSAGE_RETURN_DATE_OK = 0;
+	private static final int MESSAGE_URLS_READY = MESSAGE_RETURN_DATE_OK + 1;
+	private static final int MESSAGE_PALY_URL_OK = MESSAGE_URLS_READY + 1;
+	private static final int MESSAGE_URL_NEXT = MESSAGE_PALY_URL_OK + 1;
+	
+	public static final int TYPE_XUNLEI = -10;
+	public static final int TYPE_PUSH = TYPE_XUNLEI -1;
+	public static final int TYPE_PUSH_BT_EPISODE = TYPE_PUSH -2;
+	public static final int TYPE_XUNLEI_BT_EPISODE = TYPE_PUSH_BT_EPISODE - 1;
+	
+	private String mProd_id;
+	private String mProd_name;
+	private int    mProd_type;
+	private String mProd_src;// 来源
+	
+	private String url_temp; //首次url备份
+	private int    mDefination = 0; // 清晰度 6为尝鲜，7为普清，8为高清
+	private String mProd_sub_name = null;
+	private int    mEpisodeIndex = -1; // 当前集数对应的index
+	private long   lastTime = 0;
+	
+	private List<URLS_INDEX> playUrls_hd2 = new ArrayList<URLS_INDEX>();//超清
+	private List<URLS_INDEX> playUrls_hd = new ArrayList<URLS_INDEX>();//高清
+	private List<URLS_INDEX> playUrls_mp4 = new ArrayList<URLS_INDEX>();//标清
+	private List<URLS_INDEX> playUrls_flv = new ArrayList<URLS_INDEX>();//流畅
+	
+	private MoviePlayHistoryInfo play_info;
+	private XLLXFileInfo[] 		  mXLLXFileInfArray = null;
+	private int isRequset = 0;
+//	private int loadingCount;
+
+	private LinearLayout mNoticeNearNendLayout;
+	private TextView mNextName;
+	
+	private boolean isOnline;
+	
+	private boolean isNearEnd = false;
+	
+	/**
+	 * 网络数据
+	 */
+	private int               currentPlayIndex;
+	private String            currentPlayUrl;
+	private ReturnProgramView m_ReturnProgramView = null;
+	private List<URLS_INDEX>  playUrls = new ArrayList<URLS_INDEX>();
+	private AQuery            aq;
+	private MyApp               app;
+	private boolean           isOnlyExistFengXing = false;
+	private boolean           isOnlyExistLetv = false;
+    private String            sourceFromUrl = null;//当前集的原始播放地址
+    
+    private URLManager mURLManager = null;
+	private JoyplusSubManager mJoyplusSubManager = null;
+	private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			String action = intent.getAction();
+			if (action.equals(Constant.VIDEOPLAYERCMD)) {
+				int mCMD = intent.getIntExtra("cmd", 0);
+				Log.d(TAG, "onReceive------>" + mCMD);
+				String mContent = intent.getStringExtra("content");
+				String mProd_url = intent.getStringExtra("prod_url");
+				if (!mProd_url.equalsIgnoreCase(url_temp)){
+					Log.d(TAG, "mProd_url != url_temp");
+					return ;
+				}
+				/*
+				 * “403”：视频推送后，手机发送播放指令。 “405”：视频推送后，手机发送暂停指令。
+				 * “407”：视频推送后，手机发送快进指令。 “409”：视频推送后，手机发送后退指令。
+				 */
+				switch (mCMD) {
+				case 403:
+					VIDEOPLAYERCMD_Handler.sendEmptyMessage(MSG_REQUESTPLAY);
+					break;
+				case 405:
+					VIDEOPLAYERCMD_Handler.sendEmptyMessage(MSG_REQUESTPAUSE);
+					break;
+				case 407:
+					VIDEOPLAYERCMD_Handler.sendEmptyMessage(MSG_REQUESTFORWARD);
+				case 409:
+					VIDEOPLAYERCMD_Handler.sendEmptyMessage(MSG_REQUESTBACKWARD);
+					break;
+				}
+			}else if(Global.ACTION_RECIVE_NEW_PUSH_MOVIE.equals(action)){
+				finish();
+			}
+		}
+	};
+
+	
+	private void Create() {
+		// TODO Auto-generated method stub
+		aq = new AQuery(this);
+		app = (MyApp) getApplication();
+		m_ReturnProgramView = app.get_ReturnProgramView();
+		initVedioDate();
+	}
+	
+	private void initVedioDate() {
+		// 点击某部影片播放时，会全局设置CurrentPlayData
+		CurrentPlayDetailData playDate = app.getmCurrentPlayDetailData();
+		if (playDate == null) {// 如果不设置就不播放
+			//change by Jas@20130816
+			finishActivity();
+			return;
+		}
+		
+		// 初始化基本播放数据
+		mProd_id = playDate.prod_id;
+		mProd_type = playDate.prod_type;
+		mProd_name = playDate.prod_name;
+		mProd_sub_name = playDate.prod_sub_name;
+		currentPlayUrl = playDate.prod_url;
+		url_temp = playDate.prod_url;
+		mDefination = playDate.prod_qua;
+		lastTime = (int) playDate.prod_time;
+		mProd_src = playDate.prod_src;
+		isOnline = playDate.isOnline;
+		Log.d(TAG, "type---->" + mProd_type);
+		if(mProd_type == TYPE_PUSH ||mProd_type == TYPE_PUSH_BT_EPISODE){
+			play_info = (MoviePlayHistoryInfo) playDate.obj;
+		}
+		
+		if(mDefination == 0){
+			mDefination = 8;
+		}
+		
+		// 更新播放来源和上次播放时间
+		updateSourceAndTime();
+		updateName();
+		
+		switch (mProd_type) {
+		case TYPE_XUNLEI://迅雷 传递-10
+		case TYPE_XUNLEI_BT_EPISODE://迅雷 多集
+			getXunLeiEpisode();
+			break;
+//		case TYPE_LOCAL: //本地
+//			if(currentPlayUrl!=null){
+//				mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+//			}else{
+//				finish();
+//			}
+//			break;
+		case TYPE_PUSH: //推送
+			MyApp.pool.execute(new getPlayList());
+			break;
+		case TYPE_PUSH_BT_EPISODE:// BT聚集
+			MyApp.pool.execute(new getEpisodePlayUrls());
+			break;
+		default:
+			if (currentPlayUrl != null && URLUtil.isNetworkUrl(currentPlayUrl)) {
+				mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+			}else{
+				if (app.get_ReturnProgramView() != null) {// 如果不为空，获取服务器返回的详细数据
+
+					m_ReturnProgramView = app.get_ReturnProgramView();
+					mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+				} else {// 如果为空，就重新获取
+					getProgramViewDetailServiceData();
+				}
+			}
+			break;
+		}
+	}
+
+	private Handler mHandler = new Handler() {
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			switch (msg.what) {
+			case MESSAGE_RETURN_DATE_OK:
+				new Thread(new PrepareTask()).start();
+				break;
+//			case MESSAGE_NO_NETCONNECT:
+//				mVideoView.pause();
+//				mDateLoadingLayout.setVisibility(View.GONE);
+//				mHandler.removeCallbacksAndMessages(null);
+//				showDialog(2);
+//				break;
+			case MESSAGE_URLS_READY:// url 准备好了
+				if(playUrls.size()<=0){
+					if(mProd_type==TYPE_PUSH){
+						if(isRequset==2){
+							if(URLUtil.isNetworkUrl(URLDecoder.decode(play_info.getPush_url()))){
+								Intent intent_web = new Intent(JoyplusMediaPlayerActivity.this, WebViewActivity.class);
+								intent_web.putExtra("url", URLDecoder.decode(play_info.getPush_url()));
+								startActivity( intent_web);
+							}else{
+								if(!isFinishing()){
+									showDialog(0);
+								}
+							}
+						}else{
+							//失效了 接着搞
+							new Thread(new RequestNewUrl()).start();
+						}
+					}if(mProd_type == TYPE_PUSH_BT_EPISODE){
+						if(isRequset>1){
+							if(!isFinishing()){
+								showDialog(0);
+							}
+						}else{
+							new Thread(new RequestNewUrl()).start();
+						}
+					} else {
+						if(!isFinishing()){
+							showDialog(0);
+						}
+					}
+					return;
+				}
+				
+				//字幕获取
+				if((mProd_type == TYPE_PUSH || mProd_type == TYPE_PUSH_BT_EPISODE) && 
+						!mJoyplusSubManager.CheckSubAviable()){
+					MyApp.pool.execute(new Runnable() {
+
+						@Override
+						public void run() {
+							// TODO Auto-generated method stub
+							if (play_info != null
+									&& play_info.getPush_url() != null
+									&& !play_info.getPush_url().equals("")) {
+								if (play_info.getSubList() != null) {
+									mJoyplusSubManager.AddSubUri(play_info.getSubList());
+								} else {
+									String subTitleUrl = Constant.BASE_URL
+											+ "/joyplus/subtitle/?url="
+											+ URLEncoder.encode(play_info.getPush_url())
+											+ "&md5_code=" + getUmengMd5();
+									mJoyplusSubManager.AddSubUri(XunLeiLiXianUtil
+													.getSubtitle4Push(subTitleUrl,
+															Constant.APPKEY));
+									mSubTitleView.displaySubtitle();
+								}
+							}
+						}
+					});
+				}
+				
+				currentPlayIndex = 0;
+				currentPlayUrl = playUrls.get(currentPlayIndex).url;
+				Log.d(TAG,"MESSAGE_URLS_READY--->currentPlayUrl:" + currentPlayUrl);
+				mProd_src = playUrls.get(currentPlayIndex).source_from;
+				if (currentPlayUrl != null
+						&& URLUtil.isNetworkUrl(currentPlayUrl)) {
+					// 地址跳转相关。。。
+					new Thread(new UrlRedirectTask()).start();
+//					mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+					// 要根据不同的节目做相应的处理。这里仅仅是为了验证上下集
+				}else {
+					
+					mHandler.sendEmptyMessage(MESSAGE_URL_NEXT);
+				}
+				break;
+			case MESSAGE_URL_NEXT:
+				if (playUrls.size() <= 0) {
+					if (app.get_ReturnProgramView() != null) {
+						m_ReturnProgramView = app.get_ReturnProgramView();
+						mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+					} else {
+						if (mProd_type > 0 && !"-1".equals(mProd_id)
+								&& mProd_id != null) {
+							getProgramViewDetailServiceData();
+						}
+						else if(mProd_type==TYPE_PUSH){
+							if(isRequset==1){
+								if(URLUtil.isNetworkUrl(URLDecoder.decode(play_info.getPush_url()))){
+									Intent intent_web = new Intent(JoyplusMediaPlayerActivity.this, WebViewActivity.class);
+									intent_web.putExtra("url", URLDecoder.decode(play_info.getPush_url()));
+									startActivity( intent_web);
+								}else{
+									if(!isFinishing()){
+										showDialog(0);
+									}
+								}
+								
+							}else{
+								//失效了 接着搞
+								new Thread(new RequestNewUrl()).start();
+							}
+						}else if(mProd_type == TYPE_PUSH_BT_EPISODE){
+							if(isRequset>1){
+								if(!isFinishing()){
+									showDialog(0);
+								}
+							}else{
+								new Thread(new RequestNewUrl()).start();
+							}
+						}
+					}
+				} else {
+					if (currentPlayIndex < playUrls.size() - 1) {
+						currentPlayIndex += 1;
+						currentPlayUrl = playUrls.get(currentPlayIndex).url;
+						mProd_src = playUrls.get(currentPlayIndex).source_from;
+						if (currentPlayUrl != null
+								&& URLUtil.isNetworkUrl(currentPlayUrl)) {
+							// 地址跳转相关。。。
+							Log.d(TAG, "currentPlayUrl" + currentPlayUrl);
+							Log.d(TAG, "mProd_src" + mProd_src);
+							new Thread(new UrlRedirectTask()).start();
+//							mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+						}
+					} else {
+						// 所有的片源都不能播放
+						Log.e(TAG, "no url can play!");
+						if(mProd_type==TYPE_PUSH){
+							if(isRequset==1){
+								if(URLUtil.isNetworkUrl(URLDecoder.decode(play_info.getPush_url()))){
+									Intent intent_web = new Intent(JoyplusMediaPlayerActivity.this, WebViewActivity.class);
+									intent_web.putExtra("url", URLDecoder.decode(play_info.getPush_url()));
+									startActivity( intent_web);
+								}else{
+									if(!isFinishing()){
+										showDialog(0);
+									}
+								}
+							}else{
+								//失效了 接着搞
+								new Thread(new RequestNewUrl()).start();
+							}
+						}else if(mProd_type == TYPE_PUSH_BT_EPISODE){
+							if(isRequset>1){
+								if(!isFinishing()){
+									showDialog(0);
+								}
+							}else{
+								new Thread(new RequestNewUrl()).start();
+							}
+						}
+					}
+				}
+//				if(JoyplusMediaPlayerManager.getInstance().IshaveNextType()){
+//					mURLManager.resetCurURLS_INDEX();
+//					InitUI();
+//					mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+//				}else {
+//					noUrlCanPlay();
+//				}
+				break;
+			case MESSAGE_PALY_URL_OK:
+				updateName();
+				updateSourceAndTime();
+				//add by Jas@20130816 for player
+				mInfo.mPlayerUri = currentPlayUrl;
+				PlayerPlay(mInfo.mPlayerUri , (int)lastTime);
+				break;
+			default:
+				break;
+			}
+		}
+	};
+	
+	private String defintionToType(int defintion){		
+		String sourceQua = "";		
+		switch (defintion) {
+		case 8:
+			sourceQua = "hd2";
+			break;
+		case 7:
+			sourceQua = "mp4";
+			break;
+		case 6:
+			sourceQua = "flv";
+			break;
+		}		
+		return sourceQua;
+	}
+	
+	private void noUrlCanPlay(){		
+		if(!JoyplusMediaPlayerActivity.this.isFinishing()){			
+			//所有url不能播放，向服务器传递-1
+			showDialog(0);
+//			saveToDB(-1, 0);
+		}
+	}
+
+	private void updateName() {
+		switch (mProd_type) {
+		case -1:
+		case 1:
+			//mVideoNameText.setText(mProd_name);
+			mInfo.mPlayerName = mProd_name;
+			break;
+		case 2:
+		case 131:
+			//mVideoNameText.setText(mProd_name + " 第" + mProd_sub_name + "集");
+			mInfo.mPlayerName = mProd_name+" 第" + mProd_sub_name + "集";
+			break;
+		case 3:
+			//mVideoNameText.setText(mProd_name + " " + mProd_sub_name);
+			mInfo.mPlayerName = mProd_name+" "+ mProd_sub_name;
+			break;
+		case TYPE_PUSH:
+		case TYPE_XUNLEI:
+			mInfo.mPlayerName = mProd_name;
+			break;
+		case TYPE_PUSH_BT_EPISODE:
+		case TYPE_XUNLEI_BT_EPISODE:
+			mInfo.mPlayerName = mProd_sub_name;
+			break;
+		default:
+			mInfo.mPlayerName = "UnKnow ";
+			break;
+		}
+		mInfo.NotifyPlayerInfo();
+	}
+		
+	private void autoPlayNext(){
+		switch (mProd_type) {
+		case 1:
+			finishActivity();
+			break;
+		case 2:
+		case 131:
+			if(mEpisodeIndex<m_ReturnProgramView.tv.episodes.length-1){
+				playNext();
+			}else{
+				setResult2Xiangqing();//返回集数和是否收藏
+				finishActivity();
+			}
+			break;
+		case 3:
+			if(mEpisodeIndex>0){
+				playNext();
+			}else{
+				setResult2Xiangqing();//返回集数和是否收藏
+				finishActivity();
+			}
+			break;
+		case TYPE_PUSH_BT_EPISODE:
+		case TYPE_XUNLEI_BT_EPISODE:
+//			if(mEpisodeIndex<play_info.getBtEpisodes().size()-1&&isNearEnd){
+			Log.i(TAG, "autoPlayNext--->mProd_type:" + mProd_type + " isNearEnd:" + isNearEnd);
+			if(isNearEnd){
+				playNextBt();
+			}else{
+				finishActivity();
+			}
+			break;
+		default:
+			finishActivity();
+			break;
+		}
+	}
+	private void playNext(){
+		InitUI();
+		JoyplusMediaPlayerManager.getInstance().ResetURLAndSub();
+		lastTime = 0;
+		if (mProd_type == 3) {
+			mEpisodeIndex -= 1;
+		} else {
+			mEpisodeIndex += 1;
+		}
+		mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+	}
+	private void playNextBt(){
+		if(mProd_type == TYPE_PUSH_BT_EPISODE){
+			if(mEpisodeIndex<play_info.getBtEpisodes().size()-1){
+				playNextBTEpisode();
+			}
+		}else if(mProd_type == TYPE_XUNLEI_BT_EPISODE){
+			if(mXLLXFileInfArray != null && mEpisodeIndex < mXLLXFileInfArray.length -1){
+				playNextXunLeiEpisode();
+			}
+		}
+	}
+	
+	private void playNextXunLeiEpisode(){		
+		mEpisodeIndex += 1;
+		mProd_sub_name = mXLLXFileInfArray[mEpisodeIndex].file_name;
+		lastTime = 0;
+		if(menuDialog.isShowing()){
+			menuDialog.dismiss();
+		}
+		mNoticeNearNendLayout.setVisibility(View.GONE);
+		isNearEnd = false;
+		InitUI();
+		ResetURLAndSub();
+		updateSourceAndTime();
+		updateName();
+		getXunLeiEpisode();
+	}
+	
+	private void playNextBTEpisode(){
+		MediaInfo info       = mVideoView.CurrentMediaInfo.CreateMediaInfo();
+		long duration        = info.getTotleTime();
+		long curretnPosition = info.getCurrentTime();
+		play_info.getBtEpisodes().get(mEpisodeIndex).setDuration((int)(duration/1000));
+		play_info.getBtEpisodes().get(mEpisodeIndex).setPlayback_time((int)(duration/1000)-Constant.END_TIME);
+		mEpisodeIndex += 1;
+		mProd_sub_name = play_info.getBtEpisodes().get(mEpisodeIndex).getName();
+		if(play_info.getBtEpisodes().get(mEpisodeIndex).getDuration()-play_info.getBtEpisodes().get(mEpisodeIndex).getPlayback_time()<=Constant.END_TIME){
+			lastTime = 0;
+		}else{
+			lastTime = play_info.getBtEpisodes().get(mEpisodeIndex).getPlayback_time()*1000;
+		}
+		if(menuDialog.isShowing()){
+			menuDialog.dismiss();
+		}
+		mNoticeNearNendLayout.setVisibility(View.GONE);
+		isNearEnd = false;
+		InitUI();
+		ResetURLAndSub();
+		updateSourceAndTime();
+		updateName();
+		MyApp.pool.execute(new getEpisodePlayUrls());
+	}
+	
+	private void updateSourceAndTime() {
+		Log.d(TAG, " ---- sre = " + mProd_src);
+		if (mProd_src == null || mProd_src.length() == 1
+				|| "null".equals(mProd_src)) {
+			//mResourceTextView.setText("");
+			//add by Jas
+			mInfo.mFrom = "";
+		} else {
+			String strSrc = "";
+			if (mProd_src.equalsIgnoreCase("wangpan")) {
+				strSrc = "PPTV";
+			} else if (mProd_src.equalsIgnoreCase("le_tv_fee")) {
+				strSrc = "乐  视";
+			} else if (mProd_src.equalsIgnoreCase("letv")) {
+				strSrc = "乐  视";
+			} else if (mProd_src.equalsIgnoreCase("fengxing")) {
+				strSrc = "风  行";
+			} else if (mProd_src.equalsIgnoreCase("qiyi")) {
+				strSrc = "爱  奇  艺";
+			} else if (mProd_src.equalsIgnoreCase("youku")) {
+				strSrc = "优  酷";
+			} else if (mProd_src.equalsIgnoreCase("sinahd")) {
+				strSrc = "新  浪  视  频";
+			} else if (mProd_src.equalsIgnoreCase("sohu")) {
+				strSrc = "搜  狐  视  频";
+			} else if (mProd_src.equalsIgnoreCase("qq")) {
+				strSrc = "腾  讯  视  频";
+			} else if (mProd_src.equalsIgnoreCase("pptv")) {
+				strSrc = "PPTV";
+			} else if (mProd_src.equalsIgnoreCase("m1905")) {
+				strSrc = "电  影  网";
+			} else if (mProd_src.equalsIgnoreCase("p2p")) {
+				strSrc = "P 2 P";
+			} else if (mProd_src.equalsIgnoreCase("XUNLEI")) {
+				strSrc = "迅  雷";
+			}else {
+				strSrc = "PPTV";
+			}
+			//add by Jas
+			mInfo.mFrom = strSrc;
+			//mResourceTextView.setText(strSrc);
+		}
+		//add by Jas
+		mInfo.mLastTime = (int) lastTime;
+		//end add by Jas
+//		if(mURLManager.getCurURLS_INDEX() != null){
+//			Log.d(TAG, "type---->" + mURLManager.getCurURLS_INDEX().defination_from_server);
+//			//mDefinationIcon.setVisibility(View.VISIBLE);
+//			if(Constant.player_quality_index[0].equalsIgnoreCase(mURLManager.getCurURLS_INDEX().defination_from_server)){
+//				//mDefinationIcon.setImageResource(R.drawable.player_1080p);
+//				mInfo.mQua = "1080p";
+//			}else if(Constant.player_quality_index[1].equalsIgnoreCase(mURLManager.getCurURLS_INDEX().defination_from_server)){
+//				//mDefinationIcon.setImageResource(R.drawable.player_720p);
+//				mInfo.mQua = "720p";
+//			}else{
+//				//mDefinationIcon.setVisibility(View.INVISIBLE);
+//				mInfo.mQua = "Unknow";
+//			}
+//		}
+		if(playUrls.size()>0&&currentPlayIndex<=playUrls.size()-1){
+			if(mProd_type == TYPE_PUSH||mProd_type == TYPE_XUNLEI||mProd_type == TYPE_PUSH_BT_EPISODE
+					|| mProd_type == TYPE_XUNLEI_BT_EPISODE){
+				if("hd2".equalsIgnoreCase(playUrls.get(currentPlayIndex).defination_from_server)){
+					mInfo.mQua = "hd2";
+					mDefination = 8;
+				}else if("hd".equalsIgnoreCase(playUrls.get(currentPlayIndex).defination_from_server)){
+					mInfo.mQua = "hd";
+					mDefination = 7;
+				}else if("mp4".equalsIgnoreCase(playUrls.get(currentPlayIndex).defination_from_server)){
+					mInfo.mQua = "mp4";
+					mDefination = 6;
+				}else{
+//					mDefinationIcon.setVisibility(View.INVISIBLE);
+					mInfo.mQua = "flv";
+					mDefination = 5;
+				}
+			}
+		}
+		mInfo.NotifyPlayerInfo();
+	}
+
+	/**
+	 * 把m_ReturnProgramView中数据转化成基本数据
+	 * 
+	 * @author Administrator
+	 * 
+	 */
+	class PrepareTask implements Runnable {
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			playUrls.clear();
+			switch (mProd_type) {
+			case 1:
+				
+				if(m_ReturnProgramView.movie != null) {
+					
+					mProd_name = m_ReturnProgramView.movie.name;
+					
+					if(m_ReturnProgramView.movie.episodes != null 
+							&& m_ReturnProgramView.movie.episodes.length > 0 
+							&& m_ReturnProgramView.movie.episodes[0].down_urls != null) {
+							
+							if(m_ReturnProgramView.movie.episodes[0].video_urls != null
+									&& m_ReturnProgramView.movie.episodes[0].video_urls.length ==1){
+								if(m_ReturnProgramView.movie.episodes[0].video_urls[0]!= null){
+									
+									if(m_ReturnProgramView.movie.episodes[0].video_urls[0].source != null){
+										
+										if(m_ReturnProgramView.movie.episodes[0].video_urls[0].source.
+												equals(Constant.video_index[2])||
+												m_ReturnProgramView.movie.episodes[0].video_urls[0].source.
+												equals(Constant.video_index[3])){
+											
+											isOnlyExistLetv = true;
+										}else if(m_ReturnProgramView.movie.episodes[0].video_urls[0].source.
+												equals(Constant.video_index[4])){
+											
+											isOnlyExistFengXing = true;
+										}
+									}
+									
+									if(isOnlyExistFengXing || isOnlyExistLetv){
+										
+										sourceFromUrl = m_ReturnProgramView.movie.episodes[0].video_urls[0].url;
+									}
+								}
+							}
+						
+						for (int i = 0; i < m_ReturnProgramView.movie.episodes[0].down_urls.length; i++) {
+							
+							if(m_ReturnProgramView.movie.episodes[0].down_urls[i] != null) {
+								
+								String souces = m_ReturnProgramView.movie.episodes[0].down_urls[i].source;
+								
+								if(m_ReturnProgramView.movie.episodes[0].down_urls[i].urls != null) {
+									
+									for (int j = 0; j < m_ReturnProgramView.movie.episodes[0].down_urls[i].urls.length; j++) {
+										
+										if(m_ReturnProgramView.movie.episodes[0].down_urls[i].urls[j] != null) {
+											
+											URLS_INDEX url = new URLS_INDEX();
+											url.source_from = souces;
+											url.defination_from_server = m_ReturnProgramView.movie.episodes[0].down_urls[i].urls[j].type;
+											url.url = m_ReturnProgramView.movie.episodes[0].down_urls[i].urls[j].url;
+											playUrls.add(url);
+										}
+
+									}
+								}
+							}
+						}
+					}
+
+				}
+				
+				break;
+			case 2:
+			case 131:
+				
+				if(m_ReturnProgramView.tv != null) {
+					
+					mProd_name = m_ReturnProgramView.tv.name;
+					
+					if(m_ReturnProgramView.tv.episodes != null) {
+						
+						if (mEpisodeIndex == -1) {
+							for (int i = 0; i < m_ReturnProgramView.tv.episodes.length; i++) {
+								if (m_ReturnProgramView.tv.episodes[i] != null 
+										&& mProd_sub_name
+										.equals(m_ReturnProgramView.tv.episodes[i].name)) {
+									mEpisodeIndex = i;
+									if(m_ReturnProgramView.tv.episodes[i].down_urls == null){
+										mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+										return; 
+									}
+									
+									if(m_ReturnProgramView.tv.episodes[i].video_urls != null
+											&& m_ReturnProgramView.tv.episodes[i].video_urls.length ==1){
+										if(m_ReturnProgramView.tv.episodes[i].video_urls[0]!= null){
+											
+											if(m_ReturnProgramView.tv.episodes[i].video_urls[0].source != null){
+												
+												if(m_ReturnProgramView.tv.episodes[i].video_urls[0].source.
+														equals(Constant.video_index[2])||
+														m_ReturnProgramView.tv.episodes[i].video_urls[0].source.
+														equals(Constant.video_index[3])){
+													
+													isOnlyExistLetv = true;
+												}else if(m_ReturnProgramView.tv.episodes[i].video_urls[0].source.
+														equals(Constant.video_index[4])){
+													
+													isOnlyExistFengXing = true;
+												}
+											}
+											
+											if(isOnlyExistFengXing || isOnlyExistLetv){
+												
+												sourceFromUrl = m_ReturnProgramView.tv.episodes[i].video_urls[0].url;
+											}
+										}
+									}
+									
+									for (int j = 0; j < m_ReturnProgramView.tv.episodes[i].down_urls.length; j++) {
+										
+										if(m_ReturnProgramView.tv.episodes[i].down_urls[j] != null) {
+											
+											String souces = m_ReturnProgramView.tv.episodes[i].down_urls[j].source;
+											
+											if(m_ReturnProgramView.tv.episodes[i].down_urls[j].urls != null) {
+												
+												for (int k = 0; k < m_ReturnProgramView.tv.episodes[i].down_urls[j].urls.length; k++) {
+													
+													if(m_ReturnProgramView.tv.episodes[i].down_urls[j].urls[k] != null) {
+														
+														URLS_INDEX url = new URLS_INDEX();
+														url.source_from = souces;
+														url.defination_from_server = m_ReturnProgramView.tv.episodes[i].down_urls[j].urls[k].type;
+														url.url = m_ReturnProgramView.tv.episodes[i].down_urls[j].urls[k].url;
+														playUrls.add(url);
+													}
+												}
+											}
+										}
+
+									}
+								}
+							}
+						} else {
+							
+							if(m_ReturnProgramView.tv.episodes.length > mEpisodeIndex
+									&& m_ReturnProgramView.tv.episodes[mEpisodeIndex] != null) {
+								
+								if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls != null
+										&& m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls.length ==1){
+									if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0]!= null){
+										
+										if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0].source != null){
+											
+											if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0].source.
+													equals(Constant.video_index[2])||
+													m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0].source.
+													equals(Constant.video_index[3])){
+												
+												isOnlyExistLetv = true;
+											}else if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0].source.
+													equals(Constant.video_index[4])){
+												
+												isOnlyExistFengXing = true;
+											}
+										}
+										
+										if(isOnlyExistFengXing || isOnlyExistLetv){
+											
+											sourceFromUrl = m_ReturnProgramView.tv.episodes[mEpisodeIndex].video_urls[0].url;
+										}
+									}
+								}
+								
+								if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls != null) {
+									
+									for (int j = 0; j < m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls.length; j++) {
+										
+										if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j] != null) {
+											
+											String souces = m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].source;
+											
+											if( m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].urls != null) {
+												
+												for (int k = 0; k < m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].urls.length; k++) {
+													
+													if(m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].urls[k] != null) {
+														
+														URLS_INDEX url = new URLS_INDEX();
+														url.source_from = souces;
+														url.defination_from_server = m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].urls[k].type;
+														url.url = m_ReturnProgramView.tv.episodes[mEpisodeIndex].down_urls[j].urls[k].url;
+														playUrls.add(url);
+													}
+												}
+											}
+										}
+									}
+								}
+								mProd_sub_name = m_ReturnProgramView.tv.episodes[mEpisodeIndex].name;
+							}
+						}
+					}
+				}
+				
+				break;
+			case 3:
+				
+				if(m_ReturnProgramView.show != null) {
+					
+					mProd_name = m_ReturnProgramView.show.name;
+					
+					if(m_ReturnProgramView.show.episodes != null) {
+						
+						if (mEpisodeIndex == -1) {
+							for (int i = 0; i < m_ReturnProgramView.show.episodes.length; i++) {
+								
+								if(m_ReturnProgramView.show.episodes[i] != null) {
+									
+									if (Utils.isSame4Str(mProd_sub_name, m_ReturnProgramView.show.episodes[i].name)) {
+										mEpisodeIndex = i;
+										mProd_sub_name = m_ReturnProgramView.show.episodes[i].name;
+										if(m_ReturnProgramView.show.episodes[i].down_urls==null){
+											mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+											return ;
+										}
+										
+										if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls != null
+												&& m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls.length ==1){
+											if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0]!= null){
+												
+												if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source != null){
+													
+													if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+															equals(Constant.video_index[2])||
+															m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+															equals(Constant.video_index[3])){
+														
+														isOnlyExistLetv = true;
+													}else if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+															equals(Constant.video_index[4])){
+														
+														isOnlyExistFengXing = true;
+													}
+												}
+												
+												if(isOnlyExistFengXing || isOnlyExistLetv){
+													
+													sourceFromUrl = m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].url;
+												}
+											}
+										}
+										
+										for (int j = 0; j < m_ReturnProgramView.show.episodes[i].down_urls.length; j++) {
+											
+											
+											if(m_ReturnProgramView.show.episodes[i].down_urls[j] != null) {
+												
+												String souces = m_ReturnProgramView.show.episodes[i].down_urls[j].source;
+												
+												if(m_ReturnProgramView.show.episodes[i].down_urls[j].urls != null) {
+													
+													for (int k = 0; k < m_ReturnProgramView.show.episodes[i].down_urls[j].urls.length; k++) {
+														
+														if(m_ReturnProgramView.show.episodes[i].down_urls[j].urls[k] != null) {
+															
+															URLS_INDEX url = new URLS_INDEX();
+															url.source_from = souces;
+															url.defination_from_server = m_ReturnProgramView.show.episodes[i].down_urls[j].urls[k].type;
+															url.url = m_ReturnProgramView.show.episodes[i].down_urls[j].urls[k].url;
+															playUrls.add(url);
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						} else {
+							
+							if(m_ReturnProgramView.show.episodes.length > mEpisodeIndex ) {
+								
+								if(m_ReturnProgramView.show.episodes[mEpisodeIndex] != null 
+										&& m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls != null) {
+									
+									if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls != null
+											&& m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls.length ==1){
+										if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0]!= null){
+											
+											if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source != null){
+												
+												if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+														equals(Constant.video_index[1])||
+														m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+														equals(Constant.video_index[2])){
+													
+													isOnlyExistLetv = true;
+												}else if(m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].source.
+														equals(Constant.video_index[3])){
+													
+													isOnlyExistFengXing = true;
+												}
+											}
+											
+											if(isOnlyExistFengXing || isOnlyExistLetv){
+												
+												sourceFromUrl = m_ReturnProgramView.show.episodes[mEpisodeIndex].video_urls[0].url;
+											}
+										}
+									}
+									
+									for (int j = 0; j < m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls.length; j++) {
+										
+										if(m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j] != null) {
+											
+											String souces = m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].source;
+											
+											if(m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].urls != null) {
+												
+												for (int k = 0; k < m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].urls.length; k++) {
+													
+													if(m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].urls[k] != null) {
+														
+														URLS_INDEX url = new URLS_INDEX();
+														url.source_from = souces;
+														url.defination_from_server = m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].urls[k].type;
+														url.url = m_ReturnProgramView.show.episodes[mEpisodeIndex].down_urls[j].urls[k].url;
+														playUrls.add(url);
+													}
+												}
+											}
+										}
+
+									}
+								}
+								mProd_sub_name = m_ReturnProgramView.show.episodes[mEpisodeIndex].name;
+							}
+						}
+					}
+				}
+				break;
+			}
+			
+			boolean hasChaoqing = false,hasGaoqing = false,hasPuqing = false;
+			
+			for(int i=0;i<playUrls.size();i++){
+				
+				URLS_INDEX url_index = playUrls.get(i);
+				
+				if(url_index.defination_from_server.equals(Constant.player_quality_index[0])){
+					
+					hasChaoqing = true;
+				}else if(url_index.defination_from_server.equals(Constant.player_quality_index[1])){
+					
+					hasGaoqing = true;
+				}else {
+					
+					hasPuqing = true;
+				}
+			}
+			
+			if(hasChaoqing){
+				
+				maxQuality = 8;
+			}else {
+				
+				if(hasGaoqing){
+					
+					maxQuality = 7;
+				}else {
+					
+					if(hasPuqing){
+						
+						maxQuality = 6;
+					}
+				}
+			}
+
+			sequenceList();
+			// url list 准备完成
+			mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+		}
+	}
+	
+	private void getMD5_P2P(){
+//		UtilTools.setP2PMD5(getApplicationContext(), "");
+//
+//		if("".equals(UtilTools.getP2PMD5(getApplicationContext()))){
+//			
+//			String md5 = null;
+//			if(Constant.TestEnv){
+//				md5 = MobclickAgent.getConfigParams(this, "TEST_P2P_TV_MD5");
+//			}else {
+//				md5 = MobclickAgent.getConfigParams(this, "P2P_TV_MD5");
+//			}
+//			
+////			Log.i(TAG, "md5--->" + md5);
+//			if(md5 != null && !"".equals(md5)){
+//				
+//				UtilTools.setP2PMD5(getApplicationContext(), md5);
+//			}
+//		}
+	}
+	
+	private String getUmengMd5(){
+		
+		String md5 = "";
+		if (PreferencesUtils.getPincodeMd5(this) == null ||
+				"".equals(PreferencesUtils.getPincodeMd5(this))) {
+			if (Constant.TestEnv) {
+				md5 = MobclickAgent.getConfigParams(this, "TEST_P2P_TV_MD5");
+			} else {
+				md5 = MobclickAgent.getConfigParams(this, "P2P_TV_MD5");
+			}
+
+		}else{
+			md5 = PreferencesUtils.getPincodeMd5(this);
+		}
+		Log.i(TAG, "md5--->" + md5);
+		return md5;
+	}
+	
+	private void getDownloadUrl_P2P(){
+		
+		List<URLS_INDEX> tempP2PList = new ArrayList<URLS_INDEX>();
+		List<URLS_INDEX> tempExP2PList = new ArrayList<URLS_INDEX>();
+		
+		for (int i = 0; i < playUrls.size(); i++) {
+			Log.i(TAG, "url_index-->" + playUrls.get(i).toString());
+
+			if ("p2p".equalsIgnoreCase(playUrls.get(i).source_from)) {
+				tempP2PList.add(playUrls.get(i));
+			}else {
+				
+				tempExP2PList.add(playUrls.get(i));
+			}
+		}
+		for(int i=0;i< tempP2PList.size();i++){
+			
+			if("p2p".equalsIgnoreCase(tempP2PList.get(i).source_from)){
+				
+				String p2pUrl = tempP2PList.get(i).url;
+				Log.i(TAG, "p2pUrl--->" + p2pUrl);
+				if(p2pUrl != null && !p2pUrl.equals("")){//取P2P资源
+					
+//					if(!"".equals(UtilTools.getP2PMD5(getApplicationContext()))){
+//						
+//						String p2pStr = URLUtils.getXunLeiUrlURL(Constant.P2P_PARSE_URL_URL,p2pUrl,
+//								UtilTools.getP2PMD5(getApplicationContext()));
+//						Log.i(TAG, "p2pStr-->" + p2pStr);
+//						AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();           
+//						cb.url(p2pStr).type(JSONObject.class);             
+//						Map<String, String> headers = new HashMap<String, String>();
+//						headers.put("app_key", Constant.APPKEY);
+//						cb.SetHeader(headers);        
+//						aq.sync(cb);
+////						AjaxStatus status = cb.getStatus();
+//						JSONObject jo = cb.getResult();
+//						if(jo != null && jo.has("error")){
+//							Log.i(TAG, "jo-->" + jo.toString());
+//							
+//							try {
+//								if(!jo.getBoolean("error")){
+//									String downloadUrl = jo.getString("downurl");
+//									if(downloadUrl != null && !"".equals(downloadUrl)){
+//										String data = DesUtils.decode(Constant.DES_KEY, downloadUrl);
+//										Log.i(TAG, "data code-->" + data);
+//										String[] urls = data.split("\\{mType\\}");
+//										for(String str : urls){
+//											URLS_INDEX url_index_info = new URLS_INDEX();
+//											String[] p = str.split("\\{m\\}");
+//											if(p.length<2){
+//												continue;
+//											}
+//											url_index_info.source_from="p2p";
+//											url_index_info.defination_from_server = p[0];
+//											if("hd".equals(p[0])){
+//												url_index_info.defination_from_server="mp4";
+//											}else if("hd2".equals(p[0])){
+//												url_index_info.defination_from_server="hd2";
+//											}else {
+//												url_index_info.defination_from_server="flv";
+//											}
+//											url_index_info.url = p[1];
+//											tempExP2PList.add(url_index_info);
+//										}
+//									}
+//								}
+//							} catch (JSONException e) {
+//								// TODO Auto-generated catch block
+//								e.printStackTrace();
+//							}
+//						}
+//						//获取字幕
+//						if(!mJoyplusSubManager.CheckSubAviable()){
+//							mJoyplusSubManager.setSubUri(mJoyplusSubManager.
+//									getNetworkSubURI(p2pUrl, UtilTools.getP2PMD5(getApplicationContext()),getApplicationContext()));
+//						}
+//					}
+				}
+			}
+		}
+		
+		playUrls.clear();
+		playUrls = tempExP2PList;
+	}
+	
+	private void getDownloadUrl_BaiduWP(){
+		
+		for (int i = 0; i < playUrls.size(); i++) {
+			URLS_INDEX url_index = playUrls.get(i);
+			if (url_index.source_from
+					.equalsIgnoreCase(Constant.BAIDU_WANGPAN)) {
+				Document doc = null;
+				try {
+					doc = Jsoup.connect(url_index.url).timeout(10000).get();
+					// doc = Jsoup.connect(htmlStr).timeout(10000).get();
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if (doc != null) {
+					Element e = doc.getElementById("fileDownload");
+					if (e != null) {
+						Log.d(TAG, "url = " + e.attr("href"));
+						if (e.attr("href") != null
+								&& e.attr("href").length() > 0) {
+							url_index.url = e.attr("href");
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	private int maxQuality = -1;//最高清晰度
+	
+	private void sequenceList(){		
+		Log.d(TAG, "playUrls size--->" + playUrls.size() + " maxQuality--->" + maxQuality);	
+		
+		/**获取MD5值**/
+		getMD5_P2P();
+		
+		/**获取P2P的真正播放地址 **/
+		getDownloadUrl_P2P();
+		
+		/**获取百度网盘的真正播放地址 **/
+		getDownloadUrl_BaiduWP();
+		
+		mURLManager.setDefaultQuality(mDefination);
+		mURLManager.setURLS(playUrls);
+	}
+	
+	@Override
+	protected void onResume() {
+		// TODO Auto-generated method stub
+		MobclickAgent.onResume(this);
+		super.onResume();
+	}
+
+	@Override
+	protected void onPause() {		
+		Log.i(TAG, "onPause--->");		
+		// TODO Auto-generated method stub
+		MobclickAgent.onPause(this);
+		SaveCurrentRecord();
+		super.onPause();
+	}
+    
+	@Override
+	protected void onStop() {
+		Log.i(TAG, "onStop--->");
+		//if(!isFinishing()){
+			finishActivity();
+		//}
+		super.onStop();
+	}
+
+	public void saveToDB(long duration, long playBackTime) {
+		
+		Log.d(TAG, "mProd_type---------------->" + mProd_type);
+		Log.d(TAG, "mEpisodeIndex---------------->" + mEpisodeIndex);
+		DBServices services = DBServices.getInstance(this);
+		if(mProd_type == TYPE_PUSH_BT_EPISODE && mEpisodeIndex < play_info.getBtEpisodes().size()){
+			if(duration>0){
+				play_info.getBtEpisodes().get(mEpisodeIndex).setDuration((int) duration);
+			}
+			if(playBackTime>0){
+				play_info.getBtEpisodes().get(mEpisodeIndex).setPlayback_time((int) playBackTime);
+			}
+//			play_info.getBtEpisodes().get(mEpisodeIndex).setDefination(mDefination);
+			play_info.setCreat_time(System.currentTimeMillis());
+			services.updateMoviePlayHistory(play_info);
+		}else if(mProd_type == TYPE_PUSH){
+			play_info.setDuration((int) duration);
+			play_info.setPlayback_time((int) playBackTime);
+//			if(mProd_type == TYPE_PUSH){
+//				play_info.setDefination(mDefination);
+////				play_info.setDownload_url(currentPlayUrl);
+//			}
+			play_info.setCreat_time(System.currentTimeMillis());
+			services.updateMoviePlayHistory(play_info);
+		}
+		
+//		String url = Constant.BASE_URL + "program/play";
+//		Map<String, Object> params = new HashMap<String, Object>();
+//		params.put("app_key", Constant.APPKEY);// required string
+//		params.put("prod_id", mProd_id);
+//		params.put("prod_name", mProd_name);// required
+//		params.put("prod_subname", mProd_sub_name);
+//		params.put("prod_type", mProd_type);// required int 视频类别
+//		params.put("play_type", "1");
+//		params.put("playback_time", playBackTime);// _time required int
+//		params.put("duration", duration);// required int 视频时长， 单位：秒
+//		params.put("video_url", currentPlayUrl);// required
+//		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+//		cb.SetHeader(app.getHeaders());
+//		cb.params(params).url(url).type(JSONObject.class)
+//				.weakHandler(this, "CallProgramPlayResult");		
+//		aq.ajax(cb);
+		// DB操作，把存储到服务器的数据保存到数据库
+//		TvDatabaseHelper helper = TvDatabaseHelper
+//				.newTvDatabaseHelper(getApplicationContext());
+//		SQLiteDatabase database = helper.getWritableDatabase();// 获取写db
+//		String selection = UserShouCang.USER_ID + "=? and "
+//				+ UserHistory.PRO_ID + "=?";// 通过用户id，找到相应信息
+//		String[] selectionArgs = {
+//				UtilTools.getCurrentUserId(getApplicationContext()), mProd_id };
+//		database.delete(TvDatabaseHelper.HISTORY_TABLE_NAME, selection,
+//				selectionArgs);
+//		HotItemInfo info = new HotItemInfo();
+//		info.prod_type = mProd_type + "";
+//		info.prod_name = mProd_name;
+//		info.prod_subname = mProd_sub_name;
+//		info.prod_id = mProd_id;
+//		info.play_type = "1";
+//		info.playback_time = playBackTime + "";
+//		info.video_url = currentPlayUrl;
+//		info.duration = duration + "";
+//		DBUtils.insertHotItemInfo2DB_History(getApplicationContext(), info,
+//				UtilTools.getCurrentUserId(getApplicationContext()), database);
+//		helper.closeDatabase();		
+		//发送更新最新记录广播
+//		app.set_ReturnProgramView(m_ReturnProgramView);
+//		Intent historyIntent  = new Intent(UtilTools.ACTION_PLAY_END_HISTORY);
+//		historyIntent.putExtra("prod_id", mProd_id);
+//		historyIntent.putExtra("prod_sub_name", mProd_sub_name);
+//		historyIntent.putExtra("prod_type", mProd_type);
+//		historyIntent.putExtra("time", playBackTime);
+//		sendBroadcast(historyIntent);
+//		
+//		Intent mainIntent  = new Intent(UtilTools.ACTION_PLAY_END_MAIN);
+//		mainIntent.putExtra("prod_id", mProd_id);
+//		mainIntent.putExtra("prod_sub_name", mProd_sub_name);
+//		mainIntent.putExtra("prod_type", mProd_type);
+//		mainIntent.putExtra("time", playBackTime);
+//		sendBroadcast(mainIntent);
+	}
+	
+	private void setResult2Xiangqing() {		
+//		Intent dataIntent = getIntent();
+//		dataIntent.putExtra("prod_subname", mProd_sub_name);		
+//		if(isShoucang) {			
+//			setResult(JieMianConstant.SHOUCANG_ADD,dataIntent);
+//		} else {			
+//			setResult(JieMianConstant.SHOUCANG_CANCEL,dataIntent);
+//		}
+	}
+
+	public void CallProgramPlayResult(String url, JSONObject json,
+			AjaxStatus status) {
+		if (json != null) {
+			Log.d(TAG, json.toString());
+		}
+	}
+
+	@Override
+	protected void onDestroy() {
+		// TODO Auto-generated method stub
+		Log.i(TAG, "onDestroy--->");		
+		unregisterReceiver(mReceiver);	
+		super.onDestroy();
+	}
+
+	private void getIsShoucangData() {
+		String url = Constant.BASE_URL + "program/is_favority";
+		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("prod_id", mProd_id);
+		cb.params(params).url(url).type(JSONObject.class)
+				.weakHandler(this, "initIsShoucangData");
+		cb.SetHeader(app.getHeaders());
+		aq.ajax(cb);
+	}
+
+	public void initIsShoucangData(String url, JSONObject json,
+			AjaxStatus status) {
+		if (status.getCode() == AjaxStatus.NETWORK_ERROR || json == null) {
+			Utils.showToast(aq.getContext(),getResources().getString(R.string.networknotwork));
+			return;
+		}
+		if (json == null || json.equals(""))return;
+		Log.d(TAG, "data = " + json.toString());
+		String flag = json.toString();
+		if (!flag.equals("")) {
+			if (flag.contains("true")) {
+				mInfo.mCollection = 1;
+			} else {
+				mInfo.mCollection = 0;
+			}
+		} else {
+			mInfo.mCollection = 1;
+		}
+	}
+
+	public void favorityResult(String url, JSONObject json,AjaxStatus status) {
+		if (json != null) {
+			try {
+				// woof is "00000",now "20024",by yyc
+				if (json.getString("res_code").trim().equalsIgnoreCase("00000")) {
+					Utils.showToast(this, "收藏成功!");					
+					mInfo.mCollection = 1;
+				} else {					
+					mInfo.mCollection = 1;
+					Utils.showToast(this, "已收藏!");
+				}					
+			} catch (JSONException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			// ajax error, show error code
+			if (status.getCode() == AjaxStatus.NETWORK_ERROR)
+				Utils.showToast(aq.getContext(),getResources().getString(R.string.networknotwork));
+		}
+
+	}
+
+	public void unfavorityResult(String url, JSONObject json, AjaxStatus status) {
+		if (json != null) {
+			try {
+				if (json.getString("res_code").trim().equalsIgnoreCase("00000")) {
+					Utils.showToast(this, "取消收藏成功!");
+					mInfo.mCollection = 0;
+				} else {					
+					Utils.showToast(this, "取消收藏失败!");
+					mInfo.mCollection = 1;
+				}
+			} catch (JSONException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		} else {
+			// ajax error, show error code
+			if (status.getCode() == AjaxStatus.NETWORK_ERROR)
+				Utils.showToast(this,getResources().getString(R.string.networknotwork));
+		}
+	}
+	
+	private void getProgramViewDetailServiceData() {
+		// TODO Auto-generated method stub
+		String url = Constant.BASE_URL + "program/view" + "?prod_id="+ mProd_id;
+		getServiceData(url, "initMovieDate");
+	}
+
+	public void initMovieDate(String url, JSONObject json, AjaxStatus status) {
+		if (status.getCode() == AjaxStatus.NETWORK_ERROR || json == null) {
+			Utils.showToast(aq.getContext(),getResources().getString(R.string.networknotwork));
+			return;
+		}
+		if (json == null || json.equals(""))
+			return;
+		Log.d(TAG, "data = " + json.toString());
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			m_ReturnProgramView = null;
+			m_ReturnProgramView = mapper.readValue(json.toString(),ReturnProgramView.class);
+			// 检测URL
+			mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
+		} catch (JsonParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (JsonMappingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	protected void getServiceData(String url, String interfaceName) {
+		// TODO Auto-generated method stub
+		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+		cb.url(url).type(JSONObject.class).weakHandler(this, interfaceName);
+		cb.SetHeader(app.getHeaders());
+		Log.d(TAG, url);
+		Log.d(TAG, "header appkey" + app.getHeaders().get("app_key"));
+		aq.ajax(cb);
+	}
+	
+//	private void getFenxingNetServiceData(String url){
+//		
+//		getParseServiceData(url, "initFenxingNetServiceData");
+//	}
+	
+	public void initFenxingNetServiceData(String url, JSONObject json, AjaxStatus status) {
+
+//		if (status.getCode() == AjaxStatus.NETWORK_ERROR || json == null) {
+//			Utils.showToast(aq.getContext(),
+//					getResources().getString(R.string.networknotwork));
+//			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+//			return;
+//		}
+//
+//		if (json == null || json.equals("")){
+//			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+//			return;
+//		}
+//
+//		Log.d(TAG, "initFenxingNetServiceData = " + json.toString());
+//		getFengxingSecondServiceData(Constant.FENGXING_REGET_SECOND_URL, json);
+		
+	}
+	
+//	private void getFengxingSecondServiceData(String url,JSONObject json){
+//		
+//		getParseServiceData(url,json, "initFengxingSecondServiceData");
+//	}
+	
+	protected void getParseServiceData(String url,JSONObject json, String interfaceName) {
+		// TODO Auto-generated method stub
+
+		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+		cb.url(url).type(JSONObject.class).weakHandler(this, interfaceName);
+		Map<String, Object> params = new HashMap<String, Object>();
+		try {
+			HttpEntity entity = new StringEntity(json.toString());
+			params.put(AQuery.POST_ENTITY, entity);
+
+			cb.params(params);
+			Map<String, String> headers = new HashMap<String, String>();
+			headers.put("Content-Type", "application/json");
+			headers.put("app_key", Constant.APPKEY);
+			cb.SetHeader(headers);
+			aq.ajax(cb);
+		} catch (UnsupportedEncodingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+;
+	}
+	
+	public void initFengxingSecondServiceData(String url, JSONObject json, AjaxStatus status) {
+
+//		if (status.getCode() == AjaxStatus.NETWORK_ERROR) {
+//			Utils.showToast(aq.getContext(),
+//					getResources().getString(R.string.networknotwork));
+//			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+//			return;
+//		}
+//		
+//		if (json == null || json.equals("")){
+//			Log.d(TAG, "initFengxingSecondServiceData = ");
+//			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+//			return;
+//		}
+//
+//
+//		Log.d(TAG, "initFengxingSecondServiceData = " + json.toString());
+//		ObjectMapper mapper = new ObjectMapper();
+//		try {
+//			ReturnFengxingSecondView returnFengxingSecondView = mapper.readValue(json.toString(),
+//					ReturnFengxingSecondView.class);
+//			
+//			if(returnFengxingSecondView != null && returnFengxingSecondView.error!= null
+//					&& returnFengxingSecondView.error.equals("false")){
+//				
+//				if(returnFengxingSecondView.urls != null && returnFengxingSecondView.urls.length > 0){
+//					
+//					String type = defintionToType(mDefination);
+//					if(playUrls != null){
+//						
+//						playUrls.clear();
+//					}
+//					for(int i=0;i<returnFengxingSecondView.urls.length;i++){
+//						
+//						URLS_INDEX urls_INDEX = new URLS_INDEX();
+//						urls_INDEX.source_from = "fengxing";
+//						urls_INDEX.defination_from_server = type;
+//						urls_INDEX.url = returnFengxingSecondView.urls[i];
+//						Log.i(TAG, "urls_INDEX--->" + urls_INDEX.toString());
+//						playUrls.add(urls_INDEX);
+//					}
+//				}
+//			}
+//		} catch (JsonParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (JsonMappingException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//			
+//			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+	}
+	
+	protected void getParseServiceData(String url, String interfaceName) {
+		// TODO Auto-generated method stub
+
+		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
+		cb.url(url).type(JSONObject.class).weakHandler(this, interfaceName);
+
+		if(!"initFenxingNetServiceData".equals(interfaceName)){
+			
+			Map<String, String> headers = new HashMap<String, String>();
+			headers.put("app_key", Constant.APPKEY);
+			cb.SetHeader(headers);
+		}
+		aq.ajax(cb);
+	}
+	
+	private void getLetvParseServiceData(String url){
+		
+		getParseServiceData(url, "initLetvParseServiceData");
+	}
+	
+	public void initLetvParseServiceData(String url, JSONObject json, AjaxStatus status) {
+
+//		if (status.getCode() == AjaxStatus.NETWORK_ERROR || json == null) {
+//			Utils.showToast(aq.getContext(),
+//					getResources().getString(R.string.networknotwork));
+//			noUrlCanPlay();
+//			return;
+//		}
+//
+//		if (json == null || json.equals("")){
+//			
+//			noUrlCanPlay();
+//			return;
+//		}
+//
+//
+//		Log.d(TAG, "initLetvParseServiceData = " + json.toString());
+//		ObjectMapper mapper = new ObjectMapper();
+//		try {
+//			ReturnReGetVideoView reGetVideoView = mapper.readValue(json.toString(),
+//					ReturnReGetVideoView.class);
+//			
+//			
+//			if(reGetVideoView != null && "false".equals(reGetVideoView.error)
+//					&&reGetVideoView.down_urls != null
+//					&& reGetVideoView.down_urls.urls != null
+//					&& reGetVideoView.down_urls.urls.length > 0){
+//				if(playUrls != null){
+//					
+//					playUrls.clear();
+//				}
+//				for(int i=0;i<reGetVideoView.down_urls.urls.length ;i++){
+//					
+//					if(reGetVideoView.down_urls.urls != null){
+//						
+//						URLS_INDEX urls_INDEX = new URLS_INDEX(); 
+//						urls_INDEX.source_from = reGetVideoView.down_urls.source;
+//						urls_INDEX.defination_from_server = reGetVideoView.down_urls.urls[i].type;
+//						urls_INDEX.url = reGetVideoView.down_urls.urls[i].url;
+//						Log.i(TAG, "urls_INDEX--->" + urls_INDEX.toString());
+//						playUrls.add(urls_INDEX);
+//					}
+//				}
+//				
+//				if(maxQuality != -1 && isOnlyExistLetv){
+//					
+//					if(maxQuality == mDefination){
+//						
+//						mDefination = 8;
+//					}
+//				}
+//				
+//				sequenceList();
+//				
+//				for(int i=0;i<playUrls.size();i++){
+//					
+//					Log.i(TAG, "playUrls--->" + playUrls.get(i).defination_from_server);
+//				}
+//				// url list 准备完成
+//				mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+//				return;
+//				
+//			}
+//		} catch (JsonParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (JsonMappingException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		
+//		noUrlCanPlay();
+	}
+	
+	private void getFengxingParseServiceData(String url){
+		getParseServiceData(url, "initFengxingParseServiceData");
+	}
+	
+	public void initFengxingParseServiceData(String url, JSONObject json, AjaxStatus status) {
+		if (status.getCode() == AjaxStatus.NETWORK_ERROR || json == null) {
+			Utils.showToast(aq.getContext(),
+					getResources().getString(R.string.networknotwork));
+			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+			return;
+		}
+		if (json == null || json.equals("")){
+			mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+			return;
+		}
+		Log.d(TAG, "initFengxingParseServiceData= " + json.toString());		
+		ObjectMapper mapper = new ObjectMapper();
+//		try {
+//			ReturnFirstFengxingUrlView returnFirstFengxingUrlView = mapper.readValue(json.toString(),
+//					ReturnFirstFengxingUrlView.class);			
+//			if(returnFirstFengxingUrlView != null){
+//				if(returnFirstFengxingUrlView.error != null && 
+//						returnFirstFengxingUrlView.error.equals("false")){
+//					String sourceQua = defintionToType(mDefination);
+//					if(returnFirstFengxingUrlView.video_infos != null &&
+//							returnFirstFengxingUrlView.video_infos.length > 0){						
+//						for(int i=0;i<returnFirstFengxingUrlView.video_infos.length;i++){							
+//							if(returnFirstFengxingUrlView.video_infos[i]!= null 
+//									&& returnFirstFengxingUrlView.video_infos[i].type != null){								
+//								if(sourceQua.equals(returnFirstFengxingUrlView.video_infos[i].type)){									
+//									String tempUrl = returnFirstFengxingUrlView.video_infos[i].request_url;
+//									Log.i(TAG, "tempUrl--->" + tempUrl);
+//									getFenxingNetServiceData(tempUrl);
+//									return;
+//								}
+//							}							
+//						}
+//					}
+//				}				
+//			}
+//		} catch (JsonParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (JsonMappingException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+		mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+	}
+	
+	/**
+	 * 地址跳转
+	 */	
+	class  UrlRedirectTask implements Runnable{
+		@Override
+		public void run() {			
+			// TODO Auto-generated method stub			
+			Log.i(TAG, "UrlRedirectTask-->" + currentPlayUrl);			
+			if(currentPlayUrl != null && !currentPlayUrl.equals("")) {				
+				if(currentPlayUrl.indexOf(("{now_date}")) != -1) {					
+					currentPlayUrl = currentPlayUrl.replace("{now_date}", System.currentTimeMillis()/1000 + "");
+				}
+			}			
+			String str = Utils.getRedirectUrl(currentPlayUrl);			
+			if(str!=null){
+				currentPlayUrl = str;
+				mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+			}else{
+				mHandler.sendEmptyMessage(MESSAGE_URL_NEXT);
+			}
+		}		
+	}
+	
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		// TODO Auto-generated method stub
+		 Dialog alertDialog = new AlertDialog.Builder(this). 
+	                setTitle("提示"). 
+	                setMessage("该视频无法播放"). 
+	                setPositiveButton("确定", new DialogInterface.OnClickListener() {
+
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							// TODO Auto-generated method stub
+							finishActivity();
+						}
+
+					}).
+	                create();
+		 	alertDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+				
+				@Override
+				public void onCancel(DialogInterface dialog) {
+					// TODO Auto-generated method stub
+					finishActivity();
+				}
+			});
+	        alertDialog.show(); 
+		return null;
+	}
+	
+	class getEpisodePlayUrls implements Runnable{
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			
+			for(int i=0 ; i<play_info.getBtEpisodes().size(); i++){
+				BTEpisode e = play_info.getBtEpisodes().get(i);
+				if(mProd_sub_name!=null&&mProd_sub_name.equals(e.getName())){
+					mEpisodeIndex = i;
+				}
+			}
+			Log.d(TAG, "mEpisodeIndex---------------->" + mEpisodeIndex);
+			String url = Constant.BASE_URL + "/joyplus/produrl?id=" + play_info.getPush_id()
+					+ "&name=" + URLEncoder.encode(mProd_sub_name) 
+					+ "&md5_code=" + getUmengMd5()
+					+ "&mac_address=" + Utils.getMacAdd(JoyplusMediaPlayerActivity.this);
+			String date_str = HttpTools.get(JoyplusMediaPlayerActivity.this, url);
+			Log.d(TAG, date_str);
+			try{
+				JSONObject data = new JSONObject(date_str);
+				boolean haserror = data.getBoolean("error");
+				if(!haserror){
+					String downurls = data.getString("downurl");
+					List<SubURI> subList = null;
+					if(data.has("subtitle")){
+						Log.d(TAG, data.get("subtitle").toString());
+						if(!"".equals(data.get("subtitle").toString())){
+							JSONArray array_sub = data.getJSONArray("subtitle");
+							subList = new ArrayList<SubURI>();
+							for(int i = 0; i< array_sub.length() ; i++){
+								JSONObject subObj = array_sub.getJSONObject(i);
+								SubURI subInfo = new SubURI();
+								subInfo.setName(subObj.getString("name"));
+								subInfo.setUrl(subObj.getString("url"));
+								subInfo.SubType = SUBTYPE.NETWORK;
+								subList.add(subInfo);
+							}
+						}
+						
+					}
+					play_info.setSubList(subList);
+					String donwLoad_url_data = DesUtils.decode(Constant.DES_KEY, downurls);
+					Log.d(TAG, "getPlayList--->data:" + donwLoad_url_data);
+					String[] urls = donwLoad_url_data.split("\\{mType\\}");
+//					List<URLS_INDEX> list = new ArrayList<URLS_INDEX>();
+					playUrls.clear();
+//					playUrls_flv.clear();
+//					playUrls_hd.clear();
+//					playUrls_hd2.clear();
+//					playUrls_mp4.clear();
+					for(String str : urls){
+						URLS_INDEX url_index_info = new URLS_INDEX();
+						String[] p = str.split("\\{m\\}");
+						if(p.length<2){
+							continue;
+						}
+						url_index_info.defination_from_server = p[0];
+						url_index_info.url = p[1];
+//						if("hd2".equalsIgnoreCase(p[0])){
+//							playUrls_hd2.add(url_index_info);
+//						}else if("hd".equalsIgnoreCase(p[0])){
+//							playUrls_hd.add(url_index_info);
+//						}else if("mp4".equalsIgnoreCase(p[0])){
+//							playUrls_mp4.add(url_index_info);
+//						}else{
+//							playUrls_flv.add(url_index_info);;
+//						}
+						playUrls.add(url_index_info);
+					}
+					initFourList();
+					sortPushUrls(mDefination);
+				}
+			}catch (Exception e) {
+				// TODO: handle exception
+			}
+			mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+		}
+		
+	}
+	
+	class getPlayList implements Runnable{
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			try{
+				Log.d(TAG, "getPlayList----> start");
+				if(play_info!=null){
+					String data = DesUtils.decode(Constant.DES_KEY, play_info.getRecivedDonwLoadUrls());
+					Log.d(TAG, "getPlayList--->data:" + data);
+					String[] urls = data.split("\\{mType\\}");
+//					List<URLS_INDEX> list = new ArrayList<URLS_INDEX>();
+					playUrls.clear();
+//					playUrls_flv.clear();
+//					playUrls_hd.clear();
+//					playUrls_hd2.clear();
+//					playUrls_mp4.clear();
+					for(String str : urls){
+						URLS_INDEX url_index_info = new URLS_INDEX();
+						String[] p = str.split("\\{m\\}");
+						if(p.length<2){
+							continue;
+						}
+						url_index_info.defination_from_server = p[0];
+						url_index_info.url = p[1];
+//						if("hd2".equalsIgnoreCase(p[0])){
+//							playUrls_hd2.add(url_index_info);
+//						}else if("hd".equalsIgnoreCase(p[0])){
+//							playUrls_hd.add(url_index_info);
+//						}else if("mp4".equalsIgnoreCase(p[0])){
+//							playUrls_mp4.add(url_index_info);
+//						}else{
+//							playUrls_flv.add(url_index_info);;
+//						}
+						playUrls.add(url_index_info);
+					}
+					initFourList();
+					sortPushUrls(mDefination);
+					mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+				}else{
+					Log.d(TAG, "play_info----> = null");
+					mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+				}
+			}catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+				mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+			}
+		}
+		
+	}
+	
+	private void initFourList(){
+		playUrls_flv.clear();
+		playUrls_hd.clear();
+		playUrls_hd2.clear();
+		playUrls_mp4.clear();
+		for(URLS_INDEX url_index_info:playUrls){
+			if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)){
+				playUrls_hd2.add(url_index_info);
+			}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)){
+				playUrls_hd.add(url_index_info);
+			}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)){
+				playUrls_mp4.add(url_index_info);
+			}else{
+				playUrls_flv.add(url_index_info);;
+			}
+		}
+	}
+	
+	private void sortPushUrls(int defination){
+		
+		for(URLS_INDEX url_index_info:playUrls){
+			switch (defination) {
+			case Constant.DEFINATION_HD2:
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 0;
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 1;
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 2;
+				}else if("flv".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 3;
+				}else{
+					url_index_info.defination = 4;
+				}
+				break;
+			case Constant.DEFINATION_HD:
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 1;
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 0;
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 2;
+				}else if("flv".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 3;
+				}else{
+					url_index_info.defination = 4;
+				}
+				break;
+			case Constant.DEFINATION_MP4:
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 1;
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 2;
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 0;
+				}else if("flv".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 3;
+				}else{
+					url_index_info.defination = 4;
+				}
+				break;
+			case Constant.DEFINATION_FLV:
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 1;
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 2;
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 3;
+				}else if("flv".equalsIgnoreCase(url_index_info.defination_from_server)){
+					url_index_info.defination = 0;
+				}else{
+					url_index_info.defination = 4;
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		if(playUrls.size()>1){
+			Collections.sort(playUrls, new DefinationComparatorIndex());
+		}
+	}
+	
+	class RequestNewUrl implements Runnable{
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			isRequset +=1;	
+			playUrls.clear();
+			//updateXunleiurl
+			String url = null;
+			String url_param = play_info.getPush_url();
+			if(url_param.contains(":")){
+				url_param = URLEncoder.encode(url_param);
+			}
+			if(mProd_type==TYPE_PUSH_BT_EPISODE){
+				if(isOnline){
+					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
+							+ "&id=" + play_info.getPush_id()
+							+ "&md5_code=" + getUmengMd5()
+							+ "&name=" + URLEncoder.encode(mProd_sub_name);
+				}else{
+					if(isRequset==1){
+						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + url_param
+								+ "&id=" + play_info.getPush_id()
+								+ "&md5_code=" + getUmengMd5()
+								+ "&name=" + URLEncoder.encode(mProd_sub_name);
+					}else{
+						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
+								+ "&id=" + play_info.getPush_id()
+								+ "&md5_code=" + getUmengMd5()
+								+ "&name=" + URLEncoder.encode(mProd_sub_name);
+					}
+				}
+			}else{
+				if(isOnline){
+					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
+							+ "&id=" + play_info.getPush_id()
+							+ "&md5_code=" + getUmengMd5();
+				}else{
+					if(isRequset==1){
+						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + url_param
+								+ "&id=" + play_info.getPush_id()
+								+ "&md5_code=" + getUmengMd5();
+					}else{
+						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
+								+ "&id=" + play_info.getPush_id()
+								+ "&md5_code=" + getUmengMd5();
+					}
+				}
+				
+			}
+			Log.d(TAG, "url--->" + url);
+			String response = HttpTools.get(JoyplusMediaPlayerActivity.this, url);
+			Log.d(TAG, "response--->" + response);
+			try {
+				JSONObject data = new JSONObject(response);
+				String reciveData = data.getString("downurl");
+				if(play_info!=null){
+					play_info.setRecivedDonwLoadUrls(reciveData);
+				}
+				String downLoadurls = DesUtils.decode(Constant.DES_KEY, reciveData);
+				Log.d(TAG, "downLoadurls--->" + downLoadurls);
+				List<SubURI> subList = null;
+				if(data.has("subtitle")){
+					Log.d(TAG, data.get("subtitle").toString());
+					if(!"".equals(data.get("subtitle").toString())){
+						JSONArray array_sub = data.getJSONArray("subtitle");
+						subList = new ArrayList<SubURI>();
+						for(int i = 0; i< array_sub.length() ; i++){
+							JSONObject subObj = array_sub.getJSONObject(i);
+							SubURI subInfo = new SubURI();
+							subInfo.setName(subObj.getString("name"));
+							subInfo.setUrl(subObj.getString("url"));
+							subInfo.SubType = SUBTYPE.NETWORK;
+							subList.add(subInfo);
+						}
+					}
+					
+				}
+				play_info.setSubList(subList);
+				String[] urls = downLoadurls.split("\\{mType\\}");
+//				List<URLS_INDEX> list = new ArrayList<URLS_INDEX>();
+				
+//				playUrls_flv.clear();
+//				playUrls_hd.clear();
+//				playUrls_hd2.clear();
+//				playUrls_mp4.clear();
+				for(String str : urls){
+					URLS_INDEX url_index_info = new URLS_INDEX();
+					String[] p = str.split("\\{m\\}");
+					if(p.length<2){
+						continue;
+					}
+					url_index_info.defination_from_server = p[0];
+					url_index_info.url = p[1];
+//					if("hd2".equalsIgnoreCase(p[0])){
+//						playUrls_hd2.add(url_index_info);
+//					}else if("hd".equalsIgnoreCase(p[0])){
+//						playUrls_hd.add(url_index_info);
+//					}else if("mp4".equalsIgnoreCase(p[0])){
+//						playUrls_mp4.add(url_index_info);
+//					}else{
+//						playUrls_flv.add(url_index_info);;
+//					}
+					playUrls.add(url_index_info);
+				}
+				initFourList();
+				sortPushUrls(play_info.getDefination());
+				mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+//				currentPlayUrl = Utils.getUrl(downLoadurls);
+//				currentPlayUrl = Utils.getRedirectUrl(currentPlayUrl);
+//				mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
+			} catch (Exception e) {
+				// TODO: handle exception
+//				mHandler.sendEmptyMessage(MESSAGE_URL_NEXT);
+				e.printStackTrace();
+				mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+			}
+		}
+	}
+	
+	public List<URLS_INDEX> getPlayUrls(){
+		return this.playUrls;
+	}
+	
+	public List<String> getEpisode(){
+		List<String> date = null;
+		switch (mProd_type) {
+		case TYPE_PUSH_BT_EPISODE:
+			date = new ArrayList<String>();
+			for(BTEpisode b:play_info.getBtEpisodes()){
+				date.add(b.getName());
+			}
+			break;
+		case TYPE_XUNLEI_BT_EPISODE:
+			if(mXLLXFileInfArray == null) return date;
+			date = new ArrayList<String>();
+			for(XLLXFileInfo b:mXLLXFileInfArray){
+				date.add(b.file_name);
+			}
+			break;
+		case 2:
+		case 131:
+			date = new ArrayList<String>();
+			for(int i=0; i<m_ReturnProgramView.tv.episodes.length; i++){
+				date.add(m_ReturnProgramView.tv.episodes[i].name);
+			}
+			break;
+		case 3:
+			date = new ArrayList<String>();
+			for(int i=0; i<m_ReturnProgramView.show.episodes.length; i++){
+				date.add(m_ReturnProgramView.show.episodes[i].name);
+			}
+			break;
+		}
+		return date;
+	}
+	
+	public int getCurrentDefination(){
+		return mDefination;
+	}
+	
+	public String getCurrentProdSubName(){
+		return mProd_sub_name;
+	}
+	
+	public void changeDefination(int defination){
+		if(mDefination == defination){
+			return ;
+		}
+		Log.d(TAG, "changeDefination-------->" + defination);
+		lastTime = mVideoView.CurrentMediaInfo.getCurrentTime();
+		InitUI();
+		mDefination = defination;
+		if(mProd_type == TYPE_PUSH){
+			play_info.setDefination(defination);
+		}else if(mProd_type == TYPE_PUSH_BT_EPISODE){
+			play_info.getBtEpisodes().get(mEpisodeIndex).setDefination(defination);
+		}
+		sortPushUrls(mDefination);
+		mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+	}
+	
+	public void changeVideoSize(int type){
+		mScreenManager.setScreenParams(type);
+	}
+	
+	public int getVideoSizeType(){
+		return mScreenManager.getScreenParams();
+	}
+	
+	public void changeEpisode(int index){
+		if(mProd_type == TYPE_PUSH_BT_EPISODE){
+			changeBTEpisode(index);
+		}else if(mProd_type == TYPE_XUNLEI_BT_EPISODE){
+			changeXunleiEpisode(index);
+		}
+	}
+	
+	private void changeXunleiEpisode(int index){
+		if(index<0||mXLLXFileInfArray == null ||index>mXLLXFileInfArray.length||index==mEpisodeIndex){
+			return;
+		}
+		XLLXFileInfo info = mXLLXFileInfArray[index];
+		mProd_sub_name = info.file_name;
+		lastTime = 0;
+		mEpisodeIndex = index;
+		mDefination = Constant.DEFINATION_HD2;
+		InitUI();
+		ResetURLAndSub();
+		updateSourceAndTime();
+		updateName();
+		getXunLeiEpisode();
+	}
+	private void changeBTEpisode(int index){
+		if(index<0||index>play_info.getBtEpisodes().size()||index==mEpisodeIndex){
+			return;
+		}
+		isRequset = 0;
+		BTEpisode bte = play_info.getBtEpisodes().get(index);
+		mProd_sub_name = bte.getName();
+		lastTime = bte.getPlayback_time()*1000;
+		play_info.getBtEpisodes().get(mEpisodeIndex).setPlayback_time((int)(mVideoView.CurrentMediaInfo.getCurrentTime()/1000));
+		play_info.getBtEpisodes().get(mEpisodeIndex).setDuration((int)(mVideoView.CurrentMediaInfo.getTotleTime()/1000));
+		Log.d(TAG, "changeEpisode----lastTime---->" + lastTime);
+		mEpisodeIndex = index;
+		mDefination = bte.getDefination();
+		InitUI();
+		ResetURLAndSub();
+		updateSourceAndTime();
+		updateName();
+		MyApp.pool.execute(new getEpisodePlayUrls());
+	}
+	
+	private void getXunLeiEpisode(){
+		//取list
+		MyApp.pool.execute(new Runnable() {
+			public void run() {
+				XLLXFileInfo xllxFileInfo = null;
+				if(mProd_type == TYPE_XUNLEI){
+					xllxFileInfo = (XLLXFileInfo) app.getmCurrentPlayDetailData().obj;
+				} else {
+					if(TextUtils.isEmpty(mProd_sub_name)) return;
+					mXLLXFileInfArray = (XLLXFileInfo[]) app.getmCurrentPlayDetailData().obj;
+					if(mXLLXFileInfArray == null || mXLLXFileInfArray.length <= 0) return;
+					for(int i=0;i<mXLLXFileInfArray.length;i++){
+						if(mProd_sub_name.equals(mXLLXFileInfArray[i].file_name)){
+							mEpisodeIndex = i;
+							xllxFileInfo = mXLLXFileInfArray[i];
+							break;
+						}
+					}
+				}
+				if(xllxFileInfo != null && !xllxFileInfo.isDir) {
+					ArrayList<VideoPlayUrl> list = 
+							XunLeiLiXianUtil.getLXPlayUrl(JoyplusMediaPlayerActivity.this, xllxFileInfo);
+					mJoyplusSubManager.setSubUri(XunLeiLiXianUtil.
+							getSubtitleList(JoyplusMediaPlayerActivity.this,xllxFileInfo));
+					
+					if(list != null && list.size() > 0) {
+						if(playUrls != null && playUrls.size() > 0)	playUrls.clear();
+						for(int i=0;i<list.size();i++) {
+							VideoPlayUrl videoPlayUrl = list.get(i);
+							Log.i(TAG, "VideoPlayUrl--->" + videoPlayUrl.toString());
+							if(videoPlayUrl != null && videoPlayUrl.playurl != null) {
+								
+								URLS_INDEX url = new URLS_INDEX();
+								url.url = videoPlayUrl.playurl;
+								url.source_from = "XUNLEI";
+								if(videoPlayUrl.isCanDrag){// can drag hd2 hd mp4 
+									if(videoPlayUrl.sharp != null) {
+										int index = videoPlayUrl.sharp.getIndex();
+										switch (index) {
+										case 0:
+											url.defination_from_server ="mp4";
+											break;
+										case 2:
+											url.defination_from_server ="hd";
+											break;
+										case 3:
+											url.defination_from_server ="hd2";
+											break;
+
+										default:
+											break;
+										}
+									}
+								}else {//can't drag flv
+									url.defination_from_server ="flv";
+								}
+								playUrls.add(url);
+							}
+						}
+					}
+				}
+				initFourList();
+				sortPushUrls(mDefination);
+				mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+			}
+		});
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerAd.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerAd.java
new file mode 100644
index 0000000..22059e2
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerAd.java
@@ -0,0 +1,155 @@
+package com.joyplus;
+
+import java.io.File;
+
+import android.media.MediaPlayer;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.VideoView;
+
+import com.joyplus.ad.AdvertManager;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Constant;
+import com.joyplus.tvhelper.utils.Log;
+
+public class JoyplusMediaPlayerAd implements MediaPlayer.OnCompletionListener,
+                                               MediaPlayer.OnPreparedListener{
+	
+	private String TAG = "JoyplusMediaPlayerAd";
+	
+	private JoyplusMediaPlayerActivity mActivity;
+	private VideoView mAdVideoView;
+	private RelativeLayout mLayout;
+	private TextView  mTime;
+	private long Time = 16*1000;
+	private final static long MAXTIME = 16*1000;
+	private AdvertManager mManager;
+	enum ADSTATE{
+		NOAD , PREPARE , PLAYING , FINISH
+	};
+	private ADSTATE mAdState;
+	public void setAdState(ADSTATE adstate){
+		mAdState = adstate;
+	}
+	public ADSTATE getAdState(){
+		return mAdState;
+	}
+	public JoyplusMediaPlayerAd(JoyplusMediaPlayerActivity activity){
+		mActivity = activity;
+		mAdState = ADSTATE.NOAD;
+		mAdVideoView = (VideoView)      mActivity.findViewById(R.id.joyplusmediaplayer_advideoView);
+		mAdVideoView.setOnCompletionListener(this);
+		mAdVideoView.setOnPreparedListener(this);
+		mLayout      = (RelativeLayout) mActivity.findViewById(R.id.joyplusmediaplayer_advideoView_layout);
+		mTime        = (TextView)       mActivity.findViewById(R.id.joyplusmediaplayer_advideoView_time);
+		try {
+			//mManager = new AdvertManager(mActivity, getPUBLISHERID(), true);	
+			mManager = new AdvertManager(mActivity, Constant.PLAYERPACH_ADV_PUBLISHERID, true);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			mManager = null;
+			e.printStackTrace();
+		}
+		UpdateAd();
+	}
+	public void UpdateAd() {
+		// TODO Auto-generated method stub
+		Log.i(TAG," UpdateAd()");
+		new Thread(new Runnable(){
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				if(mManager != null){
+					mManager.UpdateAdvert();
+				}
+			}}
+		).start();		
+	}
+	public boolean isPlaying(){
+		return mLayout.getVisibility()==View.VISIBLE;
+	}
+	public void startAD(){
+//		mAdState = ADSTATE.PLAYING;
+//		if(!CheckAdFile())return;
+//		mLayout.setVisibility(View.VISIBLE);
+//		Time = MAXTIME;
+//		mAdVideoView.setVideoPath(getPlayerUri());
+//		mAdState = ADSTATE.PREPARE;
+//		new Thread(new Runnable(){
+//			@Override
+//			public void run() {
+//				// TODO Auto-generated method stub
+//				ADWait();	
+//				if(mManager != null){
+//					mManager.ReportCount();
+//				}
+//			}			
+//		}).start();
+	}
+	private void ADWait(){
+		long time1 ;
+		long time2 ;
+		while(mAdState != ADSTATE.FINISH){
+			try {
+				time1 = System.currentTimeMillis();
+				Thread.sleep(500);
+				time2 = System.currentTimeMillis();
+				Time -=(time2-time1);
+				CheckTime();
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		mActivity.runOnUiThread(new Runnable(){
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mLayout.setVisibility(View.GONE);
+			}			
+		});	
+		
+	}
+	private void CheckTime() {
+		// TODO Auto-generated method stub
+		if((Time<=0 && mAdState != ADSTATE.FINISH) 
+			||(mActivity.StateOk && mAdState != ADSTATE.FINISH)){
+			mAdVideoView.stopPlayback();
+			mAdState = ADSTATE.FINISH;
+		}
+		if(Time<0)Time = 0;
+		mActivity.runOnUiThread(new Runnable(){
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mTime.setText(String.valueOf(Time/1000));
+			}			
+		});		
+	}
+	private boolean CheckAdFile(){
+		if(mManager == null)return false;		
+		String uri = getPlayerUri();
+		Log.d(TAG,"CheckAdFile() "+uri);
+		if(uri == null)return false;
+		File ad = new File(uri);
+		if(ad.exists() && ad.canRead())return true;
+		mAdState = ADSTATE.NOAD;
+		return false;
+	}
+	public String getPlayerUri(){
+		if(mManager == null)return null;
+		return mManager.getPlayUri(); 
+	}
+	@Override
+	public void onCompletion(MediaPlayer mp) {
+		// TODO Auto-generated method stub
+		mAdState = ADSTATE.FINISH;
+	}
+	@Override
+	public void onPrepared(MediaPlayer mp) {
+		// TODO Auto-generated method stub 
+		mAdVideoView.start();
+		mAdState = ADSTATE.PLAYING;
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerBar.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerBar.java
new file mode 100644
index 0000000..952acae
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerBar.java
@@ -0,0 +1,646 @@
+package com.joyplus;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import android.os.Handler;
+import android.os.Message;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.joyplus.mediaplayer.MediaInfo;
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+import com.joyplus.tvhelper.utils.Utils;
+
+public class JoyplusMediaPlayerBar implements JoyplusMediaPlayerInterface{
+    
+	private boolean Debug = true;
+	private String  TAG   = "JoyplusMediaPlayerBar";
+	private JoyplusMediaPlayerActivity mActivity;
+	private VideoViewController        mBottomBar;
+	private VideoViewTopBar            mTopBar;
+	private View                       mTopMask,mBottomMask;
+
+	private static final int SHOWTIME = 1500;//1.5s
+	
+	private static final int MSG_BASE        = 300;
+	private static final int MSG_SHOWVIEW    = MSG_BASE+1;
+	private static final int MSG_HIDEVIEW    = MSG_BASE+2;
+	//private static final int MSG_UPDATETIME  = MSG_BASE+3;
+	private static final int MSG_REQUESTSHOW = MSG_BASE+4;
+	private static final int MSG_REQUESTHIDE = MSG_BASE+5;
+	private static final int LAYOUT_BAR      = MSG_BASE+7;
+    
+	public static final int  MSG_SHOWANDKEYLONGPRESS = MSG_BASE+8;
+	public static final int  MSG_SHOWANDKEYDOWN      = MSG_BASE+9;
+	public static final int  MSG_SHOWANDHOLD         = MSG_BASE+10;
+	
+	private static final int MSG_UPDATE_SEEKBAR      = MSG_BASE+11;
+	private static final int MSG_UPDATE_SEEKBARMODE  = MSG_BASE+12;
+	/*use to control seekbar*/
+	enum SEEKMODE{
+		NORMAL , LONGPRESS ,PRESS
+	}
+	enum SEEKTYPE{
+		NORMAL , FORWARD , BACKWARD
+	}
+	enum SPEED{
+		X0 ("x0"),X1 ("x1"), X2 ("x2"), X3 ("x3");
+		private String speed;
+		SPEED(String Speed){
+			speed = Speed;
+		}
+		public String toString(){
+			return speed;
+		}
+	}
+	public int getIntSpeed(SPEED speed){
+		if(speed == null)return 0;
+		if(speed == SPEED.X3)return 4;
+		if(speed == SPEED.X2)return 2;
+		if(speed == SPEED.X1)return 1;
+		if(speed == SPEED.X0)return 0;
+		return 0;
+	}
+	public SPEED getNextSpeed(SPEED speed){
+		if(speed == null)return null;
+		if(speed == SPEED.X0){
+			return SPEED.X1;
+		}else if(speed == SPEED.X1){
+			return SPEED.X2;
+		}else if(speed == SPEED.X2){
+			return SPEED.X3;
+		}else if(speed == SPEED.X3){
+			return SPEED.X3;
+		}else{
+			return SPEED.X0;
+		}
+	}
+	public void Init(){
+		mHandler.removeCallbacksAndMessages(null);
+		mBottomBar.Init();
+		mTopBar.Init();
+	}
+	
+	private void setMaskVisible(boolean isVisible){
+		if(!isVisible && mTopMask.getVisibility() == View.VISIBLE)
+			mTopMask.startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+		if(!isVisible && mBottomMask.getVisibility() == View.VISIBLE)
+			mBottomMask.startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+		mTopMask.setVisibility(isVisible?View.VISIBLE:View.GONE);
+		mBottomMask.setVisibility(isVisible?View.VISIBLE:View.GONE);
+	}
+	private Handler mHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case JoyplusMediaPlayerActivity.MSG_MEDIAINFO:
+				mBottomBar.dispatchMessage(msg);
+				break;
+			case MSG_SHOWVIEW:
+				setMaskVisible(true);
+				mTopBar.setVisible(true);
+				mBottomBar.setVisible(true);
+				if(!mBottomBar.SEEKING
+					|| !(mBottomBar.mSeekBarState.mSeekBarType == SEEKTYPE.NORMAL))
+				      setVisible(false,SHOWTIME);
+				break;
+			case MSG_HIDEVIEW:				
+				mTopBar.setVisible(false);
+				mBottomBar.setVisible(false);
+				setMaskVisible(false);
+				mHandler.removeCallbacksAndMessages(null);
+				break;
+			case MSG_REQUESTSHOW:
+				mHandler.removeCallbacksAndMessages(null);
+				setVisible(true,500);
+				break;
+			case MSG_REQUESTHIDE:
+				mHandler.removeCallbacksAndMessages(null);
+				setVisible(false,0);
+				break;
+			case JoyplusMediaPlayerActivity.MSG_UPDATEPLAYERINFO:
+				mTopBar.UpdatePlayerInfo();
+				break;
+			case MSG_SHOWANDKEYLONGPRESS:
+			case MSG_SHOWANDKEYDOWN:
+				mHandler.removeCallbacksAndMessages(null);
+				setMaskVisible(true);
+				mTopBar.setVisible(true);
+				mBottomBar.setVisible(true);
+				mBottomBar.dispatchMessage(msg);
+				break;
+			case MSG_SHOWANDHOLD:
+				setMaskVisible(true);
+				mTopBar.setVisible(true);
+				mBottomBar.setVisible(true);
+				mHandler.removeCallbacksAndMessages(null);
+				break;
+			case MSG_UPDATE_SEEKBAR:
+				mBottomBar.UpdateSeekBarUI();
+				break;
+			case MSG_UPDATE_SEEKBARMODE:
+				if(mBottomBar.mSeekBarState != null){
+					mBottomBar.mSeekBarState.notifySeekBarMode();
+				}
+				break;
+			}
+		}
+	};
+
+	public JoyplusMediaPlayerBar(JoyplusMediaPlayerActivity context){
+		mActivity  = context;
+		mBottomBar = new VideoViewController();
+		mTopBar    = new VideoViewTopBar();
+		mTopMask   = context.findViewById(R.id.mediacontroller_mask_top);
+		mBottomMask= context.findViewById(R.id.mediacontroller_mask_bottom);
+		setVisible(true,0);
+	}
+	private void setVisible(boolean visible,int delay){
+		Message m ;
+		if(visible)
+			m=Message.obtain(mHandler,MSG_SHOWVIEW,"MSG_SHOWVIEW");
+		else
+			m=Message.obtain(mHandler,MSG_HIDEVIEW,"MSG_HIDEVIEW");
+		mHandler.removeCallbacksAndMessages("MSG_SHOWVIEW");
+		mHandler.removeCallbacksAndMessages("MSG_HIDEVIEW");
+		mHandler.sendMessageDelayed(m,delay);
+	}
+	
+	/**
+	 * for Mask top and bottom
+	 * @author Administrator
+	 *
+	 */
+	
+	
+
+	/*add by Jas@20130812 for TopBar in JoyPlus VideoView
+	 * it use to display Media name , media resolution .current time
+	 * */
+	private class VideoViewTopBar {
+
+		private boolean     Debug = true;
+		private String      TAG   = "VideoViewTopBar";
+
+		private ImageView   MediaResolution;
+		private TextView    MediaName;
+		private TextView    Click;
+		private LinearLayout Layout; 
+		public void Init(){
+			Layout.setVisibility(View.VISIBLE);
+		};
+		public void UpdatePlayerInfo() {
+			// TODO Auto-generated method stub
+			if(Layout.getVisibility() == View.VISIBLE){
+				 InitView();
+			}
+		}
+		public VideoViewTopBar(){
+			InitResource();
+		}
+		private Runnable UpdateTime = new Runnable(){
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				if(Layout.getVisibility() == View.VISIBLE)InitView();
+			}
+		};
+		public void setVisible(boolean Visiblility){
+			if(Debug)Log.d(TAG,"setVisibility("+Visiblility+")");
+			if(!Visiblility && Layout.getVisibility()==View.VISIBLE){
+				Layout.startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+			}
+			Layout.setVisibility(Visiblility?View.VISIBLE:View.GONE);
+			if(Layout.getVisibility() == View.VISIBLE){
+				InitView();
+				mHandler.removeCallbacks(UpdateTime);
+				mHandler.postDelayed(UpdateTime, 1000);
+			}else{
+				mHandler.removeCallbacks(UpdateTime);
+			}
+		}
+
+		private void InitView() {
+			// TODO Auto-generated method stub
+			if(Layout.getVisibility() != View.VISIBLE)return;
+			Date date = new Date();
+			SimpleDateFormat format = new SimpleDateFormat("H:mm");
+			Click.setText(format.format(date));
+			MediaName.setText(JoyplusMediaPlayerActivity.mInfo.mPlayerName);
+			
+			if("hd2".equals(JoyplusMediaPlayerActivity.mInfo.mQua)){
+				MediaResolution.setImageResource(R.drawable.icon_def_hd2);
+				MediaResolution.setVisibility(View.VISIBLE);
+			}else if("hd".equals(JoyplusMediaPlayerActivity.mInfo.mQua)){
+				MediaResolution.setImageResource(R.drawable.icon_def_hd);
+				MediaResolution.setVisibility(View.VISIBLE);
+			}else if("mp4".equals(JoyplusMediaPlayerActivity.mInfo.mQua)){
+				MediaResolution.setImageResource(R.drawable.icon_def_mp4);
+				MediaResolution.setVisibility(View.VISIBLE);
+			}else if("flv".equals(JoyplusMediaPlayerActivity.mInfo.mQua)){
+				MediaResolution.setImageResource(R.drawable.icon_def_flv);
+				MediaResolution.setVisibility(View.VISIBLE);
+			}else{
+				MediaResolution.setVisibility(View.GONE);
+			}
+		}
+
+		private void InitResource() {
+			// TODO Auto-generated method stub
+			Layout          = (LinearLayout)   mActivity.findViewById(R.id.mediacontroller_topbar);
+			MediaName       = (TextView)       mActivity.findViewById(R.id.mediacontroller_topbar_playname);
+			MediaResolution = (ImageView)      mActivity.findViewById(R.id.mediacontroller_topbar_resolution);
+			Click           = (TextView)       mActivity.findViewById(R.id.mediacontroller_topbar_time);
+			setVisible(true);
+		}
+	}
+
+	/*Add by Jas@20130813 for add the BottomBar in JoyPlus VideoView 
+	 * it depends on the MediaInfo which report from JoyPlusMediaPlayerStateTrack
+	 * and depends on the layout of joyplusvideoview.xml 
+	 * */
+	private class VideoViewController {
+        
+		private boolean     Debug = true;
+		private String      TAG   = "VideoViewController";
+        private boolean        SEEKING = false;
+		private TextView       CurrentTimeView;
+		private TextView       TotalTimeView;
+		private SeekBar        SeekBar;
+		private RelativeLayout Layout_Time;
+		private RelativeLayout Layout_seek;
+		private RelativeLayout Layout_Speed;
+		private TextView       SpeedView;
+	    private int            DefaultSpeedSpace = 1000;
+	    private int OFFSET = 33;
+		private int seekBarWidthOffset  = 40;
+		private SeekBarState   mSeekBarState;
+		private long           LongPressStartTime = 0;
+		private class SeekBarState {
+			private SEEKMODE mSeekBarMode;
+			private SEEKTYPE mSeekBarType;
+			private SPEED    mSpeed;
+			private boolean  StopFlog = false;
+			private boolean  Notify   = false;
+			public String toString(){
+				StringBuffer ap = new StringBuffer();
+				ap.append("mSeekBarMode="+mSeekBarMode.toString()+"\n");
+			    ap.append("mSeekBarType="+mSeekBarType.toString()+"\n");
+			    ap.append("mSpeed="+mSpeed.toString()+"\n");
+			    ap.append("StopFlog="+StopFlog);
+			    return ap.toString();				  
+			}
+			public SeekBarState(){
+				InitSpeed();
+				this.StopFlog = false;
+			}
+			public void InitSpeed(){
+				mSeekBarMode   = SEEKMODE.NORMAL;
+				mSeekBarType   = SEEKTYPE.NORMAL;
+				mSpeed         = SPEED.X0;
+			}
+			private void notifySeekBarMode(){
+				if(Notify)return;
+				if(mSeekBarType != SEEKTYPE.NORMAL){
+					Notify  = true;
+					SEEKING = false;
+					if(mSeekBarMode == SEEKMODE.LONGPRESS){
+						UpdateLongPress();
+					}
+					UpdateSeekUI();
+					Notify    = false;
+					mHandler.removeMessages(MSG_UPDATE_SEEKBARMODE);
+					mHandler.sendEmptyMessageDelayed(MSG_UPDATE_SEEKBARMODE, 10);
+				}else{
+					InitSpeed();
+					mHandler.removeMessages(MSG_UPDATE_SEEKBARMODE);
+					Notify    = false;
+				}	
+				
+			}
+			private void UpdateLongPress(){
+				if(mSeekBarMode != SEEKMODE.LONGPRESS)return;
+				long DelayTime = System.currentTimeMillis()-LongPressStartTime;
+				if(DelayTime>5*500)
+					mSpeed = SPEED.X3;
+				else if(DelayTime<2*500)
+					mSpeed = SPEED.X1; 
+				else
+					mSpeed = SPEED.X2;
+			}
+			public void UpdateSeekUI(){
+				mHandler.removeMessages(MSG_UPDATE_SEEKBAR);
+                mHandler.sendEmptyMessage(MSG_UPDATE_SEEKBAR);
+			}
+		}
+		public boolean UpdateUIRunnableRunning = false;
+		public void UpdateSeekBarUI(){ 
+			if(UpdateUIRunnableRunning)return;			
+			if(mSeekBarState.mSeekBarType == SEEKTYPE.NORMAL) return;
+			UpdateUIRunnableRunning = true;
+			int position =0;
+			if(mSeekBarState.mSeekBarType == SEEKTYPE.FORWARD)
+			    position  = SeekBar.getProgress()+getSpeedSpace()*getIntSpeed(mSeekBarState.mSpeed);
+			else if(mSeekBarState.mSeekBarType == SEEKTYPE.BACKWARD)
+				position  = SeekBar.getProgress()-getSpeedSpace()*getIntSpeed(mSeekBarState.mSpeed);
+			if(position<0)position = 0;
+			if(position>SeekBar.getMax())position = SeekBar.getMax();
+			SeekBar.setProgress(position);
+			UpdateProgress(null);
+			UpdateUIRunnableRunning = false;
+		}
+		public void Init(){
+			SeekBar.setEnabled(false);
+			InitSeekBarState();
+			setVisible(true);
+			UpdateProgress(null);
+			Layout_Time.setVisibility(View.VISIBLE);
+		}
+		private void InitSeekBarState(){
+			if(mSeekBarState != null){
+				mSeekBarState.InitSpeed();
+				return;
+			}
+			mSeekBarState = new SeekBarState();
+		}		
+		private int getSpeedSpace(){
+			int Space = SeekBar.getMax();
+			if(Space == 0)
+				return 0;
+			else 
+				return Space/DefaultSpeedSpace;
+		}
+		public void dispatchMessage(Message m){
+			switch(m.what){
+			case JoyplusMediaPlayerActivity.MSG_MEDIAINFO:
+				 if(Layout_Time.getVisibility() == View.VISIBLE){
+					 if(mSeekBarState.mSeekBarMode != SEEKMODE.NORMAL)return;
+					 if(SEEKING && mActivity.mVideoView.hasMediaInfoChange()
+							 && mSeekBarState.mSeekBarMode == SEEKMODE.NORMAL){
+						 SEEKING = false;
+						 mHandler.sendEmptyMessage(MSG_REQUESTHIDE);
+					 }
+					 UpdateProgress(((MediaInfo) m.obj).CreateMediaInfo());
+				 }
+				 break;
+			case MSG_SHOWANDKEYLONGPRESS:
+				JoyplusonKeyLongPress((Integer) m.obj,null);
+				break;
+			case MSG_SHOWANDKEYDOWN:
+				JoyplusonKeyDown((Integer) m.obj,null);
+				break;
+			}
+		}
+		public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event){
+			Log.d("KeyCode","Bar JoyplusonKeyLongPress keyCode="+keyCode);
+			if(Layout_Time.getVisibility() == View.VISIBLE && (mActivity.getPlayer()!=null)){
+				Log.d("KeyCode","mSeekBarState--->"+mSeekBarState.toString());
+				SEEKING = false;
+				switch(keyCode){
+				case KeyEvent.KEYCODE_DPAD_LEFT:
+					LongPressStartTime         = System.currentTimeMillis();
+					mSeekBarState.mSeekBarMode = SEEKMODE.LONGPRESS;
+					mSeekBarState.mSpeed = SPEED.X1;						
+					mSeekBarState.mSeekBarType = SEEKTYPE.BACKWARD;					
+					mSeekBarState.notifySeekBarMode();
+					return true;
+				case KeyEvent.KEYCODE_DPAD_RIGHT:
+					LongPressStartTime         = System.currentTimeMillis();
+					mSeekBarState.mSeekBarMode = SEEKMODE.LONGPRESS;
+					mSeekBarState.mSpeed = SPEED.X1;
+					mSeekBarState.mSeekBarType = SEEKTYPE.FORWARD;
+					mSeekBarState.notifySeekBarMode();
+					return true;
+				}
+			}
+			return false;
+		}
+		public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+			// TODO Auto-generated method stub
+			Log.d("KeyCode","Bar JoyplusonKeyDown keyCode="+keyCode);
+			if(Layout_Time.getVisibility() == View.VISIBLE && (mActivity.getPlayer()!=null)){
+				Log.d("KeyCode","mSeekBarState--->"+mSeekBarState.toString());
+				SEEKING = false;
+				switch(keyCode){
+				case KeyEvent.KEYCODE_DPAD_LEFT:
+					if(mSeekBarState.mSeekBarMode == SEEKMODE.LONGPRESS){
+						JoyplusonKeyDown(KeyEvent.KEYCODE_DPAD_CENTER,null);
+						return true;
+					}else{
+						mSeekBarState.mSeekBarMode = SEEKMODE.PRESS;
+						if(mSeekBarState.mSeekBarType == SEEKTYPE.FORWARD){
+							if(mSeekBarState.mSpeed == SPEED.X1)mSeekBarState.mSeekBarType = SEEKTYPE.BACKWARD;
+							mSeekBarState.mSpeed = SPEED.X1;
+						}else if(mSeekBarState.mSpeed == SPEED.X3)return true;
+						else {mSeekBarState.mSpeed = getNextSpeed(mSeekBarState.mSpeed);
+						    mSeekBarState.mSeekBarType = SEEKTYPE.BACKWARD;}
+						mSeekBarState.notifySeekBarMode();
+					}
+					return true;
+				case KeyEvent.KEYCODE_DPAD_RIGHT:
+					if(mSeekBarState.mSeekBarMode == SEEKMODE.LONGPRESS){
+						JoyplusonKeyDown(KeyEvent.KEYCODE_DPAD_CENTER,null);
+						return true;
+					}else{
+						mSeekBarState.mSeekBarMode = SEEKMODE.PRESS;
+						if(mSeekBarState.mSeekBarType == SEEKTYPE.BACKWARD){
+							if(mSeekBarState.mSpeed == SPEED.X1)mSeekBarState.mSeekBarType = SEEKTYPE.FORWARD;
+							mSeekBarState.mSpeed = SPEED.X1;
+						}else if(mSeekBarState.mSpeed == SPEED.X3)return true;
+						else {mSeekBarState.mSpeed = getNextSpeed(mSeekBarState.mSpeed);
+						mSeekBarState.mSeekBarType = SEEKTYPE.FORWARD;}
+						mSeekBarState.notifySeekBarMode();
+					}
+					return true;
+				case KeyEvent.KEYCODE_DPAD_CENTER:
+				case KeyEvent.KEYCODE_ENTER:
+					if(mSeekBarState.mSeekBarType != SEEKTYPE.NORMAL){
+						int progress = SeekBar.getProgress();						
+						if(!(progress == SeekBar.getMax())){							
+							mHandler.removeCallbacksAndMessages(null);		
+							mActivity.getPlayer().SeekVideo(progress);
+							SEEKING = true;
+							InitSeekBarState();
+						}else {
+							InitSeekBarState();
+							UpdateProgress(JoyplusMediaPlayerVideoView.CurrentMediaInfo);
+							mHandler.removeCallbacksAndMessages(null);
+							mHandler.sendEmptyMessage(MSG_REQUESTSHOW);
+						}
+						return true;
+					}
+					return false;
+				case KeyEvent.KEYCODE_BACK:
+				case 111://the keycode was be change to 111 ,but don't know where change
+					if(mSeekBarState.mSeekBarType != SEEKTYPE.NORMAL){
+						InitSeekBarState();
+						mSeekBarState.notifySeekBarMode();
+						UpdateProgress(JoyplusMediaPlayerVideoView.CurrentMediaInfo);
+						mHandler.removeCallbacksAndMessages(null);
+						mHandler.sendEmptyMessage(MSG_REQUESTSHOW);
+						return true;
+					}
+				case KeyEvent.KEYCODE_MENU:
+					if(mSeekBarState.mSpeed!=SPEED.X0){
+						return true;
+					}
+				}
+			} 
+			return false;
+		} 
+		
+		public VideoViewController(){
+			InitResource();
+		}
+		public void setVisible(boolean Visiblility){
+			if(Debug)Log.d(TAG,"setVisibility("+Visiblility+")");
+			if(!Visiblility && Layout_Time.getVisibility()==View.VISIBLE)
+				Layout_Time.startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+			if(!Visiblility && Layout_seek.getVisibility()==View.VISIBLE)
+				Layout_seek.startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+			Layout_Time.setVisibility(Visiblility?View.VISIBLE:View.GONE);
+			Layout_seek.setVisibility(Visiblility?View.VISIBLE:View.GONE);
+			if(Visiblility && mSeekBarState.mSeekBarType == SEEKTYPE.NORMAL)
+				UpdateProgress(JoyplusMediaPlayerVideoView.CurrentMediaInfo);	
+			if(!Visiblility && mSeekBarState!=null)InitSeekBarState();
+		}
+		private void InitResource(){
+			if(Debug)Log.d(TAG,"VideoViewController InitResource()");
+			Layout_Time       = (RelativeLayout)mActivity.findViewById(R.id.mediacontroller_bottombar);
+			CurrentTimeView   = (TextView)      mActivity.findViewById(R.id.mediacontroller_bottombar_current_time);
+			TotalTimeView     = (TextView)      mActivity.findViewById(R.id.mediacontroller_bottombar_total_time);
+			SeekBar           = (SeekBar)       mActivity.findViewById(R.id.mediacontroller_bottombar_seekbar);
+			Layout_seek       = (RelativeLayout)mActivity.findViewById(R.id.mediacontroller_bottombar_seek);
+			Layout_Speed      = (RelativeLayout)mActivity.findViewById(R.id.mediacontroller_bottombar_time_fast);
+			SpeedView         = (TextView)      mActivity.findViewById(R.id.mediacontroller_bottombar_time_fasttext);
+			SeekBar.setEnabled(false);			
+		}
+		public void UpdateProgress(MediaInfo info){
+			if(Layout_seek.getVisibility() != View.VISIBLE)return;
+			if(mSeekBarState.mSeekBarType == SEEKTYPE.BACKWARD || mSeekBarState.mSeekBarType == SEEKTYPE.FORWARD){
+				Layout_Speed.setVisibility(View.VISIBLE);
+				if(mSeekBarState.mSeekBarType == SEEKTYPE.FORWARD)
+					Layout_Speed.setBackgroundResource(R.drawable.play_time_right);
+				else if(mSeekBarState.mSeekBarType == SEEKTYPE.BACKWARD)
+					Layout_Speed.setBackgroundResource(R.drawable.play_time_left);
+				CurrentTimeView.setText(getTimeString(SeekBar.getProgress()));
+				SpeedView.setText(mSeekBarState.mSpeed.toString());
+				updateSeekBar(null);
+				return;
+			}
+			if(mSeekBarState.mSeekBarType != SEEKTYPE.NORMAL)return;
+			Layout_Speed.setVisibility(View.GONE);
+			if(SEEKING)return;
+			if(info != null){
+			    if(info.getState() == STATE.MEDIA_STATE_PLAYING
+						||info.getState() == STATE.MEDIA_STATE_INITED){
+					CurrentTimeView.setText(getTimeString((int)info.getCurrentTime()));
+					if(info.getTotleTime()<=0){
+						TotalTimeView.setText("--:--");
+					}else{
+						TotalTimeView.setText(getTimeString((int)info.getTotleTime()));
+					}					
+					updateSeekBar(info);
+				}
+			}else{
+				CurrentTimeView.setText(getTimeString(0));
+				TotalTimeView.setText("--:--");
+				SeekBar.setMax(100);
+				SeekBar.setProgress(0);
+				updateSeekBar(null);
+			}
+		}
+		private void updateSeekBar(MediaInfo info){		
+			if (info != null && (info.getState().toInt()>=STATE.MEDIA_STATE_INITED.toInt()) && mSeekBarState.mSeekBarType == SEEKTYPE.NORMAL){
+				SeekBar.setMax((int) info.getTotleTime());
+				SeekBar.setProgress((int) info.getCurrentTime());
+			}else if(info == null && mSeekBarState.mSeekBarType == SEEKTYPE.NORMAL){
+				SeekBar.setMax(100);
+				SeekBar.setProgress(0);
+			}
+			UpdateSeekTime();
+		}
+		private void UpdateSeekTime(){
+			RelativeLayout.LayoutParams parms = new RelativeLayout.LayoutParams(
+					RelativeLayout.LayoutParams.WRAP_CONTENT,
+					RelativeLayout.LayoutParams.WRAP_CONTENT);
+			parms.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, RelativeLayout.TRUE);	
+			if (SeekBar.getProgress()>0){
+				double mLeft = (double) SeekBar.getProgress() / SeekBar.getMax()* 
+						(SeekBar.getMeasuredWidth() - Utils.getStandardValue(mActivity, seekBarWidthOffset)) + Utils.getStandardValue(mActivity, OFFSET);
+				parms.leftMargin = (int) mLeft;
+			}else{
+				parms.leftMargin = Utils.getStandardValue(mActivity, OFFSET);
+			}
+			parms.bottomMargin = Utils.getStandardValue(mActivity,(20 + 10));
+			Layout_Time.setLayoutParams(parms);
+		}
+		private String getTimeString(int time){
+			if(time<0)time = 0;
+			StringBuffer sb = new StringBuffer();
+			time/=1000;
+	        sb.append(getString(time/(60*60)));
+	        sb.append(":");
+	        time%=(60*60);
+	        sb.append(getString(time/60));
+	        sb.append(":");
+	        time%=60;
+	        sb.append(getString(time));
+	        return sb.toString();
+		}
+		private String getString(int time){
+			StringBuffer sb = new StringBuffer();
+			sb.append(time/10).append(time%10);
+			return sb.toString();
+		}
+	}
+
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		mHandler.dispatchMessage(msg);
+		return false;
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(mBottomBar.Layout_Time.getVisibility()== View.VISIBLE){
+			if(mBottomBar.JoyplusonKeyDown(keyCode, event)){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public void JoyplussetVisible(boolean visible,int layout) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setVisible("+visible+")");
+		setVisible(visible,0);
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return LAYOUT_BAR;
+	}
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(mBottomBar.Layout_Time.getVisibility()== View.VISIBLE){
+			if(mBottomBar.JoyplusonKeyLongPress(keyCode, event)){
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerInterface.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerInterface.java
new file mode 100644
index 0000000..859d1f5
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerInterface.java
@@ -0,0 +1,20 @@
+package com.joyplus;
+
+import android.os.Message;
+import android.view.KeyEvent;
+
+/*define by Jas@20130813 for control layout in joyplusvideoview.xml*/
+public interface JoyplusMediaPlayerInterface {
+       
+	  boolean JoyplusdispatchMessage(Message msg);
+	  
+	  boolean JoyplusonKeyDown(int keyCode, KeyEvent event);
+	  
+	  boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event);
+	  
+	  //boolean JoyplusonKeyUp(int keyCode, KeyEvent event);
+	  
+	  void    JoyplussetVisible(boolean visible,int layout);
+	  
+	  int     JoyplusgetLayout();
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMenuDialog.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMenuDialog.java
new file mode 100644
index 0000000..9822907
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMenuDialog.java
@@ -0,0 +1,505 @@
+package com.joyplus;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.AlertDialog;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils.TruncateAt;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.widget.AbsListView.LayoutParams;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerScreenManager;
+import com.joyplus.sub.JoyplusSubManager;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.entity.URLS_INDEX;
+import com.joyplus.tvhelper.utils.Constant;
+import com.joyplus.tvhelper.utils.Log;
+import com.joyplus.tvhelper.utils.Utils;
+
+public class JoyplusMediaPlayerMenuDialog extends AlertDialog implements OnItemClickListener {
+
+	private static final String TAG = "JoyplusMediaPlayerMenuDialog";
+	private JoyplusMediaPlayerActivity mContext;
+	private static final int MAX = 3;
+	private int MIN = 0;
+	
+//	private String[] list1 = {"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111","222222222222222","33333333333333333","44444444444444","555555555555555555555555555555555555","222222222222222","33333333333333333","44444444444444","555555555555555555555555555555555555"};
+//	private String[] list3 = {"超清","高清","标清","普清"};
+//	private String[] list2 = {"字幕关","字幕1","字幕2","字幕3"};
+//	private String[] list4 = {"全屏","4:3","自适应"};
+	
+	private List<String> list_juji;
+	private List<String> list_zimu;
+	private List<Integer> list_definition;
+	private List<Integer> list_size;
+	private Map<Integer, Integer> selectionPosions = new HashMap<Integer, Integer>();
+	
+	private ListView list;
+	private MyAdapter adapter;
+	private ImageView bg_image;
+	private ImageView bg_title_selceted;
+	private TextView title_xuanji;
+	private TextView title_zimu;
+	private TextView title_definition;
+	private TextView title_size;
+	private TextView selectedTitle;
+	
+	private int title_selecet_index = 0;
+	
+	private Handler mHandler = new Handler();
+	
+	public JoyplusMediaPlayerMenuDialog(JoyplusMediaPlayerActivity context) {
+		super(context,R.style.Transparent);
+		// TODO Auto-generated constructor stub
+		mContext = context;		
+	}	
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+		this.setContentView(R.layout.player_menu_dialog);
+		findViews();
+//		initView();
+	}
+	
+	private void findViews(){
+		list = (ListView) findViewById(R.id.list_choice);
+		bg_image = (ImageView) findViewById(R.id.highlight_bg);
+		bg_image.setVisibility(View.INVISIBLE);
+		bg_title_selceted = (ImageView) findViewById(R.id.title_selected_background);
+		title_xuanji = (TextView) findViewById(R.id.title_xuanji);
+		title_zimu = (TextView) findViewById(R.id.title_zimu);
+		title_definition = (TextView) findViewById(R.id.title_definition);
+		title_size = (TextView) findViewById(R.id.title_size);
+		list.setOnItemClickListener(this);
+	}
+	
+	private void initView(){
+		Log.d(TAG, "initView called------------------>");
+		if(selectedTitle!=null){
+			selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+			selectedTitle.setTextSize(25);
+		}
+		MIN = list_juji!=null?0:1;
+		title_selecet_index = MIN;
+		updateTitleSelceted();
+		if(MIN == 0){
+			title_xuanji.setTextSize(35);
+			title_xuanji.setPadding(0, 0, 0, 0);
+			selectedTitle = title_xuanji;
+		}else{
+			title_zimu.setTextSize(35);
+			title_zimu.setPadding(0, 0, 0, 0);
+			selectedTitle = title_zimu;
+			title_xuanji.setVisibility(View.GONE);
+		}
+		adapter = new MyAdapter();
+		list.setAdapter(adapter);
+		list.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				// TODO Auto-generated method stub
+				Log.d(TAG, "top--------->" + (view.getTop()-Utils.getStandardValue(mContext, 10)));
+				Log.d(TAG, "bottom----------------->"+(view.getBottom()+Utils.getStandardValue(mContext, 45)));
+				if(position>=0){
+					bg_image.setVisibility(View.VISIBLE);
+					bg_image.layout(bg_image.getLeft(), view.getTop()-Utils.getStandardValue(mContext, 10), 
+							bg_image.getRight(), view.getBottom()+Utils.getStandardValue(mContext, 45));
+				}else{
+					bg_image.setVisibility(View.INVISIBLE);
+				}
+				if(title_selecet_index == 3){
+					if(list_size.get(position)!=mContext.getVideoSizeType()){
+						mContext.changeVideoSize(list_size.get(position));
+					}
+				}
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+			}
+		});
+		list.setOnKeyListener(new View.OnKeyListener() {
+			
+			@Override
+			public boolean onKey(View v, int keyCode, KeyEvent event) {
+				// TODO Auto-generated method stub
+				if(keyCode == KeyEvent.KEYCODE_DPAD_LEFT&& event.getAction() == KeyEvent.ACTION_UP){
+					title_selecet_index -= 1;
+					if(title_selecet_index<MIN){
+						title_selecet_index = MIN;
+					}else{
+						updateTitleSelceted();
+						adapter = new MyAdapter();
+						list.setAdapter(adapter);
+						list.setSelection(selectionPosions.get(title_selecet_index));
+					}
+					return true;
+				}else if(keyCode == KeyEvent.KEYCODE_DPAD_RIGHT&&event.getAction() == KeyEvent.ACTION_UP){
+					title_selecet_index += 1;
+					if(title_selecet_index>MAX){
+						title_selecet_index = MAX;
+					}else{
+						updateTitleSelceted();
+						adapter = new MyAdapter();
+						list.setAdapter(adapter);
+						list.setSelection(selectionPosions.get(title_selecet_index));
+					}
+					return true;
+				}else if(keyCode == KeyEvent.KEYCODE_MENU&&event.getAction() == KeyEvent.ACTION_UP){
+					dismiss();
+					return true;
+				}
+				return false;
+			}
+		});
+		
+		mHandler.postDelayed(new Runnable() {
+			
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				list.setSelection(selectionPosions.get(title_selecet_index));
+			}
+		}, 150);
+//		list.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+//			
+//			@Override
+//			public void onFocusChange(View v, boolean hasFocus) {
+//				// TODO Auto-generated method stub
+//				if(hasFocus){
+//					list.setSelection(selectionPosions.get(title_selecet_index));
+//					Log.d(TAG, "requst  hasFocus ------------->");
+//				}
+//			}
+//		});
+	}
+	
+	class MyAdapter extends BaseAdapter{
+
+		@Override
+		public int getCount() {
+			// TODO Auto-generated method stub
+			int count = 0;
+			switch (title_selecet_index) {
+			case 0:
+				count = list_juji.size();
+				break;
+			case 1:
+				count = list_zimu.size();
+				break;
+			case 2:
+				count = list_definition.size();
+				break;
+			case 3:
+				count = list_size.size();
+				break;
+			}
+			return count;
+		}
+
+		@Override
+		public Object getItem(int position) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public long getItemId(int position) {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			// TODO Auto-generated method stub
+			TextView view;
+			if(convertView == null){
+				view = new TextView(mContext);
+				LayoutParams layoutParams = new LayoutParams(parent.getWidth(), Utils.getStandardValue(mContext, 70));
+				view.setLayoutParams(layoutParams);
+				view.setGravity(Gravity.CENTER);
+				view.setTextColor(Color.WHITE);
+				view.setTextSize(25);
+				view.setSingleLine(true);
+				view.setEllipsize(TruncateAt.MARQUEE);
+			}else{
+				view = (TextView) convertView;
+			}
+			if(title_selecet_index == 0){
+				view.setGravity(Gravity.LEFT|Gravity.CENTER_VERTICAL);
+				view.setPadding(Utils.getStandardValue(mContext, 35), 0, Utils.getStandardValue(mContext, 35), 0);
+			}else{
+				view.setGravity(Gravity.CENTER);
+				view.setPadding(0, 0, 0, 0);
+			}
+			switch (title_selecet_index) {
+			case 0:
+				view.setText(list_juji.get(position));
+				break;
+			case 1:
+				view.setText(list_zimu.get(position));
+				break;
+			case 2:
+				switch (list_definition.get(position)) {
+				case Constant.DEFINATION_HD2:
+					view.setText("超    清");
+					break;
+				case Constant.DEFINATION_HD:
+					view.setText("高    清");
+					break;
+				case Constant.DEFINATION_MP4:
+					view.setText("标    清");
+					break;
+				case Constant.DEFINATION_FLV:
+					view.setText("流    畅");
+					break;
+				}
+				break;
+			case 3:
+				switch (list_size.get(position)) {
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL:
+					view.setText("全    屏");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9:
+					view.setText("16 : 9");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3:
+					view.setText("4 : 3");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL:
+					view.setText("自 适 应");
+					break;
+				}
+				break;
+			}
+			return view;
+		}
+	}
+	
+	private void updateTitleSelceted(){
+		MarginLayoutParams p = (MarginLayoutParams) bg_title_selceted.getLayoutParams();
+		p.setMargins(Utils.getStandardValue(mContext, 15)+(title_selecet_index-MIN)*title_zimu.getWidth(), p.topMargin, 
+				p.rightMargin, p.bottomMargin);
+		bg_title_selceted.setLayoutParams(p);
+//		bg_title_selceted.layout(15+(title_selecet_index-MIN)*title_xuanji.getWidth(), 
+//				bg_title_selceted.getTop(), 
+//				15+(title_selecet_index-MIN)*title_xuanji.getWidth()+bg_title_selceted.getWidth(),
+//				bg_title_selceted.getBottom());
+		switch (title_selecet_index) {
+		case 0:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_xuanji.setPadding(0, 0, 0, 0);
+			title_xuanji.setTextSize(35);
+			selectedTitle = title_xuanji;
+			break;
+		case 1:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_zimu.setPadding(0, 0, 0, 0);
+			title_zimu.setTextSize(35);
+			selectedTitle = title_zimu;
+			break;
+		case 2:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			
+			title_definition.setPadding(0, 0, 0, 0);
+			title_definition.setTextSize(35);
+			selectedTitle = title_definition;
+			break;
+		case 3:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_size.setPadding(0, 0, 0, 0);
+			title_size.setTextSize(35);
+			selectedTitle = title_size;
+			break;
+		}
+	}
+
+	public void init() {
+		// TODO Auto-generated method stub
+		initLists();
+//		if(findViewById(R.id.title_definition)!=null){
+//			initView();
+//		}
+	}
+	
+	@Override
+	public void onAttachedToWindow() {
+		// TODO Auto-generated method stub
+		super.onAttachedToWindow();
+		initView();
+	}
+	
+	private void initLists(){
+		
+		selectionPosions.clear();
+		
+		list_juji = mContext.getEpisode();
+		if(list_juji!=null){
+			int prod_Sub_index = list_juji.indexOf(mContext.getCurrentProdSubName());
+			if(prod_Sub_index<0){
+				selectionPosions.put(0, 0);
+			}else{
+				selectionPosions.put(0, prod_Sub_index);
+			}
+		}else{
+			selectionPosions.put(0, 0);
+		}
+		
+		list_definition = new ArrayList<Integer>();
+		list_zimu = new ArrayList<String>();
+		//清晰度
+		List<URLS_INDEX> playUrls = mContext.getPlayUrls();
+		JoyplusSubManager subManager = (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
+		if(playUrls!=null){
+			for(URLS_INDEX url_index_info:playUrls){
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_HD2)){
+					list_definition.add(Constant.DEFINATION_HD2);
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_HD)){
+					list_definition.add(Constant.DEFINATION_HD);
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_MP4)){
+					list_definition.add(Constant.DEFINATION_MP4);
+				}else if(!list_definition.contains(Constant.DEFINATION_FLV)){
+					list_definition.add(Constant.DEFINATION_FLV);
+				}
+			}
+		}
+		if(list_definition.size()>1){
+			Collections.sort(list_definition, new Comparator<Integer>(){
+
+				@Override
+				public int compare(Integer l, Integer r) {
+					// TODO Auto-generated method stub.
+					if(l>r){
+						return -1;
+					}else if(r<l){
+						return 1;
+					}else{ 
+						return 0;
+					}
+				}
+			});
+		}
+		int defanition_index = list_definition.indexOf(mContext.getCurrentDefination());
+		if(defanition_index<0){
+			defanition_index = 0;
+		}
+		selectionPosions.put(2 , defanition_index);
+		//字幕
+		if(subManager!=null){
+			if(subManager.CheckSubAviable()){
+				list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_closesub));
+            	for(int i = 0;i<subManager.getSubList().size();i++){
+            		list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_sub,(i+1)));
+            	}
+            	Log.i(TAG, "subManager.getCurrentSubIndex()+1--->" + (subManager.getCurrentSubIndex()+1));
+            	if(subManager.IsSubEnable()){
+            		selectionPosions.put(1, subManager.getCurrentSubIndex()+1);
+            	}else {
+            		selectionPosions.put(1, 0);
+            	}
+            }else{
+            	list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_nosub));
+            	selectionPosions.put(1, 0);
+            }
+		}
+		list_size = new ArrayList<Integer>();
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL);
+		Log.d(TAG, "size type -- >" + mContext.getVideoSizeType());
+		int index_size = list_size.indexOf(mContext.getVideoSizeType());
+		if(index_size<0){
+			index_size = 0;
+		}
+		selectionPosions.put(3 , index_size);
+		Log.d(TAG, "0----->"+selectionPosions.get(0));
+		Log.d(TAG, "1----->"+selectionPosions.get(1));
+		Log.d(TAG, "2----->"+selectionPosions.get(2));
+		Log.d(TAG, "3----->"+selectionPosions.get(3));
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position,
+			long id) {
+		// TODO Auto-generated method stub
+		switch (title_selecet_index) {
+		case 0://切换剧集
+			String newPord_sub_name = list_juji.get(position);
+			if(!newPord_sub_name.equals(mContext.getCurrentProdSubName())){
+				//通知改变剧集
+				mContext.changeEpisode(position);
+			}
+			break;
+		case 1://切换字幕
+			JoyplusSubManager subManager = (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
+			if(subManager!=null&&subManager.CheckSubAviable()){
+				if(position==0){
+					if(subManager.IsSubEnable()){
+						subManager.setSubEnable(false);
+					}
+				}else{
+					Log.i("JoyplusMediaPlayerMenuDialog", "subManager.getCurrentSubIndex()-->" + subManager.getCurrentSubIndex()
+							+ " position" + (position));
+					if(subManager.getCurrentSubIndex()!=(position-1)){
+						subManager.setSubEnable(true);
+						final int zimu_index = position-1;
+						new Thread(new Runnable() {
+							@Override
+							public void run() {
+								// TODO Auto-generated method stub
+								((JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager()).SwitchSub(zimu_index);
+							}
+						}).start();
+					}
+				}
+			}
+			break;
+		case 2://切换清晰度
+			mContext.changeDefination(list_definition.get(position));
+			break;
+		case 3://切换画面比例
+			break;
+		default:
+			break;
+		}
+		dismiss();
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControl.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControl.java
new file mode 100644
index 0000000..23676c5
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControl.java
@@ -0,0 +1,181 @@
+package com.joyplus;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewStub;
+import android.widget.LinearLayout;
+
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+public class JoyplusMediaPlayerMiddleControl extends LinearLayout implements JoyplusMediaPlayerInterface{
+     
+
+	private boolean Debug = true;
+	private String  TAG   = "JoyplusMediaPlayerMiddleControl";
+
+	private JoyplusMediaPlayerInterface   mView;//Current display layout;
+	//private Context  mContext;
+    
+	private final static int MSG_BASE  = 200;
+	public  final static int MSG_HIDEVIEW               = MSG_BASE+1;
+	public  final static int MSG_SHOWVIEW               = MSG_BASE+2;
+	public  final static int MSG_REQUESTSHOWVIEW        = MSG_BASE+3;
+	public  final static int MSG_REQUESTHIDEVIEW        = MSG_BASE+4;
+	public  final static int MSG_REQUESTHOLDSHOWVIEW    = MSG_BASE+5;
+	public  final static int LAYOUT_CONTROL_MIDDLE      = MSG_BASE+6;
+	//layout of loading
+	public  final static int LAYOUT_LOADING             = MSG_BASE+30;
+	public  final static int LAYOUT_LOADING_UPDATEINFO  = MSG_BASE+31;
+	//layout of audio 
+	public  final static int LAYOUT_AUDIO               = MSG_BASE+50;
+	//layout of minicontrol
+	public  final static int LAYOUT_MINI                = MSG_BASE+70;
+	public void Init(){
+		update(LAYOUT_LOADING);
+		mHandler.removeCallbacksAndMessages(null);
+	}
+	private Handler mHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case MSG_HIDEVIEW:
+				hideView();
+				break;
+			case MSG_SHOWVIEW:
+				update((Integer) msg.obj);				
+				if(mView != null && mView.JoyplusgetLayout()==LAYOUT_AUDIO){
+					setVisible(false,JoyplusMediaPlayerMiddleControlAudio.SHOWTIME,0);
+				}
+				break;
+            case MSG_REQUESTSHOWVIEW:
+            	if(mView != null && ((View)mView).getVisibility()!=View.VISIBLE){
+            		setVisible(true,0,mView.JoyplusgetLayout());
+            	}
+            	mHandler.removeCallbacksAndMessages(null);
+            	if(mView != null && mView.JoyplusgetLayout()==LAYOUT_AUDIO){
+					setVisible(false,JoyplusMediaPlayerMiddleControlAudio.SHOWTIME,0);
+				}
+				break;
+            case MSG_REQUESTHOLDSHOWVIEW:
+            	if(mView != null){
+            		if(((View)mView).getVisibility() != View.VISIBLE)
+            		setVisible(true,0,mView.JoyplusgetLayout());
+            		mHandler.removeCallbacksAndMessages(null);
+            	}
+            	break;
+            case MSG_REQUESTHIDEVIEW:
+            	setVisible(false,0,mView.JoyplusgetLayout());
+            	break;
+			}
+		}
+	};
+	private void setVisible(boolean visible,int delay,int layout){
+		Message m ;
+		mHandler.removeCallbacksAndMessages(null);
+		if(visible)
+			m=Message.obtain(mHandler,MSG_SHOWVIEW,"MSG_SHOWVIDE");
+		else
+			m=Message.obtain(mHandler,MSG_HIDEVIEW,"MSG_HIDEVIDE");
+		m.obj = layout;
+		mHandler.sendMessageDelayed(m,delay);
+	}
+	public JoyplusMediaPlayerMiddleControl(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		//mContext = context;
+		hideView();
+	}
+	public JoyplusMediaPlayerMiddleControl(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		//mContext = context;
+		hideView();
+	}
+	public void hideView(){
+		if(mView!=null){
+			mView.JoyplussetVisible(false, 0);
+    		((View)mView).setVisibility(View.GONE);
+    		((View)mView).startAnimation(JoyplusMediaPlayerActivity.mAlphaDispear);
+    	}
+		mView = null;
+	}
+	public boolean update(int layout){
+		hideView();
+		mView = CreateView(layout);
+		mView.JoyplussetVisible(true, mView.JoyplusgetLayout());
+		return true;
+	}
+	private View getStubView(int stubId,int viewId){
+    	if(Debug)Log.d(TAG,"getStubView("+stubId+" , "+viewId+")");
+    	View view = findViewById(viewId);
+    	if(view == null){
+    		ViewStub stub = (ViewStub)findViewById(stubId);
+    		view          = stub.inflate();
+    	}
+    	return view;
+    }
+    private JoyplusMediaPlayerInterface CreateView(int layout){
+    	if(Debug)Log.d(TAG,"CreateView("+layout+")");
+    	if(layout == LAYOUT_LOADING){
+    		return CreateLayoutView(
+    				R.id.joyplusvideoview_loading_stub,
+    				R.id.joyplusvideoview_loading);
+    	}else if(layout == LAYOUT_AUDIO){
+    		return CreateLayoutView(
+    				R.id.joyplusvideoview_audio_stub,
+    				R.id.joyplusvideoview_audio);
+    	}else if(layout == LAYOUT_MINI){
+    		return CreateLayoutView(
+    				R.id.joyplusvideoview_mini_stub,
+    				R.id.joyplusvideoview_mini);
+    	}else{
+    		throw new IllegalArgumentException();
+    	}
+    }
+    private JoyplusMediaPlayerInterface CreateLayoutView(int stubId,int viewId){
+    	if(Debug)Log.d(TAG,"CreateLayoutView("+stubId+" , "+viewId+")");
+    	LinearLayout view = (LinearLayout) getStubView(stubId,viewId);
+    	view.setVisibility(View.VISIBLE);
+    	return (JoyplusMediaPlayerInterface)view;
+    }
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(mView!=null && (((View)mView).getVisibility() == View.VISIBLE)){
+			 if(Debug)Log.d("KeyCode","Control JoyplusonKeyDown() keyCode="+keyCode);
+			 if( mView.JoyplusonKeyDown(keyCode, event)){
+				 mHandler.sendEmptyMessage(MSG_REQUESTSHOWVIEW);
+				 return true;
+			 }
+		}
+		return false;
+	}
+	@Override
+	public void JoyplussetVisible(boolean visible,int layout) {
+		// TODO Auto-generated method stub
+		setVisible(visible,0,layout);
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return LAYOUT_CONTROL_MIDDLE;
+	}
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlAudio.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlAudio.java
new file mode 100644
index 0000000..d7c6736
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlAudio.java
@@ -0,0 +1,88 @@
+package com.joyplus;
+
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.widget.LinearLayout;
+
+import com.joyplus.tvhelper.R;
+
+public class JoyplusMediaPlayerMiddleControlAudio extends LinearLayout implements JoyplusMediaPlayerInterface{
+	private Context      mContext;
+	private AudioManager mAudioManager;
+	private ArcView      mArcView;
+	public final static int SHOWTIME = 1500;
+	public JoyplusMediaPlayerMiddleControlAudio(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		mContext = context;
+	}
+	
+	public JoyplusMediaPlayerMiddleControlAudio(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		mContext = context; 
+	}
+	
+	protected void onFinishInflate() {
+		mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+		mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC,AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+		mArcView      = (ArcView) findViewById(R.id.joyplusvideoview_audio_arcview);
+		UpdateAudioUI();
+	}
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	private void UpdateAudioUI(){
+		int mMaxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+		int index      = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+		int mAngle = index * 360 / mMaxVolume;
+		if (index == 0)
+			mArcView.setBackgroundResource(R.drawable.player_volume_mute);
+		else {
+			mArcView.setBackgroundResource(R.drawable.player_volume);
+		}
+		mArcView.SetAngle(mAngle);
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		switch(keyCode){
+		case KeyEvent.KEYCODE_VOLUME_UP:
+		case KeyEvent.KEYCODE_DPAD_UP:
+			mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, AudioManager.FLAG_VIBRATE);
+			UpdateAudioUI();
+			return true;
+		case KeyEvent.KEYCODE_VOLUME_DOWN:
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			mAudioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, AudioManager.FLAG_VIBRATE);
+			UpdateAudioUI();
+			return true;
+		case KeyEvent.KEYCODE_VOLUME_MUTE:
+			//return true;
+			break;
+		}
+		return false;
+	}
+	@Override
+	public void JoyplussetVisible(boolean visible, int layout) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return JoyplusMediaPlayerMiddleControl.LAYOUT_AUDIO;
+	}
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlLoading.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlLoading.java
new file mode 100644
index 0000000..a17955f
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlLoading.java
@@ -0,0 +1,141 @@
+package com.joyplus;
+
+
+
+import android.content.Context;
+import android.net.TrafficStats;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.joyplus.JoyplusMediaPlayerActivity.URLTYPE;
+import com.joyplus.tvhelper.R;
+
+public class JoyplusMediaPlayerMiddleControlLoading extends LinearLayout implements JoyplusMediaPlayerInterface{
+	private Context mContext;
+	private long mStartRX = 0;//
+	private long rxByteslast = 0;
+	public  long mLoadingPreparedPercent = -1;//
+	
+	private TextView info;
+	private TextView lasttime;
+	private TextView from;
+	public JoyplusMediaPlayerMiddleControlLoading(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		mContext = context;
+	}
+	public JoyplusMediaPlayerMiddleControlLoading(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		mContext = context; 
+	}
+	protected void onFinishInflate() {
+		info     = (TextView) this.findViewById(R.id.MiddleControlLoading_info);
+		lasttime = (TextView) this.findViewById(R.id.MiddleControlLoading_lasttime);
+		from     = (TextView) this.findViewById(R.id.MiddleControlLoading_from);
+		StartTrafficStates();
+	}
+	private void UpdateInfo(int speed,int finished){
+		if(speed<0)speed = 0;
+		if(finished<-1)finished=0;
+		else if(finished>95)finished = 95;
+		if(finished >= 0)info.setText(mContext.getApplicationContext().getString(R.string.meidaplayer_loading_string,speed,finished));
+		if(JoyplusMediaPlayerActivity.mInfo.mLastTime>0){
+			lasttime.setVisibility(View.VISIBLE);
+//			lasttime.setText(mContext.getApplicationContext().getString(R.string.meidaplayer_loading_string_lasttime)+getTimeString(JoyplusMediaPlayerActivity.mInfo.mLastTime));
+			lasttime.setText(mContext.getApplicationContext().getString(R.string.meidaplayer_loading_string_lasttime, getTimeString(JoyplusMediaPlayerActivity.mInfo.mLastTime)));
+		}else lasttime.setVisibility(View.GONE);
+		if(JoyplusMediaPlayerActivity.mInfo.mFrom != null && !"".equals(JoyplusMediaPlayerActivity.mInfo.mFrom)){
+			from.setVisibility(View.VISIBLE);
+			from.setText(JoyplusMediaPlayerActivity.mInfo.mFrom);
+		}else from.setVisibility(View.GONE);
+	}
+	private String getTimeString(int time){
+		if(time<0)time = 0;
+		StringBuffer sb = new StringBuffer();
+		time/=1000;
+        sb.append(getString(time/(60*60)));
+        sb.append(":");
+        time%=(60*60);
+        sb.append(getString(time/60));
+        sb.append(":");
+        time%=60;
+        sb.append(getString(time));
+        return sb.toString();
+	}
+	private String getString(int time){
+		StringBuffer sb = new StringBuffer();
+		sb.append(time/10).append(time%10);
+		return sb.toString();
+	}
+	private Handler mHandler = new Handler();
+	private void StartTrafficStates(){
+		mStartRX = TrafficStats.getTotalRxBytes();// ��ȡ�����ٶ�
+		if (mStartRX == TrafficStats.UNSUPPORTED) {
+			info.setText(mContext.getApplicationContext().getString(R.string.meidaplayer_loading_string_loading));
+		} else {
+			rxByteslast = 0;
+			mLoadingPreparedPercent = 0;
+			mHandler.removeCallbacks(UpdateTrafficStats);
+			mHandler.postDelayed(UpdateTrafficStats, 500);
+		}
+	}
+	private Runnable UpdateTrafficStats = new Runnable(){
+		long beginTimeMillis, timeTakenMillis, m_bitrate;
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			long rxBytes = TrafficStats.getTotalRxBytes() - mStartRX;
+			timeTakenMillis = System.currentTimeMillis() - beginTimeMillis;
+			beginTimeMillis = System.currentTimeMillis();
+			if(timeTakenMillis!=0){
+				m_bitrate = (rxBytes - rxByteslast) / timeTakenMillis;
+				rxByteslast = rxBytes;
+				mLoadingPreparedPercent+=m_bitrate;
+				UpdateInfo((int) m_bitrate,(int)mLoadingPreparedPercent/100);
+			}	
+			mHandler.removeCallbacksAndMessages(null);
+			mHandler.postDelayed(UpdateTrafficStats, 500);
+		}
+	};
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+	@Override
+	public void JoyplussetVisible(boolean visible,int layout) {
+		// TODO Auto-generated method stub
+		if(visible){
+			this.setVisibility(View.VISIBLE);
+			if(JoyplusMediaPlayerActivity.mInfo.mType == URLTYPE.NETWORK){
+				StartTrafficStates();
+				UpdateInfo(-1,(int)mLoadingPreparedPercent);
+			}
+		}
+		if(!visible){
+			mHandler.removeCallbacksAndMessages(null);
+			mLoadingPreparedPercent = 0;
+		}
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return JoyplusMediaPlayerMiddleControl.LAYOUT_LOADING;
+	}
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlMini.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlMini.java
new file mode 100644
index 0000000..193ded9
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerMiddleControlMini.java
@@ -0,0 +1,397 @@
+package com.joyplus;
+
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import com.joyplus.mediaplayer.MediaInfo;
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+
+
+public class JoyplusMediaPlayerMiddleControlMini extends LinearLayout implements JoyplusMediaPlayerInterface{
+
+	//private Context        mContext;
+	private static Handler mHandler;
+
+	private boolean StateOk = false;
+	//switch layout
+	private LinearLayout mSwitch;
+	private ImageButton  mSwitch_center;
+	private ImageButton  mSwitch_left;
+	private ImageButton  mSwitch_top;
+	private ImageButton  mSwitch_right;
+	private ImageButton  mSwitch_bottom;
+	//pause or play layout
+	private LinearLayout mPauseplay;
+	private ImageButton  mPauseplay_button;
+
+	/*Event of this layout*/
+	public final static int MSG_KEYDOWN_CENTER    = 1;
+	public final static int MSG_KEYDOWN_LEFT      = 2;
+	public final static int MSG_KEYDOWN_TOP       = 3;
+	public final static int MSG_KEYDOWN_RIGHT     = 4;
+	public final static int MSG_KEYDOWN_BOTTOM    = 5;
+	public final static int MSG_KEYDOWN_PAUSEPLAY = 6;
+	public final static int MSG_REQUESTHIDEVIEW   = 7;
+	public final static int MSG_PAUSEPLAY         = 8;
+
+	public final static int LAYOUT_PAUSEPLAY    = 1;
+	public final static int LAYOUT_SWITCH       = 2;
+	public final static int LAYOUT_UNKNOW       = 3;
+	private      static int mLayout             = LAYOUT_PAUSEPLAY;
+	public static void setLayout(int layout){		
+		if(layout == LAYOUT_SWITCH || layout == LAYOUT_PAUSEPLAY){
+			mLayout = layout;
+		}else{
+			mLayout = LAYOUT_UNKNOW;
+		}
+	}
+	public static void setHandler(Handler handler){
+		mHandler = handler;
+	}
+	private class MessageOnClick implements OnClickListener,OnFocusChangeListener {
+        private int mWhat;
+        public MessageOnClick(int what) {
+            mWhat = what;
+        }
+        public void onClick(View v) {
+        	if(mSwitch.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_SWITCH,v.getId());
+			}else if(mPauseplay.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_PAUSEPLAY,v.getId());
+			}
+            Message msg = Message.obtain(mHandler, mWhat);
+            msg.sendToTarget();
+        }
+		@Override
+		public void onFocusChange(View v, boolean hasFocus) {
+			// TODO Auto-generated method stub
+			if(mSwitch.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_SWITCH,v.getId());
+			}else if(mPauseplay.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_PAUSEPLAY,v.getId());
+			}
+			Message msg = Message.obtain(mHandler, mWhat);
+            msg.sendToTarget();
+		}
+    }
+	public JoyplusMediaPlayerMiddleControlMini(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		//mContext = context;
+	}
+	public JoyplusMediaPlayerMiddleControlMini(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		//mContext = context; 
+
+	}
+	public void UpdateShowLayout(){
+		if(mLayout       == LAYOUT_SWITCH){
+			ShowSwitch();
+		}else if(mLayout == LAYOUT_PAUSEPLAY){
+			ShowPlaypause();
+		}else{
+			Message.obtain(mHandler, MSG_REQUESTHIDEVIEW).sendToTarget();
+		}
+		UpdateUI(mLayout);
+		mLayout             = LAYOUT_UNKNOW;
+		Message.obtain(mHandler, MSG_PAUSEPLAY).sendToTarget();
+	}
+	protected void onFinishInflate() {
+		super.onFinishInflate();
+		mSwitch           = (LinearLayout) findViewById(R.id.joyplusvideoview_mini_switch);
+		mPauseplay        = (LinearLayout) findViewById(R.id.joyplusvideoview_mini_pauseplay);
+		//UpdateShowLayout();	    
+	}
+	private void ShowSwitch(){
+		if(mPauseplay.getVisibility()!=View.VISIBLE &&mSwitch.getVisibility() == View.VISIBLE)return;
+		mPauseplay.setVisibility(View.GONE);
+		mSwitch.setVisibility(View.VISIBLE);
+		mSwitch_center = (ImageButton) findViewById(R.id.joyplusvideoview_mini_switch_center);
+		mSwitch_left   = (ImageButton) findViewById(R.id.joyplusvideoview_mini_switch_left);
+		mSwitch_top    = (ImageButton) findViewById(R.id.joyplusvideoview_mini_switch_top);
+		mSwitch_right  = (ImageButton) findViewById(R.id.joyplusvideoview_mini_switch_right);
+		mSwitch_bottom = (ImageButton) findViewById(R.id.joyplusvideoview_mini_switch_bottom);
+		mSwitch_center.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_CENTER));
+		mSwitch_center.setOnFocusChangeListener(new MessageOnClick(MSG_KEYDOWN_CENTER));
+		mSwitch_left.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_LEFT));
+		mSwitch_left.setOnFocusChangeListener(new MessageOnClick(MSG_KEYDOWN_LEFT));
+		mSwitch_top.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_TOP));
+		mSwitch_top.setOnFocusChangeListener(new MessageOnClick(MSG_KEYDOWN_TOP));
+		mSwitch_right.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_RIGHT));
+		mSwitch_right.setOnFocusChangeListener(new MessageOnClick(MSG_KEYDOWN_RIGHT));
+		mSwitch_bottom.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_BOTTOM));
+		mSwitch_bottom.setOnFocusChangeListener(new MessageOnClick(MSG_KEYDOWN_BOTTOM));
+		UpdateButtonState();
+		Message.obtain(mHandler, MSG_PAUSEPLAY).sendToTarget();
+	}
+	private void ShowPlaypause(){
+		if(mSwitch.getVisibility()!=View.VISIBLE &&mPauseplay.getVisibility() == View.VISIBLE)return;
+		mPauseplay.setVisibility(View.VISIBLE);
+		mSwitch.setVisibility(View.GONE);
+		mPauseplay_button = (ImageButton)  findViewById(R.id.joyplusvideoview_mini_pauseplay_button);
+		mPauseplay_button.setOnClickListener(new MessageOnClick(MSG_KEYDOWN_PAUSEPLAY));
+		Message.obtain(mHandler, MSG_PAUSEPLAY).sendToTarget();
+	}
+	private void UpdateButtonState(){
+		if(!JoyplusMediaPlayerActivity.mInfo.getHaveNext()){
+			mSwitch_right.setFocusable(false);
+			mSwitch_right.setEnabled(false);
+		}else{
+			mSwitch_right.setFocusable(true);
+			mSwitch_right.setEnabled(true);
+		}
+		if(!JoyplusMediaPlayerActivity.mInfo.getHavePre()){
+			mSwitch_left.setFocusable(false);
+			mSwitch_left.setEnabled(false);
+		}else{
+			mSwitch_left.setFocusable(true);
+			mSwitch_left.setEnabled(true);
+		}
+		if(JoyplusMediaPlayerActivity.mInfo.mCollection == 0){
+			mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_unfav);
+		}else{
+			mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_fav);
+		}
+	}
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		switch(msg.what){
+		case JoyplusMediaPlayerActivity.MSG_MEDIAINFO:
+			if(mPauseplay.getVisibility()==View.VISIBLE
+			   || mSwitch.getVisibility()==View.VISIBLE){
+			   MediaInfo info = ((MediaInfo) msg.obj).CreateMediaInfo();
+			   if(info.getState()!=STATE.MEDIA_STATE_PUSE){
+				   mHandler.sendEmptyMessageDelayed(MSG_REQUESTHIDEVIEW,100);
+			   }
+			}
+		}
+		return false;
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		Log.d("KeyCode","ControlMini JoyplusonKeyDown() keyCode="+keyCode);
+		switch(keyCode){
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+		case KeyEvent.KEYCODE_ENTER:
+			if(mSwitch.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_SWITCH,mSwitch_center.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_CENTER).sendToTarget();
+			}else if(mPauseplay.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_PAUSEPLAY,mPauseplay_button.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_PAUSEPLAY).sendToTarget();
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			if(mSwitch.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_SWITCH,mSwitch_bottom.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_BOTTOM).sendToTarget();
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			if(mSwitch.getVisibility() == View.VISIBLE && mSwitch_left.isEnabled()){
+				UpdateUI(LAYOUT_SWITCH,mSwitch_left.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_LEFT).sendToTarget();
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			if(mSwitch.getVisibility() == View.VISIBLE && mSwitch_right.isEnabled()){
+				UpdateUI(LAYOUT_SWITCH,mSwitch_right.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_RIGHT).sendToTarget();
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP:
+			if(mSwitch.getVisibility() == View.VISIBLE){
+				UpdateUI(LAYOUT_SWITCH,mSwitch_top.getId());
+				Message.obtain(mHandler, MSG_KEYDOWN_TOP).sendToTarget();
+			}
+			break;
+		case KeyEvent.KEYCODE_BACK:
+			break;
+		}
+		return true;
+	}
+
+	/*follow was use to change UI ,it only use to adapter TV*/
+	private void UpdateUI(int layout){
+		switch(layout){
+		case LAYOUT_SWITCH:
+			if(mSwitch.getVisibility() == View.VISIBLE)
+				UpdateUI(layout,mSwitch_center.getId());
+			break;
+		case LAYOUT_PAUSEPLAY:
+			if(mPauseplay.getVisibility() == View.VISIBLE)
+				UpdateUI(layout,mPauseplay_button.getId());
+			break;
+		}
+	}
+	private void UpdateUI(int layout,int id){
+		UpdateNormal(layout);
+		UpdateActive(layout,id);
+	}
+	private static final int TYPE_ACTIVE   = 1;
+	private static final int TYPE_UNUSE    = 2;
+	private static final int TYPE_NORMAL   = 3;
+	private void UpdateActive(int layout,int Id){
+		if(layout == LAYOUT_SWITCH && mSwitch.getVisibility() == View.VISIBLE ){
+			if(Id == mSwitch_center.getId()){
+				UpdatemSwitch_center(TYPE_ACTIVE);
+			}else if(Id == mSwitch_left.getId()){
+				UpdatemSwitch_left(TYPE_ACTIVE);
+			}else if(Id == mSwitch_top.getId()){
+				UpdatemSwitch_top(TYPE_ACTIVE);
+			}else if(Id == mSwitch_right.getId()){
+				UpdatemSwitch_right(TYPE_ACTIVE);
+			}else if(Id == mSwitch_bottom.getId()){
+				UpdatemSwitch_bottom(TYPE_ACTIVE);
+			}
+		}else if(layout == LAYOUT_PAUSEPLAY && mPauseplay.getVisibility() == View.VISIBLE){ 
+			if(Id == mPauseplay_button.getId()){
+			    UpdatemPauseplay_button(TYPE_ACTIVE);
+		    }
+		}
+	}
+	private void UpdateNormal(int layout){
+		switch(layout){
+		case LAYOUT_SWITCH:
+			UpdatemSwitch_center(TYPE_NORMAL);
+			UpdatemSwitch_top(TYPE_NORMAL);
+			UpdatemSwitch_bottom(TYPE_NORMAL);
+			UpdatemSwitch_left(TYPE_NORMAL);
+			UpdatemSwitch_right(TYPE_NORMAL);
+			break;
+		case LAYOUT_PAUSEPLAY:
+			UpdatemPauseplay_button(TYPE_NORMAL);
+			break;
+		}
+	}
+	private void UpdatemSwitch_center(int type){
+		switch(type){
+		case TYPE_ACTIVE:
+			mSwitch_center.setBackgroundResource(R.drawable.player_btn_finish_active);
+			break;
+		case TYPE_UNUSE:
+			mSwitch_center.setBackgroundResource(R.drawable.player_btn_finish_unuse);
+			break;
+		case TYPE_NORMAL:
+			default:
+				mSwitch_center.setBackgroundResource(R.drawable.player_btn_finish_normal);	
+			break;	
+		}
+	}
+	private void UpdatemSwitch_top(int type){
+		switch(type){
+		case TYPE_ACTIVE:
+			mSwitch_top.setBackgroundResource(R.drawable.player_btn_continue_active);
+			break;
+		case TYPE_UNUSE:
+			mSwitch_top.setBackgroundResource(R.drawable.player_btn_continue_unuse);
+			break;
+		case TYPE_NORMAL:
+			default:
+				mSwitch_top.setBackgroundResource(R.drawable.player_btn_continue_normal);	
+			break;	
+		}
+	}
+	private void UpdatemSwitch_left(int type){
+		if(!mSwitch_left.isEnabled())type = TYPE_UNUSE;
+		switch(type){
+		case TYPE_ACTIVE:
+			mSwitch_left.setBackgroundResource(R.drawable.player_btn_pre_active);
+			break;
+		case TYPE_UNUSE:
+			mSwitch_left.setBackgroundResource(R.drawable.player_btn_pre_unuse);
+			break;
+		case TYPE_NORMAL:
+			default:
+				mSwitch_left.setBackgroundResource(R.drawable.player_btn_pre_normal);	
+			break;	
+		}
+	}
+	private void UpdatemSwitch_right(int type){
+		if(!mSwitch_right.isEnabled())type = TYPE_UNUSE;
+		switch(type){
+		case TYPE_ACTIVE:
+			mSwitch_right.setBackgroundResource(R.drawable.player_btn_next_active);
+			break;
+		case TYPE_UNUSE:
+			mSwitch_right.setBackgroundResource(R.drawable.player_btn_next_unuse);
+			break;
+		case TYPE_NORMAL:
+			default:
+				mSwitch_right.setBackgroundResource(R.drawable.player_btn_next_normal);	
+			break;	
+		}
+	}
+	private void UpdatemSwitch_bottom(int type){
+		switch(type){
+		case TYPE_ACTIVE:
+			if(JoyplusMediaPlayerActivity.mInfo.mCollection == 0){//un collection
+				mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_unfav_active);
+			}else{
+				mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_fav_active);
+			}
+			break;
+		case TYPE_UNUSE:
+			if(JoyplusMediaPlayerActivity.mInfo.mCollection == 0){//un collection
+				mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_unfav_unuse);
+			}else{
+				mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_fav_unuse);
+			}
+			break;
+		case TYPE_NORMAL:
+			default:
+				if(JoyplusMediaPlayerActivity.mInfo.mCollection == 0){//un collection
+					//mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_unfav_normal);
+					mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_fav_normal);
+				}else{
+					//mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_fav_normal);
+					mSwitch_bottom.setBackgroundResource(R.drawable.player_btn_unfav_normal);
+				}	
+			break;	
+		}
+	}
+	private void UpdatemPauseplay_button(int type){
+		switch(type){
+		case TYPE_ACTIVE:
+			mPauseplay_button.setBackgroundResource(R.drawable.player_btn_play_play_active);
+			break;
+		case TYPE_NORMAL:
+			default:
+				mPauseplay_button.setBackgroundResource(R.drawable.player_btn_play_play_normal);	
+			break;	
+		}
+	}
+	@Override
+	public void JoyplussetVisible(boolean visible, int layout) {
+		// TODO Auto-generated method stub
+		if(visible == false)StateOk = false;
+		else{
+			UpdateShowLayout();
+			StateOk = true;
+		}
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return JoyplusMediaPlayerMiddleControl.LAYOUT_MINI;
+	}
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerPreference.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerPreference.java
new file mode 100644
index 0000000..7e1c90f
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerPreference.java
@@ -0,0 +1,211 @@
+package com.joyplus;
+
+import java.util.ArrayList;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Gallery;
+import android.widget.TextView;
+
+import com.joyplus.manager.URLManager;
+import com.joyplus.manager.URLManager.Quality;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.sub.JoyplusSubManager;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+import com.joyplus.tvhelper.utils.Utils;
+
+
+public class JoyplusMediaPlayerPreference extends AlertDialog{
+
+	private boolean Debug = true;
+	private String  TAG   = "JoyplusMediaPlayerPreference";
+	
+	private final static int MSG_BASE = 400;
+	public  final static int MSG_QUALITY_CHANGE = MSG_BASE+1;
+	public  final static int MSG_SUB_CHANGE     = MSG_BASE+2;
+	
+	private Context    mContext;
+	private QUALITY    mQuality;
+	private SUB        mSub;
+	private Handler mHandler;
+	public void setHandler(Handler handler){
+		mHandler = handler;
+	}
+	public void setVisible(boolean visible){
+		if(visible){
+			show();
+			if(mQuality != null)mQuality.setURLManager(JoyplusMediaPlayerManager.getInstance().getURLManager());
+			if(mSub != null)    mSub.setSubManager((JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager());
+		}
+		else Dismiss();
+	}
+	
+	public JoyplusMediaPlayerPreference(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		mContext = context;		
+	}	
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		this.setContentView(R.layout.video_choose_defination);
+		initView();
+	}
+//    public void setURLManager(URLManager urlManager){
+//    	if(mQuality == null) return;
+//    	mQuality.setURLManager(urlManager);
+//    }
+	private void initView() {
+		// TODO Auto-generated method stub		
+		findViewById(R.id.btn_ok_def).setOnClickListener(new OKListener());
+		findViewById(R.id.btn_cancle_def).setOnClickListener(new android.view.View.OnClickListener(){
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				Dismiss();				
+			}
+		});
+		mQuality   = new QUALITY();
+		mSub       = new SUB();
+	}
+	private void Dismiss() {
+		// TODO Auto-generated method stub
+		JoyplusMediaPlayerPreference.this.dismiss();
+	}	
+	private class OKListener implements android.view.View.OnClickListener{
+		@Override
+		public void onClick(View v) {
+			// TODO Auto-generated method stub
+			if(mHandler==null) {
+				Dismiss();
+				return;
+			}
+			if(mQuality != null && mQuality.isChange()){
+				 Message m = new Message();
+				 m.what    = MSG_QUALITY_CHANGE;
+				 m.obj     = mQuality.getCurrentQuality();
+				 mHandler.sendMessage(m);		
+			}else if(mSub != null && mSub.isChange()){
+				 Message m = new Message();
+				 m.what    = MSG_SUB_CHANGE;
+				 m.arg1     = mSub.getCurrentIndex();
+				 mHandler.sendMessage(m);
+			}
+			Dismiss();
+		}		
+	}
+	private class QUALITY {		
+		public  Gallery              gallery;
+		private URLManager.Quality   mCurrentQuality;
+		private ArrayList<String>    definationStrings = new ArrayList<String>();//清晰度选择
+		public  QUALITY(){
+			gallery = (Gallery) findViewById(R.id.gallery_def);
+			gallery.requestFocus();
+		};
+        public void setURLManager(URLManager urlManager){
+        	if(urlManager == null)return;
+        	definationStrings = urlManager.getExitQualityList();
+        	mCurrentQuality   = urlManager.getCurrentQuality();
+        	gallery.setAdapter(new QuaSubAdapter(definationStrings));
+        	gallery.setSelection(definationStrings.indexOf(URLManager.getQualityString(mCurrentQuality)));
+        	gallery.requestFocus();
+        }
+        public boolean isChange(){
+        	Log.i(TAG, "isChange-->gallery.getSelectedItemPosition():" + gallery.getSelectedItemPosition()
+        			+ " definationStrings:" + definationStrings.toString()
+        			+ " URLManager.getQualityString(mCurrentQuality):" + URLManager.getQualityString(mCurrentQuality));
+        	return gallery.getSelectedItemPosition() != (definationStrings.indexOf(URLManager.getQualityString(mCurrentQuality)));
+        }
+        public Quality getCurrentQuality(){
+        	return JoyplusMediaPlayerManager.getInstance().getURLManager().getQualityFromString(
+        			     definationStrings.get(gallery.getSelectedItemPosition()));
+        }
+	}
+	private class SUB {		
+		private Gallery    gallery;
+		private ArrayList<String> definationStrings = new ArrayList<String>();
+		public SUB(){
+			gallery = (Gallery) findViewById(R.id.gallery_zimu);
+		};
+        public void setSubManager(JoyplusSubManager subManager){
+        	if(subManager == null)return;
+        	definationStrings.clear();
+        	Log.i(TAG, "SUB-setSubManager-size-->" + subManager.getSubList().size());
+            if(subManager.CheckSubAviable()){
+            	definationStrings.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_closesub));
+            	for(int i = 0;i<subManager.getSubList().size();i++){
+            		definationStrings.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_sub,(i+1)));
+            	}
+            	gallery.setAdapter(new QuaSubAdapter(definationStrings));
+            	Log.i(TAG, "subManager.getCurrentSubIndex()+1--->" + (subManager.getCurrentSubIndex()+1));
+            	if(subManager.IsSubEnable()){
+            		gallery.setSelection(subManager.getCurrentSubIndex()+1);//for have add "sub close"
+            	}else {
+            		gallery.setSelection(0);//for have add "sub close"
+
+            	}
+            }else{
+            	definationStrings.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_nosub));
+            	gallery.setAdapter(new QuaSubAdapter(definationStrings));
+            }
+        }	
+        public boolean isChange(){
+        	return gallery.getSelectedItemPosition() != (definationStrings.indexOf(((JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager()).getCurrentSubIndex()+1));
+        }
+        public int getCurrentIndex(){
+        	return gallery.getSelectedItemPosition();
+        }
+	}
+	
+	class QuaSubAdapter extends BaseAdapter{
+		private ArrayList<String> StringResource = new ArrayList<String>();
+		public QuaSubAdapter(ArrayList<String> list){
+			if(list == null)return;
+			StringResource.clear();
+			StringResource = list;
+		}
+		@Override
+		public int getCount() {
+			// TODO Auto-generated method stub
+			return StringResource.size();
+		}
+		@Override
+		public Object getItem(int position) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		@Override
+		public long getItemId(int position) {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			// TODO Auto-generated method stub
+			return CreateTextView(StringResource.get(position));
+		}
+		private TextView CreateTextView(String text){
+			TextView tv = new TextView(mContext);
+			tv.setBackgroundResource(R.drawable.bg_choose_defination_selector);
+			tv.setTextColor(Color.WHITE);
+			tv.setTextSize(25);
+			tv.setText(text);
+			Gallery.LayoutParams param = new Gallery.LayoutParams(Utils.getStandardValue(mContext,165), 
+					Utils.getStandardValue(mContext,40));
+			tv.setGravity(Gravity.CENTER);
+			tv.setLayoutParams(param);
+			return tv;
+		}
+	} 
+}
diff --git a/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerVideoView.java b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerVideoView.java
new file mode 100644
index 0000000..5d96648
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/JoyplusMediaPlayerVideoView.java
@@ -0,0 +1,255 @@
+package com.joyplus;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import android.net.TrafficStats;
+import android.os.Handler;
+import android.os.Message;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.joyplus.mediaplayer.JoyplusMediaPlayerScreenManager;
+import com.joyplus.mediaplayer.JoyplusVideoView;
+import com.joyplus.mediaplayer.MediaInfo;
+import com.joyplus.mediaplayer.VideoViewInterface;
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+/*videoview layout
+ * It use to displayer media
+ * it have: Android system VideoView 
+ *          vitamio VideoView
+ *          
+ **/
+public class JoyplusMediaPlayerVideoView implements JoyplusMediaPlayerInterface{
+
+	private boolean Debug = false;
+	private String  TAG   = "JoyplusMediaPlayerVideoView";
+	
+	private JoyplusMediaPlayerActivity mActivity;
+	private VideoViewInterface         Player = null;
+	private JoyplusVideoView           VideoView;
+	public  static MediaInfo           CurrentMediaInfo;
+	private MediaInfo                  PreMediaInfo;	
+	private LoadingWindows             mWaitingWindows;
+	private final static int MSG_BASE  = 100;
+	public  final static int LAYOUT_VIDEOVIEW = MSG_BASE+1;
+
+	public void Init(){
+		update();
+		CurrentMediaInfo = new MediaInfo();
+		PreMediaInfo     = new MediaInfo();
+		mWaitingWindows.Init();
+	}
+    public JoyplusMediaPlayerVideoView(JoyplusMediaPlayerActivity activity){
+    	mActivity = activity;
+    	InitResource();
+    }
+    private void InitResource() {
+		// TODO Auto-generated method stub
+    	VideoView = (JoyplusVideoView) mActivity.findViewById(R.id.JoyplusVideoView);
+    	//mWaitingDialog   = new RoundProcessDialog(mActivity);
+    	mWaitingWindows  = new LoadingWindows();
+	}
+	public VideoViewInterface getPlayer(){
+    	return Player;
+    }
+    public void update(){
+    	if(Debug)Log.d(TAG,"VideoViewControl update()");
+    	VideoView.Update();
+        Player = VideoView.getVideoView();
+    }
+    
+	@Override
+	public boolean JoyplusdispatchMessage(Message msg) {
+		// TODO Auto-generated method stub
+		switch(msg.what){
+		case JoyplusMediaPlayerActivity.MSG_MEDIAINFO:
+			PreMediaInfo     = new MediaInfo(CurrentMediaInfo);
+			CurrentMediaInfo = ((MediaInfo) msg.obj).CreateMediaInfo();
+			return CheckMediaInfo(); 
+		}
+		return false;
+	}
+	private boolean CheckMediaInfo(){
+		//don't do this twice
+		//if(CurrentMediaInfo.getState() == STATE.MEDIA_STATE_UNKNOW)Init();
+		if(hasMediaInfoChange()){
+			mWaitingWindows.setVisible(false);
+		}else if(CurrentMediaInfo.getState().toInt()>STATE.MEDIA_STATE_INITED.toInt()
+		     && CurrentMediaInfo.getState().toInt()<STATE.MEDIA_STATE_FINISH.toInt()
+		     && CurrentMediaInfo.getState().toInt() != STATE.MEDIA_STATE_PUSE.toInt()){
+			 if( CurrentMediaInfo.getINFO() == 701 //loading
+					&& CurrentMediaInfo.getCurrentTime()>1000
+					&& JoyplusMediaPlayerActivity.StateOk
+					&& CurrentMediaInfo.getState()==STATE.MEDIA_STATE_PLAYING
+					){
+				mWaitingWindows.setVisible(true);
+			 }else{
+				mWaitingWindows.setVisible(false);
+			 }
+		}
+		if(CurrentMediaInfo.getPath()==null || "".equals(CurrentMediaInfo.getPath()))return true;
+		if(PreMediaInfo.getPath()!=null && !PreMediaInfo.getPath().equals(CurrentMediaInfo.getPath()))return true;
+		return false;
+	}
+	@Override
+	public boolean JoyplusonKeyDown(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub 
+		return false;
+	}
+	@Override
+	public void JoyplussetVisible(boolean visible,int layout) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setVisibliable("+visible+")");
+    	if(visible){
+    		update();
+    	}else{
+    		VideoView.hideView();
+    	}
+	}
+	@Override
+	public int JoyplusgetLayout() {
+		// TODO Auto-generated method stub
+		return LAYOUT_VIDEOVIEW;
+	}
+	public boolean setScreenLayoutParams(int type){
+		if(!JoyplusMediaPlayerScreenManager.IsAviableType(type))return false;
+		return VideoView.setScreenLayoutParams(type);
+	}  
+	public int getScreenLayoutParams(){
+		return VideoView.getScreenLayoutParams();
+	}
+	public boolean hasMediaInfoChange(){
+		long delay = Math.abs(CurrentMediaInfo.getCurrentTime()-PreMediaInfo.getCurrentTime());
+		if(Debug)Log.e(TAG,"eeeeeeeeeeeeeeeee  "+delay +" eeeeeeeeeeee");
+		return (delay<2000&&delay>=300);
+	}
+	private class LoadingWindows {
+		private final static int MSG_SHOW = 1;
+		private final static int MSG_HIDE = 2;
+		private final static int DELAYTIME  = 1*60*1000; //1 min
+		
+		private class WindowsInfo{
+			public long ShowTime;
+			public WindowsInfo(long time){
+				ShowTime = time;
+			}
+		}
+		private List<WindowsInfo> mWindowsInfo = new ArrayList<WindowsInfo>();
+		
+	    private TextView       mInfo;
+		private LinearLayout   mLayout;
+		private TextView       mNotify;
+		
+		private long mStartRX    = 0;
+		private long rxByteslast = 0;
+		public void Init(){
+			mHandler.removeCallbacksAndMessages(null);
+			mWindowsInfo = new ArrayList<WindowsInfo>();
+			mStartRX    = 0;
+			rxByteslast = 0;
+			if((mLayout.getVisibility()==View.VISIBLE))mLayout.setVisibility(View.GONE);
+		}
+		public LoadingWindows(){
+			mInfo   = (TextView)       mActivity.findViewById(R.id.joyplus_videoview_buffer_info);
+			mLayout = (LinearLayout)   mActivity.findViewById(R.id.joyplus_videoview_buffer);
+			mNotify = (TextView)       mActivity.findViewById(R.id.joyplus_videoview_buffer_notify);
+		}
+		public void setVisible(boolean Visible){
+			if(!Visible)mHandler.removeCallbacksAndMessages(null);
+			if((mLayout.getVisibility()==View.VISIBLE) == Visible)return;
+			mHandler.removeCallbacksAndMessages(null);
+			if(Visible){
+				mHandler.sendEmptyMessage(MSG_SHOW);
+				UpdateWindowsInfo();
+			}else mHandler.sendEmptyMessage(MSG_HIDE);
+		}
+		private Handler mHandler = new Handler(){
+			public void handleMessage(Message msg) {
+				super.handleMessage(msg);
+				switch(msg.what){
+				case MSG_SHOW:
+					if(mLayout.getVisibility()==View.VISIBLE)return;
+					mLayout.setVisibility(View.VISIBLE);
+					mHandler.removeCallbacksAndMessages(null);
+					StartTrafficStates();
+					break;
+				case MSG_HIDE:
+					if(!(mLayout.getVisibility()==View.VISIBLE))return;
+					mLayout.setVisibility(View.GONE);
+					mHandler.removeCallbacksAndMessages(null);
+					break;
+				}
+			}
+		};
+		private void StartTrafficStates(){
+			if(Debug)Log.d("Jas","=========StartTrafficStates===========");
+			mStartRX = TrafficStats.getTotalRxBytes();// ��ȡ�����ٶ�
+			rxByteslast = 0;
+			if (mStartRX == TrafficStats.UNSUPPORTED) {
+			     
+			} else {
+				mHandler.removeCallbacks(UpdateTrafficStats);
+				mHandler.postDelayed(UpdateTrafficStats, 500);
+			}
+		}
+		private Runnable UpdateTrafficStats = new Runnable(){
+			long beginTimeMillis, timeTakenMillis, m_bitrate;
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				if(Debug)Log.d("Jas","-------------run-------------");
+				long rxBytes = TrafficStats.getTotalRxBytes() - mStartRX;
+				timeTakenMillis = System.currentTimeMillis() - beginTimeMillis;
+				beginTimeMillis = System.currentTimeMillis();
+				if(timeTakenMillis>0){
+					m_bitrate = (rxBytes - rxByteslast) / timeTakenMillis;
+					rxByteslast = rxBytes;
+					UpdateInfo(m_bitrate);
+				}	
+				mHandler.removeCallbacks(UpdateTrafficStats);
+				mHandler.postDelayed(UpdateTrafficStats, 500);
+			}
+		};
+		private void UpdateInfo(long speed){
+			if(Debug)Log.d("Jas","============= speed="+speed+" =========================");
+			if(!(mLayout.getVisibility()==View.VISIBLE))return;
+			mInfo.setVisibility(View.VISIBLE);
+			if(speed>=0)
+				mInfo.setText(mActivity.getApplicationContext().getString(R.string.meidaplayer_loading_string_buffer,speed));
+			else
+				mInfo.setText(mActivity.getApplicationContext().getString(R.string.meidaplayer_loading_string_buffer_loading));
+			UpdateNotify();
+		}
+		private void UpdateNotify(){
+			if(!(mLayout.getVisibility()==View.VISIBLE))return;
+			if(mWindowsInfo.size()>=10)
+				mNotify.setVisibility(View.VISIBLE);
+			else 
+				mNotify.setVisibility(View.GONE);
+		}
+		private void UpdateWindowsInfo(){
+			long currenttime = System.currentTimeMillis();
+			mWindowsInfo.add(new WindowsInfo(currenttime)); 
+			Iterator<WindowsInfo> it = mWindowsInfo.iterator();
+			while(it.hasNext()){
+				WindowsInfo index = it.next();
+				if((currenttime-index.ShowTime)>DELAYTIME){
+					it.remove();
+				}
+			}
+		}
+	}
+	
+
+	@Override
+	public boolean JoyplusonKeyLongPress(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/Sub/ASSSub.java b/showkeyHelper/src/com/joyplus/Sub/ASSSub.java
deleted file mode 100644
index 697cfff..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/ASSSub.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.util.Iterator;
-
-public class ASSSub extends JoyplusSub{
-
-	public ASSSub(SubURI uri) {
-		super(uri);
-		// TODO Auto-generated constructor stub
-		this.mContentType = SubContentType.SUB_ASS;
-		CheckUri();
-	}
-	private void CheckUri() {
-		// TODO Auto-generated method stub
-		JoyplusSubContentRestrictionFactory.getContentRestriction().checkUri(SubContentType.SUB_ASS, this.getUri().Uri);
-	}
-	private void CheckSize(byte[] Sub){
-    	JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, Sub.length);
-    }
-	@Override
-	public void parse(byte[] sub) {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.NETWORK)return;
-		CheckSize(sub);
-		//don't support it now
-	}
-
-	@Override
-	public void parseLocal() {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.LOCAL)return;
-		LocalSubParser parser = new LocalSubParser();
-		TimedTextObject obd = parser.ParserFile(new File(this.getUri().Uri));
-		if(obd != null && obd.captions!=null && obd.captions.size()>0){
-			Iterator<Integer> iterator_2 = obd.captions.keySet().iterator(); 
-			int index = 0;
-			while (iterator_2.hasNext()) { 
-				 Caption mCaption = obd.captions.get(iterator_2.next());
-				 Element mElement = new Element();
-				 mElement.setRank(++index);
-				 mElement.setStartTime(new JoyplusSubTime(mCaption.start.mseconds));
-				 mElement.setEndTime(new JoyplusSubTime(mCaption.end.mseconds));
-				 this.elements.add(mElement);
-			} 
-		}
-	}
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/Caption.java b/showkeyHelper/src/com/joyplus/Sub/Caption.java
deleted file mode 100644
index 8c737d1..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/Caption.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.joyplus.Sub;
-
-public class Caption {
-	
-	public Style style;
-	public Region region;
-	
-	public LocalTime start;
-	public LocalTime end;
-	
-	public String content="";
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/Collection.java b/showkeyHelper/src/com/joyplus/Sub/Collection.java
deleted file mode 100644
index d4752aa..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/Collection.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Collection {
-	private File file;
-	private String charset;
-	
-	private List<Element> elements = new ArrayList<Element>();
-
-	public List<Element> getElements() {
-		return elements;
-	}
-	
-	public int getElementSize(){
-		
-		return elements.size();
-	}
-
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		for (Element el : elements) {
-			builder.append(el + "\n");
-		}
-		return builder.toString();
-	}
-
-	public void synchronize(final int startRank, final JoyplusSubTime newStartTime,
-			final int endRank, final JoyplusSubTime newEndTime) {
-		final JoyplusSubTime oldStartTime = elements.get(startRank).getStartTime();
-		final JoyplusSubTime oldEndTime = elements.get(endRank).getEndTime();
-		final long init = newStartTime.getTime() - oldStartTime.getTime();
-		final double coef = (newStartTime.getTime() - oldStartTime.getTime())
-				/ (newEndTime.getTime() - oldEndTime.getTime());
-		for (int i = startRank; i <= endRank; ++i) {
-			final Element e = elements.get(i);
-			e.setStartTime(new JoyplusSubTime(
-					(long) (e.getStartTime().getTime() * coef + init)));
-			e.setEndTime(new JoyplusSubTime(
-					(long) (e.getEndTime().getTime() * coef + init)));
-		}
-	}
-
-	/**
-	 * @return the file
-	 */
-	public File getFile() {
-		return file;
-	}
-
-	/**
-	 * @param file the file to set
-	 */
-	public void setFile(File file) {
-		this.file = file;
-	}
-
-	/**
-	 * @return the charset
-	 */
-	public String getCharset() {
-		return charset;
-	}
-
-	/**
-	 * @param charset the charset to set
-	 */
-	public void setCharset(String charset) {
-		this.charset = charset;
-	}
-	
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/Element.java b/showkeyHelper/src/com/joyplus/Sub/Element.java
deleted file mode 100644
index 7f838a4..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/Element.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.joyplus.Sub;
-
-
-
-public class Element {
-	public static final String TIME_SEP = " --> ";
-	private int rank;
-	private JoyplusSubTime startTime;
-	private JoyplusSubTime endTime;
-	private String text;
-	
-	public Element() {}
-	
-	public Element(Element e){
-		
-		this.rank = e.rank;
-		this.startTime = e.startTime;
-		this.endTime = e.endTime;
-		this.text = e.text;
-	}
-	
-	
-	/**
-	 * @return the rank
-	 */
-	public int getRank() {
-		return rank;
-	}
-
-
-	/**
-	 * @param rank the rank to set
-	 */
-	public void setRank(int rank) {
-		this.rank = rank;
-	}
-
-
-	/**
-	 * @return the startTime
-	 */
-	public JoyplusSubTime getStartTime() {
-		return startTime;
-	}
-
-	/**
-	 * @param time the startTime to set
-	 */
-	public void setStartTime(JoyplusSubTime time) {
-		this.startTime = time;
-	}
-
-	/**
-	 * @return the endTime
-	 */
-	public JoyplusSubTime getEndTime() {
-		return endTime;
-	}
-
-	/**
-	 * @param time the endTime to set
-	 */
-	public void setEndTime(JoyplusSubTime time) {
-		this.endTime = time;
-	}
-
-	/**
-	 * @return the text
-	 */
-	public String getText() {
-		return text;
-	}
-
-
-	/**
-	 * @param text the text to set
-	 */
-	public void setText(String text) {
-		this.text = text;
-	}
-
-
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append(String.valueOf(rank)+"\n");
-		builder.append(startTime + TIME_SEP + endTime +"\n");
-		builder.append(text);
-		return builder.toString();
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/FatalParsingException.java b/showkeyHelper/src/com/joyplus/Sub/FatalParsingException.java
deleted file mode 100644
index e0aae66..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FatalParsingException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.joyplus.Sub;
-
-/**
- * This class represents problems that may arise during the parsing of a subttile file.
- * 
- * @author J. David
- *
- */
-public class FatalParsingException extends Exception {
-
-	private static final long serialVersionUID = 6798827566637277804L;
-	
-	private String parsingErrror;
-	
-	public FatalParsingException(String parsingError){
-		super(parsingError);
-		this.parsingErrror = parsingError;
-	}
-	
-	@Override
-	public String getLocalizedMessage(){
-		return parsingErrror;
-	}
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/FormatASS.java b/showkeyHelper/src/com/joyplus/Sub/FormatASS.java
deleted file mode 100644
index 5b9ca37..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FormatASS.java
+++ /dev/null
@@ -1,605 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Class that represents the .ASS and .SSA subtitle file format
- * 
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David REQUEJO
- *
- */
-/** @hide */
-public class FormatASS implements TimedTextFileFormat {
-
-	public TimedTextObject parseFile(String fileName, InputStream is) throws IOException {
-		
-		TimedTextObject tto = new TimedTextObject();
-		tto.fileName = fileName;
-		
-		Caption caption = new Caption();
-		Style style;
-		
-		//for the clock timer
-		float timer = 100;
-		
-		//if the file is .SSA or .ASS
-		boolean isASS = false;
-		
-		//variables to store the formats
-		String [] styleFormat;
-		String [] dialogueFormat;
-
-		//first lets load the file
-		InputStreamReader in= new InputStreamReader(is);
-		BufferedReader br = new BufferedReader(in);
-
-		String line;
-		int lineCounter = 0;
-		try {
-			//we scour the file
-			line=br.readLine();
-			lineCounter++;
-			while (line!=null){
-				line = line.trim();
-				//we skip any line until we find a section [section name]
-				if(line.startsWith("[")){
-					//now we must identify the section
-					if(line.equalsIgnoreCase("[Script info]")){
-						//its the script info section section
-						lineCounter++;
-						line=br.readLine().trim();
-						//Each line is scanned for useful info until a new section is detected
-						while (!line.startsWith("[")){
-							if(line.startsWith("Title:"))
-								//We have found the title
-								tto.title = line.split(":")[1].trim();
-							else if (line.startsWith("Original Script:"))
-								//We have found the author
-								tto.author = line.split(":")[1].trim();
-							else if (line.startsWith("Script Type:")){
-								//we have found the version
-								if(line.split(":")[1].trim().equalsIgnoreCase("v4.00+"))isASS = true;
-								//we check the type to set isASS or to warn if it comes from an older version than the studied specs
-								else if(!line.split(":")[1].trim().equalsIgnoreCase("v4.00"))
-									tto.warnings+="Script version is older than 4.00, it may produce parsing errors.";
-							} else if (line.startsWith("Timer:"))
-								//We have found the timer
-								timer = Float.parseFloat(line.split(":")[1].trim().replace(',','.'));
-							//we go to the next line
-							lineCounter++;
-							line=br.readLine().trim();
-						}
-
-					} else if (line.equalsIgnoreCase("[v4 Styles]") 
-							|| line.equalsIgnoreCase("[v4 Styles+]") 
-							|| line.equalsIgnoreCase("[v4+ Styles]")){
-						//its the Styles description section
-						if(line.contains("+")&&isASS==false){
-							//its ASS and it had not been noted
-							isASS=true;
-							tto.warnings+="ScriptType should be set to v4:00+ in the [Script Info] section.\n\n";
-						}
-						lineCounter++;
-						line=br.readLine().trim();
-						//the first line should define the format
-						if(!line.startsWith("Format:")){
-							//if not, we scan for the format.
-							tto.warnings+="Format: (format definition) expected at line "+line+" for the styles section\n\n";
-							while (!line.startsWith("Format:")){
-								lineCounter++;
-								line=br.readLine().trim();;
-							}
-						}
-						// we recover the format's fields
-						styleFormat = line.split(":")[1].trim().split(",");
-						lineCounter++;
-						line=br.readLine().trim();
-						// we parse each style until we reach a new section
-						while (!line.startsWith("[")){
-							//we check it is a style
-							if (line.startsWith("Style:")){
-								//we parse the style
-								style = parseStyleForASS(line.split(":")[1].trim().split(","),styleFormat,lineCounter,isASS,tto.warnings);
-								//and save the style
-								tto.styling.put(style.iD, style);
-							}
-							//next line
-							lineCounter++;
-							line=br.readLine().trim();
-						}
-
-					} else if (line.trim().equalsIgnoreCase("[Events]")){
-						//its the events specification section
-						lineCounter++;
-						line=br.readLine().trim();
-						tto.warnings+="Only dialogue events are considered, all other events are ignored.\n\n";
-						//the first line should define the format of the dialogues
-						if(!line.startsWith("Format:")){
-							//if not, we scan for the format.
-							tto.warnings+="Format: (format definition) expected at line "+line+" for the events section\n\n";
-							while (!line.startsWith("Format:")){
-								lineCounter++;
-								line=br.readLine().trim();
-							}
-						}
-						// we recover the format's fields
-						dialogueFormat = line.split(":")[1].trim().split(",");
-						//next line
-						lineCounter++;
-						line=br.readLine().trim();
-						// we parse each style until we reach a new section
-						while (!line.startsWith("[")){
-							//we check it is a dialogue
-							//WARNING: all other events are ignored.
-							if (line.startsWith("Dialogue:")){
-								//we parse the dialogue
-								caption = parseDialogueForASS(line.split(":",2)[1].trim().split(",",10),dialogueFormat,timer, tto);
-								//and save the caption
-								int key = caption.start.mseconds;
-								//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-								while (tto.captions.containsKey(key)) key++;
-								tto.captions.put(key, caption);
-							}
-							//next line
-							lineCounter++;
-							line=br.readLine().trim();
-						}
-
-					} else if (line.trim().equalsIgnoreCase("[Fonts]") || line.trim().equalsIgnoreCase("[Graphics]")){
-						//its the custom fonts or embedded graphics section
-						//these are not supported
-						tto.warnings+= "The section "+line.trim()+" is not supported for conversion, all information there will be lost.\n\n";
-						line=br.readLine().trim();
-					} else {
-						tto.warnings+= "Unrecognized section: "+line.trim()+" all information there is ignored.";
-						line=br.readLine().trim();
-					}	
-				} else {
-					line = br.readLine();
-					lineCounter++;
-				}
-			}
-			// parsed styles that are not used should be eliminated
-			tto.cleanUnusedStyles();
-
-		}  catch (NullPointerException e){
-			tto.warnings+= "unexpected end of file, maybe last caption is not complete.\n\n";
-		} finally{
-			//we close the reader
-			is.close();
-		}
-
-		tto.built = true;
-		return tto;
-	}
-
-
-	public String[] toFile(TimedTextObject tto) {
-		
-		//first we check if the TimedTextObject had been built, otherwise...
-		if(!tto.built)
-			return null;
-
-		//we will write the lines in an ArrayList 
-		int index = 0;
-		//the minimum size of the file is the number of captions and styles + lines for sections and formats and the script info, so we'll take some extra space.
-		ArrayList<String> file = new ArrayList<String>(30+tto.styling.size()+tto.captions.size());
-
-	//header is placed
-		file.add(index++,"[Script Info]");
-		//title next
-		String title = "Title: ";
-		if (tto.title == null || "".equals(tto.title))
-			title += tto.fileName;
-		else title += tto.title;
-		file.add(index++,title);
-		//author next
-		String author = "Original Script: ";
-		if (tto.author == null || "".equals(tto.author))
-			author += "Unknown";
-		else author += tto.author;
-		file.add(index++,author);
-		//additional info
-		if (tto.copyrigth != null && !"".equals(tto.copyrigth))
-			file.add(index++,"; "+tto.copyrigth);
-		if (tto.description != null && !"".equals(tto.description))
-			file.add(index++,"; "+tto.description);
-		file.add(index++,"; Converted by the Online Subtitle Converter developed by J. David Requejo");
-		//mandatory info
-		if (tto.useASSInsteadOfSSA)
-			file.add(index++,"Script Type: V4.00+");
-		else file.add(index++,"Script Type: V4.00");
-		file.add(index++,"Collisions: Normal");
-		file.add(index++,"Timer: 100,0000");
-		if (tto.useASSInsteadOfSSA)
-			file.add(index++,"WrapStyle: 1");
-		//an empty line is added
-		file.add(index++,"");
-
-	//Styles section
-		if (tto.useASSInsteadOfSSA)
-			file.add(index++,"[V4+ Styles]");
-		else file.add(index++,"[V4 Styles]");
-		//define the format
-		if (tto.useASSInsteadOfSSA)
-			file.add(index++,"Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding");
-		else file.add(index++,"Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding");
-		//Next we iterate over the styles
-		Iterator<Style> itrS = tto.styling.values().iterator();
-		while(itrS.hasNext()){
-			String styleLine = "Style: ";
-			//new style
-			Style current = itrS.next();
-			//name
-			styleLine+= current.iD+",";
-			styleLine+= current.font+",";
-			styleLine+= current.fontSize+",";
-			styleLine+= getColorsForASS(tto.useASSInsteadOfSSA, current);
-			styleLine+= getOptionsForASS(tto.useASSInsteadOfSSA, current);
-			//BorderStyle, Outline, Shadow
-			styleLine+= "1,2,2,";
-			styleLine+= getAlignForASS(tto.useASSInsteadOfSSA, current.textAlign);
-			//MarginL, MarginR, MarginV
-			styleLine+= ",0,0,0,";
-			//AlphaLevel
-			if(!tto.useASSInsteadOfSSA)styleLine+= "0,";
-			//Encoding
-			styleLine+= "0";
-
-			//and we add the style definition line
-			file.add(index++,styleLine);
-		}
-		//an empty line is added
-		file.add(index++,"");
-
-	//Events section
-		file.add(index++,"[Events]");
-		//define the format
-		if (tto.useASSInsteadOfSSA)
-			file.add(index++,"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text");
-		else file.add(index++,"Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text");
-		//Next we iterate over the captions
-		Iterator<Caption> itrC = tto.captions.values().iterator();
-		while(itrC.hasNext()){
-			//for each caption
-			String line = "Dialogue: 0,";
-			//new caption
-			Caption current = itrC.next();
-			//offset is applied
-			if(tto.offset != 0){
-				current.start.mseconds += tto.offset;
-				current.end.mseconds += tto.offset;
-			}
-			//start time
-			line+= current.start.getTime("h:mm:ss.cs")+",";
-			//end time
-			line+= current.end.getTime("h:mm:ss.cs")+",";
-			//offset is undone
-			if(tto.offset != 0){
-				current.start.mseconds -= tto.offset;
-				current.end.mseconds -= tto.offset;
-			}
-			//style
-			if (current.style != null)
-				line+= current.style.iD;
-			else
-				line+="Default";
-			//default margins are used, no name or effect is recognized
-			line+=",,0000,0000,0000,,";
-
-			//we add the caption text with \N as line breaks  and clean of XML
-			line +=  current.content.replaceAll("<br />","·N").replaceAll("\\<.*?\\>", "").replace('·', '\\');
-			//and we add the caption line
-			file.add(index++,line);
-		}
-		//an empty line is added
-		file.add(index++,"");
-
-		//we return the expected file as an array of String
-		String[] toReturn = new String [file.size()];
-		for (int i = 0; i < toReturn.length; i++) {
-			toReturn[i] = file.get(i);
-		}
-		return toReturn;
-	}
-
-	/* PRIVATEMETHODS */
-	
-	/**
-	 * This methods transforms a format line from ASS according to a format definition into an Style object.
-	 * 
-	 * @param line the format line without its declaration
-	 * @param styleFormat the list of attributes in this format line
-	 * @return a new Style object.
-	 */
-	private Style parseStyleForASS(String[] line, String[] styleFormat, int index, boolean isASS, String warnings) {
-
-		Style newStyle = new Style(Style.defaultID());
-		if (line.length != styleFormat.length){
-			//both should have the same size
-			warnings+="incorrectly formated line at "+index+"\n\n";
-		} else {
-			for (int i = 0; i < styleFormat.length; i++) {
-				//we go through every format parameter and save the interesting values
-				if (styleFormat[i].trim().equalsIgnoreCase("Name")){
-					//we save the name
-					newStyle.iD=line[i].trim();
-				} else if (styleFormat[i].trim().equalsIgnoreCase("Fontname")){
-					//we save the font
-					newStyle.font=line[i].trim();
-				} else if (styleFormat[i].trim().equalsIgnoreCase("Fontsize")){
-					//we save the size
-					newStyle.fontSize=line[i].trim();
-				}else if (styleFormat[i].trim().equalsIgnoreCase("PrimaryColour")){
-					//we save the color
-					String color =line[i].trim();
-					if(isASS){
-						if(color.startsWith("&H")) newStyle.color=Style.getRGBValue("&HAABBGGRR", color);
-						else  newStyle.color=Style.getRGBValue("decimalCodedAABBGGRR", color);
-					} else {
-						if(color.startsWith("&H")) newStyle.color=Style.getRGBValue("&HBBGGRR", color);
-						else  newStyle.color=Style.getRGBValue("decimalCodedBBGGRR", color);
-					}
-				}else if (styleFormat[i].trim().equalsIgnoreCase("BackColour")){
-					//we save the background color
-					String color =line[i].trim();
-					if(isASS){
-						if(color.startsWith("&H")) newStyle.backgroundColor=Style.getRGBValue("&HAABBGGRR", color);
-						else  newStyle.backgroundColor=Style.getRGBValue("decimalCodedAABBGGRR", color);
-					} else {
-						if(color.startsWith("&H")) newStyle.backgroundColor=Style.getRGBValue("&HBBGGRR", color);
-						else  newStyle.backgroundColor=Style.getRGBValue("decimalCodedBBGGRR", color);
-					}
-				}else if (styleFormat[i].trim().equalsIgnoreCase("Bold")){
-					//we save if bold
-					newStyle.bold=Boolean.parseBoolean(line[i].trim());
-				}else if (styleFormat[i].trim().equalsIgnoreCase("Italic")){
-					//we save if italic
-					newStyle.italic=Boolean.parseBoolean(line[i].trim());
-				}else if (styleFormat[i].trim().equalsIgnoreCase("Underline")){
-					//we save if underlined
-					newStyle.underline=Boolean.parseBoolean(line[i].trim());
-				}else if (styleFormat[i].trim().equalsIgnoreCase("Alignment")){
-					//we save the alignment
-					int placement =Integer.parseInt(line[i].trim());
-					if (isASS){
-						switch(placement){
-						case 1:
-							newStyle.textAlign="bottom-left";
-							break;
-						case 2:
-							newStyle.textAlign="bottom-center";
-							break;
-						case 3:
-							newStyle.textAlign="bottom-right";
-							break;
-						case 4:
-							newStyle.textAlign="mid-left";
-							break;
-						case 5:
-							newStyle.textAlign="mid-center";
-							break;
-						case 6:
-							newStyle.textAlign="mid-right";
-							break;
-						case 7:
-							newStyle.textAlign="top-left";
-							break;
-						case 8:
-							newStyle.textAlign="top-center"; 
-							break;
-						case 9:
-							newStyle.textAlign="top-right";
-							break;
-						default:
-							warnings+="undefined alignment for style at line "+index+"\n\n";
-						}
-					} else {
-						switch(placement){
-						case 9:
-							newStyle.textAlign="bottom-left";
-							break;
-						case 10:
-							newStyle.textAlign="bottom-center";
-							break;
-						case 11:
-							newStyle.textAlign="bottom-right";
-							break;
-						case 1:
-							newStyle.textAlign="mid-left";
-							break;
-						case 2:
-							newStyle.textAlign="mid-center";
-							break;
-						case 3:
-							newStyle.textAlign="mid-right";
-							break;
-						case 5:
-							newStyle.textAlign="top-left";
-							break;
-						case 6:
-							newStyle.textAlign="top-center"; 
-							break;
-						case 7:
-							newStyle.textAlign="top-right";
-							break;
-						default:
-							warnings+="undefined alignment for style at line "+index+"\n\n";
-						}
-					}
-				}	
-				
-			}
-		}
-		
-		return newStyle;
-	}
-	
-	/**
-	 * This methods transforms a dialogue line from ASS according to a format definition into an Caption object.
-	 * 
-	 * @param line the dialogue line without its declaration
-	 * @param dialogueFormat the list of attributes in this dialogue line
-	 * @param timer % to speed or slow the clock, above 100% span of the subtitles is reduced.
-	 * @return a new Caption object
-	 */
-	private Caption parseDialogueForASS(String[] line, String[] dialogueFormat, float timer, TimedTextObject tto) {
-		
-		Caption newCaption = new Caption();
-		
-		//all information from fields 10 onwards are the caption text therefore needn't be split
-		String captionText = line[9];
-		//text is cleaned before being inserted into the caption
-		newCaption.content = captionText.replaceAll("\\{.*?\\}", "").replace("\n", "<br />").replace("\\N", "<br />");		
-		
-		for (int i = 0; i < dialogueFormat.length; i++) {
-			//we go through every format parameter and save the interesting values
-			if (dialogueFormat[i].trim().equalsIgnoreCase("Style")){
-				//we save the style
-				Style s =  tto.styling.get(line[i].trim());
-				if (s!=null)
-					newCaption.style= s;
-				else
-					tto.warnings+="undefined style: "+line[i].trim()+"\n\n";
-			} else if (dialogueFormat[i].trim().equalsIgnoreCase("Start")){
-				//we save the starting time
-				newCaption.start=new LocalTime("h:mm:ss.cs",line[i].trim());
-			} else if (dialogueFormat[i].trim().equalsIgnoreCase("End")){
-				//we save the starting time
-				newCaption.end=new LocalTime("h:mm:ss.cs",line[i].trim());
-			}
-		}
-		
-		//timer is applied
-    	if (timer != 100){
-    		newCaption.start.mseconds /= (timer/100);
-    		newCaption.end.mseconds /= (timer/100);
-    	}
-		return newCaption;
-	}
-	
-	/**
-	 * returns a string with the correctly formated colors
-	 * @param useASSInsteadOfSSA true if formated for ASS
-	 * @return the colors in the decimal format
-	 */
-	private String getColorsForASS(boolean useASSInsteadOfSSA, Style style) {
-		String colors;
-		if(useASSInsteadOfSSA)
-			//primary color(BBGGRR) with Alpha level (00) in front + 00FFFFFF + 00000000 + background color(BBGGRR) with Alpha level (80) in front
-			colors=Integer.parseInt("00"+ style.color.substring(4,6)+style.color.substring(2, 4)+style.color.substring(0, 2), 16)+",16777215,0,"+Long.parseLong("80"+ style.backgroundColor.substring(4,6)+style.backgroundColor.substring(2, 4)+style.backgroundColor.substring(0, 2), 16)+",";
-		else {
-			//primary color(BBGGRR) + FFFFFF + 000000 + background color(BBGGRR)
-			String color = style.color.substring(4,6)+style.color.substring(2, 4)+style.color.substring(0, 2);
-			String bgcolor = style.backgroundColor.substring(4,6)+style.backgroundColor.substring(2, 4)+style.backgroundColor.substring(0, 2);
-			colors=Long.parseLong(color, 16)+",16777215,0,"+Long.parseLong(bgcolor, 16)+",";	
-		}
-		return colors;
-	}
-	
-	/**
-	 * returns a string with the correctly formated options
-	 * @param useASSInsteadOfSSA
-	 * @return
-	 */
-	private String getOptionsForASS(boolean useASSInsteadOfSSA, Style style) {
-		String options;
-		if (style.bold)
-			options="-1,";
-		else
-			options="0,";
-		if (style.italic)
-			options+="-1,";
-		else
-			options+="0,";
-		if(useASSInsteadOfSSA){
-			if (style.underline)
-				options+="-1,";
-			else
-				options+="0,";
-			options+="0,100,100,0,0,";
-		}	
-		return options;
-	}
-	
-	/**
-	 * converts the string explaining the alignment into the ASS equivalent integer offering bottom-center as default value
-	 * @param useASSInsteadOfSSA
-	 * @param align
-	 * @return
-	 */
-	private int getAlignForASS(boolean useASSInsteadOfSSA, String align) {
-		if (useASSInsteadOfSSA){
-			int placement = 2;
-			if ("bottom-left".equals(align))
-				placement = 1;
-			else if ("bottom-center".equals(align))
-				placement = 2;
-			else if ("bottom-right".equals(align))
-				placement = 3;
-			else if ("mid-left".equals(align))
-				placement = 4;
-			else if ("mid-center".equals(align))
-				placement = 5;
-			else if ("mid-right".equals(align))
-				placement = 6;
-			else if ("top-left".equals(align))
-				placement = 7;
-			else if ("top-center".equals(align))
-				placement = 8;
-			else if ("top-right".equals(align))
-				placement = 9;
-			
-			return placement;
-		} else {
-
-			int placement = 10;
-			if ("bottom-left".equals(align))
-				placement = 9;
-			else if ("bottom-center".equals(align))
-				placement = 10;
-			else if ("bottom-right".equals(align))
-				placement = 11;
-			else if ("mid-left".equals(align))
-				placement = 1;
-			else if ("mid-center".equals(align))
-				placement = 2;
-			else if ("mid-right".equals(align))
-				placement = 3;
-			else if ("top-left".equals(align))
-				placement = 5;
-			else if ("top-center".equals(align))
-				placement = 6;
-			else if ("top-right".equals(align))
-				placement = 7;
-			
-			return placement;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/Sub/FormatSCC.java b/showkeyHelper/src/com/joyplus/Sub/FormatSCC.java
deleted file mode 100644
index d92c88e..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FormatSCC.java
+++ /dev/null
@@ -1,1056 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * This class represents the .SCC subtitle format
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public class FormatSCC implements TimedTextFileFormat {
-
-	public TimedTextObject parseFile(String fileName, InputStream is) throws IOException, FatalParsingException {
-		
-		TimedTextObject tto = new TimedTextObject();
-		Caption newCaption = null;
-		
-		//variables to represent a decoder
-		String textBuffer = "";
-		boolean isChannel1 = false;
-		boolean isBuffered = true;
-		
-		//to store current style
-		boolean underlined = false;
-		boolean italics = false;
-		String color = null;
-
-		//first lets load the file
-		BufferedReader br = new BufferedReader(new InputStreamReader(is));
-
-		//the file name is saved
-		tto.fileName = fileName;
-		tto.title = fileName;
-
-		String line;
-		int lineCounter = 0;
-		try {
-			
-			lineCounter++;
-			//the file must start with the type declaration
-			//if (!br.readLine().trim().equalsIgnoreCase("Scenarist_SCC V1.0")){
-				//this is a fatal parsing error.
-			//	throw new FatalParsingException("The fist line should define the file type: \"Scenarist_SCC V1.0\"");
-
-			//} else {
-			{	
-				createSCCStyles(tto);
-				
-				tto.warnings+="Only data from CC channel 1 will be extracted.\n\n";
-				line = br.readLine();
-
-				while(line!=null){
-					line = line.trim();
-					lineCounter++;
-					//if its not an empty line
-					if(!(line.length()<=0)){
-						//we separate the time code from the VANC data
-						String[] data = line.split("\t");
-						LocalTime currentTime = new LocalTime("h:m:s:f/fps", data[0]+"/29.97");
-						//we separate the words
-						data = data[1].split(" ");
-						for (int j = 0; j < data.length; j++) {
-							//we get its hex value stored in a short
-							int word = Integer.parseInt(data[j],16);
-
-							// odd parity could be checked here
-
-							//we eliminate the parity bits before decoding
-							word &= 0x7f7f;
-
-							// if it is a char:
-							if ((word & 0x6000) != 0){
-								//if we are in the right channel (1)
-								if(isChannel1){
-									//we extract the two chars
-									byte c1 = (byte) ((word & 0xff00)>>>8);
-									byte c2 = (byte) (word & 0x00ff);
-									
-									if (isBuffered){
-										//we decode the byte and add it to the text buffer
-										textBuffer += decodeChar(c1);
-										//we decode the second char and add it, this one can be empty.
-										textBuffer += decodeChar(c2);
-									} else {
-										//we decode the byte and add it to the text screen
-										newCaption.content += decodeChar(c1);
-										//we decode the second char and add it, this one can be empty.
-										newCaption.content += decodeChar(c2);
-									}
-								}
-
-							} else if (word==0x0000)
-								// word 8080 is filler to add frames
-								currentTime.mseconds+=1000/29.97;	
-							else {
-								//it is a control code
-								if (j+1 < data.length && data[j].equals(data[j+1]))
-									//if code is repeated, skip one.
-									j++;
-
-								// we check the channel
-								if ((word&0x0800)==0){
-									//we are on channel 1 or 3
-
-									//we parse the code
-									if ((word&0x1670)==0x1420){
-										//it is a command code
-										//we check the channel
-										if ((word&0x0100)==0){
-											//it is channel 1
-											isChannel1 = true;
-											//the command is decoded
-											word&=0x000f;
-											switch (word){
-											case 0:
-												//Resume Caption Loading: start pop on captions
-												isBuffered = true;
-												textBuffer = "";
-												break;
-											case 5:
-											case 6:
-											case 7:
-												//roll-up caption by number of rows, effect not supported
-												//clear text buffer
-												textBuffer="";
-												//clear screen text
-												if (newCaption != null){
-													newCaption.end = currentTime;
-													String style = "";
-													style += color;
-													if (underlined) style +="U";
-													if (italics) style += "I";
-													newCaption.style = tto.styling.get(style);
-													tto.captions.put(newCaption.start.mseconds, newCaption);
-												}
-												//new caption starts with roll up style
-												newCaption = new Caption();
-												newCaption.start = currentTime;
-												//all characters and codes will be applied directly to the screen
-												isBuffered = false;
-												break;
-											case 9:
-												//Resume Direct Captioning: start paint-on captions
-												isBuffered = false;
-												newCaption = new Caption();
-												newCaption.start = currentTime;
-												break;
-											case 12:
-												//Erase Displayed Memory: clear screen text
-												if (newCaption != null){
-													newCaption.end = currentTime;
-													if (newCaption.start != null){
-														//we save the caption
-														int key = newCaption.start.mseconds;
-														//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-														while (tto.captions.containsKey(key)) key++;
-														//we save the caption
-														tto.captions.put(newCaption.start.mseconds, newCaption);
-														//and reset the caption builder
-														newCaption = new Caption();	
-													}
-												}
-												break;
-											case 14:
-												//Erase Non-Displayed Memory: clear the text buffer
-												textBuffer = "";
-												break;
-											case 15:
-												//End of caption: Swap off-screen buffer with caption screen.
-												newCaption = new Caption();
-												newCaption.start = currentTime;
-												newCaption.content += textBuffer;
-												break;
-											default:
-												//unsupported or unrecognized command code
-											}
-											
-										} else {
-											isChannel1 = false;
-										}
-
-									} else if (isChannel1){
-										if ((word&0x1040)==0x1040){
-											//it is a preamble code, format is removed
-											color = "white";
-											underlined = false;
-											italics = false;
-											//it is a new line
-											if (isBuffered && !(textBuffer.length()<=0))
-												textBuffer+="<br />";
-											if (!isBuffered && !(newCaption.content.length()<=0))
-												newCaption.content+="<br />";
-											if((word&0x0001)==1)
-												//it is underlined
-												underlined = true;
-											//positioning is not supported, rows and columns are ignored
-											if((word&0x0010)!=0x0010){
-												//setting style for following text
-												word&=0x000e;
-												word = (short)(word>>1);
-												switch (word){
-												case 0:
-													color = "white";
-													break;
-												case 1:
-													color = "green";
-													break;
-												case 2:
-													color = "blue";
-													break;
-												case 3:
-													color = "cyan";
-													break;
-												case 4:
-													color = "red";
-													break;
-												case 5:
-													color = "yellow";
-													break;
-												case 6:
-													color = "magenta";
-													break;
-												case 7:
-													italics = true;
-													break;
-												default:
-													//error!	
-												}
-											} else {
-												color = "white";
-											}
-											
-
-										} else if ((word&0x1770)==0x1120){
-											//it is a midrow style code
-											if((word&0x001)==1)
-												//it is underlined
-												underlined = true;
-											else underlined = false;
-											//setting style for text
-											word&=0x000e;
-											word = (short)(word>>1);
-											switch (word){
-											case 0:
-												color = "white";
-												italics = false;
-												break;
-											case 1:
-												color = "green";
-												italics = false;
-												break;
-											case 2:
-												color = "blue";
-												italics = false;
-												break;
-											case 3:
-												color = "cyan";
-												italics = false;
-												break;
-											case 4:
-												color = "red";
-												italics = false;
-												break;
-											case 5:
-												color = "yellow";
-												italics = false;
-												break;
-											case 6:
-												color = "magenta";
-												italics = false;
-												break;
-											case 7:
-												italics = true;
-												break;
-											default:
-												//error!	
-											}
-										} else if ((word&0x177c)==0x1720){
-											//it is a tab code
-											//positioning is not supported
-
-										} else if ((word&0x1770)==0x1130){
-											//it is a special character code
-											word&=0x000f;
-											//coded value is extracted
-											if (isBuffered)
-												//we decode the special char and add it to the text buffer
-												textBuffer += decodeSpecialChar(word);
-											 else 
-												//we decode the special char and add it to the text
-												 newCaption.content += decodeSpecialChar(word);
-										} else if ((word&0x1660)==0x1220){
-											//it is an extended character code
-											word&=0x011f;
-											//coded value is extracted
-											if (isBuffered)
-												//we decode the extended char and add it to the text buffer
-												decodeXtChar(textBuffer, word);
-											 else 
-												//we decode the extended char and add it to the text
-												decodeXtChar(newCaption.content, word);
-
-										} else {
-											//non recognized code
-										}
-									}
-								} else {
-									//we are on channel 2 or 4
-									isChannel1 = false;
-								}
-
-							}
-						}
-
-
-					}
-					// end of while
-					line = br.readLine();
-
-				}
-
-				//we save any last shown caption
-				newCaption.end =  new LocalTime("h:m:s:f/fps", "99:59:59:29/29.97");;
-				if (newCaption.start != null){
-					//we save the caption
-					int key = newCaption.start.mseconds;
-					//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-					while (tto.captions.containsKey(key)) key++;
-					//we save the caption
-					tto.captions.put(newCaption.start.mseconds, newCaption);
-				}
-				tto.cleanUnusedStyles();
-			}
-
-		}  catch (NullPointerException e){
-			tto.warnings+= "unexpected end of file at line "+lineCounter+", maybe last caption is not complete.\n\n";
-		} finally{
-			//we close the reader
-			is.close();
-		}
-
-		tto.built = true;
-		return tto;
-	}
-
-
-	public String[] toFile(TimedTextObject tto) {
-		
-		//first we check if the TimedTextObject had been built, otherwise...
-		if(!tto.built)
-			return null;
-		
-		//we will write the lines in an ArrayList 
-		int index = 0;
-		//the minimum size of the file is double the number of captions since lines are double spaced.
-		ArrayList<String> file = new ArrayList<String>(20 + 2*tto.captions.size());
-
-		//first we add the header
-		file.add(index++,"Scenarist_SCC V1.0\n");
-
-		//line is to store the information to add to the file
-		String line;
-		//to store information about the captions
-		Caption oldC;
-		Caption newC = new Caption();
-		newC.content = "";
-		newC.end =  new LocalTime("h:mm:ss.cs", "0:00:00.00");
-
-		//Next we iterate over the captions
-		Iterator<Caption> itrC = tto.captions.values().iterator();
-		while(itrC.hasNext()){
-			line = "";
-			oldC = newC;
-			newC = itrC.next();
-			//if old caption ends after new caption starts
-			if (oldC.end.mseconds > newC.start.mseconds ){
-				//captions overlap
-				newC.content+="<br />"+oldC.content;
-				//we add the time to the new line, and clear old caption so both can now appear
-				newC.start.mseconds-=1000/29.97;
-				//we correct the frame delay (8080 8080)
-				line+=newC.start.getTime("hh:mm:ss:ff/29.97")+"\t942c 942c ";
-				newC.start.mseconds+=1000/29.97;
-				//we clear the buffer and start new pop-on caption
-				line+= "94ae 94ae 9420 9420 ";
-				
-			} else if (oldC.end.mseconds < newC.start.mseconds ){
-				//we clear the screen for new caption
-				line+=oldC.end.getTime("hh:mm:ss:ff/29.97")+"\t942c 942c\n\n";
-				//we add the time to the new line, we clear buffer and start new caption
-				newC.start.mseconds-=1000/29.97;
-				//we correct the frame delay (8080 8080)
-				line+=newC.start.getTime("hh:mm:ss:ff/29.97")+"\t94ae 94ae 9420 9420 ";
-				newC.start.mseconds+=1000/29.97;
-			} else {
-				//we add the time to the new line, we clear screen and buffer and start new caption
-				newC.start.mseconds-=1000/29.97;
-				//we correct the frame delay (8080 8080)
-				line+=newC.start.getTime("hh:mm:ss:ff/29.97")+"\t942c 942c 94ae 94ae 9420 9420 ";
-				newC.start.mseconds+=1000/29.97;
-			}
-			
-			//we add the coded caption text along with any styles to the off-screen buffer
-			line += codeText(newC);
-			//lastly we display the caption
-			line += "8080 8080 942f 942f\n";
-			
-			//we add it to the "file"
-			file.add(index++,line);
-
-		}
-
-		//an empty line is added
-		file.add(index++,"");
-
-		//we return the expected file as an array of String
-		String[] toReturn = new String [file.size()];
-		for (int i = 0; i < toReturn.length; i++) {
-			toReturn[i] = file.get(i);
-		}
-		return toReturn;
-	}
-	
-	/* PRIVATEMETHODS */
-	
-	/**
-	 * INCOMPLETE METHOD: does not tab to correct position or applies styles
-	 */
-	private String codeText(Caption newC) {
-		String toReturn = "";
-		
-		String[]lines = newC.content.split("<br />");
-		
-		int i = 0;
-		int tab = 0;
-		//max 32 chars
-		if(lines[i].length() > 32)
-			lines[i] = lines[i].substring(0, 32);
-		// we calculate tabs to center the text
-		tab = (32-lines[i].length())/2;
-		
-		//we position the cursor with a preamble code
-		//the row should be chosen according to how many lines left...
-		toReturn+="1340 1340 ";
-		//we tab over to the correct spot
-		if(tab%4 != 0)
-			//tab code should go here
-			;
-		
-		//we add the caption style using midrow codes
-		
-		//we code the caption text
-		toReturn+= codeChar(lines[i].toCharArray());
-
-		if (lines.length > 1){
-			//and next line
-			i++;
-
-			//max 32 chars
-			if(lines[i].length() > 32)
-				lines[i] = lines[i].substring(0, 32);
-			// we calculate tabs to center the text
-			tab = (32-lines[i].length())/2;
-
-			//we position the cursor with a preamble code
-			//the row should be chosen according to how many lines left...
-			toReturn+="13e0 13e0 ";
-			//we tab over to the correct spot
-			if(tab%4 != 0)
-				//tab code should go here
-				;
-
-			//we add the caption style using midrow codes
-
-			//we code the caption text
-			toReturn+= codeChar(lines[i].toCharArray());
-
-			if (lines.length > 2){
-				//and next line
-				i++;
-
-				//max 32 chars
-				if(lines[i].length() > 32)
-					lines[i] = lines[i].substring(0, 32);
-				// we calculate tabs to center the text
-				tab = (32-lines[i].length())/2;
-
-				//we position the cursor with a preamble code
-				toReturn+="9440 9440 ";
-				//we tab over to the correct spot
-				if(tab%4 != 0)
-					//tab code should go here
-					;
-				//we add the caption style using midrow codes
-
-				//we code the caption text
-				toReturn+= codeChar(lines[i].toCharArray());
-
-				if (lines.length > 3){
-					//and next line
-					i++;
-
-					//max 32 chars
-					if(lines[i].length() > 32)
-						lines[i] = lines[i].substring(0, 32);
-					// we calculate tabs to center the text
-					tab = (32-lines[i].length())/2;
-
-					//we position the cursor with a preamble code
-					toReturn+="94e0 94e0 ";
-					//we tab over to the correct spot
-					if(tab%4 != 0)
-						//tab code should go here
-						;
-					//we add the caption style using midrow codes
-
-					//we code the caption text
-					toReturn+= codeChar(lines[i].toCharArray());
-
-				}
-			}
-		}
-
-		return toReturn;
-	}
-
-	/**
-	 * INCOMPLETE METHOD, does not consider special or extended chars
-	 */
-	private String codeChar(char[] chars) {
-		String toReturn = "";
-
-		int i;
-		for (i = 0; i < chars.length; i++) {
-			switch (chars[i]){
-			case ' ':
-				toReturn+="20";
-				break;
-			case '!':
-				toReturn+="a1";
-				break;
-			case '"':
-				toReturn+="a2";
-				break;
-			case '#':
-				toReturn+="23";
-				break;
-			case '$':
-				toReturn+="a4";
-				break;
-			case '%':
-				toReturn+="25";
-				break;
-			case '&':
-				toReturn+="26";
-				break;
-			case '\'':
-				toReturn+="a7";
-				break;
-			case '(':
-				toReturn+="a8";
-				break;
-			case ')':
-				toReturn+="29";
-				break;
-			case 'á':
-				toReturn+="2a";
-				break;
-			case '+':
-				toReturn+="ab";
-				break;
-			case ',':
-				toReturn+="2c";
-				break;
-			case '-':
-				toReturn+="ad";
-				break;
-			case '.':
-				toReturn+="ae";
-				break;
-			case '/':
-				toReturn+="2f";
-				break;
-			case '0':
-				toReturn+="b0";
-				break;
-			case '1':
-				toReturn+="31";
-				break;
-			case '2':
-				toReturn+="32";
-				break;
-			case '3':
-				toReturn+="b3";
-				break;
-			case '4':
-				toReturn+="34";
-				break;
-			case '5':
-				toReturn+="b5";
-				break;
-			case '6':
-				toReturn+="b6";
-				break;
-			case '7':
-				toReturn+="37";
-				break;
-			case '8':
-				toReturn+="38";
-				break;
-			case '9':
-				toReturn+="b9";
-				break;
-			case ':':
-				toReturn+="ba";
-				break;
-			case ';':
-				toReturn+="3b";
-				break;
-			case '<':
-				toReturn+="bc";
-				break;
-			case '=':
-				toReturn+="3d";
-				break;
-			case '>':
-				toReturn+="3e";
-				break;
-			case '?':
-				toReturn+="bf";
-				break;
-			case '@':
-				toReturn+="40";
-				break;
-			case 'A':
-				toReturn+="c1";
-				break;
-			case 'B':
-				toReturn+="c2";
-				break;
-			case 'C':
-				toReturn+="43";
-				break;
-			case 'D':
-				toReturn+="c4";
-				break;
-			case 'E':
-				toReturn+="45";
-				break;
-			case 'F':
-				toReturn+="46";
-				break;
-			case 'G':
-				toReturn+="c7";
-				break;
-			case 'H':
-				toReturn+="c8";
-				break;
-			case 'I':
-				toReturn+="49";
-				break;
-			case 'J':
-				toReturn+="4a";
-				break;
-			case 'K':
-				toReturn+="cb";
-				break;
-			case 'L':
-				toReturn+="4c";
-				break;
-			case 'M':
-				toReturn+="cd";
-				break;
-			case 'N':
-				toReturn+="ce";
-				break;
-			case 'O':
-				toReturn+="4f";
-				break;
-			case 'P':
-				toReturn+="d0";
-				break;
-			case 'Q':
-				toReturn+="51";
-				break;
-			case 'R':
-				toReturn+="52";
-				break;
-			case 'S':
-				toReturn+="d3";
-				break;
-			case 'T':
-				toReturn+="54";
-				break;
-			case 'U':
-				toReturn+="d5";
-				break;
-			case 'V':
-				toReturn+="d6";
-				break;
-			case 'W':
-				toReturn+="57";
-				break;
-			case 'X':
-				toReturn+="58";
-				break;
-			case 'Y':
-				toReturn+="d9";
-				break;
-			case 'Z':
-				toReturn+="da";
-				break;
-			case '[':
-				toReturn+="5b";
-				break;
-			case 'é':
-				toReturn+="dc";
-				break;
-			case ']':
-				toReturn+="5d";
-				break;
-			case 'í':
-				toReturn+="5e";
-				break;
-			case 'ó':
-				toReturn+="df";
-				break;
-			case 'ú':
-				toReturn+="e0";
-				break;
-			case 'a':
-				toReturn+="61";
-				break;
-			case 'b':
-				toReturn+="62";
-				break;
-			case 'c':
-				toReturn+="e3";
-				break;
-			case 'd':
-				toReturn+="64";
-				break;
-			case 'e':
-				toReturn+="e5";
-				break;
-			case 'f':
-				toReturn+="e6";
-				break;
-			case 'g':
-				toReturn+="67";
-				break;
-			case 'h':
-				toReturn+="68";
-				break;
-			case 'i':
-				toReturn+="e9";
-				break;
-			case 'j':
-				toReturn+="ea";
-				break;
-			case 'k':
-				toReturn+="6b";
-				break;
-			case 'l':
-				toReturn+="ec";
-				break;
-			case 'm':
-				toReturn+="6d";
-				break;
-			case 'n':
-				toReturn+="6e";
-				break;
-			case 'o':
-				toReturn+="ef";
-				break;
-			case 'p':
-				toReturn+="70";
-				break;
-			case 'q':
-				toReturn+="f1";
-				break;
-			case 'r':
-				toReturn+="f2";
-				break;
-			case 's':
-				toReturn+="73";
-				break;
-			case 't':
-				toReturn+="f4";
-				break;
-			case 'u':
-				toReturn+="75";
-				break;
-			case 'v':
-				toReturn+="76";
-				break;
-			case 'w':
-				toReturn+="f7";
-				break;
-			case 'x':
-				toReturn+="f8";
-				break;
-			case 'y':
-				toReturn+="79";
-				break;
-			case 'z':
-				toReturn+="7a";
-				break;
-			case 'ç':
-				toReturn+="fb";
-				break;
-			case '÷':
-				toReturn+="7c";
-				break;
-			case 'Ñ':
-				toReturn+="fd";
-				break;
-			case 'ñ':
-				toReturn+="fe";
-				break;
-			case '|':
-				toReturn+="7f";
-				break;
-				
-			default:
-				//error
-				//it happens for strange chars, since it is not complete, they are replaced by spaces
-				toReturn+="7f";
-				break;
-			}
-			if(i%2==1) toReturn+=" ";
-		}
-		if(i%2==1) toReturn+="80 ";
-		
-		return toReturn;
-	}
-
-
-	private String decodeChar(byte c) {
-		switch (c){
-		case 42:
-			return "�";
-		case 92:
-			return "é";
-		case 94:
-			return "í";
-		case 95:
-			return "ó";
-		case 96:
-			return "ú";
-		case 123:
-			return "ç";
-		case 124:
-			return "�";
-		case 125:
-			return "Ñ";
-		case 126:
-			return "ñ";
-		case 127:
-			return "|";
-		case 0:
-			//filler code
-			return "";
-		default:
-			return "" + (char)c;
-		}
-	}
-	
-	
-	private String decodeSpecialChar(int word) {
-		switch(word){
-		case 15:
-			return"�";
-		case 14:
-			return "�";
-		case 13:
-			return "�";
-		case 12:
-			return "�";
-		case 11:
-			return "�";
-		case 10:
-			return "�";
-		case 9:
-			return "\u00A0";
-		case 8:
-			return "�";
-		case 7:
-			return "\u266A";
-		case 6:
-			return "�";
-		case 5:
-			return "�";
-		case 4:
-			return "�";
-		case 3:
-			return "�";
-		case 2:
-			return "�";
-		case 1:
-			return "�";
-		case 0:
-			return "�";
-		default:
-			//unrecoginzed code
-			return "";
-		}
-	}
-	
-	private void decodeXtChar(String textBuffer, int word) {
-		switch(word){
-		
-		}
-	}
-	
-	private void createSCCStyles(TimedTextObject tto) {
-		Style style;
-		
-		style = new Style("white");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("green");
-		style.color = Style.getRGBValue("name", "green");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blue");
-		style.color = Style.getRGBValue("name", "blue");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyan");
-		style.color = Style.getRGBValue("name", "cyan");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("red");
-		style.color = Style.getRGBValue("name", "red");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellow");
-		style.color = Style.getRGBValue("name", "yellow");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magenta");
-		style.color = Style.getRGBValue("name", "magenta");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-	}
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/FormatSRT.java b/showkeyHelper/src/com/joyplus/Sub/FormatSRT.java
deleted file mode 100644
index 1204b27..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FormatSRT.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-
-/**
- * This class represents the .SRT subtitle format
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public class FormatSRT implements TimedTextFileFormat {
-
-
-	public TimedTextObject parseFile(String fileName, InputStream is) throws IOException {
-
-		TimedTextObject tto = new TimedTextObject();
-		Caption caption = new Caption();
-		int captionNumber = 1;
-		boolean allGood;
-
-		//first lets load the file
-		InputStreamReader in= new InputStreamReader(is);
-		BufferedReader br = new BufferedReader(in);
-
-		//the file name is saved
-		tto.fileName = fileName;
-
-		String line = br.readLine();
-		int lineCounter = 0;
-		try {
-			while(line!=null){
-				line = line.trim();
-				lineCounter++;
-				//if its a blank line, ignore it, otherwise...
-				if (!line.isEmpty()){
-					allGood = false;
-					//the first thing should be an increasing number
-					try {
-						int num = Integer.parseInt(line);
-						if (num != captionNumber)
-							throw new Exception();
-						else {
-							captionNumber++;
-							allGood = true;
-						}
-					} catch (Exception e) {
-						tto.warnings+= captionNumber + " expected at line " + lineCounter;
-						tto.warnings+= "\n skipping to next line\n\n";
-					}
-					if (allGood){
-						//we go to next line, here the begin and end time should be found
-						try {
-							lineCounter++;
-							line = br.readLine().trim();
-							String start = line.substring(0, 12);
-							String end = line.substring(line.length()-12, line.length());
-							LocalTime time = new LocalTime("hh:mm:ss,ms",start);
-							caption.start = time;
-							time = new LocalTime("hh:mm:ss,ms",end);
-							caption.end = time;
-						} catch (Exception e){
-							tto.warnings += "incorrect time format at line "+lineCounter;
-							allGood = false;
-						}
-					}
-					if (allGood){
-						//we go to next line where the caption text starts
-						lineCounter++;
-						line = br.readLine().trim();
-						String text = "";
-						while (!line.isEmpty()){
-							text+=line+"<br />";
-							line = br.readLine().trim();
-							lineCounter++;
-						}
-						caption.content = text;
-						int key = caption.start.mseconds;
-						//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-						while (tto.captions.containsKey(key)) key++;
-						if (key != caption.start.mseconds)
-							tto.warnings+= "caption with same start time found...\n\n";
-						//we add the caption.
-						tto.captions.put(key, caption);
-					}
-					//we go to next blank
-					while (!line.isEmpty()) {
-						line = br.readLine().trim();
-						lineCounter++;
-					}
-					caption = new Caption();
-				}
-				line = br.readLine();
-			}
-
-		}  catch (NullPointerException e){
-			tto.warnings+= "unexpected end of file, maybe last caption is not complete.\n\n";
-		} finally{
-	        //we close the reader
-	       is.close();
-	     }
-		
-		tto.built = true;
-		return tto;
-	}
-
-
-	public String[] toFile(TimedTextObject tto) {
-		
-		//first we check if the TimedTextObject had been built, otherwise...
-		if(!tto.built)
-			return null;
-
-		//we will write the lines in an ArrayList,
-		int index = 0;
-		//the minimum size of the file is 4*number of captions, so we'll take some extra space.
-		ArrayList<String> file = new ArrayList<String>(5*tto.captions.size());
-		//we iterate over our captions collection, they are ordered since they come from a TreeMap
-		Collection<Caption> c = tto.captions.values();
-		Iterator<Caption> itr = c.iterator();
-		int captionNumber = 1;
-
-		while(itr.hasNext()){
-			//new caption
-			Caption current = itr.next();
-			//number is written
-			file.add(index++,""+captionNumber++);
-			//we check for offset value:
-			if(tto.offset != 0){
-				current.start.mseconds += tto.offset;
-				current.end.mseconds += tto.offset;
-			}
-			//time is written
-			file.add(index++,current.start.getTime("hh:mm:ss,ms")+" --> "+current.end.getTime("hh:mm:ss,ms"));
-			//offset is undone
-			if(tto.offset != 0){
-				current.start.mseconds -= tto.offset;
-				current.end.mseconds -= tto.offset;
-			}
-			//text is added
-			String[] lines = cleanTextForSRT(current);
-			int i=0;
-			while(i<lines.length)
-				file.add(index++,""+lines[i++]);
-			//we add the next blank line
-			file.add(index++,"");
-		}
-
-		String[] toReturn = new String [file.size()];
-		for (int i = 0; i < toReturn.length; i++) {
-			toReturn[i] = file.get(i);
-		}
-		return toReturn;
-	}
-
-
-	/* PRIVATE METHODS */
-
-	/**
-	 * This method cleans caption.content of XML and parses line breaks.
-	 * 
-	 */
-	private String[] cleanTextForSRT(Caption current) {
-		String[] lines;
-		String text = current.content;
-		//add line breaks
-		lines = text.split("<br />");
-		//clean XML
-		for (int i = 0; i < lines.length; i++){
-			//this will destroy all remaining XML tags
-			lines[i] = lines[i].replaceAll("\\<.*?\\>", "");
-		}
-		return lines;
-	}
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/FormatSTL.java b/showkeyHelper/src/com/joyplus/Sub/FormatSTL.java
deleted file mode 100644
index 15c2dfb..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FormatSTL.java
+++ /dev/null
@@ -1,620 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-
-
-/**
- * This class represents the .STL subtitle format
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public class FormatSTL implements TimedTextFileFormat {
-
-	public TimedTextObject parseFile(String fileName, InputStream is) throws IOException, FatalParsingException {
-
-		TimedTextObject tto = new TimedTextObject();
-		tto.fileName = fileName;
-
-		byte [] gsiBlock = new byte [1024];
-		byte [] ttiBlock = new byte [128];
-		
-
-		try {
-			//we read the file
-			//but first we create the possible styles
-			createSTLStyles(tto);
-
-			int bytesRead;
-			//the GSI block is loaded
-			bytesRead = is.read(gsiBlock);
-			if (bytesRead<1024)
-				//the file must contain at least a GSI block and a TTI block
-				//this is a fatal parsing error.
-				throw new FatalParsingException("The file must contain at least a GSI block");
-			//CPC : code page number 0..2
-			//DFC : disk format code 3..10
-			//save the number of frames per second
-			byte[] dfc = {gsiBlock[6],gsiBlock[7]};
-			int fps = Integer.parseInt(new String(dfc));
-			//DSC : Display Standard Code 11
-			//CCT : Character Code Table number 12..13
-			byte[] cct = {gsiBlock[12],gsiBlock[13]};
-			int table = Integer.parseInt(new String(cct));
-			//LC : Language Code 14..15
-			//OPT : Original Programme Title 16..47
-			byte[] opt = new byte [32];
-			System.arraycopy(gsiBlock, 16, opt, 0, 32);
-			String title = new String(opt);
-			//OEP : Original Episode Title 48..79
-			byte[] oet = new byte [32];
-			System.arraycopy(gsiBlock, 48, oet, 0, 32);
-			String episodeTitle = new String(oet);
-			//TPT : Translated Programme Title 80..111
-			//TEP : Translated Episode Title 112..143
-			//TN : Translator's Name 144..175
-			//TCD : Translators Contact Details 176..207
-			//SLR : Subtitle List Reference code 208..223
-			//CD : Creation Date 224..229
-			//RD : Revision Date 230..235
-			//RN : Revision Number 236..237
-			//TNB : Total Number of TTI Blocks 238..242
-			byte[] tnb = {gsiBlock[238],gsiBlock[239],gsiBlock[240],gsiBlock[241],gsiBlock[242]};
-			int numberOfTTIBlocks = Integer.parseInt(new String(tnb));
-			//TNS : Total Number of Subtitles 243..247
-			byte[] tns = {gsiBlock[243],gsiBlock[244],gsiBlock[245],gsiBlock[246],gsiBlock[247]};
-			int numberOfSubtitles = Integer.parseInt(new String(tns));
-			//TNG : Total Number of Subtitle Groups 248..250
-			//MNC : Max Number of characters in row 251..252
-			//MNR : Max number of rows 253..254
-			//TCS : Time Code: Status 255
-			//TCP : Time Code: Start-of-Programme 256..263
-			//TCF : Time Code: First In-Cue 264..271
-			//TND : Total Number of Disks 272
-			//DSN : Disk Sequence Number 273
-			//CO : Country of Origin 274..276
-			//PUB : Publisher 277..308
-			//EN : Editor's Name 309..340
-			//ECD : Editor's Contact Details 341..372
-			// Spare bytes 373..447
-			//UDA : User-Defined Area 448..1023
-
-			//we add the title
-			tto.title = (title.trim()+" "+episodeTitle.trim()).trim();
-			//this checks the reference to the characters coding employed.
-			if (table > 4 || table < 0)
-				tto.warnings+="Invalid Character Code table number, corrupt data? will try to parse anyways assuming it is latin.\n\n";
-			else if (table != 0)
-				tto.warnings+="Only latin alphabet supported for import from STL, other languages may produce unexpected results.\n\n";
-
-			int subtitleNumber = 0;
-			boolean additionalText = false;
-			Caption currentCaption = null;
-			//the TTI blocks are read
-			for (int i = 0; i < numberOfTTIBlocks; i++) {
-				//the TTI block is loaded
-				bytesRead = is.read(ttiBlock);
-				if (bytesRead < 128){
-					//unexpected end of file
-					tto.warnings += "Unexpected end of file, "+i+" blocks read, expecting "+numberOfTTIBlocks+" blocks in total.\n\n";
-					break;
-				}
-
-				//if we have additional text pending, we do not create a new caption
-				if(!additionalText)
-					currentCaption = new Caption();
-
-				//SGN : Subtitle group number 0
-				//SN : Subtitle Number 1..2
-				int currentSubNumber = ttiBlock[1]+256*ttiBlock[2];
-				if (currentSubNumber != subtitleNumber)
-					//missing subtitle number?
-					tto.warnings += "Unexpected subtitle number at TTI block "+i+". Parsing proceeds...\n\n";
-				//EBN : Extension Block Number 3
-				int ebn = ttiBlock[3];
-				if (ebn != -1)
-					additionalText = true;
-				else additionalText = false;
-
-				//CS : Cumulative Status 4
-				//TCI : Time Code In 5..8
-				String startTime = ""+ttiBlock[5]+":"+ttiBlock[6]+":"+ttiBlock[7]+":"+ttiBlock[8];
-				//TCO : Time Code Out 9..12
-				String endTime = ""+ttiBlock[9]+":"+ttiBlock[10]+":"+ttiBlock[11]+":"+ttiBlock[12];;
-				//VP : Vertical Position 13
-				//JC : Justification Code 14
-				int justification = ttiBlock[14];
-				//0:none, 1:left, 2:centered, 3:right
-				//CF : Comment Flag 15
-				if (ttiBlock[15] == 0){
-					//comments are ignored
-					//TF : Text Field 16..112	
-					byte[] textField = new byte [112];
-					System.arraycopy(ttiBlock, 16, textField, 0, 112);
-
-					if(additionalText)
-						//if it is just additional text for the caption
-						parseTextForSTL(currentCaption,textField,justification,tto);
-					else {
-						currentCaption.start = new LocalTime("h:m:s:f/fps", startTime+"/"+fps);
-						currentCaption.end = new LocalTime("h:m:s:f/fps", endTime+"/"+fps);
-						parseTextForSTL(currentCaption,textField,justification,tto);
-					}
-				}
-				//we increase the subtitle number
-				if(!additionalText)
-					subtitleNumber++;
-
-			}
-			if(subtitleNumber != numberOfSubtitles)
-				tto.warnings += "Number of parsed subtitles ("+subtitleNumber+") different from expected number of subtitles ("+numberOfSubtitles+").\n\n";
-
-			//we close the reader
-			is.close();
-
-
-			tto.cleanUnusedStyles();
-
-		} catch (Exception e){
-			//format error
-			e.printStackTrace();
-			throw new FatalParsingException("Format error in the file, migth be due to corrupt data.\n"+e.getMessage());
-		}
-
-		tto.built = true;
-		return tto;
-	}
-
-
-
-	public byte[] toFile(TimedTextObject tto) {
-		
-		//first we check if the TimedTextObject had been built, otherwise...
-		if(!tto.built)
-			return null;
-
-		Caption currentC;
-		
-		byte [] gsiBlock = new byte [1024];
-		byte [] ttiBlock = new byte [128];
-		
-		//we will store the whole binary file as a unique array
-		byte [] file = new byte[1024+128*tto.captions.size()];
-		
-		//we build the GSI block
-		byte [] extra = "850STL25.0110000".getBytes();
-		System.arraycopy(extra, 0, gsiBlock, 0, extra.length);
-		//then we add the title and fill the rest with blanks
-		extra = (tto.title != null)? tto.title.getBytes(): tto.fileName.getBytes();		
-		for (int i = 0; i < 224-16; i++) {
-			if (i< extra.length)
-				gsiBlock[i+16] = extra[i];
-			else 
-				gsiBlock[i+16] = 32;
-
-		}
-		//other info
-		DateFormat dateFormat = new SimpleDateFormat("yyMMdd");
-		Date date = new Date();
-		String aux = dateFormat.format(date);
-		aux +=  aux + "00"; //revision number
-		String aux2 =""+tto.captions.size();
-		while (aux2.length()<5) aux2="0"+aux2;
-		aux += aux2+aux2+"0013216100000000";
-		//we add the time of first subtitle
-		aux += tto.captions.get(tto.captions.firstKey()).start.getTime("hhmmssff/25");
-		aux += "11OOO";
-		extra = aux.getBytes();
-		System.arraycopy(extra, 0, gsiBlock, 224, extra.length);
-		//the rest is filled with blanks
-		for (int i = 277; i < 1024; i++) {
-				gsiBlock[i] = 32;
-		}
-		
-
-		//we add the GSI block to our string representing the file
-		System.arraycopy(gsiBlock,0,file,0,gsiBlock.length);
-		
-		//we iterate over the captions to create the TTI blocks
-		Iterator<Caption> itrC = tto.captions.values().iterator();
-		int subtitleNumber = 0;
-		while(itrC.hasNext()){
-			currentC = itrC.next();
-			//SGN
-			ttiBlock[0] = 0;
-			//SN
-			ttiBlock[1] = (byte) (subtitleNumber%256);
-			ttiBlock[2] = (byte) (subtitleNumber/256);
-			//EBN
-			ttiBlock[3] = (byte) 0xff;
-			//CS
-			ttiBlock[4] = 0;
-			//TCI
-			String [] timeCode = currentC.start.getTime("h:m:s:f/25").split(":");
-			ttiBlock[5] = Byte.parseByte(timeCode[0]);
-			ttiBlock[6] = Byte.parseByte(timeCode[1]);
-			ttiBlock[7] = Byte.parseByte(timeCode[2]);
-			ttiBlock[8] = Byte.parseByte(timeCode[3]);
-			//TCO
-			timeCode = currentC.end.getTime("h:m:s:f/25").split(":");
-			ttiBlock[9] = Byte.parseByte(timeCode[0]);
-			ttiBlock[10] = Byte.parseByte(timeCode[1]);
-			ttiBlock[11] = Byte.parseByte(timeCode[2]);
-			ttiBlock[12] = Byte.parseByte(timeCode[3]);
-			//VP
-			ttiBlock[13] = 18;
-			//JC
-			if (currentC.style != null){
-				if (currentC.style.textAlign.contains("left"))
-					ttiBlock[14] = 1;
-				else if (currentC.style.textAlign.contains("right"))
-					ttiBlock[14] = 3;
-			} else ttiBlock[14] = 2;
-			//CF
-			ttiBlock[15] = 0;
-			//TF
-			String[] lines = currentC.content.split("<br />");
-			//we clean XML, span would be implemented here
-			int pos = 16;
-			for (int i = 0; i < lines.length; i++) 
-				lines[i] = lines[i].replaceAll("\\<.*?\\>", "");
-			//we code the style
-			if (currentC.style != null){
-				Style style = currentC.style;
-				if(style.italic)
-					ttiBlock[pos++]= (byte) 0x80;
-				else ttiBlock[pos++]= (byte) 0x81;
-				if(style.underline)
-					ttiBlock[pos++]= (byte) 0x82;
-				else ttiBlock[pos++]= (byte) 0x83;
-				
-				//colors
-				String color = style.color.substring(0,6);
-				if (color.equalsIgnoreCase("000000"))
-						ttiBlock[pos++]= (byte) 0x00;
-				else if (color.equalsIgnoreCase("0000ff"))
-					ttiBlock[pos++]= (byte) 0x04;
-				else if (color.equalsIgnoreCase("00ffff"))
-					ttiBlock[pos++]= (byte) 0x06;
-				else if (color.equalsIgnoreCase("00ff00"))
-					ttiBlock[pos++]= (byte) 0x02;
-				else if (color.equalsIgnoreCase("ff0000"))
-					ttiBlock[pos++]= (byte) 0x01;
-				else if (color.equalsIgnoreCase("ffff00"))
-					ttiBlock[pos++]= (byte) 0x03;
-				else if (color.equalsIgnoreCase("ff00ff"))
-					ttiBlock[pos++]= (byte) 0x05;
-				else ttiBlock[pos++]= (byte) 0x07;
-	
-			}
-			
-			//we code the text
-			for (int i = 0; i < lines.length; i++) {
-				
-				char [] chars = lines[i].toCharArray();
-				for (int j = 0; j < chars.length; j++) {
-					//check the text is not too long
-					if (pos >126)
-						break;
-					//check it is a supported char, else it is ignored
-					if (chars[j]>=0x20 && chars[j]<=0x7f)
-						ttiBlock[pos++]= (byte) chars[j];
-				}
-				
-				if (i+1 < lines.length)
-					ttiBlock[pos++]= (byte) 0x8A;
-			}
-			
-			//we fill the rest with end characters
-			while (pos < 128)
-				ttiBlock[pos++]= (byte) 0x8F;
-			
-			
-			//we add the TTI block to our string representing the file
-			System.arraycopy(ttiBlock,0,file,1024+subtitleNumber*128,ttiBlock.length);
-			ttiBlock = new byte [128];
-			subtitleNumber++;
-		}
-
-		return file;
-	}
-
-	/* PRIVATEMETHODS */
-	
-	
-	/**
-	 * This method parses the text field taking into account STL control codes
-	 * @param currentCaption
-	 * @param textField
-	 * @param justification 
-	 */
-	private void parseTextForSTL(Caption currentCaption, byte[] textField, int justification, TimedTextObject tto) {
-		
-		boolean italics = false;
-		boolean underline = false;
-		String color = "white";
-		Style style;
-		String text = "";
-		
-		//we go around the field in pair of bytes to decode them
-		for (int i = 0; i < textField.length; i++) {
-			
-			if (textField[i] < 0){
-				//first byte > 8 (4 bits)
-				if (textField[i] <= -113){
-					//we might be with a  control code
-					if (i+1<textField.length && textField[i]==textField[i+1])
-						i++; //if repeated skip one
-					switch (textField[i]){
-					case -128:
-						italics = true;
-						break;
-					case -127:
-						italics = false;
-						break;
-					case -126:
-						underline = true;
-						break;
-					case -125:
-						underline = false;
-						break;
-					case -124:
-						//Boxing not supported
-						break;
-					case -123:
-						//Boxing not supported
-						break;
-					case -118:
-						//line break
-						currentCaption.content+=text+"<br />"; //line could be trimmed here
-						text = "";
-						break;
-					case -113:
-						//end of caption
-						currentCaption.content+=text; //line could be trimmed here
-						text = "";
-						//we check the style
-						if(underline)
-							color+="U";
-						if(italics)
-							color+="I";
-						style = tto.styling.get(color);
-						
-						if (justification == 1){
-							color+="L";
-							if (tto.styling.get(color) == null){
-								style = new Style (color,style);
-								style.textAlign = "bottom-left";
-								tto.styling.put(color, style);
-							}else
-								style = tto.styling.get(color);
-						} else if (justification ==3){
-							color+="R";
-							if (tto.styling.get(color) == null){
-								style = new Style (color,style);
-								style.textAlign = "bottom-rigth";
-								tto.styling.put(color, style);
-							} else
-								style = tto.styling.get(color);
-						}
-			
-						//we save the style
-						currentCaption.style = style;
-						//and save the caption
-						int key = currentCaption.start.mseconds;
-						//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-						while (tto.captions.containsKey(key)) key++;
-						tto.captions.put(key, currentCaption);
-						//we end the loop
-						i= textField.length;
-						break;
-					default:
-						//non valid code...
-					}
-				} else {
-					//other codes and non supported characters...
-					//corresponds to the upper half of the character code table
-				}
-
-			} else if(textField[i] < 32){
-				//it is a teletext control code, only colors are supported
-				if (i+1<textField.length && textField[i]==textField[i+1])
-					i++; //if repeated skip one
-				switch (textField[i]){
-				case 7:
-					color = "white";
-					break;
-				case 2:
-					color = "green";
-					break;
-				case 4:
-					color = "blue";
-					break;
-				case 6:
-					color = "cyan";
-					break;
-				case 1:
-					color = "red";
-					break;
-				case 3:
-					color = "yellow";
-					break;
-				case 5:
-					color = "magenta";
-					break;
-				case 0:
-					color = "black";
-					break;
-				default:
-					//non supported	
-				}
-				
-			} else {
-				//we have a supported character coded in the two bytes, range is from 0x20 to 0x7F
-				byte[] x = {textField[i]};
-				text+=new String(x);
-			}
-			
-		}	
-		
-	}
-	
-	private void createSTLStyles(TimedTextObject tto) {
-		Style style;
-		
-		style = new Style("white");
-		style.color = Style.getRGBValue("name", "white");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("whiteI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("green");
-		style.color = Style.getRGBValue("name", "green");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("greenI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blue");
-		style.color = Style.getRGBValue("name", "blue");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blueI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyan");
-		style.color = Style.getRGBValue("name", "cyan");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("cyanI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("red");
-		style.color = Style.getRGBValue("name", "red");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("redI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellow");
-		style.color = Style.getRGBValue("name", "yellow");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("yellowI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magenta");
-		style.color = Style.getRGBValue("name", "magenta");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("magentaI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("black");
-		style.color = Style.getRGBValue("name", "black");
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blackU",style);
-		style.underline = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blackUI",style);
-		style.italic = true;
-		tto.styling.put(style.iD, style);
-		
-		style = new Style("blackI",style);
-		style.underline = false;
-		tto.styling.put(style.iD, style);
-		
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/Sub/FormatTTML.java b/showkeyHelper/src/com/joyplus/Sub/FormatTTML.java
deleted file mode 100644
index 1c78fd9..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/FormatTTML.java
+++ /dev/null
@@ -1,532 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * This class represents W3C's TTML DFXP .XML subtitle format
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public class FormatTTML implements TimedTextFileFormat {
-
-
-	public TimedTextObject parseFile(String fileName, InputStream is) throws IOException, FatalParsingException {
-
-		TimedTextObject tto = new TimedTextObject();
-		tto.fileName = fileName;
-		
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder;
-		try {
-			dBuilder = dbFactory.newDocumentBuilder();
-			Document doc = dBuilder.parse(is);
-			doc.getDocumentElement().normalize();
-			
-			//we recover the metadata
-			Node node = doc.getElementsByTagName("ttm:title").item(0);
-			if (node != null) tto.title = node.getTextContent();
-			node = doc.getElementsByTagName("ttm:copyright").item(0);
-			if (node != null) tto.copyrigth = node.getTextContent();
-			node = doc.getElementsByTagName("ttm:desc").item(0);
-			if (node != null) tto.description = node.getTextContent();
-			
-			//we recover the styles
-			NodeList styleN = doc.getElementsByTagName("style");
-			//we recover the timed text elements
-			NodeList captionsN = doc.getElementsByTagName("p");
-			//regions of the layout could also be recovered this way
-			
-			tto.warnings += "Styling attributes are only recognized inside a style definition, to be referenced later in the captions.\n\n";
-			//we parse the styles
-			for (int i = 0; i < styleN.getLength(); i++) {
-				Style style = new Style(Style.defaultID());
-				node = styleN.item(i);
-				NamedNodeMap attr = node.getAttributes();
-				//we get the id
-				Node currentAtr = attr.getNamedItem("id");
-				if (currentAtr != null)
-					style.iD = currentAtr.getNodeValue();
-				currentAtr = attr.getNamedItem("xml:id");
-				if (currentAtr != null)
-					style.iD = currentAtr.getNodeValue();
-				
-				//we get the style it may be based upon
-				currentAtr = attr.getNamedItem("style");
-				if (currentAtr != null)
-					if(tto.styling.containsKey(currentAtr.getNodeValue()))
-							style = new Style (style.iD,tto.styling.get(currentAtr.getNodeValue()));
-				
-				//we check for background color
-				currentAtr = attr.getNamedItem("tts:backgroundColor");
-				if (currentAtr != null)
-					style.backgroundColor = parseColor(currentAtr.getNodeValue(),tto);
-				
-				//we check for color
-				currentAtr = attr.getNamedItem("tts:color");
-				if (currentAtr != null)
-					style.color = parseColor(currentAtr.getNodeValue(),tto);
-				
-				//we check for font family
-				currentAtr = attr.getNamedItem("tts:fontFamily");
-				if (currentAtr != null)
-					style.font = currentAtr.getNodeValue();
-				
-				//we check for font size
-				currentAtr = attr.getNamedItem("tts:fontSize");
-				if (currentAtr != null)
-					style.fontSize = currentAtr.getNodeValue();
-				
-				//we check for italics
-				currentAtr = attr.getNamedItem("tts:fontStyle");
-				if (currentAtr != null)
-					if (currentAtr.getNodeValue().equalsIgnoreCase("italic") || currentAtr.getNodeValue().equalsIgnoreCase("oblique"))
-						style.italic = true;
-					else if  (currentAtr.getNodeValue().equalsIgnoreCase("normal"))
-						style.italic = false;
-				
-				//we check for bold
-				currentAtr = attr.getNamedItem("tts:fontWeight");
-				if (currentAtr != null)
-					if (currentAtr.getNodeValue().equalsIgnoreCase("bold"))
-						style.bold = true;
-					else if  (currentAtr.getNodeValue().equalsIgnoreCase("normal"))
-						style.bold = false;
-				
-				//we check opacity (to set the alpha)
-				currentAtr = attr.getNamedItem("tts:opacity");
-				if (currentAtr != null){
-					try {
-						//a number between 1.0 and 0
-						float alpha = Float.parseFloat(currentAtr.getNodeValue());
-						if (alpha > 1)
-							alpha = 1;
-						else if (alpha < 0)
-							alpha = 0;
-						
-						String aa = Integer.toHexString((int) (alpha*255));
-						if (aa.length()<2)
-							aa = "0"+aa;
-						
-						style.color = style.color.substring(0, 6)+aa;
-						style.backgroundColor = style.backgroundColor.substring(0, 6)+aa;
-						
-					} catch (NumberFormatException e){
-						//ignore the alpha
-					}
-				}
-				
-				//we check for text align
-				currentAtr = attr.getNamedItem("tts:textAlign");
-				if (currentAtr != null)
-					if (currentAtr.getNodeValue().equalsIgnoreCase("left") || currentAtr.getNodeValue().equalsIgnoreCase("start"))
-						style.textAlign = "bottom-left";
-					else if  (currentAtr.getNodeValue().equalsIgnoreCase("right") || currentAtr.getNodeValue().equalsIgnoreCase("end"))
-						style.textAlign = "bottom-right";
-
-				//we check for underline
-				currentAtr = attr.getNamedItem("tts:textDecoration");
-				if (currentAtr != null)
-					if (currentAtr.getNodeValue().equalsIgnoreCase("underline"))
-						style.underline = true;
-					else if  (currentAtr.getNodeValue().equalsIgnoreCase("noUnderline"))
-						style.underline = false;
-				 
-				//we add the style
-				tto.styling.put(style.iD, style);
-			}
-			
-			//we parse the captions
-			for (int i = 0; i < captionsN.getLength(); i++) {
-				Caption caption = new Caption();
-				caption.content = "";
-				boolean validCaption = true;
-				node = captionsN.item(i);
-				
-				NamedNodeMap attr = node.getAttributes();
-				//we get the begin time
-				Node currentAtr = attr.getNamedItem("begin");
-				//if no begin is present, 0 is assumed
-				caption.start = new LocalTime("", "");
-				caption.end = new LocalTime("", "");
-				if (currentAtr != null)
-					caption.start.mseconds = parseTimeExpression(currentAtr.getNodeValue(), tto, doc);
-
-				//we get the end time, if present, duration is ignored, otherwise end is calculated from duration
-				currentAtr = attr.getNamedItem("end");
-				if (currentAtr != null)
-					caption.end.mseconds = parseTimeExpression(currentAtr.getNodeValue(), tto, doc);
-				else {
-					currentAtr = attr.getNamedItem("dur");
-					if (currentAtr != null)
-						caption.end.mseconds = caption.start.mseconds + parseTimeExpression(currentAtr.getNodeValue(), tto, doc);
-					else 
-						//no end or duration, invalid format, caption is discarded
-						validCaption = false;
-				}
-
-				//we get the style
-				currentAtr = attr.getNamedItem("style");
-				if (currentAtr != null){
-					Style style = tto.styling.get(currentAtr.getNodeValue());
-					if (style != null)
-						caption.style = style;
-					else
-						//unrecognized style
-						tto.warnings += "unrecoginzed style referenced: "+currentAtr.getNodeValue()+"\n\n"; 
-				}
-				
-				//we save the text
-				NodeList textN = node.getChildNodes();
-				for (int j = 0; j < textN.getLength(); j++) {
-					if(textN.item(j).getNodeName().equals("#text"))
-						caption.content+=textN.item(j).getTextContent().trim();
-					else if (textN.item(j).getNodeName().equals("br"))
-						caption.content+="<br />";
-					
-				}
-				//is this check worth it?
-				if (caption.content.replaceAll("<br />","").trim().isEmpty())
-					validCaption = false;
-				
-				//and save the caption
-				if (validCaption){
-					int key = caption.start.mseconds;
-					//in case the key is already there, we increase it by a millisecond, since no duplicates are allowed
-					while (tto.captions.containsKey(key)) key++;
-					tto.captions.put(key, caption);
-				}
-
-			}
-
-			
-		}catch(Exception e){
-			e.printStackTrace();
-			//this could be a fatal error...
-			throw new FatalParsingException("Error during parsing: "+e.getMessage());
-		}
-
-		
-		tto.built = true;
-		return tto;
-	}
-
-
-
-
-
-
-	public String[] toFile(TimedTextObject tto) {
-
-		//first we check if the TimedTextObject had been built, otherwise...
-		if(!tto.built)
-			return null;
-
-		//we will write the lines in an ArrayList 
-		int index = 0;
-		//the minimum size of the file is the number of captions and styles + lines for sections and formats and the metadata, so we'll take some extra space.
-		ArrayList<String> file = new ArrayList<String>(30+tto.styling.size()+tto.captions.size());
-
-		//identification line is placed
-		file.add(index++,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		//root element is placed
-		file.add(index++,"<tt xml:lang=\""+tto.language+"\" xmlns=\"http://www.w3.org/ns/ttml\" xmlns:tts=\"http://www.w3.org/ns/ttml#styling\">");
-		//head
-		file.add(index++,"\t<head>");
-		//metadata
-		file.add(index++,"\t\t<metadata xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\">");
-		//title
-		String title;
-		if (tto.title == null || tto.title.isEmpty())
-			title = tto.fileName;
-		else title = tto.title;
-		file.add(index++,"\t\t\t<ttm:title>"+title+"</ttm:title>");
-		//Copyright
-		if (tto.copyrigth != null && !tto.copyrigth.isEmpty())
-			file.add(index++,"\t\t\t<ttm:copyright>"+tto.copyrigth+"</ttm:copyright>");
-		//additional info
-		String desc = "Converted by the Online Subtitle Converter developed by J. David Requejo\n";
-		if (tto.author != null && !tto.author.isEmpty())
-			desc+="\n Original file by: "+tto.author+"\n";
-		if (tto.description != null && !tto.description.isEmpty())
-			desc+=tto.description+"\n";
-		file.add(index++,"\t\t\t<ttm:desc>"+desc+"\t\t\t</ttm:desc>");
-
-		//metadata closes
-		file.add(index++,"\t\t</metadata>");
-		//styling opens
-		file.add(index++,"\t\t<styling>");
-
-		String line;
-		//Next we iterate over the styles
-		Iterator<Style> itrS = tto.styling.values().iterator();
-		while(itrS.hasNext()){
-			Style style = itrS.next();
-			//we add the attributes
-			line = "\t\t\t<style xml:id=\""+style.iD+"\"";
-			if(style.color!=null)
-				line += " tts:color=\"#"+style.color+"\"";
-			if(style.backgroundColor!=null)
-				line += " tts:backgroundColor=\"#"+style.backgroundColor+"\"";
-			if(style.font!=null)
-				line += " tts:fontFamily=\""+style.font+"\"";
-			if(style.fontSize!=null)
-				line += " tts:fontSize=\""+style.fontSize+"\"";
-			if (style.italic)
-				line += " tts:fontStyle=\"italic\"";
-			if (style.bold)
-				line += " tts:fontWeight=\"bold\"";
-			line += " tts:textAlign=\"";
-			if (style.textAlign.contains("left"))
-				line +="left\"";
-			else if (style.textAlign.contains("right"))
-				line +="rigth\"";
-			else line +="center\"";
-			if (style.underline)
-				line += " tts:textDecoration=\"underline\"";
-			//style is ready, we close it.
-			line += " />";
-			//we insert it
-			file.add(index++,line);
-		}
-
-		//styling closes
-		file.add(index++,"\t\t</styling>");
-
-		//head closes
-		file.add(index++,"\t</head>");
-		//body opens
-		file.add(index++,"\t<body>");
-		//unique div opens
-		file.add(index++,"\t\t<div>");
-
-		//Next we iterate over the captions
-		Iterator<Caption> itrC = tto.captions.values().iterator();
-		while(itrC.hasNext()){
-			Caption caption = itrC.next();
-			//we open the subtitle line
-			line = "\t\t\t<p begin=\""+caption.start.getTime("hh:mm:ss,ms").replace(',', '.')+"\"";
-			line += " end=\""+caption.end.getTime("hh:mm:ss,ms").replace(',', '.')+"\"";
-			if (caption.style != null)
-				line += " style=\""+caption.style.iD+"\"";
-			//attributes are done being inserted, if region was implemented it should be added before this.
-			line += " >"+caption.content+"</p>\n";
-			//we write the line
-			file.add(index++,line);
-		}
-
-		//unique div closes
-		file.add(index++,"\t\t</div>");
-		//body closes
-		file.add(index++,"\t</body>");
-		//root closes
-		file.add(index++,"</tt>");
-
-		//an empty line is added
-		file.add(index++,"");
-
-		String[] toReturn = new String [file.size()];
-		for (int i = 0; i < toReturn.length; i++) {
-			toReturn[i] = file.get(i);
-		}
-		return toReturn;
-	}
-
-
-	/* PRIVATE METHODS */
-	
-	/**
-	 * Identifies the color expression and obtains the RGBA equivalent value.
-	 * 
-	 * @param color
-	 * @return
-	 */
-	private String parseColor(String color, TimedTextObject tto) {
-		String value = "";
-		String [] values;
-		if (color.startsWith("#")){
-			if (color.length()==7)
-				value = color.substring(1)+"ff";
-			else if (color.length()==9)
-				value = color.substring(1);
-			else {
-				//unrecognized format
-				value = "ffffffff";
-				tto.warnings += "Unrecoginzed format: "+color+"\n\n";
-			}
-			
-		} else if (color.startsWith("rgb")){
-			boolean alpha = false;
-			if (color.startsWith("rgba"))
-					alpha = true;
-			try {
-				values = color.split("(")[1].split(",");
-				int r,g,b,a=255;
-				r = Integer.parseInt(values[0]);
-				g = Integer.parseInt(values[1]);
-				b = Integer.parseInt(values[2].substring(0,2));
-				if (alpha) a = Integer.parseInt(values[3].substring(0,2));
-
-				values[0] = Integer.toHexString(r);
-				values[1] = Integer.toHexString(g);
-				values[2] = Integer.toHexString(b);
-				if (alpha) values[2] = Integer.toHexString(a);
-
-				for (int i = 0; i < values.length; i++) {
-					if(values[i].length()<2)
-						values[i]="0"+values[i];
-					value += values [i];
-				}
-				
-				if (!alpha)
-					value += "ff";
-
-			} catch(Exception e){
-				value = "ffffffff";
-				tto.warnings += "Unrecoginzed color: "+color+"\n\n";
-			}
-			
-		}  else {
-			//it should be a named color so...
-			value = Style.getRGBValue("name", color);
-			//if not recognized named color
-			if (value == null || value.isEmpty()){
-				value = "ffffffff";
-				tto.warnings += "Unrecoginzed color: "+color+"\n\n";
-			}
-		}
-		
-		return value;
-	}
-	
-
-	/**
-	 * returns the number of milliseconds equivalent to this time expression
-	 * 
-	 * @param timeExpression
-	 * @return
-	 */
-	private int parseTimeExpression(String timeExpression, TimedTextObject tto, Document doc) {
-		int mSeconds = 0;
-		if(timeExpression.contains(":")){
-			//it is a clock time
-			String [] parts = timeExpression.split(":");
-			if(parts.length == 3){
-				//we have h:m:s.fraction
-				int h, m;
-				float s;
-				h = Integer.parseInt(parts[0]);
-				m = Integer.parseInt(parts[1]);
-				s = Float.parseFloat(parts[2]);
-				mSeconds = h*3600000+m*60000+(int)(s*1000);
-			} else if (parts.length == 4){
-				//we have h:m:s:f.fraction?
-				int h, m, s;
-				float f;
-				int frameRate = 25;
-				//we recover the frame rate
-				Node n = doc.getElementsByTagName("ttp:frameRate").item(0);
-				if (n != null){
-					//used as auxiliary string
-					String aux = n.getNodeValue();
-					try {
-						frameRate = Integer.parseInt(aux);
-					} catch (NumberFormatException e){
-						//should not happen, but if it does, use default value...
-					}
-				}
-				h = Integer.parseInt(parts[0]);
-				m = Integer.parseInt(parts[1]);
-				s = Integer.parseInt(parts[2]);
-				f = Float.parseFloat(parts[3]);
-				mSeconds = h*3600000+m*60000+s*1000+ (int) (f*1000/frameRate);
-			} else {
-				//unrecognized  clock time format
-			}
-			
-		} else {
-			//it is an offset - time, this is composed of a number and a metric
-			String metric = timeExpression.substring(timeExpression.length()-1);
-			timeExpression = timeExpression.substring(0,timeExpression.length()-1).replace(',','.').trim();
-			double time;
-			try {
-				time = Double.parseDouble(timeExpression);
-				if (metric.equalsIgnoreCase("h"))
-					mSeconds = (int) (time*3600000);
-					
-				else if (metric.equalsIgnoreCase("m"))
-					mSeconds = (int) (time*60000);
-					
-				else if (metric.equalsIgnoreCase("s"))
-					mSeconds = (int) (time*1000);
-					
-				else if (metric.equalsIgnoreCase("ms"))
-					mSeconds = (int) time;
-					
-				else if (metric.equalsIgnoreCase("f")){
-					int frameRate;
-					//we recover the frame rate
-					Node n = doc.getElementsByTagName("ttp:frameRate").item(0);
-					if (n != null){
-						//used as auxiliary string
-						String s = n.getNodeValue();
-						frameRate = Integer.parseInt(s);
-						mSeconds = (int) (time*1000/frameRate);
-					}
-					
-				} else if (metric.equalsIgnoreCase("t")){
-					int tickRate;
-					//we recover the tick rate
-					Node n = doc.getElementsByTagName("ttp:tickRate").item(0);
-					if (n != null){
-						//used as auxiliary string
-						String s = n.getNodeValue();
-						tickRate = Integer.parseInt(s);
-						mSeconds = (int) (time*1000/tickRate);
-					}
-					
-					
-				} else {
-					//invalid metric
-					
-				}
-			} catch (NumberFormatException e){
-				//incorrect format for offset time
-			}
-		}
-		
-		return mSeconds;
-	}
-
-}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/Sub/IOClass.java b/showkeyHelper/src/com/joyplus/Sub/IOClass.java
deleted file mode 100644
index 3000824..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/IOClass.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-
-/**
- * 
- * @author J. David
- * 
- * Clase que se encarga de la lectura y escritura de ficheros o lectura desde teclado
- *
- */
-public class IOClass {
-	
-	/**
-	 * Metodo que recibe el nombre del fichero (o la ruta relativa al directorio de usuario)
-	 * y el fichero a escribir en forma de un array de Strings donde cada String representa una linea
-	 * 
-	 * @param nombreFichero nombre del fichero (o la ruta relativa al directorio de usuario)
-	 * @param ficheroTotal array de Strings donde cada String representa una linea del fichero
-	 */
-	public static void escribirFicheroTxt(String nombreFichero, String[] ficheroTotal){
-		FileWriter fichero = null;
-	    PrintWriter pw = null;
-	    try
-	    {
-	        fichero = new FileWriter(System.getProperty("user.dir")+"\\"+nombreFichero);
-	        pw = new PrintWriter(fichero);
-	
-	        for (int i = 0; i < ficheroTotal.length; i++)
-	            pw.println(ficheroTotal[i]);
-	
-	    } catch (Exception e) {
-	        e.printStackTrace();
-	    } finally {
-	       try {
-	       // Aprovechamos el finally para 
-	       // asegurarnos que se cierra el fichero.
-	       if (null != fichero)
-	          fichero.close();
-	       } catch (Exception e2) {
-	          e2.printStackTrace();
-	       }
-	    }
-	}
-	
-	/**
-	 * Metodo que recibe el nombre del fichero (o la ruta relativa al directorio de usuario)
-	 * y el fichero a escribir en forma de un array de Strings donde cada String representa una linea
-	 * 
-	 * @param nombreFichero nombre del fichero (o la ruta relativa al directorio de usuario)
-	 * @return array de Strings donde cada String representa una linea del fichero leido
-	 */
-	public static String[] leerFicheroTxt(String nombreFichero){
-		
-		String [] s = new String [0];
-		String direccion = System.getProperty("user.dir")+"\\"+ nombreFichero;
-		
-		//Intenta cargar el archivo
-		File archivo = null;
-        FileReader fr = null;
-        BufferedReader br = null;
-		try {
-	        // Apertura del fichero y creacion de BufferedReader para poder
-	        // hacer una lectura comoda (disponer del metodo readLine()).
-	        archivo = new File (direccion);
-	        fr = new FileReader (archivo);
-	        br = new BufferedReader(fr);
-
-	        // Lectura del fichero
-	        String linea = null;
-	        while((linea=br.readLine())!=null){
-	        	int n=0;
-	        	String [] s2 = new String[s.length+1];
-	        	for(n=0;n<s.length;n++)s2[n] = s[n];
-	        	s2[n]=linea.trim();
-	        	s=s2;
-	        }
-	     }catch(Exception e){
-	        System.err.println("No se ha encontrado el archivo");
-	        System.exit(-1);
-	     }finally{
-	        // En el finally cerramos el fichero, para asegurarnos
-	        // que se cierra tanto si todo va bien como si salta 
-	        // una excepcion.
-	        try{                    
-	           if( null != fr ){   
-	              fr.close();     
-	           }                  
-	        }catch (Exception e2){ 
-	           e2.printStackTrace();
-	        }
-	     }
-		return s;
-	}
-	
-	/**
-	 * Metodo que lee una linea desde el teclado
-	 * 
-	 * @return Devuelve el String leido
-	 */
-	public static String leerTeclado(){
-		String respuesta = null;
-		try{
-			InputStreamReader isr = new InputStreamReader (System.in);
-			BufferedReader br = new BufferedReader (isr);
-			respuesta = br.readLine();
-		} catch (IOException e){
-			System.err.println("excepcion al leer el teclado, programa finalizado");
-			System.exit(-1);
-		}
-		return respuesta;
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSub.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSub.java
deleted file mode 100644
index 4f7fbb9..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSub.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.joyplus.Sub;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.joyplus.Sub.JoyplusSubInterface.SubContentType;
-
-public abstract class JoyplusSub implements JoyplusSubInterface{
-    
-	protected String           mTag;
-	protected SubContentType   mContentType;
-	
-	private SubURI     mUri;
-	public  SubURI     getUri(){
-		return mUri;
-	}
-	protected List<Element> elements = new ArrayList<Element>();
-
-	public List<Element> getElements() {
-		return elements;
-	}
-	public static SubContentType getSubContentType(int type){
- 	   switch(type){
- 	   case 1: return SubContentType.SUB_SRT;
- 	   case 2: return SubContentType.SUB_ASS;
- 	   case 3: return SubContentType.SUB_SSA;
- 	   case 4: return SubContentType.SUB_STL;
- 	   case 5: return SubContentType.SUB_SCC;
- 	   }
- 	   return null;
-    }
-	public JoyplusSub(SubURI uri){
-		mUri = uri;
-		mContentType = SubContentType.SUB_UNKNOW;
-	}
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubCarrierContentRestriction.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubCarrierContentRestriction.java
deleted file mode 100644
index 844e174..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubCarrierContentRestriction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.joyplus.Sub;
-
-import com.joyplus.Sub.JoyplusSubInterface.SubContentType;
-
-public class JoyplusSubCarrierContentRestriction implements JoyplusSubContentRestriction{
-	private final static int MAXSIZE = 500*1024;
-	@Override
-	public void checkSubSize(long SubSize, long increaseSize) throws ContentRestrictionException {
-		// TODO Auto-generated method stub
-		if(SubSize<0 || increaseSize<0){
-			throw new ContentRestrictionException();
-		}
-		if((SubSize+increaseSize)>MAXSIZE){
-			throw new ContentRestrictionException();
-		}
-	}
-	@Override
-	public void checkUri(SubContentType type, String uri)
-			throws ContentRestrictionException {
-		// TODO Auto-generated method stub
-		if(type == null || uri==null || type==SubContentType.SUB_UNKNOW){
-			throw new ContentRestrictionException();
-		}
-		if(type == SubContentType.SUB_SRT){
-			CheckSRTUri(uri);
-		}
-	}
-	private void CheckSRTUri(String uri) {
-		// TODO Auto-generated method stub
-		if(uri == null || "".equals(uri))throw new ContentRestrictionException();
-		if(uri.contains("scid=" ))return;
-		if(uri.length() == uri.indexOf(".srt") + 4)return;
-		throw new ContentRestrictionException();
-	}
-
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestriction.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestriction.java
deleted file mode 100644
index c03b4a7..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestriction.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.joyplus.Sub;
-
-import com.joyplus.Sub.JoyplusSubInterface.SubContentType;
-
-public interface JoyplusSubContentRestriction {
-     
-	void checkSubSize(long SubSize, long increaseSize) throws ContentRestrictionException;
-	
-	void checkUri(SubContentType type,String uri) throws ContentRestrictionException;
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestrictionFactory.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestrictionFactory.java
deleted file mode 100644
index 2d0ff34..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubContentRestrictionFactory.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.joyplus.Sub;
-
-public class JoyplusSubContentRestrictionFactory {
-	  private static JoyplusSubContentRestriction sContentRestriction;
-
-	    private JoyplusSubContentRestrictionFactory() {
-	    }
-
-	    public static JoyplusSubContentRestriction getContentRestriction() {
-	        if (null == sContentRestriction) {
-	            sContentRestriction = new JoyplusSubCarrierContentRestriction();
-	        }
-	        return sContentRestriction;
-	    }
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubInterface.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubInterface.java
deleted file mode 100644
index 1838593..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubInterface.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.InputStream;
-
-public interface JoyplusSubInterface {
-	   /*Interface of sub type*/      
-       public enum SubContentType{
-    	   SUB_UNKNOW (0),
-    	   SUB_SRT    (1),
-    	   SUB_ASS    (2),
-    	   SUB_SSA    (3),
-    	   SUB_STL    (4),
-    	   SUB_SCC    (5),
-    	   SUB_MAX    (5);
-    	   private int Type;
-    	   SubContentType(int type){
-    		   Type = type;
-    	   }
-    	   public int toInt(){
-    		   return Type;
-    	   }
-       }
-       
-       public void parse(byte[] sub);
-       
-       public void parseLocal();
-       
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubManager.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubManager.java
deleted file mode 100644
index 641e095..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubManager.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.joyplus.Sub;
-
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-import android.content.Context;
-
-import com.androidquery.AQuery;
-import com.androidquery.callback.AjaxCallback;
-import com.joyplus.tvhelper.utils.Constant;
-import com.joyplus.tvhelper.utils.Log;
-
-public class JoyplusSubManager {
-	
-
-	   private boolean Debug = true;
-	   private static final String  TAG   = "JoyplusSubManager";
-	   
-	   private Context mContext; 
-	   
-	   private JoyplusSubServer mSubServer;
-	   
-	   public JoyplusSubManager(Context context){
-		     mContext   = context;
-		     mSubServer = new JoyplusSubServer(mContext);
-	   }
-	   
-	   /*Interface of init sub uri*/
-	   public void setSubUri(SubURI string){
-		   if(string == null || !mSubServer.CheckSubAviable())return;
-		   List<SubURI> sub = new ArrayList<SubURI>();
-		   sub.add(string);
-		   setSubUri(sub);
-	   }
-	   public void setSubUri(List<SubURI> subUri){
-		   Log.i(TAG, "setSubUri subUri size--->" + subUri.size());
-		   if(subUri==null || subUri.size()<=0 ||mSubServer.CheckSubAviable())return;
-		   mSubServer.setSubUri(subUri);
-	   }
-	   public int getCurrentSubIndex(){
-		   return mSubServer.getCurrentSubIndex();
-	   }
-	   public List<SubURI> getSubList(){
-		   return mSubServer.getSubList();
-	   }
-	   public boolean CheckSubAviable(){
-		   return mSubServer.CheckSubAviable();
-	   }
-	   public boolean IsSubEnable(){
-	    	return mSubServer.IsSubEnable();
-	   }
-	   public void setSubEnable(boolean EN){
-	    	mSubServer.setSubEnable(EN);
-	   }
-	   public void SwitchSub(int index){
-		   if(getSubList().size()<0 || index<0 || index>getSubList().size())return;
-		   mSubServer.SwitchSub(index);
-	   }
-	   public Element getElement(long time){
-		   return mSubServer.getElement(time);
-	   }
-	   
-	   /*Interface of parser uri to get download sub uri*/
-	public List<SubURI> getNetworkSubURI(String url, String MD5,
-			Context context) {
-		List<SubURI> list = new ArrayList<SubURI>();
-		String subTitleUrl = Constant.SUBTITLE_PARSE_URL_URL + "?url="
-				+ URLEncoder.encode(url) + "&md5_code=" + MD5;
-		Log.i(TAG, "subTitleUrl-->" + subTitleUrl);
-		AjaxCallback<JSONObject> cb = new AjaxCallback<JSONObject>();
-		cb.url(subTitleUrl).type(JSONObject.class);
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put("app_key", Constant.APPKEY);
-		cb.SetHeader(headers);
-		(new AQuery(context)).sync(cb);
-		JSONObject jo = cb.getResult();
-		if (jo != null && jo.toString() != null && !"".equals(jo.toString())) {
-			Log.i(TAG, "subtitles--->" + jo.toString());
-			try {
-				JSONObject subtitlesJsonObject = (JSONObject) new JSONTokener(
-						jo.toString()).nextValue();
-				if (subtitlesJsonObject.has("error")) {
-					if (!subtitlesJsonObject.getBoolean("error")
-							&& subtitlesJsonObject.has("subtitles")) {
-						JSONArray subtitleContents = subtitlesJsonObject
-								.getJSONArray("subtitles");
-						if (subtitleContents != null
-								&& subtitleContents.length() > 0) {
-							for (int i = 0; i < subtitleContents.length(); i++) {
-								String tempsubTitleUrl = subtitleContents.getString(i);
-								SubURI subURI = new SubURI();
-								subURI.SubType = SUBTYPE.NETWORK;
-								subURI.Uri = tempsubTitleUrl;
-								list.add(subURI);
-							}
-						}
-					}
-				}
-			} catch (JSONException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		Log.i(TAG, "list size--->" + list.size());
-		return list;
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubServer.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubServer.java
deleted file mode 100644
index bbbe6e1..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubServer.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.joyplus.Sub;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import android.content.Context;
-
-import com.androidquery.AQuery;
-import com.androidquery.callback.AjaxCallback;
-import com.joyplus.Sub.JoyplusSubInterface.SubContentType;
-import com.joyplus.tvhelper.utils.Constant;
-import com.joyplus.tvhelper.utils.Log;
-
-public class JoyplusSubServer {
-	private static final String TAG = "JoyplusSubServer";
-
-	private List<SubURI> SubUri = new ArrayList<SubURI>();
-	
-	private boolean    SubEnable = true;
-	private JoyplusSub mSub;
-    private Context mContext;
-    private JoyplusSub getJoyplusSub(SubContentType type , SubURI uri){
-    	if(type == SubContentType.SUB_ASS)return new ASSSub(uri);
-    	else if(type == SubContentType.SUB_SCC)return new SCCSub(uri);
-    	else if(type == SubContentType.SUB_SRT)return new SRTSub(uri);
-    	else if(type == SubContentType.SUB_SSA)return new SSASub(uri);
-    	else if(type == SubContentType.SUB_STL)return new STLSub(uri);
-    	else return null;
-    }
-    public JoyplusSubServer(Context context){
-    	mContext = context;
-    }
-	public void setSubUri(List<SubURI> subUri){
-		 Log.i(TAG, "setSubUri subUri size--->" + subUri.size());
-		 if(subUri==null || subUri.size()<=0)return;
-		 SubUri = subUri;
-		 CheckSubUriList();
-	}
-	public List<SubURI> getSubList(){
-		return SubUri;
-	}
-    public boolean CheckSubAviable(){
-    	if(mSub != null && mSub.getElements().size()>2)return true;
-    	return false;
-    }
-    public JoyplusSub getJoyplusSub() throws Exception{
-    	if(mSub != null)return mSub;
-    	throw new Exception("JoyplusSub is null");
-    }
-	private void CheckSubUriList() {
-		// TODO Auto-generated method stub
-		Iterator<SubURI> it = SubUri.iterator();
-		while(it.hasNext()){
-			if(InstanceSub(it.next()))return;
-			it.remove();
-		}
-		SubUri = new ArrayList<SubURI>();
-		mSub   = null;
-	}
-	
-	private boolean InstanceSub(SubURI uri){
-		byte[] Subtitle = null;
-		if(uri.SubType == SUBTYPE.NETWORK)
-			Subtitle = getSubByte(uri.Uri);
-		mSub = InstanceSub(uri,Subtitle);
-		if(mSub != null){
-			java.util.Collections.sort(mSub.elements, new SubTitleElementComparator());
-			return true;
-		}
-		return false;
-	}
-	private JoyplusSub InstanceSub(SubURI uri,byte[] subtitle){
-		JoyplusSub sub = null;
-		for(int i=1;i<=SubContentType.SUB_MAX.toInt();i++){
-			sub = InstanceSub(JoyplusSub.getSubContentType(i),uri,subtitle);
-			if(sub !=null)return sub;
-		}
-		return null;
-	}
-	private JoyplusSub InstanceSub(SubContentType type ,SubURI uri,byte[] subtitle){
-		try{
-			if(type.toInt()<=SubContentType.SUB_UNKNOW.toInt()
-					||type.toInt()>SubContentType.SUB_MAX.toInt())return null;
-			JoyplusSub sub = getJoyplusSub(type,uri);
-			if(sub.getUri().SubType == SUBTYPE.NETWORK)
-			      sub.parse(subtitle);
-			else if(sub.getUri().SubType == SUBTYPE.LOCAL)
-				  sub.parseLocal();
-			if(sub.getElements().size()>2)return sub;
-		}catch(ContentRestrictionException e){
-		}
-		return null;
-	}
-   private byte[] getSubByte(String url){		
-		AjaxCallback<byte[]> cb = new AjaxCallback<byte[]>();
-		cb.url(url).type(byte[].class);		
-		Map<String, String> headers = new HashMap<String, String>();
-		headers.put("app_key", Constant.APPKEY);
-		cb.SetHeader(headers); 		
-		(new AQuery(mContext)).sync(cb);
-		byte[] subTitle = cb.getResult();
-		return subTitle;
-	}
-   
-    public void SwitchSub(int index){
-    	if(index>=0 && index<SubUri.size()){
-    		if(!InstanceSub(SubUri.get(index))){
-    			SubUri.remove(index);
-    			CheckSubUriList();
-    		}
-    	}
-    }
-    public boolean IsSubEnable(){
-    	return SubEnable;
-    }
-    public void setSubEnable(boolean EN){
-    	SubEnable = EN;
-    }
-    public int getCurrentSubIndex(){
-    	if(mSub == null || !IsSubEnable())return -1;
-    	return SubUri.indexOf(mSub.getUri());
-    }
-	public Element getElement(long time) {
-		// TODO Auto-generated method stub
-		if(mSub == null || !IsSubEnable()) return null;
-		int start = 0;
-		int end   = mSub.elements.size()-1;
-		if(end<start || end==0)return null;
-		while(start < end){			
-			if(mSub.elements.get(getMiddle(start,end)).getStartTime().getTime()>time){
-				end   = getMiddle(start,end);
-			}else if(mSub.elements.get(getMiddle(start,end)).getStartTime().getTime()<time){
-				start = getMiddle(start,end);
-			}else if(mSub.elements.get(getMiddle(start,end)).getStartTime().getTime()==time){
-				return mSub.elements.get(getMiddle(start,end));
-			}
-			if(start >end )return null;
-			if(start == end ){
-				if( mSub.elements.get(getMiddle(start,end)).getStartTime().getTime()<time 
-						&& (getMiddle(start,end)+1)<mSub.elements.size()){	
-					 return mSub.elements.get(getMiddle(start,end)+1);
-				}else
-					 return mSub.elements.get(getMiddle(start,end)); 
-			}else if((end - start)==1){
-				if(mSub.elements.get(end).getStartTime().getTime()<time){
-					 if(end>=(mSub.elements.size()-1))end=mSub.elements.size()-2;
-					 return mSub.elements.get(end+1);
-				}else if(mSub.elements.get(start).getStartTime().getTime()<time)
-					 return mSub.elements.get(end);
-				else return mSub.elements.get(start);
-			}
-		}
-		return null;
-	}
-	private int getMiddle(int index){
-		if(index%2 != 0){
-			index++;
-		}
-		if(index/2>=mSub.elements.size())return (mSub.elements.size()-1);
-		return index/2;
-	}
-	private int getMiddle(int Start , int End){
-		return getMiddle(Start+End);
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubTime.java b/showkeyHelper/src/com/joyplus/Sub/JoyplusSubTime.java
deleted file mode 100644
index 19b5583..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/JoyplusSubTime.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.joyplus.Sub;
-
-import java.util.Date;
-import java.util.Scanner;
-import java.util.regex.MatchResult;
-
-public class JoyplusSubTime {
-	private long time;
-	
-	public JoyplusSubTime(long time) {
-		this.time = time;
-	}
-	
-	public JoyplusSubTime(long h, long m, long s, long ms) {
-		setTime(getTimeAsLong(h, m, s, ms));
-	}
-	
-	public JoyplusSubTime(String time) {
-		setTime(stringTimeToLong(time));
-	}
-
-	public JoyplusSubTime(Date value) {
-		this.time = value.getTime();
-	}
-
-	/**
-	 * @return the time
-	 */
-	public long getTime() {
-		return time;
-	}
-
-	/**
-	 * @param time the time to set
-	 */
-	public void setTime(long time) {
-		this.time = time;
-	}
-
-	private String longToTime(long time) {
-		return String.format(
-				"%02d:%02d:%02d,%03d", 
-				(time / 3600000),
-				(time / 60000) % 60,
-				(time / 1000) % 60,
-				time % 1000);
-	}
-	
-	private long stringTimeToLong(String time) {
-		Scanner scanner = new Scanner(time);
-		scanner.findInLine("(\\d+):(\\d+):(\\d+),(\\d+)");
-		MatchResult result = scanner.match();
-		int h = Integer.parseInt(result.group(0));
-		int m = Integer.parseInt(result.group(1));
-		int s = Integer.parseInt(result.group(2));
-		int ms = Integer.parseInt(result.group(3));
-		scanner.close();
-		return getTimeAsLong(h, m, s, ms);
-	}
-
-	public long getTimeAsLong(long h, long m, long s, long ms) {
-		return (h*3600000)+(m*60000)+(s*1000)+ms;
-	}
-	
-	public String toString() {
-		return longToTime(getTime());
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/LocalSubParser.java b/showkeyHelper/src/com/joyplus/Sub/LocalSubParser.java
deleted file mode 100644
index 39db20f..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/LocalSubParser.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class LocalSubParser {
-	
-	 
-	 public TimedTextObject ParserFile(File subfile){
-		    JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, subfile.length());
-            TimedTextObject tto;		
-			TimedTextFileFormat ttff;	
-			//To test the correct implementation of the SRT parser and writer.
-			if(subfile.getName().contains(".ass"))ttff = new FormatASS();
-			else if(subfile.getName().contains(".srt"))ttff = new FormatSRT();
-			else if(subfile.getName().contains(".scc"))ttff = new FormatSCC();
-			else if(subfile.getName().contains(".ssa"))ttff = new FormatSCC();
-			else if(subfile.getName().contains(".STL")
-					||subfile.getName().contains(".stl") )ttff = new FormatSTL();
-			else if(subfile.getName().contains(".xml"))ttff = new FormatTTML();
-			else {
-				return null;
-			}
-			InputStream is;
-			try {
-				is = new FileInputStream(subfile);
-				
-				tto = ttff.parseFile(subfile.getName(), is);
-				return tto;
-			} catch (FileNotFoundException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (FatalParsingException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			return null;
- }
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/LocalTime.java b/showkeyHelper/src/com/joyplus/Sub/LocalTime.java
deleted file mode 100644
index 87dec3d..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/LocalTime.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.joyplus.Sub;
-
-public class LocalTime {
-	
-	/**
-	 * Constructor to create a time object.
-	 * 
-	 * @param format supported formats: "hh:mm:ss,ms", "h:mm:ss.cs" and "h:m:s:f/fps"
-	 * @param value  string in the correct format
-	 */
-	public LocalTime(String format, String value) {
-		if (format.equalsIgnoreCase("hh:mm:ss,ms")){
-			// this type of format:  01:02:22,501 (used in .SRT)
-			int h, m, s, ms;
-			h = Integer.parseInt(value.substring(0, 2));
-			m = Integer.parseInt(value.substring(3, 5));
-			s = Integer.parseInt(value.substring(6, 8));
-			ms = Integer.parseInt(value.substring(9, 12));
-			
-			mseconds = ms + s*1000 + m*60000 + h*3600000;
-			
-		} else if (format.equalsIgnoreCase("h:mm:ss.cs")){
-			// this type of format:  1:02:22.51 (used in .ASS/.SSA) 
-			int h, m, s, cs;
-			h = Integer.parseInt(value.substring(0, 1));
-			m = Integer.parseInt(value.substring(2, 4));
-			s = Integer.parseInt(value.substring(5, 7));
-			cs = Integer.parseInt(value.substring(8, 10));
-
-			mseconds = cs*10 + s*1000 + m*60000 + h*3600000;
-		} else if (format.equalsIgnoreCase("h:m:s:f/fps")){
-			int h, m, s, f;
-			float fps;
-			String[] args = value.split("/");
-			fps = Float.parseFloat(args[1]);
-			args = args[0].split(":");
-			h = Integer.parseInt(args[0]);
-			m = Integer.parseInt(args[1]);
-			s = Integer.parseInt(args[2]);
-			f = Integer.parseInt(args[3]);
-
-			mseconds = (int)(f*1000/fps) + s*1000 + m*60000 + h*3600000;
-		}
-	}
-
-	// in an integer we can store 24 days worth of milliseconds, no need for a long
-	public int mseconds;
-	
-	
-	/* METHODS */
-	
-	/**
-	 * Method to return a formatted value of the time stored
-	 * 
-	 * @param string supported formats: "hh:mm:ss,ms", "h:mm:ss.cs" and "hhmmssff/fps"
-	 * @return formatted time in a string
-	 */
-	public String getTime(String format) {
-		//we use string builder for efficiency
-		StringBuilder time = new StringBuilder();
-		String aux;
-		if(format.equalsIgnoreCase("hh:mm:ss,ms")){
-			// this type of format:  01:02:22,501 (used in .SRT)
-			int h, m, s, ms;
-			h =  mseconds/3600000;
-			aux = String.valueOf(h);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			m = (mseconds/60000)%60;
-			aux = String.valueOf(m);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			s = (mseconds/1000)%60;
-			aux = String.valueOf(s);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(',');
-			ms = mseconds%1000;
-			aux = String.valueOf(ms);
-			if (aux.length()==1) time.append("00");
-			else if (aux.length()==2) time.append('0');
-			time.append(aux);
-			
-		} else if(format.equalsIgnoreCase("h:mm:ss.cs")){
-			// this type of format:  1:02:22.51 (used in .ASS/.SSA)
-			int h, m, s, cs;
-			h =  mseconds/3600000;
-			aux = String.valueOf(h);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			m = (mseconds/60000)%60;
-			aux = String.valueOf(m);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			s = (mseconds/1000)%60;
-			aux = String.valueOf(s);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append('.');
-			cs = (mseconds/10)%100;
-			aux = String.valueOf(cs);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			
-		} else if (format.startsWith("hhmmssff/")){
-			//this format is used in EBU's STL
-			int h, m, s, f;
-			float fps;
-			String[] args = format.split("/");
-			fps = Float.parseFloat(args[1]);
-			//now we concatenate time
-			h =  mseconds/3600000;
-			aux = String.valueOf(h);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			m = (mseconds/60000)%60;
-			aux = String.valueOf(m);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			s = (mseconds/1000)%60;
-			aux = String.valueOf(s);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			f = (mseconds%1000)*(int)fps/1000;
-			aux = String.valueOf(f);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			
-		} else if (format.startsWith("h:m:s:f/")){
-			//this format is used in EBU's STL
-			int h, m, s, f;
-			float fps;
-			String[] args = format.split("/");
-			fps = Float.parseFloat(args[1]);
-			//now we concatenate time
-			h =  mseconds/3600000;
-			aux = String.valueOf(h);
-			//if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			m = (mseconds/60000)%60;
-			aux = String.valueOf(m);
-			//if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			s = (mseconds/1000)%60;
-			aux = String.valueOf(s);
-			//if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			f = (mseconds%1000)*(int)fps/1000;
-			aux = String.valueOf(f);
-			//if (aux.length()==1) time.append('0');
-			time.append(aux);
-		} else if (format.startsWith("hh:mm:ss:ff/")){
-			//this format is used in SCC
-			int h, m, s, f;
-			float fps;
-			String[] args = format.split("/");
-			fps = Float.parseFloat(args[1]);
-			//now we concatenate time
-			h =  mseconds/3600000;
-			aux = String.valueOf(h);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			m = (mseconds/60000)%60;
-			aux = String.valueOf(m);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			s = (mseconds/1000)%60;
-			aux = String.valueOf(s);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-			time.append(':');
-			f = (mseconds%1000)*(int)fps/1000;
-			aux = String.valueOf(f);
-			if (aux.length()==1) time.append('0');
-			time.append(aux);
-		}
-
-		return time.toString();
-	}
-	
-	
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/Region.java b/showkeyHelper/src/com/joyplus/Sub/Region.java
deleted file mode 100644
index 8c7a916..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/Region.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.joyplus.Sub;
-
-public class Region {
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SCCSub.java b/showkeyHelper/src/com/joyplus/Sub/SCCSub.java
deleted file mode 100644
index 07ddff3..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SCCSub.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.util.Iterator;
-
-public class SCCSub extends JoyplusSub{
-	  
-	
-		public SCCSub(SubURI uri) {
-			super(uri);
-			// TODO Auto-generated constructor stub
-			this.mContentType = SubContentType.SUB_SCC;
-			CheckUri();
-		}
-
-		private void CheckUri() {
-			// TODO Auto-generated method stub
-			JoyplusSubContentRestrictionFactory.getContentRestriction().checkUri(SubContentType.SUB_SCC, this.getUri().Uri);
-		}
-	    private void CheckSize(byte[] Sub){
-	    	JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, Sub.length);
-	    }
-		@Override
-		public void parse(byte[] Sub) {
-			// TODO Auto-generated method stub
-			if(this.getUri().SubType != SUBTYPE.NETWORK)return;
-			CheckSize(Sub);
-			
-		}
-
-		@Override
-		public void parseLocal() {
-			// TODO Auto-generated method stub
-			if(this.getUri().SubType != SUBTYPE.LOCAL)return;
-			LocalSubParser parser = new LocalSubParser();
-			TimedTextObject obd = parser.ParserFile(new File(this.getUri().Uri));
-			if(obd != null && obd.captions!=null && obd.captions.size()>0){
-				Iterator<Integer> iterator_2 = obd.captions.keySet().iterator(); 
-				int index = 0;
-				while (iterator_2.hasNext()) { 
-					 Caption mCaption = obd.captions.get(iterator_2.next());
-					 Element mElement = new Element();
-					 mElement.setRank(++index);
-					 mElement.setStartTime(new JoyplusSubTime(mCaption.start.mseconds));
-					 mElement.setEndTime(new JoyplusSubTime(mCaption.end.mseconds));
-					 this.elements.add(mElement);
-				} 
-			}
-		}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SRTParser.java b/showkeyHelper/src/com/joyplus/Sub/SRTParser.java
deleted file mode 100644
index e7dbe93..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SRTParser.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.mozilla.intl.chardet.nsDetector;
-import org.mozilla.intl.chardet.nsICharsetDetectionObserver;
-
-public class SRTParser {
-	private static final String SEP = "\r?\n";
-	private static final String RANK_REGEX = "(\\d+)";
-	private static final String TIME_REGEX = "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[,.](\\d{1,3})";
-	private static final String TEXT_REGEX = "(.*?)^" + SEP;
-	private static final String SRT_REGEX = RANK_REGEX + SEP + TIME_REGEX
-			+ " --> " + TIME_REGEX + SEP + TEXT_REGEX;
-
-	private String charset = "GBK";
-
-	private final Collection collection = new Collection();
-	private final Pattern pattern = Pattern.compile(SRT_REGEX,
-			Pattern.MULTILINE | Pattern.DOTALL);
-
-	public SRTParser() {
-//		parse(f);
-	}
-
-//	public Parser(InputStream is) {
-//		parse(is);
-//	}
-//
-//	public Parser(String input) {
-//		parse(input);
-//	}
-
-	public void parse(File f) {
-		try {
-			InputStream is;
-			nsICharsetDetectionObserver observer = new nsICharsetDetectionObserver() {
-				@Override
-				public void Notify(String charset) {
-					setCharset(charset);
-				}
-			};
-			collection.setFile(f);
-			nsDetector detector = new nsDetector();
-			detector.Init(observer);
-			is = new FileInputStream(f);
-			int len = 0;
-			byte[] buf = new byte[512];
-			while ((len = is.read(buf, 0, buf.length)) > 0) {
-				detector.DoIt(buf, len, false);
-			}
-			detector.DataEnd();
-			is.close();
-			is = new FileInputStream(f);
-			parse(is);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void parse(InputStream is) {
-		int len = 0;
-		final char[] buffer = new char[512];
-		final Writer writer = new StringWriter();
-		try {
-			InputStreamReader isr = new InputStreamReader(is, getCharset());
-			final BufferedReader br = new BufferedReader(isr);
-			while ((len = br.read(buffer)) > 0) {
-				writer.write(buffer, 0, len);
-			}
-		} catch (Exception e) {
-		} finally {
-			try {
-				is.close();
-			} catch (Exception e) {
-			}
-		}
-		parse(writer.toString());
-
-	}
-
-	public void parse(String input) {
-		Matcher m = pattern.matcher(input);
-		int match = 0;
-		while (m.find()) {
-			++match;
-			Element e = getElement(m);
-			if(collection.getElementSize() >= 1 ){
-				if(e.getStartTime().getTime() !=
-					collection.getElements().get(collection.getElementSize()-1)
-					.getStartTime().getTime()){
-					collection.getElements().add(e);
-				}
-			}else {
-				collection.getElements().add(e);
-			}
-		}
-		collection.setCharset(getCharset());
-		java.util.Collections.sort(collection.getElements(), new SubTitleElementComparator());
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public Element getElement(Matcher matcher) {
-		final Element e = new Element();
-		e.setRank(Integer.parseInt(matcher.group(1)));
-		{
-			final long h = Long.parseLong(matcher.group(2));
-			final long m = Long.parseLong(matcher.group(3));
-			final long s = Long.parseLong(matcher.group(4));
-			final long ms = Long.parseLong(matcher.group(5));
-			e.setStartTime(new JoyplusSubTime(h, m, s, ms));
-		}
-		{
-			final long h = Long.parseLong(matcher.group(6));
-			final long m = Long.parseLong(matcher.group(7));
-			final long s = Long.parseLong(matcher.group(8));
-			final long ms = Long.parseLong(matcher.group(9));
-			e.setEndTime(new JoyplusSubTime(h, m, s, ms));
-		}
-		e.setText(matcher.group(10).replaceAll("<.*>", "").trim().replaceAll("\\\\N", "\n"));
-		return e;
-	}
-
-	public void updateCollection(Collection subtitles) {
-		synchronized (subtitles) {
-			// subtitles.getElements().clear();
-			subtitles.getElements().addAll(getCollection().getElements());
-		}
-	}
-
-	/**
-	 * @return the charset
-	 */
-	public String getCharset() {
-		return charset;
-	}
-
-	/**
-	 * @param charset
-	 *            the charset to set
-	 */
-	public void setCharset(String charset) {
-		System.out.println(charset);
-		this.charset = charset;
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SRTSub.java b/showkeyHelper/src/com/joyplus/Sub/SRTSub.java
deleted file mode 100644
index 24e084b..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SRTSub.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.util.Iterator;
-
-import com.joyplus.tvhelper.utils.Log;
-import com.joyplus.tvhelper.utils.Utils;
-
-
-public class SRTSub extends JoyplusSub{
-	private static final String TAG = "SRTSub";
-  
-	
-	public SRTSub(SubURI uri) {
-		super(uri);
-		// TODO Auto-generated constructor stub
-		this.mContentType = SubContentType.SUB_SRT;
-		CheckUri();
-	}
-
-	private void CheckUri() {
-		// TODO Auto-generated method stub
-		JoyplusSubContentRestrictionFactory.getContentRestriction().checkUri(SubContentType.SUB_SRT, this.getUri().Uri);
-	}
-    private void CheckSize(byte[] Sub){
-    	JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, Sub.length);
-    }
-	@Override
-	public void parse(byte[] Sub) {
-		// TODO Auto-generated method stub
-		Log.i(TAG, "Sub size--->" + Sub.length + " getUri().SubType--->" + getUri().SubType.name());
-		if(this.getUri().SubType != SUBTYPE.NETWORK)return;
-		CheckSize(Sub);
-		SRTParser parser = new SRTParser();		
-		String charsetName = Utils.getCharset(Sub, 512);		
-		if(charsetName.equals("")){			
-			boolean isUtf8 = Utils.isUTF_8(Sub);					
-			if(!isUtf8){
-				parser.setCharset("GBK");
-			} else {
-				parser.setCharset("UTF-8");
-			}
-		}else {
-			parser.setCharset(charsetName);
-		}
-		parser.parse(new ByteArrayInputStream(Sub));
-		SRTSub.this.elements = parser.getCollection().getElements();
-		Log.i(TAG, "elements size--->" + elements.size());
-	}
-
-	@Override
-	public void parseLocal() {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.LOCAL)return;
-		LocalSubParser parser = new LocalSubParser();
-		TimedTextObject obd = parser.ParserFile(new File(this.getUri().Uri));
-		if(obd != null && obd.captions!=null && obd.captions.size()>0){
-			Iterator<Integer> iterator_2 = obd.captions.keySet().iterator(); 
-			int index = 0;
-			while (iterator_2.hasNext()) { 
-				 Caption mCaption = obd.captions.get(iterator_2.next());
-				 Element mElement = new Element();
-				 mElement.setRank(++index);
-				 mElement.setStartTime(new JoyplusSubTime(mCaption.start.mseconds));
-				 mElement.setEndTime(new JoyplusSubTime(mCaption.end.mseconds));
-				 mElement.setText(mCaption.content.replaceAll("<br />", ""));
-				 this.elements.add(mElement);
-			} 
-		}
-	}
-    
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SSASub.java b/showkeyHelper/src/com/joyplus/Sub/SSASub.java
deleted file mode 100644
index 1972e40..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SSASub.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.util.Iterator;
-
-public class SSASub extends JoyplusSub{
-
-	public SSASub(SubURI uri) {
-		super(uri);
-		// TODO Auto-generated constructor stub
-		this.mContentType = SubContentType.SUB_SSA;
-		CheckUri();
-	}
-	private void CheckUri() {
-		// TODO Auto-generated method stub
-		JoyplusSubContentRestrictionFactory.getContentRestriction().checkUri(SubContentType.SUB_SSA, this.getUri().Uri);
-	}
-	private void CheckSize(byte[] Sub){
-    	JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, Sub.length);
-    }
-	@Override
-	public void parse(byte[] sub) {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.NETWORK)return;
-		CheckSize(sub);
-		//don't support it now
-	}
-
-	@Override
-	public void parseLocal() {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.LOCAL)return;
-		LocalSubParser parser = new LocalSubParser();
-		TimedTextObject obd = parser.ParserFile(new File(this.getUri().Uri));
-		if(obd != null && obd.captions!=null && obd.captions.size()>0){
-			Iterator<Integer> iterator_2 = obd.captions.keySet().iterator(); 
-			int index = 0;
-			while (iterator_2.hasNext()) { 
-				 Caption mCaption = obd.captions.get(iterator_2.next());
-				 Element mElement = new Element();
-				 mElement.setRank(++index);
-				 mElement.setStartTime(new JoyplusSubTime(mCaption.start.mseconds));
-				 mElement.setEndTime(new JoyplusSubTime(mCaption.end.mseconds));
-				 this.elements.add(mElement);
-			} 
-		}
-	}
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/STLSub.java b/showkeyHelper/src/com/joyplus/Sub/STLSub.java
deleted file mode 100644
index 907191a..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/STLSub.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.File;
-import java.util.Iterator;
-
-public class STLSub extends JoyplusSub{
-
-	public STLSub(SubURI uri) {
-		super(uri);
-		// TODO Auto-generated constructor stub
-		this.mContentType = SubContentType.SUB_STL;
-		CheckUri();
-	}
-	private void CheckUri() {
-		// TODO Auto-generated method stub
-		JoyplusSubContentRestrictionFactory.getContentRestriction().checkUri(SubContentType.SUB_STL, this.getUri().Uri);
-	}
-	private void CheckSize(byte[] Sub){
-    	JoyplusSubContentRestrictionFactory.getContentRestriction().checkSubSize(0, Sub.length);
-    }
-	@Override
-	public void parse(byte[] sub) {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.NETWORK)return;
-		CheckSize(sub);
-		//don't support it now
-	}
-
-	@Override
-	public void parseLocal() {
-		// TODO Auto-generated method stub
-		if(this.getUri().SubType != SUBTYPE.LOCAL)return;
-		LocalSubParser parser = new LocalSubParser();
-		TimedTextObject obd = parser.ParserFile(new File(this.getUri().Uri));
-		if(obd != null && obd.captions!=null && obd.captions.size()>0){
-			Iterator<Integer> iterator_2 = obd.captions.keySet().iterator(); 
-			int index = 0;
-			while (iterator_2.hasNext()) { 
-				 Caption mCaption = obd.captions.get(iterator_2.next());
-				 Element mElement = new Element();
-				 mElement.setRank(++index);
-				 mElement.setStartTime(new JoyplusSubTime(mCaption.start.mseconds));
-				 mElement.setEndTime(new JoyplusSubTime(mCaption.end.mseconds));
-				 this.elements.add(mElement);
-			} 
-		}
-	}
-}
-
diff --git a/showkeyHelper/src/com/joyplus/Sub/SUBTYPE.java b/showkeyHelper/src/com/joyplus/Sub/SUBTYPE.java
deleted file mode 100644
index dbb519b..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SUBTYPE.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.joyplus.Sub;
-
-public enum SUBTYPE {
-
-	UNKNOW , NETWORK , LOCAL
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/Style.java b/showkeyHelper/src/com/joyplus/Sub/Style.java
deleted file mode 100644
index e374fef..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/Style.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.joyplus.Sub;
-
-public class Style {
-	
-	private static int styleCounter;
-
-	/**
-	 * Constructor that receives a String to use a its identifier
-	 * 
-	 * @param styleName = identifier of this style
-	 */
-	protected Style(String styleName) {
-		this.iD = styleName;
-	}
-	
-	/**
-	 * Constructor that receives a String with the new styleName and a style to copy
-	 * 
-	 * @param styleName
-	 * @param style
-	 */
-	protected Style(String styleName, Style style) {
-		this.iD = styleName;
-		this.font = style.font;
-		this.fontSize = style.fontSize;
-		this.color = style.color;
-		this.backgroundColor = style.backgroundColor;
-		this.textAlign = style.textAlign;
-		this.italic = style.italic;
-		this.underline = style.underline;
-		this.bold = style.bold;
-		
-	}
-
-	/* ATTRIBUTES */
-	protected String iD;
-	protected String font;
-	protected String fontSize;
-	/**colors are stored as 8 chars long RGBA*/
-	protected String color;
-	protected String backgroundColor;
-	protected String textAlign = "";
-	
-	protected boolean italic;
-	protected boolean bold;
-	protected boolean underline;
-	
-	/* METHODS */
-	
-	/**
-	 * To get the string containing the hex value to put into color or background color
-	 * 
-	 * @param format supported: "name", "&HBBGGRR", "&HAABBGGRR", "decimalCodedBBGGRR", "decimalCodedAABBGGRR"
-	 * @param value RRGGBBAA string
-	 * @return
-	 */
-	protected static String getRGBValue(String format, String value){
-		String color = null;
-		if (format.equalsIgnoreCase("name")){
-			//standard color format from W3C
-			if (value.equals("transparent"))
-				color = "00000000";
-			else if (value.equals("black"))
-				color = "000000ff";
-			else if (value.equals("silver"))
-				color = "c0c0c0ff";
-			else if (value.equals("gray"))
-				color = "808080ff";
-			else if (value.equals("white"))
-				color = "ffffffff";
-			else if (value.equals("maroon"))
-				color = "800000ff";
-			else if (value.equals("red"))
-				color = "ff0000ff";
-			else if (value.equals("purple"))
-				color = "800080ff";
-			else if (value.equals("fuchsia"))
-				color = "ff00ffff";
-			else if (value.equals("magenta"))
-				color = "ff00ffff ";
-			else if (value.equals("green"))
-				color = "008000ff";
-			else if (value.equals("lime"))
-				color = "00ff00ff";
-			else if (value.equals("olive"))
-				color = "808000ff";
-			else if (value.equals("yellow"))
-				color = "ffff00ff";
-			else if (value.equals("navy"))
-				color = "000080ff";
-			else if (value.equals("blue"))
-				color = "0000ffff";
-			else if (value.equals("teal"))
-				color = "008080ff";
-			else if (value.equals("aqua"))
-				color = "00ffffff";
-			else if (value.equals("cyan"))
-				color = "00ffffff ";
-		} else if (format.equalsIgnoreCase("&HBBGGRR")){
-			//hex format from SSA
-			StringBuilder sb = new StringBuilder();
-			sb.append(value.substring(6));
-			sb.append(value.substring(4,5));
-			sb.append(value.substring(2,3));
-			sb.append("ff");
-			color = sb.toString();
-		} else if (format.equalsIgnoreCase("&HAABBGGRR")){
-			//hex format from ASS
-			StringBuilder sb = new StringBuilder();
-			sb.append(value.substring(8));
-			sb.append(value.substring(6,7));
-			sb.append(value.substring(4,5));
-			sb.append(value.substring(2,3));
-			color = sb.toString();
-		} else if (format.equalsIgnoreCase("decimalCodedBBGGRR")){
-			//normal format from SSA
-			color = Integer.toHexString(Integer.parseInt(value));
-			//any missing 0s are filled in
-			while(color.length()<6)color="0"+color;
-			//order is reversed
-			color = color.substring(4)+color.substring(2,4)+color.substring(0,2)+"ff";
-		}  else if (format.equalsIgnoreCase("decimalCodedAABBGGRR")){
-			//normal format from ASS
-			color = Long.toHexString(Long.parseLong(value));
-			//any missing 0s are filled in
-			while(color.length()<8)color="0"+color;
-			//order is reversed
-			color = color.substring(6)+color.substring(4,6)+color.substring(2,4)+color.substring(0,2);
-		}
-		 return color;
-	}
-
-	protected static String defaultID() {
-		return "default"+styleCounter++;
-	}
-
-	
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SubTitleElementComparator.java b/showkeyHelper/src/com/joyplus/Sub/SubTitleElementComparator.java
deleted file mode 100644
index ad32102..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SubTitleElementComparator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.joyplus.Sub;
-
-import java.util.Comparator;
-
-public class SubTitleElementComparator implements Comparator<Element> {
-
-	@Override
-	public int compare(Element lhs, Element rhs) {
-		// TODO Auto-generated method stub
-		long lhsStartTime = lhs.getStartTime().getTime();
-		long rhsStartTime = rhs.getStartTime().getTime();
-		
-		if(lhsStartTime - rhsStartTime > 0 ){
-			return 1;
-		}else if(lhsStartTime - rhsStartTime < 0 ){
-			return -1;
-		}
-		
-		return 0;
-	}
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/SubURI.java b/showkeyHelper/src/com/joyplus/Sub/SubURI.java
deleted file mode 100644
index 17f3e14..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/SubURI.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.joyplus.Sub;
-
-public class SubURI {
-      
-	public String  Uri;
-	private String name;
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getUrl() {
-		return Uri;
-	}
-	public void setUrl(String url) {
-		this.Uri = url;
-	}
-	
-	public SUBTYPE SubType;
-	
-//	public enum SUBTYPE{
-//		  UNKNOW , NETWORK , LOCAL
-//    }
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/TimedTextFileFormat.java b/showkeyHelper/src/com/joyplus/Sub/TimedTextFileFormat.java
deleted file mode 100644
index 45990b6..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/TimedTextFileFormat.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.joyplus.Sub;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This class specifies the interface for any format supported by the converter, these formats must
- * create a {@link TimedTextObject} from an {@link InputStream} (so it can process files form standard In or uploads)
- * and return a String array for text formats, or byte array for binary formats.
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public interface TimedTextFileFormat {
-	
-	/**
-	 * This methods receives the path to a file, parses it, and returns a TimedTextObject
-	 * 
-	 * @param path String that contains the path to the file
-	 * @return TimedTextObject representing the parsed file
-	 * @throws IOException when having trouble reading the file from the given path
-	 */
-	TimedTextObject parseFile(String fileName, InputStream is) throws IOException, FatalParsingException;
-	
-	/**
-	 * This method transforms a given TimedTextObject into a formated subtitle file
-	 * 
-	 * @param tto the object to transform into a file
-	 * @return NULL if the given TimedTextObject has not been built first,
-	 * 		or String[] where each String is at least a line, if size is 2, then the file has at least two lines.
-	 * 		or byte[] in case the file is a binary (as is the case of STL format) 
-	 */
-	Object toFile(TimedTextObject tto);
-	
-
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/TimedTextObject.java b/showkeyHelper/src/com/joyplus/Sub/TimedTextObject.java
deleted file mode 100644
index a0cd41a..0000000
--- a/showkeyHelper/src/com/joyplus/Sub/TimedTextObject.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.joyplus.Sub;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.TreeMap;
-
-/**
- * These objects can (should) only be created through the implementations of parseFile() in the {@link TimedTextFileFormat} interface
- * They are an object representation of a subtitle file and contain all the captions and associated styles.
- * <br><br>
- * Copyright (c) 2012 J. David Requejo <br>
- * j[dot]david[dot]requejo[at] Gmail
- * <br><br>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
- * is furnished to do so, subject to the following conditions:
- * <br><br>
- * The above copyright notice and this permission notice shall be included in all copies
- * or substantial portions of the Software.
- * <br><br>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
- * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * @author J. David Requejo
- *
- */
-public class TimedTextObject {
-	
-	/*
-	 * Attributes
-	 * 
-	 */
-	//meta info
-	public String title = "";
-	public String description = "";
-	public String copyrigth = "";
-	public String author = "";
-	public String fileName = "";
-	public String language = "";
-	
-	//list of styles (id, reference)
-	public Hashtable<String, Style> styling;
-	
-	//list of layouts (id, reference)
-	public Hashtable<String, Region> layout;
-	
-	//list of captions (begin time, reference)
-	//represented by a tree map to maintain order
-	public TreeMap<Integer, Caption> captions;
-	
-	//to store non fatal errors produced during parsing
-	public String warnings;
-	
-	//**** OPTIONS *****
-	//to know whether file should be saved as .ASS or .SSA
-	public boolean useASSInsteadOfSSA = true;
-	//to delay or advance the subtitles, parsed into +/- milliseconds
-	public int offset = 0;
-	
-	//to know if a parsing method has been applied
-	public boolean built = false;
-	
-	
-	/**
-	 * Protected constructor so it can't be created from outside
-	 */
-	protected TimedTextObject(){
-		
-		styling = new Hashtable<String, Style>();
-		layout = new Hashtable<String, Region>();
-		captions = new TreeMap<Integer, Caption>(); 
-		
-		warnings = "List of non fatal errors produced during parsing:\n\n";
-		
-	}
-	
-	
-	/*
-	 * Writing Methods
-	 * 
-	 */
-	/**
-	 * Method to generate the .SRT file
-	 * 
-	 * @return an array of strings where each String represents a line
-	 */
-	public String[] toSRT(){
-		return new FormatSRT().toFile(this);
-	}
-
-	
-	/**
-	 * Method to generate the .ASS file
-	 * 
-	 * @return an array of strings where each String represents a line
-	 */
-	public String[] toASS(){
-		return new FormatASS().toFile(this);
-	}
-	
-	/**
-	 * Method to generate the .STL file
-	 */
-	public byte[] toSTL(){
-		return new FormatSTL().toFile(this);
-	}
-	
-	/**
-	 * Method to generate the .SCC file
-	 * @return 
-	 */
-	public String[] toSCC(){
-		return new FormatSCC().toFile(this);
-	}
-	
-	/**
-	 * Method to generate the .XML file
-	 * @return 
-	 */
-	public String[] toTTML(){
-		return new FormatTTML().toFile(this);
-	}
-	
-	/* 
-	 * PROTECTED METHODS 
-	 * 
-	 */
-	
-	/**
-	 * This method simply checks the style list and eliminate any style not referenced by any caption
-	 * This might come useful when default styles get created and cover too much.
-	 * It require a unique iteration through all captions.
-	 * 
-	 */
-	protected void cleanUnusedStyles(){
-		//here all used styles will be stored
-		Hashtable<String, Style> usedStyles = new Hashtable<String, Style>();
-		//we iterate over the captions
-		Iterator<Caption> itrC = captions.values().iterator();
-		while(itrC.hasNext()){
-			//new caption
-	    	Caption current = itrC.next();
-	    	//if it has a style
-	    	if(current.style != null){
-	    		String iD = current.style.iD;
-	    		//if we haven't saved it yet
-	    		if(!usedStyles.containsKey(iD))
-	    			usedStyles.put(iD, current.style);
-	    	}
-		}
-		//we saved the used styles
-		this.styling = usedStyles;
-	}
-
-}
diff --git a/showkeyHelper/src/com/joyplus/SubTitleView.java b/showkeyHelper/src/com/joyplus/SubTitleView.java
new file mode 100644
index 0000000..396f9da
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/SubTitleView.java
@@ -0,0 +1,250 @@
+package com.joyplus;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.TextView;
+
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.MediaInfo;
+import com.joyplus.sub.Element;
+import com.joyplus.sub.JoyplusSubListener;
+import com.joyplus.sub.JoyplusSubManager;
+
+public class SubTitleView extends TextView implements JoyplusSubListener{
+	private static final String TAG = "SubTitleView";
+	
+	private static final int SUBTITLE_DELAY_TIME_MAX = 500;
+	
+	/* subtitle display */
+	private static final int MESSAGE_SUBTITLE_DISPLAY = 0;
+	/* subtitle hidden */
+	private static final int MESSAGE_SUBTITLE_HIDEN = MESSAGE_SUBTITLE_DISPLAY + 1;
+	/* subtitle waiting for videoview pause*/
+	private static final int MESSAGE_SUBTITLE_PAUSE = MESSAGE_SUBTITLE_HIDEN + 1;
+	/* subtitle start recycle */
+	private static final int MESSAGE_SUBTITLE_START = MESSAGE_SUBTITLE_PAUSE + 1;
+	/* subtitle show text */
+	private static final int MESSAGE_SUBTITLE_BEGAIN_SHOW =  MESSAGE_SUBTITLE_START + 1;
+	/* subtitle text over*/
+	private static final int MESSAGE_SUBTITLE_END_HIDEN = MESSAGE_SUBTITLE_BEGAIN_SHOW + 1;
+	/* subtitle show text cache and check current time */
+	private static final int MESSAGE_SUBTITLE_SHOW_CACHE = MESSAGE_SUBTITLE_END_HIDEN + 1;
+	/* subtitle text over and check current time */
+	private static final int MESSAGE_SUBTITLE_HIDEN_CACHE = MESSAGE_SUBTITLE_SHOW_CACHE + 1;
+	
+	private Handler mHandler = new Handler(){
+
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			switch (msg.what) {
+			case MESSAGE_SUBTITLE_DISPLAY:
+				messageDisplay();
+				break;
+			case MESSAGE_SUBTITLE_HIDEN:
+				setVisibility(INVISIBLE);
+				break;
+			case MESSAGE_SUBTITLE_START:
+			case MESSAGE_SUBTITLE_END_HIDEN:
+			case MESSAGE_SUBTITLE_PAUSE:
+				startSubtitle();
+				break;
+			case MESSAGE_SUBTITLE_BEGAIN_SHOW:
+				showStartSubtitle();
+				break;
+			case MESSAGE_SUBTITLE_SHOW_CACHE:
+				cacheShowSubtitle();
+				break;
+			case MESSAGE_SUBTITLE_HIDEN_CACHE:
+				cacheHidenSubtitle();
+				break;
+			default:
+				break;
+			}
+		}
+	};
+	
+	private void cacheHidenSubtitle(){
+		if(getTag() == null || !(getTag() instanceof Element)) return;
+		Element currElement = (Element) getTag();
+		long currTime = getCurrentTime();
+		long endTime = currElement.getEndTime().getTime();
+		
+		if(currTime >= endTime + SUBTITLE_DELAY_TIME_MAX / 10){//for Fast Forward
+			mHandler.removeCallbacksAndMessages(null);
+			mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
+		}else {
+			if(endTime - currTime > SUBTITLE_DELAY_TIME_MAX){
+				Element preElement = getElement(currTime);
+				if(preElement != null &&
+						preElement.getStartTime().getTime() < endTime - SUBTITLE_DELAY_TIME_MAX){//for Fast back
+					mHandler.removeCallbacksAndMessages(null);
+					mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
+					return;
+				}
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_HIDEN_CACHE, SUBTITLE_DELAY_TIME_MAX);
+			}else {
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_END_HIDEN, endTime - currTime);
+			}
+		}
+	}
+	
+	private void cacheShowSubtitle(){
+		if(getTag() == null || !(getTag() instanceof Element)) return;
+		Element currElement = (Element) getTag();
+		long currTime = getCurrentTime();
+		long startTime =  currElement.getStartTime().getTime();
+		if(currTime >= startTime + SUBTITLE_DELAY_TIME_MAX / 10){//for Fast Forward
+			mHandler.removeCallbacksAndMessages(null);
+			mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
+		}else {
+			if(startTime - currTime > SUBTITLE_DELAY_TIME_MAX){
+				Element preElement = getElement(currTime);
+				if(preElement != null &&
+						preElement.getStartTime().getTime() < startTime - SUBTITLE_DELAY_TIME_MAX){//for Fast back
+					mHandler.removeCallbacksAndMessages(null);
+					mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
+					return;
+				}
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_SHOW_CACHE, SUBTITLE_DELAY_TIME_MAX);
+			}else {
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_BEGAIN_SHOW, startTime - currTime);
+			}
+		}
+	}
+	
+	private void showStartSubtitle(){
+		if(getTag() == null || !(getTag() instanceof Element)) return;
+		Element elementShow = (Element) getTag();
+		setText(elementShow.getText());
+		long tempShowTime = getCurrentTime();
+		long endTime = elementShow.getEndTime().getTime();
+		if(endTime - tempShowTime > SUBTITLE_DELAY_TIME_MAX){
+			mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_HIDEN_CACHE, SUBTITLE_DELAY_TIME_MAX);
+		}else {
+			mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_END_HIDEN,endTime - tempShowTime);
+		}
+	}
+	
+	private long lastTime = -SUBTITLE_DELAY_TIME_MAX;
+	
+	private void startSubtitle(){
+		long currentPosition = getCurrentTime();
+		if(Math.abs(lastTime - currentPosition) < SUBTITLE_DELAY_TIME_MAX/10){
+			mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_PAUSE, SUBTITLE_DELAY_TIME_MAX/2);
+			return;
+		}
+		Element preElement = getElement(currentPosition);
+		setText("");
+		if(preElement != null){
+			long startTime = preElement.getStartTime().getTime();
+			setTag(preElement);
+			if( startTime - currentPosition > SUBTITLE_DELAY_TIME_MAX){
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_SHOW_CACHE, SUBTITLE_DELAY_TIME_MAX);
+			}else {
+				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_BEGAIN_SHOW, startTime - currentPosition);
+			}
+		}else{
+			mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_START, SUBTITLE_DELAY_TIME_MAX);
+		}
+		lastTime = currentPosition;
+	}
+	
+	private void messageDisplay(){
+		Log.i(TAG, "messageDisplay-->");
+		setText("");
+		if(getSubManager() != null && getSubManager().CheckSubAviable()){
+			setVisibility(VISIBLE);
+			mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
+		}
+	}
+	
+	private JoyplusMediaPlayerActivity   mActivity;
+	public void Init(JoyplusMediaPlayerActivity activity){
+		if(activity == null)return ;
+		mActivity = activity;
+	}
+	private MediaInfo getMediaInfo(){
+		if(mActivity == null || mActivity.getPlayer()==null)return new MediaInfo();
+		return  mActivity.getPlayer().getMediaInfo();
+	}
+	private long getCurrentTime(){
+		return getMediaInfo().getCurrentTime();
+	}
+	private JoyplusSubManager getSubManager(){
+		return (JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager();
+	}
+
+	private Element getElement(long time){
+		if(getSubManager() == null) return null;
+		Element element= getSubManager().getElement(time);
+//		if(element != null)Log.i(TAG, "element--->" + element.toString());
+//		else Log.i(TAG, "element is null");
+		return element;
+	}
+	
+	public SubTitleView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		initView();
+	}
+
+	public SubTitleView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		initView();
+	}
+
+	public SubTitleView(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		// TODO Auto-generated constructor stub
+		initView();
+	}
+	
+	private void initView(){
+		setVisibility(INVISIBLE);
+		mHandler.removeCallbacksAndMessages(null);
+	}
+	
+	public void displaySubtitle(){
+		mHandler.removeCallbacksAndMessages(null);
+		Log.i(TAG, "displaySubtitle--->");
+		mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_DISPLAY);
+	}
+	
+	public void hiddenSubtitle(){		
+		mHandler.removeCallbacksAndMessages(null);
+		mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_HIDEN);
+	}
+	
+	@Override
+	protected void onDetachedFromWindow() {
+		// TODO Auto-generated method stub
+		mHandler.removeCallbacksAndMessages(null);
+		super.onDetachedFromWindow();
+	}
+
+	@Override
+	public void onSubChange(boolean arg0) {
+		// TODO Auto-generated method stub
+		if(arg0){
+			displaySubtitle();
+		}
+	}
+
+	@Override
+	public void onSubInstance(boolean arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void onSubSwitch(boolean arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/ad/AdDataManager.java b/showkeyHelper/src/com/joyplus/ad/AdDataManager.java
new file mode 100644
index 0000000..c86c30d
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ad/AdDataManager.java
@@ -0,0 +1,42 @@
+package com.joyplus.ad;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+/*define by Jas@20130723 for AdBoot data W/R*/
+public class AdDataManager {
+     
+	/*Interface for PublisherId*/
+	public static final String  KEY_PUBLISHERID = "KEY_PUBLISHERID";
+    public static final String  ADKEY_PUBLISHERID_CONFIG_XML = "adkey_publisherid_config_xml";
+    
+    public static String getPublisherID(Context context){
+    	return getString(context,ADKEY_PUBLISHERID_CONFIG_XML,KEY_PUBLISHERID);
+    }
+    public static boolean setPublisherID(Context context,String ID){
+    	return saveString(context,ADKEY_PUBLISHERID_CONFIG_XML,KEY_PUBLISHERID,ID);
+    }
+    
+
+    
+    /*Interface for base*/
+    public static String getString(Context context,String XML,String KEY){
+         if(XML == null || XML.equals(""))return null;
+    	 if(KEY == null || KEY.equals(""))return null;
+    	 SharedPreferences sp = context.getSharedPreferences(XML,Context.MODE_PRIVATE);
+ 		 return sp.getString(KEY, "");
+    }
+    
+    public static boolean saveString(Context context,String XML,String KEY,String VALUE){
+    	if(XML == null || XML.equals(""))return false;
+   	    if(KEY == null || KEY.equals(""))return false;
+   	    if(VALUE == null) return false;
+   	    SharedPreferences sp = context.getSharedPreferences(XML,Context.MODE_PRIVATE);
+		Editor editor = sp.edit();
+		editor.putString(KEY, VALUE);
+		editor.commit();
+		if(VALUE.equals(getString(context,XML,KEY)))return true;
+		return false;
+    }
+}
diff --git a/showkeyHelper/src/com/joyplus/ad/AdListener.java b/showkeyHelper/src/com/joyplus/ad/AdListener.java
new file mode 100644
index 0000000..6382a11
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ad/AdListener.java
@@ -0,0 +1,19 @@
+package com.joyplus.ad;
+
+/*
+ * Interface of AdBootScreenManager
+ * Jas@20130711
+ * 
+ * */
+public interface AdListener {
+
+	// Interface of load advert file successed.
+	public void adLoadSucceeded();
+
+	// Interface of no Ad found.
+	public void noAdFound();
+
+	// interface of closed
+	public void Closed();
+
+}
diff --git a/showkeyHelper/src/com/joyplus/ad/AdPublisherIdManager.java b/showkeyHelper/src/com/joyplus/ad/AdPublisherIdManager.java
new file mode 100644
index 0000000..b3ecc39
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ad/AdPublisherIdManager.java
@@ -0,0 +1,95 @@
+package com.joyplus.ad;
+
+
+
+
+import com.umeng.analytics.MobclickAgent;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.util.Log;
+
+public class AdPublisherIdManager {
+         
+	     private boolean Debug = true;
+	     private String  TAG   = "Jas";
+	     
+	     private Context mContext;
+
+	     //when publisherId can,t get from network and local XML, we should return default ID
+	     private static final String DefaultID = "8f9bf339292d6f8216b91aa86e95d13e";
+	     
+	     public enum UMENGPARAMS{
+	    	 LOADING_ADV  ("_LOADING_ADV_PUBLISHERID"),
+	    	 MAIN_ADV     ("_MAIN_ADV_PUBLISHERID"),
+	    	 PLAYER_ADV   ("_PLAYER_ADV_PUBLISHERID"),
+	    	 BOOT_ADV     ("_BOOT_ADV_PUBLISHERID");
+	    	 private String umengparam;
+	    	 UMENGPARAMS(String param){
+	    		 this.umengparam = param;
+	    	 }
+	    	 public String toString(){
+	    		 return umengparam;
+	    	 }
+	     }
+	     
+	     public AdPublisherIdManager(Context context){
+	    	  if(context==null)return;
+	    	  mContext = context;	    	  
+	     }
+	     
+	     /*define by Jas@20130725 for get publisherId from network.if get something it will save in XML file{@link AdDataManager}
+	      * return : null    get nothing
+	      *          String  new publisherId get from network*/
+	     public String UpdatePublisherId(UMENGPARAMS param) {
+			// TODO Auto-generated method stub
+	    	  if(Debug)Log.d(TAG,"UpdatePublisherId() param="+param.toString());
+	    	  MobclickAgent.onResume(mContext);
+	  		  MobclickAgent.updateOnlineConfig(mContext);
+	  		  String Channel = getUmengChannel();
+	  		  if(Channel != null){
+	  			   if(Debug)Log.d(TAG,"UpdatePublisherId() Channel="+Channel+" param="+param.toString());
+	  			   String loadingAdvID = MobclickAgent.getConfigParams(mContext, Channel.trim() + param.toString().trim());
+	  			   Log.d(TAG,"loadingAdvID = "+loadingAdvID);
+	  			   if(loadingAdvID != null && !loadingAdvID.equals("")){
+	  				   if(!setPublisherId(loadingAdvID)){
+	  					    clearPublisherId();
+	  				   }
+	  				   return loadingAdvID;
+	  			   }
+	  		  }
+	  		  return DefaultID;
+		 }
+	     
+         private String getUmengChannel(){
+     		try {
+    			ApplicationInfo info=mContext.getPackageManager().getApplicationInfo(mContext.getPackageName(),
+    			        PackageManager.GET_META_DATA);
+    			String umengChannel =info.metaData.getString("UMENG_CHANNEL");
+    			Log.i(TAG, "UMENG_CHANNEL--->" + umengChannel);
+    			if (umengChannel != null && !umengChannel.equals("")) {
+    				return umengChannel;
+    			}
+    		} catch (NameNotFoundException e) {
+    			// TODO Auto-generated catch block
+    			e.printStackTrace();
+    		}
+     		return null;
+         }
+		 
+         public String getPublisherId(){
+        	 if(Debug)Log.d(TAG,"getPublisherId()");
+	    	 return AdDataManager.getPublisherID(mContext);
+	     }
+	     
+	     public boolean setPublisherId(String id){
+	    	 if(Debug)Log.d(TAG,"setPublisherId("+id+")");
+	    	 return AdDataManager.setPublisherID(mContext, id);
+	     }
+	     
+	     public boolean clearPublisherId(){
+	    	 if(Debug)Log.d(TAG,"clearPublisherId()");
+	    	 return setPublisherId("");
+	     }
+}
diff --git a/showkeyHelper/src/com/joyplus/ad/AdvertManager.java b/showkeyHelper/src/com/joyplus/ad/AdvertManager.java
new file mode 100644
index 0000000..2d19bee
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ad/AdvertManager.java
@@ -0,0 +1,417 @@
+package com.joyplus.ad;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import android.content.Context;
+import android.location.Location;
+
+import com.joyplus.adkey.AdRequest;
+import com.joyplus.adkey.Const;
+import com.joyplus.adkey.RequestRichMediaAd;
+import com.joyplus.adkey.Util;
+import com.joyplus.adkey.download.ImpressionThread;
+import com.joyplus.adkey.video.ResourceManager;
+import com.joyplus.adkey.video.RichMediaAd;
+import com.joyplus.adkey.video.VideoData;
+import com.joyplus.adkey.widget.SerializeManager;
+import com.joyplus.tvhelper.utils.Log;
+
+
+public class AdvertManager {
+
+	private boolean Debug = false;
+	private String TAG = "AdvertManager";
+	private boolean mIncludeLocation = false;
+	private String mRequestURL = null;
+	private SerializeManager serializeManager;
+
+	private Context mContext;
+	private String PUBLISHERID = null;
+	private String mUniqueId1;
+	private String mUniqueId2;
+	private String mUserAgent;
+	private boolean mEnabled = false;
+
+	private AdRequest mAdRequest = null;
+	private Thread mRequestThread;
+	private RichMediaAd mRichMediaAd; // respone media
+
+	private AdListener mListener;
+
+	public void setListener(AdListener listener) {
+		mListener = listener;
+	}
+
+	// this should be the same as it in BootAnimation.cpp
+	public   static String DefaultFILEPATH = "JoyplusAd";
+	public   String getPlayUri(){
+		if(PATH == null)return null;
+		File file = new File(PATH);
+		if (file.exists()) {
+			String[] temp = file.list();
+			if (temp != null) {
+				for (int i = 0; i < temp.length; i++) {
+					if (temp[i].contains(DefaultFILEPATH)) {						
+						return PATH+temp[i];
+					}
+				}
+			}
+		}
+		return null;
+	}
+	private  String DefaultAD = "tv_patch_advert";
+	private  String PATH = null;
+
+
+	public AdvertManager(Context ctx, final String publisherId,
+			final boolean cacheMode) {
+		this.PUBLISHERID = publisherId;
+		this.PATH = Const.DOWNLOAD_PATH+ctx.getPackageName()+"/"+PUBLISHERID+"/";
+		DefaultAD = PATH+DefaultAD;
+		mContext = ctx;
+		Util.CACHE_MODE = cacheMode;
+		InitResource();
+	}
+    
+	// Interface for user to Manager the resource.
+	public void UpdateAdvert() {
+		// resave advert file first.
+		ResaveCacheLoaded();
+		requestAd();
+		if (!WaitAd(20000)) {
+			notifyAdClose();
+			return;
+		}
+		// now we can download mp4 file and report count.		
+		DownloadFile();
+	}
+
+	// Interface Report count
+	public void ReportCount() {
+		new Thread(new ReportCountRunnable()).start();
+	}
+
+	// Tnterface Download file
+	private void DownloadFile() {
+		new Thread(new DownloadFileRunnable()).start();
+	}
+
+	private class DownloadFileRunnable implements Runnable {
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			RichMediaAd tempAd = (RichMediaAd) serializeManager
+					.readSerializableData(DefaultAD);
+			if (tempAd != null) {
+				VideoData video = tempAd.getVideo();
+				if (Util.CACHE_MODE && video != null) {
+					String Download_path = video.getVideoUrl();
+					URL url = null;
+					try {
+						url = new URL(Download_path);
+					} catch (MalformedURLException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					if (url != null) {
+						Util.ExternalName = "."
+								+ Util.getExtensionName(url.getPath());
+					} else {
+						Util.ExternalName = ".mp4";
+					}
+					Downloader downloader = new Downloader(Download_path,PATH);
+					if (Download_path.startsWith("http:")
+							|| Download_path.startsWith("https:")) {
+						downloader.download();
+						if (Debug)
+							Log.i(TAG, "download starting");
+					}
+				} else {
+					if (Debug)
+						Log.i(TAG, "download fail video url fail");
+					notifyAdNofound();
+				}
+			} else {
+				if (Debug)
+					Log.i(TAG, "download fail ad null");
+				notifyAdNofound();
+			}
+		}
+	}
+
+	private class ReportCountRunnable implements Runnable {
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			if (Debug)
+				Log.d(TAG, "ReportCountRunnable run()");
+			new ImpressionThread(mContext, mRichMediaAd.getmImpressionUrl(),
+					PUBLISHERID, Util.AD_TYPE.FULL_SCREEN_VIDEO).start();
+		}
+	}
+
+	/* Wait for Ad return form Server,Time out : faslse , Result : true. */
+	private boolean WaitAd(int Time) {
+		// waiting for Ad result.
+		long now = System.currentTimeMillis();
+		long timeoutTime = now + Time;// 20s
+		while ((mRichMediaAd == null) && (now < timeoutTime)) {
+			try {
+				Thread.sleep(200);
+			} catch (InterruptedException e) {
+			}
+			now = System.currentTimeMillis();
+		}
+		if (mRichMediaAd == null) {// no Ad can use
+			notifyAdClose();
+			return false;
+		}
+		return true;
+	}
+
+	/* request Ad from Server */
+	private void requestAd() {
+		requestAd(null);
+	}
+
+	private void requestAd(final InputStream xml) {
+		if (Debug)
+			Log.i(TAG, "requestAd mEnabled=" + mEnabled +" mRequestThread="+(mRequestThread!=null));
+		if (!mEnabled)
+			return;
+		if (mRequestThread == null) {
+			mRichMediaAd = null;
+			mRequestThread = new Thread(new Request(xml));
+			mRequestThread
+					.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+						@Override
+						public void uncaughtException(Thread thread,
+								Throwable ex) {
+							ex.printStackTrace();
+							mRichMediaAd = new RichMediaAd();
+							mRichMediaAd.setType(Const.AD_FAILED);
+							mRequestThread = null;
+						}
+					});
+			mRequestThread.start();
+		}
+	}
+
+	/* get Ad from Server */
+	private class Request implements Runnable {
+		private InputStream XML = null;
+		private RequestRichMediaAd requestAd;
+
+		public Request(InputStream xml) {
+			XML = xml;
+		}
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			while (ResourceManager.isDownloading()) {
+				try {
+					Thread.sleep(200);
+				} catch (InterruptedException e) {
+				}
+			}
+			try {
+				if (XML == null) {
+					requestAd = new RequestRichMediaAd();
+				} else {
+					requestAd = new RequestRichMediaAd(XML);
+				}
+				AdRequest request = getRequest();
+				File cacheDir = new File(PATH);
+				if (!cacheDir.exists())cacheDir.mkdirs();
+				mRichMediaAd = (RichMediaAd) serializeManager
+						.readSerializableData(DefaultAD);
+				RichMediaAd nextResponse = requestAd.sendRequest(request);
+				serializeManager.writeSerializableData(DefaultAD, nextResponse);				
+				if (mRichMediaAd == null) {
+					mRichMediaAd = nextResponse;
+				}
+			} catch (Throwable t) {
+				Log.e(TAG,"Request error ");
+				t.printStackTrace();
+				mRichMediaAd = (RichMediaAd) serializeManager
+						.readSerializableData(DefaultAD);
+			} finally {
+				notifyResponse();
+			}
+		}
+	}
+
+	private void notifyResponse() {
+		if (mRichMediaAd == null) {
+			if (Debug)
+				Log.d(TAG, "notifyResponse() mReponse ==null ");
+			mRichMediaAd = new RichMediaAd();
+			mRichMediaAd.setType(Const.AD_FAILED);
+		}
+		if (mRichMediaAd.getType() == Const.VIDEO_TO_INTERSTITIAL
+				|| mRichMediaAd.getType() == Const.INTERSTITIAL_TO_VIDEO
+				|| mRichMediaAd.getType() == Const.VIDEO
+				|| mRichMediaAd.getType() == Const.INTERSTITIAL) {
+			notifyAdLoadSuccessed();
+		} else {
+			notifyAdNofound();
+		}
+	}
+
+	// get the AdRequest
+	private AdRequest getRequest() {
+		if (mAdRequest == null) {
+			mAdRequest = new AdRequest();
+			mAdRequest.setDeviceId(mUniqueId1);
+			mAdRequest.setDeviceId2(mUniqueId2);
+			mAdRequest.setPublisherId(PUBLISHERID);
+			mAdRequest.setUserAgent(mUserAgent);
+			mAdRequest.setUserAgent2(Util.buildUserAgent());
+		}
+		Location location = null;
+		if (this.mIncludeLocation) {
+			location = Util.getLocation(mContext);
+		}
+		if (location != null) {
+			mAdRequest.setLatitude(location.getLatitude());
+			mAdRequest.setLongitude(location.getLongitude());
+		} else {
+			mAdRequest.setLatitude(0.0);
+			mAdRequest.setLongitude(0.0);
+		}
+		mAdRequest.setConnectionType(Util.getConnectionType(mContext));
+		mAdRequest.setIpAddress(Util.getLocalIpAddress());
+		mAdRequest.setTimestamp(System.currentTimeMillis());
+
+		mAdRequest.setType(AdRequest.VAD);
+		mAdRequest.setRequestURL(this.mRequestURL);
+		return mAdRequest;
+	}
+
+	/*
+	 * Resave advert file to default dir,make sure its same as BootAnimation.cpp
+	 * support.
+	 */
+	private boolean ResaveCacheLoaded() {
+		// TODO Auto-generated method stub
+		File file = new File(PATH);
+		if (file.exists()) {
+			String[] temp = file.list();
+			if (temp != null) {
+				for (int i = 0; i < temp.length; i++) {
+					if (temp[i].contains(Const.DOWNLOAD_PLAY_FILE)) {
+						String dstFile = PATH+DefaultFILEPATH;
+						String extra   = getExtensionName(temp[i]);
+						if(extra!=null && !extra.equals(temp[i])){
+							dstFile += ("."+getExtensionName(temp[i]));
+						}
+						copyFile(new File(PATH + temp[i]), new File(dstFile));
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	public static String getExtensionName(String filename) {   
+        if ((filename != null) && (filename.length() > 0)) {   
+            int dot = filename.lastIndexOf('.');   
+            if ((dot >-1) && (dot < (filename.length() - 1))) {   
+                return filename.substring(dot + 1);   
+            }   
+        }   
+        return null;   
+    }
+	private boolean copyFile(File srcFile, File dstFile) {
+		try {
+			InputStream in = new FileInputStream(srcFile);
+			if (dstFile.exists())
+				dstFile.delete();
+			OutputStream out = new FileOutputStream(dstFile);
+			try {
+				int cnt;
+				byte[] buf = new byte[4096];
+				while ((cnt = in.read(buf)) >= 0) {
+					out.write(buf, 0, cnt);
+				}
+			} finally {
+				out.close();
+				in.close();
+			}
+			if (Debug)
+				Log.d(TAG, "copyFile() success");
+			return true;
+		} catch (IOException e) {
+			if (Debug)
+				Log.d(TAG, "copyFile() fail");
+			return false;
+		}
+	}
+
+	private void InitResource() {
+		// TODO Auto-generated method stub
+		this.mIncludeLocation = true;
+		this.mRequestURL = Const.REQUESTURL;
+		Util.GetPackage(mContext);
+		serializeManager = new SerializeManager();
+		mUserAgent = Util.getDefaultUserAgentString(mContext);
+		this.mUniqueId1 = Util.getTelephonyDeviceId(mContext);
+		this.mUniqueId2 = Util.getDeviceId(mContext);
+		if ((PUBLISHERID == null) || (PUBLISHERID.length() == 0)) {
+			throw new IllegalArgumentException(
+					"User Id cannot be null or empty");
+		}
+		if ((mUniqueId2 == null) || (mUniqueId2.length() == 0)) {
+			throw new IllegalArgumentException(
+					"System Device Id cannot be null or empty");
+		}
+		mEnabled = (Util.getMemoryClass(mContext) > 16);
+		Util.initializeAnimations(mContext);
+	}
+
+	private synchronized void notifyAdLoadSuccessed() {
+		if (mListener == null)
+			return;
+		new Runnable() {
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mListener.adLoadSucceeded();
+			}
+		}.run();
+	}
+
+	private synchronized void notifyAdNofound() {
+		if (mListener == null)
+			return;
+		new Runnable() {
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mListener.noAdFound();
+			}
+		}.run();
+	}
+
+	private synchronized void notifyAdClose() {
+		if (mListener == null)
+			return;
+		new Runnable() {
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				mListener.Closed();
+			}
+		}.run();
+	}
+
+}
diff --git a/showkeyHelper/src/com/joyplus/ad/Downloader.java b/showkeyHelper/src/com/joyplus/ad/Downloader.java
new file mode 100644
index 0000000..58ff028
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/ad/Downloader.java
@@ -0,0 +1,129 @@
+package com.joyplus.ad;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import com.joyplus.adkey.Const;
+import com.joyplus.adkey.Util;
+import com.joyplus.adkey.widget.Log;
+
+import android.content.Context;
+
+public class Downloader {
+	private String urlstr;// 娑撳娴囬惃鍕勾閸э拷
+	private String localfile;// 娣囨繂鐡ㄧ捄顖氱窞
+	private int fileSize = 0;//閺傚洣娆㈡径褍鐨�
+	private int compeleteSize = 0;//閺傚洣娆㈡稉瀣祰鐎瑰本鍨氭径褍鐨�
+	private Context context;
+	private static final int INIT = 1;// 鐎规矮绠熸稉澶岊瀸娑撳娴囬惃鍕Ц閹緤绱伴崚婵嗩瀶閸栨牜濮搁幀渚婄礉濮濓絽婀稉瀣祰閻樿埖锟介敍灞炬畯閸嬫粎濮搁幀锟�	private static final int DOWNLOADING = 2;//濮濓絽婀稉瀣祰娑擄拷
+	private static final int DOWNLOADING = 2;
+	private static final int PAUSE = 3;//閺嗗倸浠�
+	private static final int STOP = 4;//閸嬫粍顒�
+	private static final int FAILED = 5;//婢惰精瑙�
+	private int state = INIT;
+    
+	private String PATH = null;
+	
+	public Downloader(String urlstr, String path) {
+		this.urlstr = urlstr;
+		PATH = path;
+		File cacheDir = new File(PATH);
+		if (!cacheDir.exists())
+			cacheDir.mkdirs();
+	}
+
+	public boolean isdownloading() {
+		return state == DOWNLOADING;
+	}
+
+	private void init() {
+		HttpURLConnection connection = null;
+		try {
+			URL url = new URL(urlstr);
+			connection = (HttpURLConnection) url.openConnection();
+			connection.setConnectTimeout(5000);
+			connection.setRequestMethod("GET");
+			fileSize = connection.getContentLength();
+			connection.disconnect();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally{
+			if(connection!=null)
+				connection.disconnect();
+		}
+	}
+
+	public void download() {
+		new Thread(new downloadRunnable()).start();
+	}
+    private class downloadRunnable implements Runnable{
+    	public void run() {			
+			localfile = Const.DOWNLOAD_PATH+Util.VideoFileDir+Const.DOWNLOADING_FILE;
+			if(PATH != null)localfile = PATH+Const.DOWNLOADING_FILE;
+			Log.d("JoyplusMediaPlayerAd","JoyplusMediaPlayerAd Download -->"+localfile);
+			HttpURLConnection connection = null;
+			RandomAccessFile randomAccessFile = null;
+			InputStream inputstream = null;
+			try {
+				URL url = new URL(urlstr);
+				connection = (HttpURLConnection) url.openConnection();
+				connection.setConnectTimeout(60*1000);
+				connection.setRequestMethod("GET");
+				fileSize = connection.getContentLength();
+				randomAccessFile = new RandomAccessFile(localfile, "rwd");
+				inputstream = connection.getInputStream();
+				byte[] buffer = new byte[1024 * 50];
+				int length = -1;
+				while ((length = inputstream.read(buffer)) != -1) {
+					randomAccessFile.write(buffer, 0, length);
+					compeleteSize += length;
+					if (compeleteSize == fileSize) {
+						state = STOP;
+						File file = new File(PATH+Const.DOWNLOAD_READY_FILE);
+						if(file.exists())file.delete();
+						randomAccessFile.close();
+						File filetemp = new File(PATH+Const.DOWNLOADING_FILE);
+						if(filetemp.exists())
+						{
+							File filedone = new File(PATH+Const.DOWNLOAD_PLAY_FILE+Util.ExternalName);
+							if(filedone.exists())filedone.delete();
+							filetemp.renameTo(filedone);
+						}
+					}
+					if (state == PAUSE||state == STOP) {
+						return;
+					}
+				}
+			} catch (Exception e) {
+				state = STOP;
+				e.printStackTrace();
+				if(connection!=null)
+					connection.disconnect();
+			} finally {
+				state = STOP;
+				if(connection!=null)
+					connection.disconnect();
+			}
+		}
+    };
+	
+
+	public void delete(String urlstr) {
+		
+	}
+
+	public void pause() {
+		state = PAUSE;
+	}
+
+	public void reset() {
+		state = INIT;
+	}
+
+	public int getstate() {
+		return state;
+	}
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/manager/JoyplusMediaPlayerManager.java b/showkeyHelper/src/com/joyplus/manager/JoyplusMediaPlayerManager.java
deleted file mode 100644
index ea2a4b7..0000000
--- a/showkeyHelper/src/com/joyplus/manager/JoyplusMediaPlayerManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.joyplus.manager;
-
-import android.app.Activity;
-import android.content.Context;
-
-import com.joyplus.Sub.JoyplusSubManager;
-
-public class JoyplusMediaPlayerManager {
-
-	private static final String TAG = "JoyplusMediaPlayerManager";
-	
-    private Context mContext;
-    /*Interface of sub manager*/
-    private JoyplusSubManager               mSubManager;
-    /*Interface of Url Manager*/
-    private URLManager                      mURLManager;
-    
-    private static JoyplusMediaPlayerManager mMediaPlayerManager;
-    public  static JoyplusMediaPlayerManager getInstance(){
-    	return mMediaPlayerManager;
-    }
-    
-    public static void Init(Activity context) throws Exception{
-    	mMediaPlayerManager = new JoyplusMediaPlayerManager(context);
-    }
-    		
-    public JoyplusMediaPlayerManager(Context context) throws Exception{
-    	if(! (context instanceof Activity))throw new Exception("use it in Activity");
-    	mContext       = context;
-    	InitURLAndSub();
-    }
-    
-    /*Interface of SubManager and Urlmanager*/
-    public JoyplusSubManager getSubManager(){
-    	return mSubManager;
-    }
-    public URLManager getURLManager(){
-    	return mURLManager;
-    }
-    private void InitURLAndSub(){
-    	ResetURLAndSub();
-    }
-    public void ResetURLAndSub(){
-    	mSubManager    = new JoyplusSubManager(mContext);
-//    	mURLManager    = new URLManager();
-    }
-}
diff --git a/showkeyHelper/src/com/joyplus/Sub/ContentRestrictionException.java b/showkeyHelper/src/com/joyplus/mediaplayer/ContentRestrictionException.java
similarity index 88%
rename from showkeyHelper/src/com/joyplus/Sub/ContentRestrictionException.java
rename to showkeyHelper/src/com/joyplus/mediaplayer/ContentRestrictionException.java
index d756214..fc1ac7b 100644
--- a/showkeyHelper/src/com/joyplus/Sub/ContentRestrictionException.java
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/ContentRestrictionException.java
@@ -1,4 +1,4 @@
-package com.joyplus.Sub;
+package com.joyplus.mediaplayer;
 
 public class ContentRestrictionException extends RuntimeException {
 	//serial Version UID for Android System
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerDataManager.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerDataManager.java
new file mode 100644
index 0000000..6d0e2e2
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerDataManager.java
@@ -0,0 +1,100 @@
+package com.joyplus.mediaplayer;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+
+import com.joyplus.mediaplayer.VideoViewInterface.DecodeType;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+public class JoyplusMediaPlayerDataManager{
+	private Context mDataContext;
+ 	
+    private static final String  JOYPLUS_CONFIG_XML = "joyplus_mediaplayer_config_xml";
+    
+    /*Interface of Decode type*/
+    private static final String  KEY_DECODETYPE     = "KEY_DECODETYPE";
+    private static final String  KEY_SWITCHINTERNAL = "KEY_SWITCHINTERNAL";
+    private static final String  KEY_SUPPORTVITAMIO = "KEY_SUPPORTVITAMIO";
+    private static final String  KEY_SCREENPARAMS   = "KEY_SCREENPARAMS";
+    public JoyplusMediaPlayerDataManager(Context context){
+    	this.mDataContext = context;
+    }
+    public  DecodeType getDecodeType(){
+    	return getDecodeType(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_DECODETYPE));
+    }
+    public  boolean setDecodeType(DecodeType type){
+    	return saveString(mDataContext,JOYPLUS_CONFIG_XML,KEY_DECODETYPE,getDecodeType(type));
+    }
+    public String getDecodeType(DecodeType type){
+    	if(type == DecodeType.Decode_HW){
+    		return mDataContext.getString(R.string.Decode_HW);
+    	}else if(type == DecodeType.Decode_SW){
+    		return mDataContext.getString(R.string.Decode_SW);
+    	}else{
+    		return mDataContext.getString(R.string.Default_Decode);
+    	}
+    }
+    private DecodeType getDecodeType(String type){
+    	if(!type.equals(mDataContext.getString(R.string.Decode_HW)) &&
+    			!type.equals(mDataContext.getString(R.string.Decode_SW))){
+    		type = mDataContext.getString(R.string.Default_Decode);
+    	}
+    	if(type.equals(mDataContext.getString(R.string.Decode_HW))){
+    		return DecodeType.Decode_HW;
+    	}else if(type.equals(mDataContext.getString(R.string.Decode_SW))){
+    		return DecodeType.Decode_SW;
+    	}else return null;//this can't be happen.
+    }
+    
+    public boolean setSwitchEnable(boolean en){
+    	return saveString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SWITCHINTERNAL,(en?"true":"false"));
+    }
+    public boolean getSwitchEnable(){
+    	if("false".equals(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SWITCHINTERNAL))
+    		|| "false".equals(mDataContext.getString(R.string.switch_internal))){
+    	    return false;
+    	}
+        return true;
+    }
+    public boolean setVitamioEnable(boolean en){
+    	return saveString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SUPPORTVITAMIO,(en?"true":"false"));
+    }
+    public boolean getVitamioEnable(){
+    	if("true".equals(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SUPPORTVITAMIO))){
+    	    return true;
+    	}
+        return false;
+    }
+    public  boolean setScreenParamsDefault(int type){
+    	return saveString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SCREENPARAMS,Integer.toString(type));
+    } 
+	public  int getScreenParamsDefault(){
+		if(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SCREENPARAMS)==null || "".equals(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SCREENPARAMS))){
+			return JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_DEFAULT;
+		}
+		return Integer.parseInt(getString(mDataContext,JOYPLUS_CONFIG_XML,KEY_SCREENPARAMS));
+	}
+    /*Interface for base*/
+    public String getString(Context context,String XML,String KEY){
+         if(XML == null || XML.equals(""))return null;
+    	 if(KEY == null || KEY.equals(""))return null;
+    	 SharedPreferences sp = context.getSharedPreferences(XML,Context.MODE_PRIVATE);
+ 		 return sp.getString(KEY, "");
+    }
+    
+    public boolean saveString(Context context,String XML,String KEY,String VALUE){
+    	Log.i("TAG", "saveString--->" + VALUE);
+    	if(XML == null || XML.equals(""))return false;
+   	    if(KEY == null || KEY.equals(""))return false;
+   	    if(VALUE == null) return false;
+   	    Log.i("TAG", "saveString2--->" + VALUE + " KEY--->" + KEY);
+   	    SharedPreferences sp = context.getSharedPreferences(XML,Context.MODE_PRIVATE);
+		Editor editor = sp.edit();
+		editor.putString(KEY, VALUE);
+		editor.commit();
+		if(VALUE.equals(getString(context,XML,KEY)))return true;
+		return false;
+    }
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerListener.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerListener.java
new file mode 100644
index 0000000..5467981
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerListener.java
@@ -0,0 +1,17 @@
+package com.joyplus.mediaplayer;
+
+public interface JoyplusMediaPlayerListener {
+
+	/*send MediaPlayer info current
+	 * @link{# MediaInfo}*/
+	public void MediaInfo(MediaInfo info);
+	
+	/*send MediaPlayer Complements*/
+	public void MediaCompletion();
+	
+	/*send MediaPlayer error*/
+	public void ErrorInfo();
+    
+	/*receiver error commend*/
+	public void NoProcess(String commend);
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerManager.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerManager.java
new file mode 100644
index 0000000..61a7ecd
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerManager.java
@@ -0,0 +1,175 @@
+package com.joyplus.mediaplayer;
+
+import io.vov.vitamio.LibsChecker;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Handler;
+
+import com.joyplus.control.SubManager;
+import com.joyplus.manager.URLManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerServer.PlayerState;
+import com.joyplus.mediaplayer.VideoViewInterface.DecodeType;
+
+
+public class JoyplusMediaPlayerManager {
+
+	    private boolean Debug = true;
+	    private String  TAG   = "MediaPlayerManager";
+	    
+	    private Context mContext;
+	    /*Interface of control videoview*/
+	    private JoyplusMediaPlayerServer        mServer;
+	    /*Interface of videoview preference*/
+	    private JoyplusMediaPlayerDataManager   mDataManager;
+	    /*Interface of sub manager*/
+	    public final static boolean SubanagerUseNEW = true;
+	    private SubManager            mSubManager;
+//	    private com.joyplus.sub.JoyplusSubManager          mSubManager;
+//	    private com.joyplus.sub_old_1.JoyplusSubManager    mOldSubManager;
+	    /*Interface of Url Manager*/
+	    private URLManager                      mURLManager;
+	    	    
+	    /*a type of media player which unknow*/
+	    public final static int TYPE_UNKNOW       = -1;
+	    /*a type of media player it use Android default mediaplayer*/
+	    public final static int TYPE_MEDIAPLAYER  = 0;
+	    /*a type of media player it use Vitamio*/
+	    public final static int TYPE_VITAMIO      = 1;
+	    
+	    public final static int TYPE_MAX          = TYPE_VITAMIO;
+	    
+	    public static String getPlayerTypeName(int type){
+	    	 switch(type){
+	    	 case TYPE_MEDIAPLAYER:
+	    		 return "MEDIAPLAYER";
+	    	 case TYPE_VITAMIO:
+	    		 return "VITAMIO";
+	    	 default :
+	    		 return Integer.toString(type);
+	    	 }
+	    }
+	    
+		public static boolean isTypeAvailable(int type){
+			return (type>TYPE_UNKNOW && type<=TYPE_MAX);
+		}
+	    private static JoyplusMediaPlayerManager mMediaPlayerManager;
+	    public  static JoyplusMediaPlayerManager getInstance(){
+	    	return mMediaPlayerManager;
+	    }
+	    public static void Init(Activity context) throws Exception{
+	    	mMediaPlayerManager = new JoyplusMediaPlayerManager(context);
+	    }
+	    		
+	    public JoyplusMediaPlayerManager(Context context) throws Exception{
+	    	if(! (context instanceof Activity))throw new Exception("use it in Activity");
+	    	mContext       = context;
+	    	mDataManager   = new JoyplusMediaPlayerDataManager(context);
+	    	mServer        = new JoyplusMediaPlayerServer(context);
+	    	InitURLAndSub();
+	    	if(mServer.getJoyplusPlayerConfig(TYPE_VITAMIO).EN)
+	    		setVitamioEn(LibsChecker.checkVitamioLibs((Activity)context));
+	    	else setVitamioEn(false);
+	    }
+	    /*Interface of SubManager and Urlmanager*/
+	    public SubManager getSubManager(){	    	
+	    	return mSubManager; 	    	
+	    }
+	    
+	    public URLManager getURLManager(){
+	    	return mURLManager;
+	    }
+	    public JoyplusMediaPlayerDataManager getDataManager(){
+	    	return mDataManager;
+	    }
+	    private void InitURLAndSub(){
+	    	ResetURLAndSub();
+	    }
+	    public void ResetURLAndSub(){
+	    	if(SubanagerUseNEW){
+	    		mSubManager    = new com.joyplus.sub.JoyplusSubManager(mContext);
+	    	}else{
+	    		mSubManager    = new com.joyplus.sub_old_1.JoyplusSubManager(mContext);
+	    	}	    	
+	    	mURLManager    = new URLManager();
+	    }
+	    /*Interface of type config*/
+	    public JoyplusPlayerConfig getJoyplusPlayerConfig(int Type){
+	    	try {
+				return mServer.getJoyplusPlayerConfig(Type);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				return null;
+			}
+	    }
+	    /*Interface of set decode type*/
+	    public boolean setDecodeType(DecodeType type){
+	    	 return mDataManager.setDecodeType(type);
+	    }
+	    /*Interface of get decode type*/
+	    public DecodeType getDecodeType(){
+	    	return mDataManager.getDecodeType();
+	    }
+	    /*Interface of Switch Internal flog*/
+	    public boolean setSwitchEn(boolean en){
+	    	return mDataManager.setSwitchEnable(en);
+	    }
+	    public boolean getSwitchEn(){
+	    	return mDataManager.getSwitchEnable();
+	    }
+	    /*Interface of Vitamio support flog*/
+	    public boolean setVitamioEn(boolean en){
+	    	return mDataManager.setVitamioEnable(en);
+	    }
+	    public boolean getVitamioEn(){
+	    	return mDataManager.getVitamioEnable();
+	    }
+	    /*Interface of check decode name*/
+	    public String getDecodeName(DecodeType type){
+	    	return mDataManager.getDecodeType(type);
+	    }
+	    /*Interface of mediaplayer */
+	    public PlayerState getCurrentType(){
+	    	return mServer.getCurrentType();
+	    }
+	    public PlayerState getNextType(){
+	    	PlayerState current = getCurrentType();
+	    	if(current.PlayerType != JoyplusMediaPlayerManager.TYPE_UNKNOW && isTypeAvailable(current.PlayerType)){
+	    		try {
+	    			return mServer.getNextType(current.PlayerType);
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+	    	}
+	    	return current;
+	    }
+	    public boolean IshaveNextType(){
+	    	if(!isTypeAvailable(getCurrentType().PlayerType))return false;
+	        mServer.SwitchPlayer();
+	    	return false;
+	    }
+		/*Interface of MediaPlayer Listener*/
+	    public Handler getmediaPlayerHandler(){
+	    	return mServer.getMediaPlayerHandler();
+	    }
+		public void registerListener(JoyplusMediaPlayerListener listener){
+			if(listener == null)return;
+			mServer.registerListener(listener);
+		}
+		public void unregisterListener(JoyplusMediaPlayerListener listener){
+			if(listener == null)return;
+			mServer.unregisterListener(listener);
+		}
+		public void unregisterAllListener(){
+			mServer.unregisterAllListener();
+		}
+		/*Interface of switch player*/
+		public boolean SwitchPlayer(){
+			return mServer.SwitchPlayer();
+		}
+		public void InitPlayer(){
+			mServer.InitPlayer();
+		}
+	    
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerScreenManager.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerScreenManager.java
new file mode 100644
index 0000000..c8a1c42
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerScreenManager.java
@@ -0,0 +1,69 @@
+package com.joyplus.mediaplayer;
+
+
+import com.joyplus.JoyplusMediaPlayerActivity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.widget.LinearLayout;
+
+public class JoyplusMediaPlayerScreenManager {
+
+	private static JoyplusMediaPlayerScreenManager mManager;
+	public  static JoyplusMediaPlayerScreenManager getInstance(){
+		return mManager;
+	}
+	
+	private  boolean  Debug = true;
+	private  String   TAG   = "JoyplusMediaPlayerScreenManager";
+	private  Activity mActivity;
+	
+	public final static int LINEARLAYOUT_PARAMS_16x9     = 0;
+    public final static int LINEARLAYOUT_PARAMS_4x3      = 1;
+    public final static int LINEARLAYOUT_PARAMS_FULL     = 2;
+    public final static int LINEARLAYOUT_PARAMS_ORIGINAL = 3;
+    public final static int LINEARLAYOUT_PARAMS_DEFAULT  = 3;
+    public static boolean IsAviableType(int type){
+    	return (LINEARLAYOUT_PARAMS_16x9<=type && type<=LINEARLAYOUT_PARAMS_ORIGINAL);
+    }
+	
+	public JoyplusMediaPlayerScreenManager(Activity activity) throws Exception{
+		if(! (activity instanceof Activity))throw new Exception("use it in Activity");
+		mManager = this;
+		mActivity = activity;
+	}
+	//Interface for screen control.set screen and save value to datbase
+    public boolean setScreenParams(int type){
+    	if(!IsAviableType(type))return false;
+    	if(mActivity != null && mActivity instanceof JoyplusMediaPlayerActivity){
+    		if(((JoyplusMediaPlayerActivity)mActivity).getPlayer() != null){
+    			return ((JoyplusMediaPlayerActivity)mActivity).getPlayer().setScreenLayoutParams(type);
+    		}
+    	}
+    	return false;
+    }
+    public int getScreenParams(){
+    	if(mActivity != null && mActivity instanceof JoyplusMediaPlayerActivity){
+    		if(((JoyplusMediaPlayerActivity)mActivity).getPlayer() != null){
+    			return ((JoyplusMediaPlayerActivity)mActivity).getPlayer().getScreenLayoutParams();
+    		}
+    	}
+    	return LINEARLAYOUT_PARAMS_DEFAULT;
+    }
+    public boolean setScreenParamsDefault(int type){
+    	if(!IsAviableType(type))return false;
+    	if(JoyplusMediaPlayerManager.getInstance()!=null){
+    		JoyplusMediaPlayerManager.getInstance().getDataManager().setScreenParamsDefault(type);
+    	}
+    	return false;
+    }
+    public int getScreenParamsDefault(){
+    	if(JoyplusMediaPlayerManager.getInstance()!=null){
+    		return JoyplusMediaPlayerManager.getInstance().getDataManager().getScreenParamsDefault();
+    	}
+    	return LINEARLAYOUT_PARAMS_DEFAULT;
+    }
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerServer.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerServer.java
new file mode 100644
index 0000000..c535468
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerServer.java
@@ -0,0 +1,300 @@
+package com.joyplus.mediaplayer;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+
+import com.joyplus.mediaplayer.VideoViewInterface.DecodeType;
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+
+public class JoyplusMediaPlayerServer {
+	
+	private boolean Debug = true;
+	private String  TAG   = "JoyplusMediaPlayerServer";
+	
+	private final static int NO_FIND = -1;
+	
+	//private Context mContext;
+	
+	private JoyplusPlayerConfig[] mPlayerConfigs;//it depend on priority_HW which depend in "JoyplusMediaPlayerConfig.XML" ,
+	//private VideoViewInterface    mPlayers[];//it depend on priority_HW which depend in "JoyplusMediaPlayerConfig.XML" ,
+	private int   HWPlayer = 0;     //it depend on priority_HW which depend in "JoyplusMediaPlayerConfig.XML" ,
+	private int   SWPlayer = 0;     //it depend on priority_HW which depend in "JoyplusMediaPlayerConfig.XML" ,
+	private int[] priorityHWList;   //it depend on priority_HW which depend in "JoyplusMediaPlayerConfig.XML" ,reverse order
+	private int[] prioritySWList;   //it depend on priority_SW which depend in "JoyplusMediaPlayerConfig.XML" ,reverse order
+
+	/*MediaPlayer tracker，it use to report*/
+    private JoyplusMediaPlayerStateTrack mStateTracker;
+    private PlayerState mCurrentState;
+    
+	/*client of JoyplusMediaPlayerServer,bc no C/S,so do it in the same thread*/
+	public JoyplusMediaPlayerServer(Context context){
+		 // this.mContext  = context;
+		  mStateTracker  = new JoyplusMediaPlayerStateTrack();
+		  mPlayerConfigs = new JoyplusPlayerConfig[JoyplusMediaPlayerManager.TYPE_MAX+1];
+		  //mPlayers       = new VideoViewInterface[JoyplusMediaPlayerManager.TYPE_MAX+1];
+		  String[] ConfigStrings = context.getResources().getStringArray(R.array.mediaplayerconfig);
+		  if(ConfigStrings==null || "".equals(ConfigStrings))throw new IllegalArgumentException();
+		  for(String config : ConfigStrings){
+			  JoyplusPlayerConfig n = new JoyplusPlayerConfig(config);
+			 
+			  if(!JoyplusMediaPlayerManager.isTypeAvailable(n.TYPE)){
+				  Log.i(TAG,"JoyplusMediaPlayerServer - ignoring attempt to define type");
+				  continue;
+			  }
+			  if(mPlayerConfigs[n.TYPE]!=null){
+				  Log.i(TAG,"JoyplusMediaPlayerServer - ignoring attempt to redefine type");
+				  continue;
+			  }
+			  mPlayerConfigs[n.TYPE] = n;
+			  if(!n.EN){
+				  Log.i(TAG,"JoyplusMediaPlayerServer - ignoring EN to define type");
+				  continue;
+			  }
+			  if(n.DECODE_HW)HWPlayer++;
+			  if(n.DECODE_SW)SWPlayer++;
+		  }
+		  InitprioritySWList();
+		  InitpriorityHWList();
+	}
+	/*Interface of mediaplayer config*/
+	public JoyplusPlayerConfig getJoyplusPlayerConfig(int Type) throws Exception{
+		if(!JoyplusMediaPlayerManager.isTypeAvailable(Type))throw new Exception("unAvailableType"+Type);
+		Log.i(TAG, "getJoyplusPlayerConfig--->" + mPlayerConfigs[Type]);
+		return mPlayerConfigs[Type];
+	}
+	/*interface of current player,it will be use we init or resume*/
+	public PlayerState getCurrentType(){
+		if(mCurrentState == null)mCurrentState = new PlayerState();
+		return mCurrentState;
+	}
+	/*get next player type,it depend on the priority
+	 * when CurrentDecodeType is default decode type,we allow to search the others decode type
+	 * eg: CurrentDecodeType is HW. default type is HW. when we search,frist company priorityHWList. 
+	 *     if no lower priority find,now, we allow to search prioritySWList.
+	 *     CurrentDecodeType is HW. default type is SW. when we search,frist company priorityHWList.
+	 *     if no lower priority find,now ,we return no find.
+	 * First  Priority : DecodeType
+	 * Second Priority : priority
+	 * 
+	 * Return: PlayerState*/
+	public PlayerState getNextType(int Type) throws Exception{
+		if(!JoyplusMediaPlayerManager.isTypeAvailable(Type))throw new Exception("unAvailableType"+Type);
+		DecodeType DefaultDecodeType = JoyplusMediaPlayerManager.getInstance().getDecodeType();
+		return getNextType(DefaultDecodeType,Type,true);
+	}
+	/*define by Jas@20130730 for get lower priority in list priorityHWList,prioritySWList*/
+	private PlayerState getNextType(DecodeType type,int currentType,boolean Allow){
+		PlayerState state = new PlayerState();
+		if(DecodeType.Decode_HW == type){
+			state.DecodeType = DecodeType.Decode_HW;
+			state.PlayerType = getNextType(priorityHWList,currentType);
+		}else if(DecodeType.Decode_SW == type){
+			state.DecodeType = DecodeType.Decode_SW;
+			state.PlayerType = getNextType(prioritySWList,currentType);
+		}
+		if(state.PlayerType <= NO_FIND){
+			if(Allow){
+				state = getNextType(type,currentType,false);
+			}
+		}
+		return state;
+	}
+	/*define by Jas@20130730 for get lower priority in list like priorityHWList,prioritySWList*/
+	private int getNextType(int[] list,int currentType){
+		if(list == null || list.length<1)return NO_FIND;
+		for(int m : list){
+			if(currentType <= m)continue;
+			return m;
+		}
+		return NO_FIND;
+	}
+	/*init SW priority ,reverse order*/
+	private void InitprioritySWList(){
+		if(SWPlayer<=0)return;
+		prioritySWList = new int[SWPlayer];
+		int insertionPoint = SWPlayer-1;
+        int currentLowest = 0;
+        int nextLowest = 0;
+        while (insertionPoint > -1) {
+            for (JoyplusPlayerConfig na : mPlayerConfigs) {
+                if (na == null || !na.DECODE_SW || !na.EN)    continue;
+                if (na.PRIORITY_SW < currentLowest) continue;
+                if (na.PRIORITY_SW > currentLowest) {
+                    if (na.PRIORITY_SW < nextLowest || nextLowest == 0) {
+                        nextLowest = na.PRIORITY_SW;
+                    }
+                    continue;
+                }
+                prioritySWList[insertionPoint--] = na.TYPE;
+            }
+            currentLowest = nextLowest;
+            nextLowest = 0;
+        }
+        if(Debug){
+        	for(int SW :prioritySWList){
+        		Log.d(TAG,"prioritySWList mPlayerConfigs["+SW+"]"+mPlayerConfigs[SW].toString());
+        	}
+        }
+	}
+	
+	/*init HW priority ,reverse order*/
+	private void InitpriorityHWList(){
+		if(HWPlayer<=0)return;
+		priorityHWList = new int[HWPlayer];
+	    int insertionPoint = HWPlayer-1;
+        int currentLowest = 0;
+        int nextLowest = 0;
+        while (insertionPoint > -1) {
+            for (JoyplusPlayerConfig na : mPlayerConfigs) {
+                if (na == null || !na.DECODE_HW || !na.EN)    continue;
+                if (na.PRIORITY_HW < currentLowest) continue;
+                if (na.PRIORITY_HW > currentLowest) {
+                    if (na.PRIORITY_HW < nextLowest || nextLowest == 0) {
+                        nextLowest = na.PRIORITY_HW;
+                    }
+                    continue;
+                }
+                priorityHWList[insertionPoint--] = na.TYPE;
+            }
+            currentLowest = nextLowest;
+            nextLowest = 0;
+        }
+        if(Debug){
+        	for(int HW :priorityHWList){
+        		Log.d(TAG,"priorityHWList mPlayerConfigs["+HW+"]"+mPlayerConfigs[HW].toString());
+        	}
+        }
+	}
+	
+    public class PlayerState{
+    	/*MediaPlayer TYPE
+    	 * @link{#JoyplusMediaPlayerManager}
+    	 * see@# JoyplusMediaPlayerManager TYPE_UNKNOW
+    	 * see@# JoyplusMediaPlayerManager TYPE_MEDIAPLAYER
+    	 * see@# JoyplusMediaPlayerManager TYPE_VITAMIO
+    	 * */
+    	public int        PlayerType ;
+    	/*MediaPlayer DecodeType
+    	 * @link{# JoyplusPlayer}
+    	 * see@# JoyplusPlayer DecodeType*/
+    	public DecodeType DecodeType ;
+    	/*Save player current state
+    	 * it will use to restore */
+    	public MediaInfo  Info;
+    	public PlayerState(){    
+    		DecodeType = JoyplusMediaPlayerManager.getInstance().getDecodeType();
+    		if(DecodeType == DecodeType.Decode_HW){
+    			if(priorityHWList != null && priorityHWList.length>0){
+    				PlayerType = priorityHWList[0];
+    			}else if(prioritySWList != null && prioritySWList.length>0){
+    				DecodeType = DecodeType.Decode_SW;
+    				PlayerType = prioritySWList[0];
+    			}else{
+    				PlayerType = JoyplusMediaPlayerManager.TYPE_UNKNOW;
+    			}
+    		}else if(DecodeType == DecodeType.Decode_SW){
+    			if(prioritySWList != null && prioritySWList.length>0){
+    				PlayerType = prioritySWList[0];
+    			}else if(priorityHWList != null && priorityHWList.length>0){
+    				DecodeType = DecodeType.Decode_HW;
+    				PlayerType = priorityHWList[0];
+    			}else{
+    				PlayerType = JoyplusMediaPlayerManager.TYPE_UNKNOW;
+    			}
+    		}
+    		if(JoyplusMediaPlayerManager.isTypeAvailable(PlayerType)){
+    			Info = new MediaInfo();//Info will report by MediaPlayer monitor
+    		}
+    		
+    	}
+    	public PlayerState(PlayerState state){
+    		if(state != null){
+    			this.PlayerType = state.PlayerType;
+    			this.DecodeType = state.DecodeType;
+    			this.Info       = state.Info.CreateMediaInfo();
+    		}
+    	}
+    	public String toString(){
+    		StringBuffer sb = new StringBuffer();
+            sb.append("PlayerState{ PlayerType: ").append(JoyplusMediaPlayerManager.getPlayerTypeName(PlayerType)).
+               append(", DecodeType:").append(JoyplusMediaPlayerManager.getInstance().getDecodeName(DecodeType)).
+               append(", MediaInfo:").append(Info.toString());
+            return sb.toString();
+    	}
+    }
+    
+    /*Interface of switch player*/
+    public boolean SwitchPlayer(){
+    	try {
+    		if(JoyplusMediaPlayerManager.isTypeAvailable(mCurrentState.PlayerType)){
+				PlayerState nextPlayer = getNextType(mCurrentState.PlayerType);
+				if(NO_FIND != nextPlayer.PlayerType && JoyplusMediaPlayerManager.isTypeAvailable(nextPlayer.PlayerType)){
+					mCurrentState = new PlayerState(nextPlayer);
+					return true;
+				}
+    		}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    	InitPlayer();
+    	return false;
+    }
+    public void InitPlayer(){
+    	mCurrentState = new PlayerState();
+    }
+    /*Interface of Listener*/
+	public void registerListener(JoyplusMediaPlayerListener listener){
+		if(listener == null)return;
+		mStateTracker.registerListener(listener);
+	}
+	public void unregisterListener(JoyplusMediaPlayerListener listener){
+		if(listener == null)return;
+		mStateTracker.unregisterListener(listener);
+	}
+	public void unregisterAllListener(){
+		mStateTracker.unregisterAllListener();
+	}
+	/*this handler was use to get info for MediaPlayerMonitor*/
+	public Handler getMediaPlayerHandler(){
+		return mMediaPlayerHandler;
+	}
+	private Handler mMediaPlayerHandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case JoyplusPlayerMonitor.MSG_STATEUPDATE:
+				MediaInfo info = ((MediaInfo) msg.obj).CreateMediaInfo();
+				if(info != null){
+					//mCurrentState.Info = info;
+					mStateTracker.notifyMediaInfo(info);
+					if(info.getState() == STATE.MEDIA_STATE_UNKNOW ){
+						//SwitchPlayer();
+						mStateTracker.notifyMediaError();
+					}else if(info.getState() == STATE.MEDIA_STATE_FINISH){
+						mStateTracker.notifyMediaCompletion();
+					}
+				}
+				break;
+			case JoyplusPlayerMonitor.MSG_NOPROCESSCOMMEND:
+				mStateTracker.NoProcessCommend((String)msg.obj);
+				break;
+			}
+		}
+		
+	};
+	private void notityNoProcess(String commend){
+		if(Debug)Log.d(TAG,"notityNoProcess("+commend+")");
+ 		Message m = Message.obtain(mMediaPlayerHandler, JoyplusPlayerMonitor.MSG_NOPROCESSCOMMEND,"MSG_NOPROCESSCOMMEND");
+		m.obj     = commend;
+		mMediaPlayerHandler.removeCallbacksAndMessages("MSG_NOPROCESSCOMMEND");
+		mMediaPlayerHandler.sendMessage(m);
+ 	 }
+		
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerStateTrack.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerStateTrack.java
new file mode 100644
index 0000000..c125088
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusMediaPlayerStateTrack.java
@@ -0,0 +1,92 @@
+package com.joyplus.mediaplayer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.joyplus.tvhelper.utils.Log;
+
+public class JoyplusMediaPlayerStateTrack {
+
+	private boolean Debug = false;
+	private String  TAG   = "JoyplusMediaPlayerStateTrack";
+	
+	
+	private List<JoyplusMediaPlayerListener> mListenerList=new ArrayList<JoyplusMediaPlayerListener>();
+	
+	public void registerListener(JoyplusMediaPlayerListener listener){
+		if(listener != null){
+			synchronized(mListenerList){
+			   mListenerList.add(listener);
+			}
+		}
+	}
+	public void unregisterListener(JoyplusMediaPlayerListener listener){
+		if(listener != null){
+			synchronized(mListenerList){
+				mListenerList.remove(listener);
+			}
+		}
+	}
+	public void unregisterAllListener(){
+		synchronized(mListenerList){
+			mListenerList = new ArrayList<JoyplusMediaPlayerListener>();
+		}
+	}
+	
+	public void notifyMediaInfo(final MediaInfo info){
+		if(Debug)Log.d(TAG,"notifyMediaInfo("+info.toString()+")");
+		synchronized(mListenerList){
+		   new Runnable(){
+				@Override
+				public void run() {
+					// TODO Auto-generated method stub
+					for(JoyplusMediaPlayerListener listener:mListenerList){
+						 listener.MediaInfo(info);
+					}
+				} 
+		   }.run();
+		}
+	}
+	public void notifyMediaCompletion(){
+		if(Debug)Log.d(TAG,"notifyMediaCompletion()");
+		synchronized(mListenerList){
+			   new Runnable(){
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						for(JoyplusMediaPlayerListener listener:mListenerList){
+							 listener.MediaCompletion();
+						}
+					} 
+			   }.run();
+		}
+	}
+	public void notifyMediaError(){
+		if(Debug)Log.d(TAG,"notifyMediaError()");
+		synchronized(mListenerList){
+			   new Runnable(){
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						for(JoyplusMediaPlayerListener listener:mListenerList){
+							 listener.ErrorInfo();
+						}
+					} 
+			   }.run();
+		}
+	}
+	public void NoProcessCommend(final String commend){
+		if(Debug)Log.d(TAG,"NoProcessCommend("+commend+")");
+		synchronized(mListenerList){
+			   new Runnable(){
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						for(JoyplusMediaPlayerListener listener:mListenerList){
+							 listener.NoProcess(commend);
+						}
+					} 
+			   }.run();
+	   }
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerConfig.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerConfig.java
new file mode 100644
index 0000000..995b65e
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerConfig.java
@@ -0,0 +1,55 @@
+package com.joyplus.mediaplayer;
+
+public class JoyplusPlayerConfig {
+
+	/*flog of name like mediaplayer,vitma*/
+	public String NAME;
+	
+	/*flog of MediaPlayer 
+	 * @link{#JoyplusMediaPlayerManager}
+	 * @see# TYPE_MEDIAPLAYER
+	 * @see# TYPE_VITAMIO*/
+	public int TYPE;
+	
+	/*flog of useable*/
+	public boolean EN;
+	
+	/*flog of support decode HW*/
+	public boolean DECODE_HW;
+	
+	/*flog of support decode SW*/
+	public boolean DECODE_SW;
+	
+	/*flog of prority decode HW
+	 * this should be level 1-4 */
+	public int PRIORITY_HW;
+	
+	/*flog of prority decode SW
+	 * this should be level 1-4 */
+	public int PRIORITY_SW;
+	
+	/*this should be init from a XML file */
+	public JoyplusPlayerConfig(String init){
+		String fragments[] = init.split(",");
+        NAME      = fragments[0].trim();
+        TYPE      = Integer.parseInt(fragments[1]);
+        EN        = Boolean.parseBoolean(fragments[2]);
+        DECODE_HW = Boolean.parseBoolean(fragments[3]);
+        DECODE_SW = Boolean.parseBoolean(fragments[4]);
+        PRIORITY_HW  = Integer.parseInt(fragments[5]);
+        PRIORITY_SW  = Integer.parseInt(fragments[6]);
+	}
+	public String toString() {
+		// TODO Auto-generated method stub
+		StringBuffer sb = new StringBuffer();
+        sb.append("JoyplusPlayerConfig{ NAME: ").append(NAME).
+           append(", TYPE: ").append(TYPE).
+           append(", EN: ").append(EN ).
+           append(", DECODE_HW: ").append(DECODE_HW ).
+           append(", DECODE_SW: ").append(DECODE_SW ).
+           append(", PRIORITY_HW: ").append(PRIORITY_HW ).
+           append(", PRIORITY_SW: ").append(PRIORITY_SW ).
+           append("} ");
+        return sb.toString();
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerMonitor.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerMonitor.java
new file mode 100644
index 0000000..1ce2df3
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusPlayerMonitor.java
@@ -0,0 +1,96 @@
+package com.joyplus.mediaplayer;
+
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+/*define by Jas@20130723 for monitor player state*/
+public class JoyplusPlayerMonitor{
+
+		private boolean Debug = false;
+	    private String  TAG   = "JoyplusPlayerMonitor";
+	    public static Handler mHandler;
+	    private VideoViewInterface  mPlayer;
+	    private static  int DELAY = 500;
+	    private boolean Flog = false;
+	    public  static final int MSG_STATEUPDATE       = 1;
+	    public  static final int MSG_NOPROCESSCOMMEND  = 2;
+	    public JoyplusPlayerMonitor(Context context,VideoViewInterface player){
+	    	  mPlayer  = player;
+	    	  setUpdateTime(Integer.parseInt(context.getString(R.string.defaultUpdateTime)));
+	    }
+
+		public void setUpdateTime(int time){
+			if(Debug)Log.d(TAG,"setUpdateTime("+time+")");
+			if(time>=300 && time<=800){
+				DELAY  = time;
+			}
+		}
+
+	  
+		private void notityState(){
+			if(Debug)Log.d(TAG,"notityState()mHandler="+(mHandler == null)+" mPlayer="+(mPlayer == null));
+			if(mHandler == null || mPlayer == null)return;
+			mHandler.removeCallbacksAndMessages(null);
+			Message m = new Message();
+			m.what    = MSG_STATEUPDATE;
+			m.obj     = mCurrentInfo;			
+			mHandler.sendMessage(m);
+		}
+	    public void stopMonitor(){
+	    	if(Debug)Log.d(TAG,"stopMonitor()");
+	    	Flog = false;
+	    	mRunnable = null;
+			mHandler.removeCallbacksAndMessages(null);
+			mHandler = null;
+	    }
+	    public void startMonitor(Handler handler){
+	    	if(Debug)Log.d(TAG,"startMonitor()");
+	    	mHandler = handler;
+	    	if(mRunnable==null){	
+	    	  Flog = true;
+	    	  mRunnable = new MediaPlayerMonitor();
+	    	  mRunnable.start();
+	    	}
+	    }
+	    private MediaPlayerMonitor mRunnable;
+	    private class MediaPlayerMonitor extends Thread{
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				while(Flog){
+					try {
+						Thread.sleep(DELAY);
+						CheckMediaInfo();
+						notityState();
+						System.gc();
+					} catch (InterruptedException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace(); 
+					}
+				}
+			}
+	    };
+	    /*Add AutoMediaInfo judge*/
+	    private MediaInfo mCurrentInfo  = new MediaInfo();
+	    private MediaInfo mPreMediaInfo = new MediaInfo();
+	    private final int MAXCount      = 30*1000/DELAY;
+	    private int       Count         = 0;
+	    private void CheckMediaInfo(){
+	    	mCurrentInfo = mPlayer.getMediaInfo();
+	    	if(mCurrentInfo.getState() == STATE.MEDIA_STATE_PLAYING
+	    			&& mPreMediaInfo.getState() == STATE.MEDIA_STATE_PLAYING){
+	    		if(mCurrentInfo.getCurrentTime() == mPreMediaInfo.getCurrentTime()){
+	    			if(++Count>=MAXCount)mCurrentInfo.setState(STATE.MEDIA_STATE_UNKNOW);
+	    		}else{
+	    			Count = 0;
+	    		}
+	    	}else Count = 0;
+	    	mPreMediaInfo = mCurrentInfo.CreateMediaInfo();
+	    }
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusVideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusVideoView.java
new file mode 100644
index 0000000..4fb3c35
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/JoyplusVideoView.java
@@ -0,0 +1,159 @@
+package com.joyplus.mediaplayer;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewStub;
+import android.widget.LinearLayout;
+
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+public class JoyplusVideoView extends LinearLayout{
+
+	private boolean Debug = false;
+	private String  TAG   = "JoyplusVideoView";
+	
+	private Context mContext;
+	
+	private VideoViewInterface   mView;
+	private JoyplusPlayerMonitor mMonitor;
+	private MediaInfo            mTragetMediaInfo;
+	private MediaInfo            mPreMediaInfo;
+	
+	public JoyplusVideoView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		mContext = context;
+		hideView();
+	}
+    
+	public JoyplusVideoView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		mContext = context;
+		hideView();
+	}
+
+	public VideoViewInterface getVideoView(){
+		if(Debug)Log.d(TAG,"getVideoView() mView is null ="+(mView == null));
+		if(mView != null)
+			return mView;
+		else 
+			return null;
+	}
+	/*Interface of MediaPlayer handler*/
+	private Handler mServerHandler;
+	private Handler MediaPlayerhandler = new Handler(){
+		@Override
+		public void handleMessage(Message msg) {
+			// TODO Auto-generated method stub
+			super.handleMessage(msg);
+			switch(msg.what){
+			case JoyplusPlayerMonitor.MSG_STATEUPDATE:
+				mPreMediaInfo = (MediaInfo)msg.obj;
+				if(Debug)Log.d(TAG,"MediaPlayer Info="+mPreMediaInfo.toString());
+				if(mPreMediaInfo.getState()==STATE.MEDIA_STATE_UNKNOW){
+					if(JoyplusMediaPlayerManager.getInstance().getSwitchEn()){
+						mTragetMediaInfo = mPreMediaInfo;
+					}
+				}
+				break;
+			}
+			if(mServerHandler != null){
+				Message m = Message.obtain(mServerHandler, msg.what,null);
+				if(JoyplusPlayerMonitor.MSG_STATEUPDATE == msg.what)m.obj=mPreMediaInfo;
+				mServerHandler.sendMessage(m);
+			}
+		}
+    };
+	
+	
+	public boolean Update(){
+		return Update(JoyplusMediaPlayerManager.getInstance().getCurrentType().PlayerType);
+	}
+	public boolean Update(int MediaPlayerType){
+		if(Debug)Log.d(TAG,"Update("+JoyplusMediaPlayerManager.getPlayerTypeName(MediaPlayerType)+")");
+		hideView();
+		mView = null;
+		if(!JoyplusMediaPlayerManager.isTypeAvailable(MediaPlayerType)){
+			Log.i(TAG,"Update() unavailable type "+MediaPlayerType);
+			return false;
+		}
+		JoyplusPlayerConfig config= JoyplusMediaPlayerManager.getInstance().getJoyplusPlayerConfig(MediaPlayerType);
+	    if(config == null || !config.EN){
+	    	Log.i(TAG,"JoyplusPlayerConfig("+MediaPlayerType+") unusable");
+	    	return false;	
+	    }
+	    if(config.TYPE == JoyplusMediaPlayerManager.TYPE_VITAMIO && !JoyplusMediaPlayerManager.getInstance().getVitamioEn()){
+	    	Log.i(TAG,"Vitamio unsupport now !!");
+	    	return false;
+	    }
+		mView = CreateView(MediaPlayerType);
+		return true;
+	}
+    public void hideView(){
+    	if(Debug)Log.d(TAG,"hideView()");
+    	if(mView!=null){
+    		((ViewInterface)mView).setVisibility(false);
+    		((View)mView).setVisibility(View.GONE);
+    	}
+    	if(mMonitor != null){
+			mMonitor.stopMonitor();
+			mMonitor=null;
+		}
+    	mServerHandler = null;
+    }
+    private View getStubView(int stubId,int viewId){
+    	if(Debug)Log.d(TAG,"getStubView("+stubId+" , "+viewId+")");
+    	View view = findViewById(viewId);
+    	if(view == null){
+    		ViewStub stub = (ViewStub)findViewById(stubId);
+    		view = stub.inflate();
+    	}
+    	return view;
+    }
+    private VideoViewInterface CreateView(int type){
+    	if(Debug)Log.d(TAG,"CreateView()"+JoyplusMediaPlayerManager.getPlayerTypeName(type));
+    	if(type == JoyplusMediaPlayerManager.TYPE_MEDIAPLAYER){
+    		return CreateVideoView(
+    				R.id.system_mediaplayer_videoview_stub,
+    				R.id.system_mediaplayer_videoview);
+    	}else if(type == JoyplusMediaPlayerManager.TYPE_VITAMIO){
+    		return CreateVideoView(
+    				R.id.system_vitamioplayer_videoview_stub,
+    				R.id.system_vitamioplayer_videoview);
+    	}else{
+    		throw new IllegalArgumentException();
+    	}
+    }
+    private VideoViewInterface CreateVideoView(int stubId,int viewId){
+    	if(Debug)Log.d(TAG,"CreateVideoView("+stubId+" , "+viewId+")");
+    	LinearLayout view = (LinearLayout) getStubView(stubId,viewId);
+    	view.setVisibility(View.VISIBLE);
+    	if(view != null){
+    		//view.setLayoutParams(JoyplusMediaPlayerScreenManager.getInstance().getParams());
+    		mMonitor = new JoyplusPlayerMonitor(mContext,(VideoViewInterface)view);
+    		mMonitor.startMonitor(MediaPlayerhandler);
+    		mServerHandler = JoyplusMediaPlayerManager.getInstance().getmediaPlayerHandler();
+    	}
+    	return (VideoViewInterface)view;
+    }
+    public boolean setScreenLayoutParams(int type){
+    	if(mView!=null ){
+    		((VideoViewInterface)mView).setScreenLayoutParams(type);
+    		return true;
+    	}
+    	return false;
+    }
+    public int getScreenLayoutParams(){
+    	if(mView!=null ){
+    		return ((VideoViewInterface)mView).getScreenLayoutParams();
+    	}
+    	return JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_DEFAULT;
+    }
+    
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/MediaInfo.java b/showkeyHelper/src/com/joyplus/mediaplayer/MediaInfo.java
new file mode 100644
index 0000000..b1f5aef
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/MediaInfo.java
@@ -0,0 +1,113 @@
+package com.joyplus.mediaplayer;
+
+
+import com.joyplus.mediaplayer.VideoViewInterface.STATE;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/*define by Jas@20130723 for Load MediaPlayer current info
+ * */
+public class MediaInfo implements Parcelable{
+    
+	/*add by Jas@20130723 for MediaPlayer cueernt state
+	 * @see #Player.State*/
+	private STATE mState;
+	public void setState(STATE mediaStateSetvideouri){
+		this.mState = mediaStateSetvideouri;
+	}
+	public STATE getState(){
+		return this.mState;
+	}
+	/*add by Jas@20130723 for current time*/
+	private long CurrentTime;
+	public void setCurrentTime(long l){
+		this.CurrentTime = l;
+	}
+	public long getCurrentTime(){
+		return this.CurrentTime;
+	}
+	/*add by Jas@20130723 for current totle time*/
+	private long TotleTime;
+	public void setTotleTime(long l){
+		this.TotleTime = l;
+	}
+	public long getTotleTime(){
+		return this.TotleTime;
+	}
+	/*add by Jas for get current Type*/
+	private int TYPE;
+	public void setType(int type){
+		this.TYPE = type;
+	}
+	public int getType(){
+	    return this.TYPE;	
+	}
+	/*add by Jas for restore url*/
+	private String Path;
+	
+	public void setPath(String path){
+		this.Path = path;
+	}
+	public String getPath(){
+		return this.Path;
+	}
+	/*add by Jas for VideoView info*/
+	private int INFO;
+	public void setINFO(int info){
+		this.INFO = info;
+	}
+	public int getINFO(){
+	    return this.INFO;	
+	} 
+	public MediaInfo(){
+		this.mState      = STATE.MEDIA_STATE_IDLE;
+		this.CurrentTime = 0;
+		this.TotleTime   = 0;
+		this.TYPE        = JoyplusMediaPlayerManager.TYPE_UNKNOW;
+		this.Path        = null;
+		this.INFO        = 0;
+	}
+	public MediaInfo(MediaInfo info){
+		if(info != null){
+			this.mState      = info.mState;
+			this.CurrentTime = info.CurrentTime;
+			this.TotleTime   = info.TotleTime;
+			this.TYPE        = info.TYPE;
+			this.Path        = info.Path;
+			this.INFO        = info.INFO;
+		}
+	}
+	public MediaInfo CreateMediaInfo(){
+		return new MediaInfo(this);
+	}
+	@Override
+	public int describeContents() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void writeToParcel(Parcel arg0, int arg1) {
+		// TODO Auto-generated method stub
+		arg0.writeInt(this.mState.toInt());
+		arg0.writeLong(CurrentTime);
+		arg0.writeLong(TotleTime);
+		arg0.writeString(Path);
+		arg0.writeInt(INFO);
+	}
+	
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		StringBuffer sb = new StringBuffer();
+        sb.append("MediaInfo{ STATE: ").append(mState.toInt()).
+           append(", CurrentTime: ").append(CurrentTime).
+           append(", TotleTime: ").append(TotleTime ).
+           append(", Path: ").append(Path).
+           append(", INFO: ").append(INFO).
+           append("} ");
+        return sb.toString();
+	}
+
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/SystemMediaPlayerVideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/SystemMediaPlayerVideoView.java
new file mode 100644
index 0000000..47bf22f
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/SystemMediaPlayerVideoView.java
@@ -0,0 +1,167 @@
+package com.joyplus.mediaplayer;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+public class SystemMediaPlayerVideoView extends LinearLayout implements ViewInterface,VideoViewInterface,MediaPlayer.OnErrorListener,MediaPlayer.OnCompletionListener,
+                                                                        MediaPlayer.OnPreparedListener,MediaPlayer.OnInfoListener{
+	private boolean Debug = true;
+	private String  TAG   = "SystemMediaPlayerVideoView";
+    private SystemVideoView  mVideoView;   
+	@Override
+	protected void onFinishInflate() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onFinishInflate()");
+		super.onFinishInflate();
+		mVideoView = (SystemVideoView) findViewById(R.id.systemvideoView);
+		mVideoView.setOnErrorListener(this);
+		mVideoView.setOnCompletionListener(this);
+		mVideoView.setOnPreparedListener(this);
+		mVideoView.setOnInfoListener(this);
+	}
+
+	public SystemMediaPlayerVideoView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+	}
+
+	public SystemMediaPlayerVideoView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void reset() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		Log.d("Jas","Mediaplayerssssssssssssssss "+visible);
+		if(visible == false){
+			mVideoView.StopVideo();
+		}
+	}
+
+	@Override
+	public VideoViewInterface getVideoViewInterface() {
+		// TODO Auto-generated method stub
+		return mVideoView;
+	}
+
+	@Override
+	public MediaInfo getMediaInfo() {
+		// TODO Auto-generated method stub
+		return mVideoView.getMediaInfo();
+	}
+
+	@Override
+	public void SetState(STATE state) {
+		// TODO Auto-generated method stub
+		mVideoView.SetState(state);
+	}
+
+	@Override
+	public void SetVideoPaths(String video) {
+		// TODO Auto-generated method stub
+		mVideoView.SetVideoPaths(video);
+	}
+
+	@Override
+	public void SetVideoVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void StartVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.StartVideo();
+	}
+
+	@Override
+	public void StopVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.StopVideo();
+	}
+
+	@Override
+	public void PauseVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.PauseVideo();
+	}
+
+	@Override
+	public void SeekVideo(int seekTo) {
+		// TODO Auto-generated method stub
+		mVideoView.SeekVideo(seekTo);
+	}
+
+	@Override
+	public boolean IsPlaying() {
+		// TODO Auto-generated method stub
+		return mVideoView.IsPlaying();
+	}
+
+	@Override
+	public void onPrepared(MediaPlayer mp) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onPrepared()");
+		mVideoView.SetState(STATE.MEDIA_STATE_INITED);
+		mVideoView.setScreenLayoutParams(JoyplusMediaPlayerScreenManager.getInstance().getScreenParamsDefault());
+	}
+
+	@Override
+	public void onCompletion(MediaPlayer mp) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onCompletion()");
+		mVideoView.SetState(STATE.MEDIA_STATE_FINISH);
+	}
+
+	@Override
+	public boolean onError(MediaPlayer mp, int what, int extra) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onError("+what+" ,"+extra+")");
+		mVideoView.SetState(STATE.MEDIA_STATE_UNKNOW);
+		return true;
+	}
+
+	@Override
+	public MediaInfo getTargetMediaInfo() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean onInfo(MediaPlayer mp, int what, int extra) {
+		// TODO Auto-generated method stub
+		Log.i("Jas","Vitamio info="+what+" "+extra);
+		mVideoView.SetINFO(what);
+		return false;
+	}
+
+	@Override
+	public void SetINFO(int info) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean setScreenLayoutParams(int type) {
+		// TODO Auto-generated method stub	
+		return mVideoView.setScreenLayoutParams(type);
+	}
+
+	@Override
+	public int getScreenLayoutParams() {
+		// TODO Auto-generated method stub
+		return mVideoView.getScreenLayoutParams();
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/SystemVideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/SystemVideoView.java
new file mode 100644
index 0000000..45cf988
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/SystemVideoView.java
@@ -0,0 +1,136 @@
+package com.joyplus.mediaplayer;
+
+
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout.LayoutParams;
+
+import com.joyplus.tvhelper.utils.Log;
+
+
+public class SystemVideoView extends VideoView implements VideoViewInterface{
+	
+	private boolean Debug = false;
+	private String  TAG   = "SystemVideoView";
+	
+	private MediaInfo mMediaInfo;
+	public SystemVideoView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		Init();
+	}
+	public SystemVideoView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		Init();
+	}
+	private void Init() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"Init()");
+		mMediaInfo = new MediaInfo();
+	}
+	
+	@Override
+	public MediaInfo getMediaInfo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"getMediaInfo()");
+		if(mMediaInfo.getState() == STATE.MEDIA_STATE_PUSE
+				||mMediaInfo.getState() == STATE.MEDIA_STATE_PLAYING
+				||mMediaInfo.getState() == STATE.MEDIA_STATE_INITED){
+			mMediaInfo.setCurrentTime(this.getCurrentPosition());
+			mMediaInfo.setTotleTime(this.getDuration());
+		}else if(mMediaInfo.getPath() == null){
+			mMediaInfo.setCurrentTime(0);
+			mMediaInfo.setTotleTime(0);
+		}
+		return mMediaInfo;
+	}
+	@Override
+	public void SetState(STATE state) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setState("+state.toInt()+")");
+		mMediaInfo.setState(state);
+	}
+	@Override
+	public void SetVideoVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"SetVideoVisibility()");
+	}
+	@Override
+	public void StartVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"startVideo()");
+		this.start();  
+		mMediaInfo.setState(STATE.MEDIA_STATE_PLAYING);
+	}
+	@Override
+	public void StopVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"stopVideo()");
+		mMediaInfo.setState(STATE.MEDIA_STATE_IDLE);
+		this.stopPlayback();
+	}
+	@Override
+	public void PauseVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"pauseVideo()");
+		this.pause();
+		mMediaInfo.setState(STATE.MEDIA_STATE_PUSE);
+	}
+	@Override
+	public void SeekVideo(int seekTo) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"seekVideo("+seekTo+")");
+		this.seekTo(seekTo);
+		//mMediaInfo.setState(STATE.MEDIA_STATE_LOADING);
+	}
+    public boolean IsPlaying(){
+    	if(Debug)Log.d(TAG,"IsPlaying()");
+    	return this.isPlaying();
+    }
+	@Override
+	public void SetVideoPaths(String video) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setVideoPaths("+video+")");
+		this.setVideoPath(video);
+		mMediaInfo.setPath(video);
+	}
+	@Override
+	public void reset() {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void setVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public VideoViewInterface getVideoViewInterface() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	@Override
+	public MediaInfo getTargetMediaInfo() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	@Override
+	public void SetINFO(int info) {
+		// TODO Auto-generated method stub
+		mMediaInfo.setINFO(info);
+	}
+	@Override
+	public boolean setScreenLayoutParams(int type) {
+		// TODO Auto-generated method stub
+		this.setVideoLayout(type);
+		return true;
+	}
+	@Override
+	public int getScreenLayoutParams() {
+		// TODO Auto-generated method stub
+		return this.getVideoLayout();
+	}
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/SystemVitamioPlayerVideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/SystemVitamioPlayerVideoView.java
new file mode 100644
index 0000000..05f4a5b
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/SystemVitamioPlayerVideoView.java
@@ -0,0 +1,175 @@
+package com.joyplus.mediaplayer;
+
+import io.vov.vitamio.MediaPlayer;
+import io.vov.vitamio.MediaPlayer.OnCompletionListener;
+import io.vov.vitamio.MediaPlayer.OnErrorListener;
+import io.vov.vitamio.MediaPlayer.OnInfoListener;
+import io.vov.vitamio.MediaPlayer.OnPreparedListener;
+import io.vov.vitamio.MediaPlayer.OnVideoSizeChangedListener;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+public class SystemVitamioPlayerVideoView extends LinearLayout  implements ViewInterface,VideoViewInterface, OnErrorListener,
+                                                                           OnCompletionListener, OnPreparedListener,OnInfoListener{
+    
+	private boolean Debug = true;
+	private String  TAG   = "SystemVitamioPlayerVideoView";
+	private VitamioVideoView mVideoView = null;
+    @Override
+	protected void onFinishInflate() {
+		// TODO Auto-generated method stub
+		super.onFinishInflate();
+		if(Debug)Log.d(TAG,"onFinishInflate()");
+		mVideoView = (VitamioVideoView) findViewById(R.id.VitamioVideoView);
+		mVideoView.setOnErrorListener(this);
+		mVideoView.setOnCompletionListener(this);
+		mVideoView.setOnPreparedListener(this);
+		mVideoView.setOnInfoListener(this);
+	}
+
+	public SystemVitamioPlayerVideoView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+	}
+
+	public SystemVitamioPlayerVideoView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void reset() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		if(visible == false){
+			mVideoView.StopVideo();
+		}
+	}
+
+	@Override
+	public VideoViewInterface getVideoViewInterface() {
+		// TODO Auto-generated method stub
+		return mVideoView;
+	}
+
+	@Override
+	public MediaInfo getMediaInfo() {
+		// TODO Auto-generated method stub
+		return mVideoView.getMediaInfo();
+	}
+
+	@Override
+	public void SetState(STATE state) {
+		// TODO Auto-generated method stub
+		mVideoView.SetState(state);
+	}
+
+	@Override
+	public void SetVideoPaths(String video) {
+		// TODO Auto-generated method stub
+		mVideoView.SetVideoPaths(video);
+	}
+
+	@Override
+	public void SetVideoVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void StartVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.StartVideo();
+	}
+
+	@Override
+	public void StopVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.StopVideo();
+	}
+
+	@Override
+	public void PauseVideo() {
+		// TODO Auto-generated method stub
+		mVideoView.PauseVideo();
+	}
+
+	@Override
+	public void SeekVideo(int seekTo) {
+		// TODO Auto-generated method stub
+		mVideoView.SeekVideo(seekTo);
+	}
+
+	@Override
+	public boolean IsPlaying() {
+		// TODO Auto-generated method stub
+		return mVideoView.IsPlaying();
+	}
+
+	@Override
+	public void onPrepared(MediaPlayer mp) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onPrepared()");
+		mVideoView.SetState(STATE.MEDIA_STATE_INITED);
+		mVideoView.setScreenLayoutParams(JoyplusMediaPlayerScreenManager.getInstance().getScreenParamsDefault());
+	}
+
+	@Override
+	public void onCompletion(MediaPlayer mp) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onCompletion()");
+		mVideoView.SetState(STATE.MEDIA_STATE_FINISH);
+	}
+
+	@Override
+	public boolean onError(MediaPlayer mp, int what, int extra) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"onError("+what+" ,"+extra+")");
+		mVideoView.SetState(STATE.MEDIA_STATE_UNKNOW);
+		return true;
+	}
+
+	@Override
+	public MediaInfo getTargetMediaInfo() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void SetINFO(int info) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean onInfo(MediaPlayer mp, int what, int extra) {
+		// TODO Auto-generated method stub
+		Log.i("Jas","Vitamio info="+what+" "+extra);
+		mVideoView.SetINFO(what);
+		return false;
+	}
+
+	@Override
+	public boolean setScreenLayoutParams(int type) {
+		// TODO Auto-generated method stub
+		mVideoView.setScreenLayoutParams(type);
+		return true;
+	}
+
+	@Override
+	public int getScreenLayoutParams() {
+		// TODO Auto-generated method stub
+		return mVideoView.getScreenLayoutParams() ;
+	}
+
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/VideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/VideoView.java
new file mode 100644
index 0000000..62d07c8
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/VideoView.java
@@ -0,0 +1,714 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.joyplus.mediaplayer;
+
+import java.io.IOException;
+import java.util.Map;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.OnCompletionListener;
+import android.media.MediaPlayer.OnErrorListener;
+import android.media.MediaPlayer.OnInfoListener;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.MediaController;
+import android.widget.MediaController.MediaPlayerControl;
+
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.utils.Log;
+
+/**
+ * Displays a video file.  The VideoView class
+ * can load images from various sources (such as resources or content
+ * providers), takes care of computing its measurement from the video so that
+ * it can be used in any layout manager, and provides various display options
+ * such as scaling and tinting.
+ */
+public class VideoView extends SurfaceView implements MediaPlayerControl {
+    private String TAG = "VideoView";
+    // settable by the client
+    private Uri         mUri;
+    private Map<String, String> mHeaders;
+    private int         mDuration;
+
+    // all possible internal states
+    private static final int STATE_ERROR              = -1;
+    private static final int STATE_IDLE               = 0;
+    private static final int STATE_PREPARING          = 1;
+    private static final int STATE_PREPARED           = 2;
+    private static final int STATE_PLAYING            = 3;
+    private static final int STATE_PAUSED             = 4;
+    private static final int STATE_PLAYBACK_COMPLETED = 5;
+
+    // mCurrentState is a VideoView object's current state.
+    // mTargetState is the state that a method caller intends to reach.
+    // For instance, regardless the VideoView object's current state,
+    // calling pause() intends to bring the object to a target state
+    // of STATE_PAUSED.
+    private int mCurrentState = STATE_IDLE;
+    private int mTargetState  = STATE_IDLE;
+
+    // All the stuff we need for playing and showing a video
+    private SurfaceHolder mSurfaceHolder = null;
+    private MediaPlayer mMediaPlayer = null;
+    private int         mVideoWidth;
+    private int         mVideoHeight;
+    private int         mSurfaceWidth;
+    private int         mSurfaceHeight;
+    private MediaController mMediaController;
+    private OnCompletionListener mOnCompletionListener;
+    private MediaPlayer.OnPreparedListener mOnPreparedListener;
+    private int         mCurrentBufferPercentage;
+    private OnErrorListener mOnErrorListener;
+    private OnInfoListener  mOnInfoListener;
+    private int         mSeekWhenPrepared;  // recording the seek position while preparing
+    private boolean     mCanPause;
+    private boolean     mCanSeekBack;
+    private boolean     mCanSeekForward;
+
+    private Context mContext;
+    //add for zoom by Jas@20130925
+    public static final int VIDEO_LAYOUT_16X9     = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9;
+    public static final int VIDEO_LAYOUT_4X3      = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3;
+    public static final int VIDEO_LAYOUT_FILL     = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL;
+    public static final int VIDEO_LAYOUT_ORIGINAL = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL;
+    public static final int VIDEO_LAYOUT_DEFAULT  = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_DEFAULT;
+    private int             mVideoLayout = VIDEO_LAYOUT_DEFAULT;
+    //end add for zoom
+    public VideoView(Context context) {
+        super(context);
+        initVideoView();
+    }
+
+    public VideoView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+        initVideoView();
+    }
+
+    public VideoView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initVideoView();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
+        int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
+        setMeasuredDimension(width, height);
+    }
+    public int getVideoLayout(){
+  	  return mVideoLayout;
+    }
+    public void setVideoLayout(int layout) {
+        LayoutParams lp     = getLayoutParams();       
+        View base = (View) this.getParent();
+        int windowWidth = base.getWidth();
+        int windowHeight = base.getHeight();
+        if(windowHeight<=0|| windowWidth<=0) return;
+        if(mVideoWidth<=0 || mVideoHeight<=0)return;
+        mSurfaceHeight      = mVideoHeight;
+        mSurfaceWidth       = mVideoWidth;
+        if (VIDEO_LAYOUT_16X9 == layout) {
+        	lp.width  = windowWidth;
+        	lp.height = windowWidth*9/16;
+        } else if (layout == VIDEO_LAYOUT_4X3) {
+        	lp.width  = windowHeight*4/3;
+        	lp.height = windowHeight;
+        } else if(layout == VIDEO_LAYOUT_ORIGINAL){
+        	Log.d(TAG, "video size type------>" + layout);
+        	Log.d(TAG, "prant width------>" + windowWidth);
+        	Log.d(TAG, "prant height------>" + windowHeight);
+        	Log.d(TAG, "mSurfaceWidth------>" + mSurfaceWidth);
+        	Log.d(TAG, "mSurfaceHeight------>" + mSurfaceHeight);
+        	if(((float)mSurfaceWidth/windowWidth)>=((float)mSurfaceHeight/windowHeight)){
+        		lp.width  = windowWidth;
+        		lp.height = mSurfaceHeight*windowWidth/mSurfaceWidth;
+        	}else{
+        		lp.width  = mSurfaceWidth*windowHeight/mSurfaceHeight;
+        		lp.height = windowHeight;
+        	}
+        	Log.d(TAG, "video view width ------>" + lp.width);
+        	Log.d(TAG, "video view height------>" + lp.height);
+        } else if(layout == VIDEO_LAYOUT_FILL){
+        	lp.width       = windowWidth;
+        	lp.height      = windowHeight;        	
+        }
+        if(lp.width>windowWidth || lp.height>windowHeight){
+        	if(((float)lp.width/lp.height)>((float)windowWidth/windowHeight)){
+        		lp.width  = lp.height*lp.width/windowHeight;
+        		lp.height = windowHeight;
+        	}else{
+        		lp.height = lp.width*lp.height/windowWidth;
+        		lp.width  = windowWidth;
+        	}
+        	lp.width  = lp.width >windowWidth?windowWidth:lp.width;
+        	lp.height = lp.height>windowWidth?windowWidth:lp.height;
+        }
+        setLayoutParams(lp);
+        getHolder().setFixedSize(mSurfaceWidth, mSurfaceHeight);
+        mVideoLayout = layout;
+    }
+    @Override
+    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
+        super.onInitializeAccessibilityEvent(event);
+        event.setClassName(VideoView.class.getName());
+    }
+
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+        super.onInitializeAccessibilityNodeInfo(info);
+        info.setClassName(VideoView.class.getName());
+    }
+
+    public int resolveAdjustedSize(int desiredSize, int measureSpec) {
+        int result = desiredSize;
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize =  MeasureSpec.getSize(measureSpec);
+
+        switch (specMode) {
+            case MeasureSpec.UNSPECIFIED:
+                /* Parent says we can be as big as we want. Just don't be larger
+                 * than max size imposed on ourselves.
+                 */
+                result = desiredSize;
+                break;
+
+            case MeasureSpec.AT_MOST:
+                /* Parent says we can be as big as we want, up to specSize.
+                 * Don't be larger than specSize, and don't be larger than
+                 * the max size imposed on ourselves.
+                 */
+                result = Math.min(desiredSize, specSize);
+                break;
+
+            case MeasureSpec.EXACTLY:
+                // No choice. Do what we are told.
+                result = specSize;
+                break;
+        }
+        return result;
+}
+
+    private void initVideoView() {
+        mVideoWidth = 0;
+        mVideoHeight = 0;
+        mContext = getContext();
+        getHolder().addCallback(mSHCallback);
+        getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+        setFocusable(true);
+        setFocusableInTouchMode(true);
+        requestFocus();
+        mCurrentState = STATE_IDLE;
+        mTargetState  = STATE_IDLE;
+    }
+
+    public void setVideoPath(String path) {
+        setVideoURI(Uri.parse(path));
+    }
+
+    public void setVideoURI(Uri uri) {
+        setVideoURI(uri, null);
+    }
+
+    /**
+     * @hide
+     */
+    public void setVideoURI(Uri uri, Map<String, String> headers) {
+        mUri = uri;
+        mHeaders = headers;
+        mSeekWhenPrepared = 0;
+        openVideo();
+        requestLayout();
+        invalidate();
+    }
+
+    public void stopPlayback() {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+            mCurrentState = STATE_IDLE;
+            mTargetState  = STATE_IDLE;
+        }
+    }
+   
+    private void openVideo() {
+        if (mUri == null || mSurfaceHolder == null) {
+            // not ready for playback just yet, will try again later
+            return;
+        }
+        // Tell the music playback service to pause
+        // TODO: these constants need to be published somewhere in the framework.
+        Intent i = new Intent("com.android.music.musicservicecommand");
+        i.putExtra("command", "pause");
+        mContext.sendBroadcast(i);
+
+        // we shouldn't clear the target state, because somebody might have
+        // called start() previously
+        release(false);
+        try {
+            mMediaPlayer = new MediaPlayer();
+            mMediaPlayer.setOnPreparedListener(mPreparedListener);
+            mMediaPlayer.setOnVideoSizeChangedListener(mSizeChangedListener);
+            mDuration = -1;
+            mMediaPlayer.setOnCompletionListener(mCompletionListener);
+            mMediaPlayer.setOnErrorListener(mErrorListener);
+            mMediaPlayer.setOnInfoListener(mOnInfoListener);
+            mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener);
+            mCurrentBufferPercentage = 0;
+            mMediaPlayer.setDataSource(mContext, mUri, mHeaders);
+            mMediaPlayer.setDisplay(mSurfaceHolder);
+            mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            mMediaPlayer.setScreenOnWhilePlaying(true);
+            mMediaPlayer.prepareAsync();
+            // we don't set the target state here either, but preserve the
+            // target state that was there before.
+            mCurrentState = STATE_PREPARING;
+            attachMediaController();
+        } catch (IOException ex) {
+            Log.w(TAG, "Unable to open content: " + mUri, ex);
+            mCurrentState = STATE_ERROR;
+            mTargetState = STATE_ERROR;
+            mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
+            return;
+        } catch (IllegalArgumentException ex) {
+            Log.w(TAG, "Unable to open content: " + mUri, ex);
+            mCurrentState = STATE_ERROR;
+            mTargetState = STATE_ERROR;
+            mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
+            return;
+        }
+    }
+
+    public void setMediaController(MediaController controller) {
+        if (mMediaController != null) {
+            mMediaController.hide();
+        }
+        mMediaController = controller;
+        attachMediaController();
+    }
+
+    private void attachMediaController() {
+        if (mMediaPlayer != null && mMediaController != null) {
+            mMediaController.setMediaPlayer(this);
+            View anchorView = this.getParent() instanceof View ?
+                    (View)this.getParent() : this;
+            mMediaController.setAnchorView(anchorView);
+            mMediaController.setEnabled(isInPlaybackState());
+        }
+    }
+
+    MediaPlayer.OnVideoSizeChangedListener mSizeChangedListener =
+        new MediaPlayer.OnVideoSizeChangedListener() {
+            public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+                mVideoWidth  = mp.getVideoWidth();
+                mVideoHeight = mp.getVideoHeight();                
+                if (mVideoWidth != 0 && mVideoHeight != 0) {
+                    //getHolder().setFixedSize(mVideoWidth, mVideoHeight);
+                	setVideoLayout(mVideoLayout);
+                    requestLayout();
+                }
+            }
+    };
+    MediaPlayer.OnPreparedListener mPreparedListener = new MediaPlayer.OnPreparedListener() {
+        public void onPrepared(MediaPlayer mp) {
+            mCurrentState = STATE_PREPARED;
+
+            // Get the capabilities of the player for this stream
+//            Metadata data = mp.getMetadata(MediaPlayer.METADATA_ALL,
+//                                      MediaPlayer.BYPASS_METADATA_FILTER);
+//
+//            if (data != null) {
+//                mCanPause = !data.has(Metadata.PAUSE_AVAILABLE)
+//                        || data.getBoolean(Metadata.PAUSE_AVAILABLE);
+//                mCanSeekBack = !data.has(Metadata.SEEK_BACKWARD_AVAILABLE)
+//                        || data.getBoolean(Metadata.SEEK_BACKWARD_AVAILABLE);
+//                mCanSeekForward = !data.has(Metadata.SEEK_FORWARD_AVAILABLE)
+//                        || data.getBoolean(Metadata.SEEK_FORWARD_AVAILABLE);
+//            } else {
+                mCanPause = mCanSeekBack = mCanSeekForward = true;
+//            }
+
+            if (mOnPreparedListener != null) {
+                mOnPreparedListener.onPrepared(mMediaPlayer);
+            }
+            if (mMediaController != null) {
+                mMediaController.setEnabled(true);
+            }
+            mVideoWidth = mp.getVideoWidth();
+            mVideoHeight = mp.getVideoHeight();
+            int seekToPosition = mSeekWhenPrepared;  // mSeekWhenPrepared may be changed after seekTo() call
+            if (seekToPosition != 0) {
+                seekTo(seekToPosition);
+            }
+            if (mVideoWidth != 0 && mVideoHeight != 0) {            	
+            	setVideoLayout(mVideoLayout);
+                if (mSurfaceWidth == mVideoWidth && mSurfaceHeight == mVideoHeight) {
+                    // We didn't actually change the size (it was already at the size
+                    // we need), so we won't get a "surface changed" callback, so
+                    // start the video here instead of in the callback.
+                    if (mTargetState == STATE_PLAYING) {
+                        start();
+                        if (mMediaController != null) {
+                            mMediaController.show();
+                        }
+                    } else if (!isPlaying() &&
+                               (seekToPosition != 0 || getCurrentPosition() > 0)) {
+                       if (mMediaController != null) {
+                           // Show the media controls when we're paused into a video and make 'em stick.
+                           mMediaController.show(0);
+                       }
+                   }
+                }
+            } else {
+                // We don't know the video size yet, but should start anyway.
+                // The video size might be reported to us later.
+                if (mTargetState == STATE_PLAYING) {
+                    start();
+                }
+            }
+        }
+    };
+
+    private MediaPlayer.OnCompletionListener mCompletionListener =
+        new MediaPlayer.OnCompletionListener() {
+        public void onCompletion(MediaPlayer mp) {
+            mCurrentState = STATE_PLAYBACK_COMPLETED;
+            mTargetState = STATE_PLAYBACK_COMPLETED;
+            if (mMediaController != null) {
+                mMediaController.hide();
+            }
+            if (mOnCompletionListener != null) {
+                mOnCompletionListener.onCompletion(mMediaPlayer);
+            }
+        }
+    };
+
+    private MediaPlayer.OnErrorListener mErrorListener =
+        new MediaPlayer.OnErrorListener() {
+        public boolean onError(MediaPlayer mp, int framework_err, int impl_err) {
+            Log.d(TAG, "Error: " + framework_err + "," + impl_err);
+            mCurrentState = STATE_ERROR;
+            mTargetState = STATE_ERROR;
+            if (mMediaController != null) {
+                mMediaController.hide();
+            }
+
+            /* If an error handler has been supplied, use it and finish. */
+            if (mOnErrorListener != null) {
+                if (mOnErrorListener.onError(mMediaPlayer, framework_err, impl_err)) {
+                    return true;
+                }
+            }
+
+            /* Otherwise, pop up an error dialog so the user knows that
+             * something bad has happened. Only try and pop up the dialog
+             * if we're attached to a window. When we're going away and no
+             * longer have a window, don't bother showing the user an error.
+             */
+//            if (getWindowToken() != null) {
+//                Resources r = mContext.getResources();
+//                int messageId;
+//
+//                if (framework_err == MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK) {
+//                    messageId = com.android.internal.R.string.VideoView_error_text_invalid_progressive_playback;
+//                } else {
+//                    messageId = com.android.internal.R.string.VideoView_error_text_unknown;
+//                }
+//
+//                new AlertDialog.Builder(mContext)
+//                        .setMessage(messageId)
+//                        .setPositiveButton(com.android.internal.R.string.VideoView_error_button,
+//                                new DialogInterface.OnClickListener() {
+//                                    public void onClick(DialogInterface dialog, int whichButton) {
+//                                        /* If we get here, there is no onError listener, so
+//                                         * at least inform them that the video is over.
+//                                         */
+//                                        if (mOnCompletionListener != null) {
+//                                            mOnCompletionListener.onCompletion(mMediaPlayer);
+//                                        }
+//                                    }
+//                                })
+//                        .setCancelable(false)
+//                        .show();
+//            }
+            return true;
+        }
+    };
+
+    private MediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener =
+        new MediaPlayer.OnBufferingUpdateListener() {
+        public void onBufferingUpdate(MediaPlayer mp, int percent) {
+            mCurrentBufferPercentage = percent;
+        }
+    };
+
+    /**
+     * Register a callback to be invoked when the media file
+     * is loaded and ready to go.
+     *
+     * @param l The callback that will be run
+     */
+    public void setOnPreparedListener(MediaPlayer.OnPreparedListener l)
+    {
+        mOnPreparedListener = l;
+    }
+
+    /**
+     * Register a callback to be invoked when the end of a media file
+     * has been reached during playback.
+     *
+     * @param l The callback that will be run
+     */
+    public void setOnCompletionListener(OnCompletionListener l)
+    {
+        mOnCompletionListener = l;
+    }
+
+    /**
+     * Register a callback to be invoked when an error occurs
+     * during playback or setup.  If no listener is specified,
+     * or if the listener returned false, VideoView will inform
+     * the user of any errors.
+     *
+     * @param l The callback that will be run
+     */
+    public void setOnErrorListener(OnErrorListener l)
+    {
+        mOnErrorListener = l;
+    }
+
+    /**
+     * Register a callback to be invoked when an informational event
+     * occurs during playback or setup.
+     *
+     * @param l The callback that will be run
+     */
+    public void setOnInfoListener(OnInfoListener l) {
+        mOnInfoListener = l;
+    }
+
+    SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback()
+    {
+        public void surfaceChanged(SurfaceHolder holder, int format,
+                                    int w, int h)
+        {
+            mSurfaceWidth = w;
+            mSurfaceHeight = h;
+            boolean isValidState =  (mTargetState == STATE_PLAYING);
+            boolean hasValidSize = (mVideoWidth == w && mVideoHeight == h);
+            if (mMediaPlayer != null && isValidState && hasValidSize) {
+                if (mSeekWhenPrepared != 0) {
+                    seekTo(mSeekWhenPrepared);
+                }
+                start();
+            }
+        }
+
+        public void surfaceCreated(SurfaceHolder holder)
+        {
+            mSurfaceHolder = holder;
+            openVideo();
+        }
+
+        public void surfaceDestroyed(SurfaceHolder holder)
+        {
+            // after we return from this we can't use the surface any more
+            mSurfaceHolder = null;
+            if (mMediaController != null) mMediaController.hide();
+            release(true);
+        }
+    };
+
+    /*
+     * release the media player in any state
+     */
+    private void release(boolean cleartargetstate) {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.reset();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+            mCurrentState = STATE_IDLE;
+            if (cleartargetstate) {
+                mTargetState  = STATE_IDLE;
+            }
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (isInPlaybackState() && mMediaController != null) {
+            toggleMediaControlsVisiblity();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onTrackballEvent(MotionEvent ev) {
+        if (isInPlaybackState() && mMediaController != null) {
+            toggleMediaControlsVisiblity();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event)
+    {
+        boolean isKeyCodeSupported = keyCode != KeyEvent.KEYCODE_BACK &&
+                                     keyCode != KeyEvent.KEYCODE_VOLUME_UP &&
+                                     keyCode != KeyEvent.KEYCODE_VOLUME_DOWN &&
+                                     keyCode != KeyEvent.KEYCODE_VOLUME_MUTE &&
+                                     keyCode != KeyEvent.KEYCODE_MENU &&
+                                     keyCode != KeyEvent.KEYCODE_CALL &&
+                                     keyCode != KeyEvent.KEYCODE_ENDCALL;
+        if (isInPlaybackState() && isKeyCodeSupported && mMediaController != null) {
+            if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK ||
+                    keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
+                if (mMediaPlayer.isPlaying()) {
+                    pause();
+                    mMediaController.show();
+                } else {
+                    start();
+                    mMediaController.hide();
+                }
+                return true;
+            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
+                if (!mMediaPlayer.isPlaying()) {
+                    start();
+                    mMediaController.hide();
+                }
+                return true;
+            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
+                    || keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
+                if (mMediaPlayer.isPlaying()) {
+                    pause();
+                    mMediaController.show();
+                }
+                return true;
+            } else {
+                toggleMediaControlsVisiblity();
+            }
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void toggleMediaControlsVisiblity() {
+        if (mMediaController.isShowing()) {
+            mMediaController.hide();
+        } else {
+            mMediaController.show();
+        }
+    }
+
+    public void start() {
+        if (isInPlaybackState()) {
+            mMediaPlayer.start();
+            mCurrentState = STATE_PLAYING;
+        }
+        mTargetState = STATE_PLAYING;
+    }
+
+    public void pause() {
+        if (isInPlaybackState()) {
+            if (mMediaPlayer.isPlaying()) {
+                mMediaPlayer.pause();
+                mCurrentState = STATE_PAUSED;
+            }
+        }
+        mTargetState = STATE_PAUSED;
+    }
+
+    public void suspend() {
+        release(false);
+    }
+
+    public void resume() {
+        openVideo();
+    }
+
+    // cache duration as mDuration for faster access
+    public int getDuration() {
+        if (isInPlaybackState()) {
+            if (mDuration > 0) {
+                return mDuration;
+            }
+            mDuration = mMediaPlayer.getDuration();
+            return mDuration;
+        }
+        mDuration = -1;
+        return mDuration;
+    }
+
+    public int getCurrentPosition() {
+        if (isInPlaybackState()) {
+            return mMediaPlayer.getCurrentPosition();
+        }
+        return 0;
+    }
+
+    public void seekTo(int msec) {
+        if (isInPlaybackState()) {
+            mMediaPlayer.seekTo(msec);
+            mSeekWhenPrepared = 0;
+        } else {
+            mSeekWhenPrepared = msec;
+        }
+    }
+
+    public boolean isPlaying() {
+        return isInPlaybackState() && mMediaPlayer.isPlaying();
+    }
+
+    public int getBufferPercentage() {
+        if (mMediaPlayer != null) {
+            return mCurrentBufferPercentage;
+        }
+        return 0;
+    }
+
+    private boolean isInPlaybackState() {
+        return (mMediaPlayer != null &&
+                mCurrentState != STATE_ERROR &&
+                mCurrentState != STATE_IDLE &&
+                mCurrentState != STATE_PREPARING);
+    }
+
+    public boolean canPause() {
+        return mCanPause;
+    }
+
+    public boolean canSeekBackward() {
+        return mCanSeekBack;
+    }
+
+    public boolean canSeekForward() {
+        return mCanSeekForward;
+    }
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/VideoViewInterface.java b/showkeyHelper/src/com/joyplus/mediaplayer/VideoViewInterface.java
new file mode 100644
index 0000000..5c7adb4
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/VideoViewInterface.java
@@ -0,0 +1,56 @@
+package com.joyplus.mediaplayer;
+
+import android.widget.LinearLayout;
+
+public interface VideoViewInterface extends ViewInterface{
+     
+	   /*interface of event*/
+	   static final int MIN_PLAYER_EVENT = 1;
+	   static final int MAX_PLAYER_EVENT = 100;
+	   /*define for change MediaPlayer decode type*/
+	   public enum DecodeType{
+		   Decode_HW   (1),
+		   Decode_SW   (2);
+		   private int TYPE;
+		   DecodeType(int type){
+			   TYPE = type;
+		   }
+		   public int toInt(){
+			   return TYPE;
+		   }
+	   }
+	  
+	   /*define for MediaPlayer State*/
+	   enum STATE{
+		   MEDIA_STATE_UNKNOW      (0), //State unknow this will switch to IDLE
+		   MEDIA_STATE_IDLE        (1), //State IDLE,means player can't use,pls init it first,it can be switch to setsource,idle
+		   MEDIA_STATE_SETVIDEOURI (2), //State SetResource,means player nend to set resource,it can be switch to setvideouri,idle
+		   MEDIA_STATE_INITED      (3), //State Inited,means player have been inited,it can be switch to loading. playing or idle
+		   MEDIA_STATE_LOADING     (4), //State loading,means player is loading resource,it can be switch to loaded or inited.
+		   MEDIA_STATE_LOADED      (5), //State loaded,means player has load over ,it can be switch to playing or inited.
+		   MEDIA_STATE_PLAYING     (6), //State playing,means player has be playing,it can be switch to puse ,loading or inited
+		   MEDIA_STATE_PUSE        (7), //State puse,means player has be pused,it can switch to playing,loading or inited.
+		   MEDIA_STATE_FINISH      (8), //State finish,means player has be finish play,it can switch to idle
+		   MEDIA_STATE_MAX         (8); //State MAX,it not a state only a flog use to jude
+		   private int mState;
+		   STATE(int state){
+			   this.mState = state;
+		   }
+		   public int toInt(){
+			   return mState;
+		   }
+	    }
+	    
+	    MediaInfo getMediaInfo();
+	    void SetState(STATE state);
+	    void SetVideoPaths(String video);
+	    void SetVideoVisibility(boolean visible);
+	    void StartVideo();
+	    void StopVideo();
+	    void PauseVideo();
+	    void SeekVideo(int seekTo);
+	    boolean IsPlaying();
+	    void SetINFO(int info);
+	    boolean setScreenLayoutParams(int type);
+	    int     getScreenLayoutParams();
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/ViewInterface.java b/showkeyHelper/src/com/joyplus/mediaplayer/ViewInterface.java
new file mode 100644
index 0000000..efc16f6
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/ViewInterface.java
@@ -0,0 +1,22 @@
+package com.joyplus.mediaplayer;
+
+public interface ViewInterface {
+
+	  /*Get the width of the view object*/
+	 int getWidth();
+	 
+	 /*Get the heigtht of the view object*/
+	 int getHeight();
+	 
+	 /*Reset the view (for next presentation)*/
+	 void reset();
+	 
+	 /*set the visibitity of the view object*/
+	 void setVisibility(boolean visible);
+	 
+	 /*get videoview*/
+	 VideoViewInterface getVideoViewInterface();
+	 
+	 /*get target MediaInfo*/
+	 MediaInfo getTargetMediaInfo();
+}
diff --git a/showkeyHelper/src/com/joyplus/mediaplayer/VitamioVideoView.java b/showkeyHelper/src/com/joyplus/mediaplayer/VitamioVideoView.java
new file mode 100644
index 0000000..b479ea8
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/mediaplayer/VitamioVideoView.java
@@ -0,0 +1,141 @@
+package com.joyplus.mediaplayer;
+
+
+import io.vov.vitamio.widget.VideoView;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout.LayoutParams;
+
+import com.joyplus.tvhelper.utils.Log;
+
+public class VitamioVideoView extends VideoView implements VideoViewInterface{
+
+	
+	private boolean Debug = false;
+	private String  TAG   = "VitamioVideoView";
+	
+	private MediaInfo mMediaInfo;
+	public VitamioVideoView(Context context) {
+		super(context);
+		// TODO Auto-generated constructor stub
+		Init();
+	}
+	public VitamioVideoView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		// TODO Auto-generated constructor stub
+		Init();
+	}
+	private void Init() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"Init()");
+		mMediaInfo = new MediaInfo();
+		this.setVideoQuality(16);
+	}
+	
+	@Override
+	public MediaInfo getMediaInfo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"getMediaInfo()");
+		if(mMediaInfo.getState() == STATE.MEDIA_STATE_PUSE
+				||mMediaInfo.getState() == STATE.MEDIA_STATE_PLAYING
+				||mMediaInfo.getState() == STATE.MEDIA_STATE_INITED){
+			mMediaInfo.setCurrentTime(this.getCurrentPosition());
+			mMediaInfo.setTotleTime(this.getDuration());
+		}else if(mMediaInfo.getPath() == null){
+			mMediaInfo.setCurrentTime(0);
+			mMediaInfo.setTotleTime(0);
+		}
+		return mMediaInfo;
+	}
+	@Override
+	public void SetState(STATE state) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setState("+state.toInt()+")");
+		mMediaInfo.setState(state);
+	}
+	@Override
+	public void SetVideoVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"SetVideoVisibility()");
+	}
+	@Override
+	public void StartVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"startVideo()");
+		this.start();
+		mMediaInfo.setState(STATE.MEDIA_STATE_PLAYING);
+	}
+	@Override
+	public void StopVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"stopVideo()");
+		mMediaInfo.setState(STATE.MEDIA_STATE_IDLE);
+		this.stopPlayback();
+	}
+	@Override
+	public void PauseVideo() {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"pauseVideo()");
+		this.pause();
+		mMediaInfo.setState(STATE.MEDIA_STATE_PUSE);
+	}
+	@Override
+	public void SeekVideo(int seekTo) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"seekVideo("+seekTo+")");
+		this.seekTo(seekTo);
+		//mMediaInfo.setState(STATE.MEDIA_STATE_LOADING);
+	}
+    public boolean IsPlaying(){
+    	if(Debug)Log.d(TAG,"IsPlaying()");
+    	return this.isPlaying();
+    }
+	@Override
+	public void SetVideoPaths(String video) {
+		// TODO Auto-generated method stub
+		if(Debug)Log.d(TAG,"setVideoPaths("+video+")");
+		//if (video.startsWith("http:"))
+		//	this.setVideoURI(Uri.parse(video));
+		//else
+		this.setVideoPath(video);
+		mMediaInfo.setPath(video);
+	}
+	@Override
+	public void reset() {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void setVisibility(boolean visible) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public VideoViewInterface getVideoViewInterface() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	@Override
+	public MediaInfo getTargetMediaInfo() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	@Override
+	public void SetINFO(int info) {
+		// TODO Auto-generated method stub
+		mMediaInfo.setINFO(info);
+	}
+	@Override
+	public boolean setScreenLayoutParams(int type) {
+		// TODO Auto-generated method stub
+		this.setVideoLayout(type);
+		return true;
+	}
+	@Override
+	public int getScreenLayoutParams() {
+		// TODO Auto-generated method stub
+		return this.getVideoLayout();
+	}
+	
+	
+}
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/CloudDataDisplayActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/CloudDataDisplayActivity.java
index 52bfd35..d476f17 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/CloudDataDisplayActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/CloudDataDisplayActivity.java
@@ -1,6 +1,7 @@
 package com.joyplus.tvhelper;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -10,6 +11,8 @@
 import org.json.JSONObject;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -17,6 +20,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -30,6 +34,7 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import com.joyplus.JoyplusMediaPlayerActivity;
 import com.joyplus.network.filedownload.manager.DownloadManager;
 import com.joyplus.tvhelper.adapter.MovieDownLoadedAdapter;
 import com.joyplus.tvhelper.adapter.MoviePlayHistoryAdapter;
@@ -62,7 +67,7 @@ public class CloudDataDisplayActivity extends Activity implements OnItemClickLis
 	private DBServices dbService;
 	private int selectedIndex = 0;
 	private Button title_playHistory, title_downloading, title_downloaded;
-	private Button backButton, deleteButton, cancleButton, editeButton;
+	private Button backButton, deleteButton, cancleButton, editeButton, clearButton;
 	private LinearLayout layout1, layout2;
 	private List<PushedMovieDownLoadInfo> downloadedMovies;
 	private List<MoviePlayHistoryInfo> playinfos;
@@ -170,6 +175,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		deleteButton = (Button) findViewById(R.id.del_Button);
 		cancleButton = (Button) findViewById(R.id.cancel_Button);
 		editeButton = (Button) findViewById(R.id.edit_Button);
+		clearButton = (Button) findViewById(R.id.clear_Button);
 		listView = (ExpandableListView) findViewById(R.id.movieList);
 		title_playHistory = (Button) findViewById(R.id.title_play_history);
 		title_downloading = (Button) findViewById(R.id.title_downloading);
@@ -184,6 +190,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		deleteButton.setOnClickListener(this);
 		cancleButton.setOnClickListener(this);
 		editeButton.setOnClickListener(this);
+		clearButton.setOnClickListener(this);
 		adpter_downloading = new PushedMovieDownLoadAdapter(this, FayeService.movieDownLoadInfos);
 		dbService = DBServices.getInstance(this);
 		downloadedMovies = dbService.queryMovieDownLoadedInfos();
@@ -242,7 +249,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
 //					}
 				}else{
 					CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-					Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+//					Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+					Intent intent = Utils.getIntent(this);
 //					intent.putExtra("ID", json.getString("prod_id"));
 //					playDate.prod_id = data.getString("id");
 //					playDate.prod_type = Integer.valueOf(json.getString("prod_type"));
@@ -260,6 +268,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
 //					playDate.prod_src = json.getString("prod_src");
 					playDate.prod_time = Math.round(playInfo.getPlayback_time()*1000);
 					playDate.prod_qua = playInfo.getDefination();
+					playDate.isOnline = false;
 //					if(playDate.prod_type==2||playDate.prod_type==3||playDate.prod_type==131){
 //						if(json.has("prod_subname")){//旧版android 没有传递该参数
 //							playDate.prod_sub_name = json.getString("prod_subname");
@@ -342,7 +351,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
 				}
 				
 				CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-				Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+//				Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+				Intent intent = Utils.getIntent(this);
 //				intent.putExtra("ID", json.getString("prod_id"));
 //				playDate.prod_id = data.getString("id");
 //				playDate.prod_type = Integer.valueOf(json.getString("prod_type"));
@@ -352,7 +362,12 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
 				playDate.prod_url = play_info.getLocal_url();
 				playDate.obj = play_info;
 //				playDate.prod_src = json.getString("prod_src");
-				playDate.prod_time = play_info.getPlayback_time()*1000;
+				if(play_info.getDuration()-play_info.getPlayback_time()<=Constant.END_TIME){
+					playDate.prod_time = 0;
+				}else{
+					playDate.prod_time = Math.round(play_info.getPlayback_time()*1000);
+				}
+				playDate.isOnline = false;
 //				playDate.prod_qua = Integer.valueOf(json.getString("prod_qua"));
 //				if(playDate.prod_type==2||playDate.prod_type==3||playDate.prod_type==131){
 //					if(json.has("prod_subname")){//旧版android 没有传递该参数
@@ -555,6 +570,40 @@ public void onClick(View v) {
 			}
 			((BaseAdapter)listView.getAdapter()).notifyDataSetChanged();
 			break;
+		case R.id.clear_Button:
+			final Dialog dialog = new AlertDialog.Builder(this).create();
+			dialog.show();
+			LayoutInflater inflater = LayoutInflater.from(this);
+			View view = inflater.inflate(R.layout.layout_clear_dialog, null);
+			Button delButton = (Button) view.findViewById(R.id.btn_ok);
+			Button cancelButton = (Button) view.findViewById(R.id.btn_canle);
+			dialog.setContentView(view);
+			cancelButton.setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					// TODO Auto-generated method stub
+					dialog.dismiss();
+				}
+			});
+			delButton.setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					// TODO Auto-generated method stub
+					dialog.dismiss();
+					Iterator<MoviePlayHistoryInfo> iterator = null;
+					iterator = playinfos.iterator();  
+			         while(iterator.hasNext()) {  
+			        	 MoviePlayHistoryInfo info = iterator.next();  
+		            	 info.setPlay_type(MoviePlayHistoryInfo.PLAY_TYPE_HIDE);
+		            	 dbService.updateMoviePlayHistory(info);
+						 iterator.remove();  
+			         }
+			         updateEditBottn();
+				}
+			});
+			break;
 		default:
 			break;
 		}
@@ -563,11 +612,13 @@ public void onClick(View v) {
 	private void updateEditBottn(){
 		if(((BaseAdapter)listView.getAdapter()).getCount()>0){
 			editeButton.setVisibility(View.VISIBLE);
+			clearButton.setVisibility(View.VISIBLE);
 			listView.requestFocus();
 			defult_img.setVisibility(View.GONE);
 		}else{
 			editeButton.setVisibility(View.INVISIBLE);
-			defult_img.setVisibility(View.GONE);
+			clearButton.setVisibility(View.INVISIBLE);
+			defult_img.setVisibility(View.VISIBLE);
 		}
 	}
 	
@@ -629,6 +680,20 @@ public void run() {
 							String push_play_url = item.getString("downurl");
 							String time_token = item.getString("time_token");
 							String md5_code = item.getString("md5_code");
+							List<BTEpisode> es = null; 
+							if(item.has("prodName")){
+								es = new ArrayList<BTEpisode>();
+								JSONArray array_name = item.getJSONArray("prodName");
+								Log.d(TAG, array_name.toString());
+								for(int j = 0; j< array_name.length() ; j++){
+									BTEpisode e = new BTEpisode();
+									e.setDefination(Constant.DEFINATION_HD2);
+									e.setName(array_name.getString(j));
+									es.add(e);
+									Log.d(TAG, array_name.getString(j));
+								}
+								
+							}
 							int type = item.getInt("type");
 							if(PreferencesUtils.getPincodeMd5(CloudDataDisplayActivity.this)!=null &&PreferencesUtils.getPincodeMd5(CloudDataDisplayActivity.this).equals(md5_code)){
 								if(type == 5){//漏掉的播放
@@ -643,13 +708,31 @@ public void run() {
 										play_info.setDefination(Constant.DEFINATION_HD2);
 										play_info.setCreat_time(System.currentTimeMillis());
 										play_info.setTime_token(time_token+",");
+										if(es!=null && es.size()>0){
+											play_info.setPlay_type(MoviePlayHistoryInfo.PLAY_TYPE_BT_EPISODES);
+											play_info.setBtEpisodes(es);
+										}
 										play_info.setId((int)dbService.insertMoviePlayHistory(play_info));
 									}else{
+										play_info.setDefination(Constant.DEFINATION_HD2);
+										play_info.setName(push_name);
+										play_info.setRecivedDonwLoadUrls(push_play_url);
+										play_info.setPlay_type(MoviePlayHistoryInfo.PLAY_TYPE_ONLINE);
 										if(play_info.getTime_token()==null){
 											play_info.setTime_token("");
 										}
 										play_info.setTime_token(play_info.getTime_token() + time_token+",");
+										if(es!=null && es.size()>0){
+											play_info.setPlay_type(MoviePlayHistoryInfo.PLAY_TYPE_BT_EPISODES);
+											play_info.setBtEpisodes(es);
+										}
+//										play_info.setPush_id(push_id);
 										dbService.updateMoviePlayHistory(play_info);
+//										if(play_info.getTime_token()==null){
+//											play_info.setTime_token("");
+//										}
+//										play_info.setTime_token(play_info.getTime_token() + time_token+",");
+//										services.updateMoviePlayHistory(play_info);
 									}
 								}else if(type == 6){//漏掉的下载
 									
@@ -745,24 +828,30 @@ public boolean onGroupClick(ExpandableListView parent, View v,
 //					}
 				}else{
 					CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-					Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+//					Intent intent = new Intent(this,JoyplusMediaPlayerActivity.class);
+					Intent intent = Utils.getIntent(this);
 //					intent.putExtra("ID", json.getString("prod_id"));
 //					playDate.prod_id = data.getString("id");
 //					playDate.prod_type = Integer.valueOf(json.getString("prod_type"));
 //					playDate.prod_type = playInfo.getPlay_type();
 					playDate.prod_name = playInfo.getName();
 					if(playInfo.getPlay_type()==MoviePlayHistoryInfo.PLAY_TYPE_LOCAL){
-						playDate.prod_url = playInfo.getLocal_url();
-						playDate.prod_type = VideoPlayerJPActivity.TYPE_LOCAL;
+//						playDate.prod_url = playInfo.getLocal_url();
+//						playDate.prod_type = JoyplusMediaPlayerActivity.TYPE_LOCAL;
 					}else{
 //						playDate.prod_url = playInfo.getDownload_url();
-						playDate.prod_type = VideoPlayerJPActivity.TYPE_PUSH;
+						playDate.prod_type = JoyplusMediaPlayerActivity.TYPE_PUSH;
 					}
 					playDate.obj = playInfo;
 					Log.d(TAG, "prod_type" + playDate.prod_type);
 //					playDate.prod_src = json.getString("prod_src");
-					playDate.prod_time = Math.round(playInfo.getPlayback_time()*1000);
+					if(playInfo.getDuration()-playInfo.getPlayback_time()<=Constant.END_TIME){
+						playDate.prod_time = 0;
+					}else{
+						playDate.prod_time = Math.round(playInfo.getPlayback_time()*1000);
+					}
 					playDate.prod_qua = playInfo.getDefination();
+					playDate.isOnline = false;
 //					if(playDate.prod_type==2||playDate.prod_type==3||playDate.prod_type==131){
 //						if(json.has("prod_subname")){//旧版android 没有传递该参数
 //							playDate.prod_sub_name = json.getString("prod_subname");
@@ -796,7 +885,8 @@ public boolean onChildClick(ExpandableListView parent, View v,
 		MoviePlayHistoryInfo playInfo = playinfos.get(groupPosition);
 		BTEpisode epInfo = playInfo.getBtEpisodes().get(childPosition);
 		CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-		Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+//		Intent intent = new Intent(this,JoyplusMediaPlayerActivity.class);
+		Intent intent = Utils.getIntent(this);
 //		intent.putExtra("ID", json.getString("prod_id"));
 //		playDate.prod_id = data.getString("id");
 //		playDate.prod_type = Integer.valueOf(json.getString("prod_type"));
@@ -813,8 +903,13 @@ public boolean onChildClick(ExpandableListView parent, View v,
 		playDate.obj = playInfo;
 		Log.d(TAG, "prod_type" + playDate.prod_type);
 //		playDate.prod_src = json.getString("prod_src");
-		playDate.prod_time = Math.round(epInfo.getPlayback_time()*1000);
+		if(epInfo.getDuration()-epInfo.getPlayback_time()<=Constant.END_TIME){
+			playDate.prod_time = 0;
+		}else{
+			playDate.prod_time = Math.round(epInfo.getPlayback_time()*1000);
+		}
 		playDate.prod_qua = epInfo.getDefination();
+		playDate.isOnline = false;
 //		if(playDate.prod_type==2||playDate.prod_type==3||playDate.prod_type==131){
 //			if(json.has("prod_subname")){//旧版android 没有传递该参数
 //				playDate.prod_sub_name = json.getString("prod_subname");
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/GuideActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/GuideActivity.java
new file mode 100644
index 0000000..b02d712
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/tvhelper/GuideActivity.java
@@ -0,0 +1,136 @@
+package com.joyplus.tvhelper;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+import com.joyplus.tvhelper.ui.GuideScrollLayout;
+import com.joyplus.tvhelper.utils.PreferencesUtils;
+import com.joyplus.tvhelper.utils.Utils;
+
+public class GuideActivity extends Activity implements OnGestureListener {
+
+	private GuideScrollLayout layout;
+	private ImageView guide_page_1;
+	private ImageView guide_page_2;
+	private ImageView guide_page_3;
+	private ImageView guide_page_4;
+	private GestureDetector detector;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_guide);
+		PreferencesUtils.setGuidLastVersion(this, Utils.getVersionCode(this));
+		layout = (GuideScrollLayout) findViewById(R.id.layout);
+		guide_page_1 = (ImageView) findViewById(R.id.guide_page_1);
+		guide_page_2 = (ImageView) findViewById(R.id.guide_page_2);
+		guide_page_3 = (ImageView) findViewById(R.id.guide_page_3);
+		guide_page_4 = (ImageView) findViewById(R.id.guide_page_4);
+		try{
+			guide_page_1.setBackgroundResource(R.drawable.guide_page_1);
+			guide_page_2.setBackgroundResource(R.drawable.guide_page_2);
+			guide_page_3.setBackgroundResource(R.drawable.guide_page_3);
+			guide_page_4.setBackgroundResource(R.drawable.guide_page_4);
+		}catch (Exception e) {
+			// TODO: handle exception
+			finish();
+		}
+		detector = new GestureDetector(this,this); 
+	}
+
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			if(layout.getSelected()>0){
+				layout.showPre();
+			}
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			if(layout.getSelected()>=layout.getChildCount()-1){
+				finish();
+			}else{
+				layout.showNext();
+			}
+			break;
+		case KeyEvent.KEYCODE_ENTER:
+		case KeyEvent.KEYCODE_DPAD_CENTER:
+			if(layout.getSelected()==layout.getChildCount()-1){
+				finish();
+			}
+			break;
+		case KeyEvent.KEYCODE_BACK:
+		case KeyEvent.KEYCODE_ESCAPE:
+			return true;
+		default:
+			break;
+		}
+		return super.onKeyUp(keyCode, event);
+	}
+	
+	@Override
+	public boolean onTouchEvent(MotionEvent event) {
+		// TODO Auto-generated method stub
+		return detector.onTouchEvent(event);
+	}
+
+	@Override
+	public boolean onDown(MotionEvent e) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onShowPress(MotionEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean onSingleTapUp(MotionEvent e) {
+		// TODO Auto-generated method stub
+		if(layout.getSelected()==layout.getChildCount()-1){
+			finish();
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	@Override
+	public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
+			float distanceY) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void onLongPress(MotionEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
+			float velocityY) {
+		// TODO Auto-generated method stub
+		if(e1.getX()<e2.getX()){
+			if(layout.getSelected()>0){
+				layout.showPre();
+			}
+		}else{
+			if(layout.getSelected()>=layout.getChildCount()-1){
+				finish();
+			}else{
+				layout.showNext();
+			}
+		}
+		return false;
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/MainActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/MainActivity.java
index 1dfabc3..2a6ab32 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/MainActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/MainActivity.java
@@ -78,6 +78,9 @@ public class MainActivity extends Activity implements OnFocusChangeListener, OnH
 	
 	private View selectedLayout;
 	
+	private View layout_page_3;
+	private LinearLayout layout_title;
+	
 	private TextView web_url_textview;
 	
 //	private FrameLayout relativeLayout;
@@ -164,14 +167,18 @@ public void run() {
 	};
 	
 	private void reSetImages(){
-		int width = layout_1_4.getWidth();
-		int height = layout_1_4.getHeight();
+		int width = layout_1_1.getWidth();
+		int height = (layout_1_1.getHeight()-Utils.getStandardValue(MainActivity.this,13))/2;
 		image_1_1.layout(0, 0, width+ Utils.getStandardValue(MainActivity.this,40), height*2+Utils.getStandardValue(MainActivity.this,53));
 		image_1_2.layout(width+Utils.getStandardValue(MainActivity.this,13), 0, width*2+Utils.getStandardValue(MainActivity.this,53), height*2+Utils.getStandardValue(MainActivity.this,53));
 //		image_1_2.layout(width+Utils.getStandardValue(MainActivity.this,13), 0, width*2+Utils.getStandardValue(MainActivity.this,53), height+Utils.getStandardValue(MainActivity.this,40));
 //		image_1_3.layout(width+Utils.getStandardValue(MainActivity.this,13), height+Utils.getStandardValue(MainActivity.this,13), width*2+Utils.getStandardValue(MainActivity.this,53), height*2+Utils.getStandardValue(MainActivity.this,53));
 		image_1_4.layout(width*2+Utils.getStandardValue(MainActivity.this,26), 0, width*3+Utils.getStandardValue(MainActivity.this,66), height+Utils.getStandardValue(MainActivity.this,40));
-		image_1_5.layout(width*2+Utils.getStandardValue(MainActivity.this,26), height+Utils.getStandardValue(MainActivity.this,13), width*3+Utils.getStandardValue(MainActivity.this,66), height*2+Utils.getStandardValue(MainActivity.this,53));
+		if(Constant.isSimple){
+			image_1_5.layout(width*2+Utils.getStandardValue(MainActivity.this,26), 0, width*3+Utils.getStandardValue(MainActivity.this,66), height*2+Utils.getStandardValue(MainActivity.this,53));
+		}else{
+			image_1_5.layout(width*2+Utils.getStandardValue(MainActivity.this,26), height+Utils.getStandardValue(MainActivity.this,13), width*3+Utils.getStandardValue(MainActivity.this,66), height*2+Utils.getStandardValue(MainActivity.this,53));
+		}
 		image_3_1.layout(0, 0, width+Utils.getStandardValue(MainActivity.this,40), height*2+Utils.getStandardValue(MainActivity.this,53));
 		image_3_2.layout(width+Utils.getStandardValue(MainActivity.this,13), 0, width*2+Utils.getStandardValue(MainActivity.this,53), height+Utils.getStandardValue(MainActivity.this,40));
 		image_3_3.layout(width+Utils.getStandardValue(MainActivity.this,13), height+Utils.getStandardValue(MainActivity.this,13), width*2+Utils.getStandardValue(MainActivity.this,53), height*2+Utils.getStandardValue(MainActivity.this,53));
@@ -186,13 +193,17 @@ private void reSetImages(){
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_main);
+		if(Constant.isSimple){
+			setContentView(R.layout.activity_main_simple);
+		}else{
+			setContentView(R.layout.activity_main);
+		}
 		
 		MobclickAgent.onError(this);
 		UmengUpdateAgent.setUpdateOnlyWifi(false);
 		UmengUpdateAgent.setUpdateAutoPopup(false);
 		UmengUpdateAgent.update(this);
-		MobclickAgent.setDebugMode(true);
+		MobclickAgent.setDebugMode(false);
 		;
 		MobclickAgent.updateOnlineConfig(this);
 		
@@ -307,6 +318,9 @@ public void onClick(DialogInterface dialog, int which) {
 		}else{
 			web_url_textview.setText(PreferencesUtils.getWebUrl(this));
 		}
+		if(Utils.getVersionCode(this)>PreferencesUtils.getGuidLastVersion(this)&&Constant.isNeedGuid){
+			startActivity(new Intent(this, GuideActivity.class));
+		}
 	}
 	
 	private long exitTime = 0;
@@ -445,6 +459,9 @@ private void findViews(){
 		layout_1_5.setOnKeyListener(this);
 		layout_1_4.setOnKeyListener(this);
 		
+		layout_page_3 = findViewById(R.id.layout_page_3);
+		layout_title = (LinearLayout) findViewById(R.id.layout_title);
+		
 		layout.SetOnViewChangeListener(new OnViewChangeListener() {
 			
 			@Override
@@ -464,6 +481,12 @@ public void OnViewChange(int index) {
 				}
 			}
 		});
+		if(Constant.isSimple){
+			layout_page_3.setVisibility(View.GONE);
+			layout_title.setVisibility(View.INVISIBLE);
+			findViewById(R.id.layout_1_4).setVisibility(View.GONE);
+			findViewById(R.id.layout_divider_3).setVisibility(View.GONE);
+		}
 //		web_url_textview.setText(Constant.BASE_URL.replace("http://", "").replace("https://", ""));
 	}
 	@Override
@@ -494,9 +517,11 @@ public boolean onHover(View v, MotionEvent event) {
 			case R.id.layout_3_3:
 			case R.id.layout_3_4:
 			case R.id.layout_3_5:
-				if(layout.getSelected()==1){
-					updateImageView(v);
-					v.requestFocus();
+				if(!Constant.isSimple){
+					if(layout.getSelected()==1){
+						updateImageView(v);
+						v.requestFocus();
+					}
 				}
 				break;
 			default:
@@ -547,15 +572,19 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
 		case R.id.layout_1_4:
 		case R.id.layout_1_5:
 			if(keyCode == KeyEvent.KEYCODE_DPAD_RIGHT&&event.getAction() == KeyEvent.ACTION_DOWN){
-				layout.showNext();
-				layout_3_1.requestFocus();
+				if (!Constant.isSimple) {
+					layout.showNext();
+					layout_3_1.requestFocus();
+				}
 				return true;
 			}
 			break;
 		case R.id.layout_3_1:
 			if(keyCode == KeyEvent.KEYCODE_DPAD_LEFT&&event.getAction() == KeyEvent.ACTION_DOWN){
-				layout.showPre();
-				layout_1_5.requestFocus();
+				if (!Constant.isSimple) {
+					layout.showPre();
+					layout_1_5.requestFocus();
+				}
 				return true;
 			}
 		default:
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ManagePushApkActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/ManagePushApkActivity.java
index 79f0e73..f062802 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/ManagePushApkActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ManagePushApkActivity.java
@@ -429,7 +429,7 @@ private void updateEditBottn(){
 			list.requestFocus();
 		}else{
 			editeButton.setVisibility(View.INVISIBLE);
-			defult_img.setVisibility(View.VISIBLE);
+			defult_img.setVisibility(View.GONE);
 		}
 	}
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/PlayBaiduActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/PlayBaiduActivity.java
index cd4a808..fe37a8a 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/PlayBaiduActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/PlayBaiduActivity.java
@@ -102,26 +102,40 @@ private void startPlayer(){
 		    startActivity(localIntent.addFlags(131072));
 //		    startActivity(localIntent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT));
 		}else{
-			AlertDialog.Builder tDialog = new AlertDialog.Builder(this);
-			tDialog.setTitle("安装提示");
-			tDialog.setMessage("该视频需要百度影音支持播放，是否安装百度影音播放器");
-			tDialog.setPositiveButton("确定",
-					new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							Utils.retrieveApkFromAssets(PlayBaiduActivity.this, "baidushipin_1040402251.apk");
-//							finish();
-						}
-					});
+			if(!Constant.isSimple){
+				AlertDialog.Builder tDialog = new AlertDialog.Builder(this);
+				tDialog.setTitle("安装提示");
+				tDialog.setMessage("该视频需要百度影音支持播放，是否安装百度影音播放器");
+				tDialog.setPositiveButton("确定",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int which) {
+								Utils.retrieveApkFromAssets(PlayBaiduActivity.this, "baidushipin_1040402251.apk");
+//								finish();
+							}
+						});
 
-			tDialog.setNegativeButton(
-					"取消",
-					new DialogInterface.OnClickListener() {
-						public void onClick(DialogInterface dialog, int which) {
-							finish();
-						}
-					});
+				tDialog.setNegativeButton(
+						"取消",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int which) {
+								finish();
+							}
+						});
 
-			tDialog.show();
+				tDialog.show();
+			}else{
+				AlertDialog.Builder tDialog = new AlertDialog.Builder(this);
+				tDialog.setTitle("安装提示");
+				tDialog.setMessage("该视频需要百度影音支持播放");
+				tDialog.setPositiveButton("确定",
+						new DialogInterface.OnClickListener() {
+							public void onClick(DialogInterface dialog, int which) {
+								finish();
+							}
+						});
+				tDialog.show();
+			}
+			
 		}
 	}
 
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/SettingActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/SettingActivity.java
index 7463480..f216ee2 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/SettingActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/SettingActivity.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -16,18 +17,20 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import com.joyplus.mediaplayer.JoyplusMediaPlayerDataManager;
+import com.joyplus.mediaplayer.VideoViewInterface.DecodeType;
 import com.joyplus.tvhelper.faye.FayeService;
 import com.joyplus.tvhelper.https.HttpUtils;
 import com.joyplus.tvhelper.utils.Constant;
@@ -42,6 +45,8 @@ public class SettingActivity extends Activity implements OnClickListener{
 	
 	private static final int MESSAGE_GETPINCODE_SUCCESS = 0;
 	private static final int MESSAGE_GETPINCODE_FAILE = MESSAGE_GETPINCODE_SUCCESS+1;
+	private static final int MESSAGE_GETHELPER_DATE_OK = MESSAGE_GETPINCODE_FAILE+1;
+	
 	private static final String TAG = "SettingActivity";
 	private Button btn_setting;
 	private Button btn_help;
@@ -50,15 +55,18 @@ public class SettingActivity extends Activity implements OnClickListener{
 	private LinearLayout  layout_setting;
 	private ScrollView  layout_help;
 	private ScrollView  layout_about;
-	private WebView webView;
+//	private WebView webView;
+	private LinearLayout layout_content;
 	
 	private TextView seletedView;
 	private TextView pincodeText;
 	private TextView versionName;
 	
-	private LinearLayout layout_refresh,layout_deleteApk, layout_confirm;
+	private LinearLayout layout_refresh,layout_deleteApk, layout_confirm, layout_player_mode;
+	
+	private ImageView switch_delete, switch_confirm, switch_isPlaye_HW;
 	
-	private ImageView switch_delete, switch_confirm;
+	private VideoViewSetting mVideoViewSetting;
 	
 	private Handler mHandler = new Handler(){
 		@Override
@@ -75,6 +83,27 @@ public void handleMessage(Message msg) {
 //				Toast.makeText(SettingActivity.this, "请求pinCode失败", 100).show();
 				Utils.showToast(SettingActivity.this, "请求pinCode失败");
 				removeDialog(0);
+				break;
+			case MESSAGE_GETHELPER_DATE_OK:
+				try{
+					String data = (String) msg.obj;
+					JSONObject json = new JSONObject(data);
+					JSONArray array = json.getJSONArray("results");
+					for(int i=0; i<array.length(); i++){
+						JSONObject obj_item = array.getJSONObject(i);
+						View v = LayoutInflater.from(SettingActivity.this).inflate(R.layout.item_faq_list,null);
+						TextView qustion = (TextView) v.findViewById(R.id.text_qustion);
+						TextView answer = (TextView) v.findViewById(R.id.text_answer);
+						qustion.setText(obj_item.getString("question"));
+						answer.setText("\t\t"+obj_item.getString("answer"));
+						layout_content.addView(v);
+					}
+				}catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+					handleHelperDateError();
+				}
+				
 				break;
 			default:
 				break;
@@ -97,6 +126,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		pincodeText = (TextView) findViewById(R.id.pincode_text);
 		versionName = (TextView) findViewById(R.id.versionCode);
 		
+		layout_content = (LinearLayout) findViewById(R.id.layout_content);
+		
 		btn_setting.setOnClickListener(this);
 		btn_help.setOnClickListener(this);
 		btn_about.setOnClickListener(this);
@@ -104,21 +135,25 @@ protected void onCreate(Bundle savedInstanceState) {
 		layout_refresh = (LinearLayout) findViewById(R.id.layout_refressPin);
 		layout_deleteApk = (LinearLayout) findViewById(R.id.layout_deleteApk);
 		layout_confirm = (LinearLayout) findViewById(R.id.layout_confirm);
+		layout_player_mode = (LinearLayout) findViewById(R.id.layout_player_decode_mode);
 		
 		layout_refresh.setOnFocusChangeListener(itemFoucsListener);
 		layout_deleteApk.setOnFocusChangeListener(itemFoucsListener);
+		layout_player_mode.setOnFocusChangeListener(itemFoucsListener);
 		
 		layout_refresh.setOnClickListener(this);
 		layout_deleteApk.setOnClickListener(this);
 		layout_confirm.setOnClickListener(this);
+		layout_player_mode.setOnClickListener(this);
 		
 		layout_setting = (LinearLayout) findViewById(R.id.layout_setting);
 		layout_help = (ScrollView) findViewById(R.id.layout_help);
 		layout_about = (ScrollView) findViewById(R.id.layout_about);
-		webView = (WebView) findViewById(R.id.webView);
+//		webView = (WebView) findViewById(R.id.webView);
 		
 		switch_delete = (ImageView) findViewById(R.id.switch_deleteApk);
 		switch_confirm = (ImageView) findViewById(R.id.switch_confirm);
+		switch_isPlaye_HW = (ImageView) findViewById(R.id.switch_player_decode_mode);
 		
 		isconfirm = PreferencesUtils.isneedConfirm(this);
 		isdelete = PreferencesUtils.isautodelete(this);
@@ -144,23 +179,27 @@ protected void onCreate(Bundle savedInstanceState) {
 		btn_setting.setBackgroundResource(R.drawable.highlight);
 		btn_setting.setTextColor(Color.BLACK);
 		
-		webView.getSettings().setJavaScriptEnabled(false);
-		webView.getSettings().setEnableSmoothTransition(true);
-		webView.setBackgroundColor(Color.TRANSPARENT);
-		webView.setWebViewClient(new WebViewClient()
-		   {
-		          @Override
-		          public boolean shouldOverrideUrlLoading(WebView view, String url)
-		          {
-		 
-		            view.loadUrl(url); // 在当前的webview中跳转到新的url
-		 
-		            return true;
-		          }
-		    });
-//		webView.loadUrl("http://www.joyplus.tv/faq-tv?"+System.currentTimeMillis());
-		webView.loadUrl(Constant.URL_FAQ +"?"+System.currentTimeMillis());
+//		webView.getSettings().setJavaScriptEnabled(false);
+//		webView.getSettings().setEnableSmoothTransition(true);
+//		webView.setBackgroundColor(Color.TRANSPARENT);
+//		webView.setWebViewClient(new WebViewClient()
+//		   {
+//		          @Override
+//		          public boolean shouldOverrideUrlLoading(WebView view, String url)
+//		          {
+//		 
+//		            view.loadUrl(url); // 在当前的webview中跳转到新的url
+//		 
+//		            return true;
+//		          }
+//		    });
+////		webView.loadUrl("http://www.joyplus.tv/faq-tv?"+System.currentTimeMillis());
+//		webView.loadUrl(Constant.URL_FAQ +"?"+System.currentTimeMillis());
+		MyApp.pool.execute(new GetHelperDate());
 		layout_refresh.requestFocus();
+		
+		mVideoViewSetting = new VideoViewSetting();
+		mVideoViewSetting.updateUI();
 	}
 	
 	private View.OnFocusChangeListener itemFoucsListener = new View.OnFocusChangeListener() {
@@ -268,9 +307,55 @@ public void onClick(View v) {
 			PreferencesUtils.setIsneedConfirm(this, isconfirm);
 			updateSwitch();
 			break;
+		case R.id.layout_player_decode_mode:
+			//点击切换
+			mVideoViewSetting.switchMode();
+			break;
 		}
 	}
 	
+	private void handleHelperDateError(){
+		//获取帮助信息失败或者获取数据有误
+		TextView tv = new TextView(this);
+		tv.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,LayoutParams.WRAP_CONTENT));
+		tv.setGravity(Gravity.CENTER);
+		tv.setText("获取帮助界面失败");
+		layout_content.addView(tv);
+	}
+	
+	private class VideoViewSetting {
+		
+		private JoyplusMediaPlayerDataManager mJoyplusMediaPlayerDataManager;
+		
+		public VideoViewSetting(){
+			mJoyplusMediaPlayerDataManager = new JoyplusMediaPlayerDataManager(SettingActivity.this);
+		}
+		
+		public void switchMode(){
+			DecodeType type = mJoyplusMediaPlayerDataManager.getDecodeType();
+			if(type == DecodeType.Decode_HW)type= DecodeType.Decode_SW;
+			else type= DecodeType.Decode_HW;
+			mJoyplusMediaPlayerDataManager.setDecodeType(type);
+			updateUI();
+		}
+		
+		public void updateUI(){
+			DecodeType type = mJoyplusMediaPlayerDataManager.getDecodeType();
+			if(type == DecodeType.Decode_HW)
+				setSwitch(true);
+			else
+				setSwitch(false);
+		}
+		
+		private void setSwitch(boolean en){
+			if(en)
+				((ImageView)findViewById(R.id.switch_player_decode_mode)).
+				setImageResource(R.drawable.switch_hard);
+			else
+				((ImageView)findViewById(R.id.switch_player_decode_mode)).
+				setImageResource(R.drawable.switch_soft);
+		}
+	}
 	@Override
 	protected Dialog onCreateDialog(int id) {
 		// TODO Auto-generated method stub
@@ -306,14 +391,14 @@ private void updateSwitch(){
 		Log.d(TAG, "is auto delete --->"  + PreferencesUtils.isautodelete(this));
 		Log.d(TAG, "is isdelete  --->"  + isdelete);
 		if(isdelete){
-			switch_delete.setImageResource(R.drawable.swith_on);
+			switch_delete.setImageResource(R.drawable.switch_on);
 		}else{
-			switch_delete.setImageResource(R.drawable.swith_off);
+			switch_delete.setImageResource(R.drawable.switch_off);
 		}
 		if(isconfirm){
-			switch_confirm.setImageResource(R.drawable.swith_on);
+			switch_confirm.setImageResource(R.drawable.switch_on);
 		}else{
-			switch_confirm.setImageResource(R.drawable.swith_off);
+			switch_confirm.setImageResource(R.drawable.switch_off);
 		}
 	}
 	
@@ -360,4 +445,18 @@ public void run() {
 			  
 		}
 	}
+	
+	class GetHelperDate implements Runnable{
+
+		@Override
+		public void run() {
+			// TODO Auto-generated method stub
+			String url = Constant.BASE_URL+"/questions/showkey";
+			String str = HttpTools.get(SettingActivity.this, url);
+			Message msg = mHandler.obtainMessage(MESSAGE_GETHELPER_DATE_OK);
+			msg.obj = str;
+			mHandler.sendMessage(msg);
+		}
+		
+	}
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ThirdPlayActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/ThirdPlayActivity.java
index f025f9f..8b5f49d 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/ThirdPlayActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ThirdPlayActivity.java
@@ -10,6 +10,7 @@
 import com.joyplus.tvhelper.entity.CurrentPlayDetailData;
 import com.joyplus.tvhelper.entity.MoviePlayHistoryInfo;
 import com.joyplus.tvhelper.utils.Constant;
+import com.joyplus.tvhelper.utils.Utils;
 import com.umeng.analytics.MobclickAgent;
 
 public class ThirdPlayActivity extends Activity {
@@ -41,7 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {
 			info.setId((int)dbService.insertMoviePlayHistory(info));
 		}
 		CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-		Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+//		Intent intent = new Intent(this,VideoPlayerJPActivity.class);
+		Intent intent = Utils.getIntent(this);
 		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		playDate.prod_type = VideoPlayerJPActivity.TYPE_PUSH;
 		playDate.prod_name = info.getName();
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/TvLiveSrcUpdateActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/TvLiveSrcUpdateActivity.java
index 01df0d3..a480d97 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/TvLiveSrcUpdateActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/TvLiveSrcUpdateActivity.java
@@ -377,7 +377,7 @@ private void setTvLivingStaus() {
 						tvLiveInfo.setDstFileLists(dstFileList);//存储目的文件
 						long fileTotalSize = Utils
 								.getTotalSize4ListFiles(dstFileList);
-						if (listFileTotalSize > fileTotalSize) {
+						if (listFileTotalSize != fileTotalSize) {
 
 							if(tvLiveInfo.isInstall()){
 								
@@ -588,44 +588,41 @@ public void run() {
 					if(urlStr != null && URLUtil.isNetworkUrl(urlStr)){
 						
 						File file = new File(tempStoreTvLivingFileDir, filename);
-						if(!file.exists()){
-							
-							try {
-								file.createNewFile();
-								url = new URL(Uri.encode(urlStr,"UTF-8").replaceAll("%3A", ":").replaceAll("%2F", "/").replaceAll("%3F", "?"));
-								HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-								connection.setDoInput(true);
-								connection.connect();
-								is =  connection.getInputStream();
-								
-								fos = new FileOutputStream(file);
-								
-								byte[] b = new byte[4096];
-								int len = 0;
-								 while ((len = is.read(b, 0, 4096)) != -1){
-									 
-									 fos.write(b, 0, len);
-									 fos.flush();
-								 }
-								 fos.flush();
-							} catch (IOException e) {
-								// TODO Auto-generated catch block
-								e.printStackTrace();
-							}finally{
-								
-								if(fos != null){
-									
-									try {
-										fos.close();
-										is.close();
-									} catch (IOException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
-									}
+						try {
+							file.createNewFile();
+							url = new URL(Uri.encode(urlStr, "UTF-8")
+									.replaceAll("%3A", ":").replaceAll("%2F", "/")
+									.replaceAll("%3F", "?"));
+							HttpURLConnection connection = (HttpURLConnection) url
+									.openConnection();
+							connection.setDoInput(true);
+							connection.connect();
+							is = connection.getInputStream();
+
+							fos = new FileOutputStream(file);
+							byte[] b = new byte[4096];
+							int len = 0;
+							while ((len = is.read(b, 0, 4096)) != -1) {
+								fos.write(b, 0, len);
+								fos.flush();
+							}
+							fos.flush();
+						} catch (IOException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						} finally {
+
+							if (fos != null) {
+								try {
+									fos.close();
+									is.close();
+								} catch (IOException e) {
+									// TODO Auto-generated catch block
+									e.printStackTrace();
 								}
 							}
 						}
-						
+
 					}
 				}
 				
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/VideoPlayerJPActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/VideoPlayerJPActivity.java
index e7250de..a1e1bb7 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/VideoPlayerJPActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/VideoPlayerJPActivity.java
@@ -44,7 +44,6 @@
 import android.os.Message;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -55,7 +54,6 @@
 import android.view.animation.AnimationUtils;
 import android.webkit.URLUtil;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.Gallery;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -72,10 +70,10 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.joyplus.Sub.JoyplusSubManager;
-import com.joyplus.Sub.SUBTYPE;
-import com.joyplus.Sub.SubURI;
-import com.joyplus.manager.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.sub.SUBTYPE;
+import com.joyplus.sub.SubURI;
+import com.joyplus.sub_old_1.JoyplusSubManager;
 import com.joyplus.tvhelper.db.DBServices;
 import com.joyplus.tvhelper.entity.BTEpisode;
 import com.joyplus.tvhelper.entity.CurrentPlayDetailData;
@@ -85,11 +83,13 @@
 import com.joyplus.tvhelper.entity.XLLXFileInfo;
 import com.joyplus.tvhelper.entity.service.ReturnProgramView;
 import com.joyplus.tvhelper.ui.ArcView;
+import com.joyplus.tvhelper.ui.PlayerMenuDialog;
 import com.joyplus.tvhelper.ui.SubTitleView;
 import com.joyplus.tvhelper.utils.BangDanConstant;
 import com.joyplus.tvhelper.utils.Constant;
 import com.joyplus.tvhelper.utils.DefinationComparatorIndex;
 import com.joyplus.tvhelper.utils.DesUtils;
+import com.joyplus.tvhelper.utils.Global;
 import com.joyplus.tvhelper.utils.HttpTools;
 import com.joyplus.tvhelper.utils.Log;
 import com.joyplus.tvhelper.utils.PreferencesUtils;
@@ -116,8 +116,6 @@ public class VideoPlayerJPActivity extends Activity implements
 	private static final int MESSAGE_HIDE_VOICE = MESSAGE_HIDE_PROGRESSBAR + 1;
 	private static final int MESSAGE_DATALOADING_UPDATE_NETSPEED = MESSAGE_HIDE_VOICE + 1;
 	private static final int MESSAGE_NO_NETCONNECT = MESSAGE_DATALOADING_UPDATE_NETSPEED + 1;
-//	private static final int MESSAGE_SUBTITLE_BEGAIN_SHOW = MESSAGE_DATALOADING_UPDATE_NETSPEED + 1;
-//	private static final int MESSAGE_SUBTITLE_END_HIDEN = MESSAGE_SUBTITLE_BEGAIN_SHOW + 1;
 	
 	public static final int TYPE_XUNLEI = -10;
 	public static final int TYPE_PUSH = TYPE_XUNLEI -1;
@@ -155,8 +153,7 @@ public class VideoPlayerJPActivity extends Activity implements
 	private int seekBarWidthOffset = 40;
 	
 	private static final int SEEKBAR_REFRESH_TIME = 500;//refresh time
-	private static final int SUBTITLE_DELAY_TIME_MAX = 1000;
-
+	
 	private TextView mVideoNameText; // 名字
 	private ImageView mDefinationIcon;// 清晰度icon
 	private SeekBar mSeekBar; // 进度条
@@ -184,6 +181,8 @@ public class VideoPlayerJPActivity extends Activity implements
 	private TextView mDataLoadingSpeedText; //缓冲速度
 	private long mCurrentLoadingbytes;
 	
+	private PlayerMenuDialog mMenuDialog;
+	
 	/**
 	 * 预加载层
 	 */
@@ -277,14 +276,6 @@ public class VideoPlayerJPActivity extends Activity implements
 	private Animation mAlphaDispear;
 	private boolean isSeekBarIntoch = false;
 	
-	/**  Subtitle*/
-//	private Collection mSubTitleCollection = null;
-//	private int mStartTimeSubTitle,mEndTimeSubTitle;
-//	private org.blaznyoght.subtitles.model.Element mCurSubTitleE,mBefSubTitleE;
-	
-//	private List<String> subTitleUrlList = new ArrayList<String>();
-//	private int currentSubtitleIndex = 0;//默认为第一个
-	
 	private JoyplusSubManager mJoyplusSubManager = null;
 	
 	private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -353,7 +344,8 @@ public void onReceive(Context context, Intent intent) {
 					break;
 				}
 
-			} else {
+			} else if(Global.ACTION_RECIVE_NEW_PUSH_MOVIE.equals(action)){
+				finish();
 			}
 		}
 	};
@@ -371,12 +363,12 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		try {
 			JoyplusMediaPlayerManager.Init(this);
-			mJoyplusSubManager = JoyplusMediaPlayerManager.getInstance().getSubManager();
+			mJoyplusSubManager = (JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager();
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+		mMenuDialog = new PlayerMenuDialog(this);
 		initViews();
 		mSeekBar.setEnabled(false);
 		m_ReturnProgramView = app.get_ReturnProgramView();
@@ -390,6 +382,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		IntentFilter intentFilter = new IntentFilter();
 		intentFilter.addAction(Constant.VIDEOPLAYERCMD);
+		intentFilter.addAction(Global.ACTION_RECIVE_NEW_PUSH_MOVIE);
 		registerReceiver(mReceiver, intentFilter);
 
 		OFFSET = Utils.getStandardValue(getApplicationContext(), OFFSET);
@@ -423,6 +416,7 @@ private void dismissView(View v){
 	private void initVedioDate() {
 		mStatue = STATUE_PRE_LOADING;
 		isRequset = 0;
+		
 		mSeekBar.setEnabled(false);
 		mSeekBar.setProgress(0);
 		mTotalTimeTextView.setText("--:--");
@@ -456,7 +450,7 @@ private void initVedioDate() {
 		mDefination = playDate.prod_qua;
 		lastTime = (int) playDate.prod_time;
 		mProd_src = playDate.prod_src;
-		
+		isOnline = playDate.isOnline;
 		if(mProd_type == TYPE_PUSH || mProd_type == TYPE_LOCAL|| mProd_type == TYPE_PUSH_BT_EPISODE){
 			play_info = (MoviePlayHistoryInfo) playDate.obj;
 		}
@@ -487,13 +481,9 @@ public void run() {
 						
 						ArrayList<VideoPlayUrl> list = 
 								XunLeiLiXianUtil.getLXPlayUrl(VideoPlayerJPActivity.this, xllxFileInfo);
-						//get subtitle
-//						subTitleUrlList = XunLeiLiXianUtil.getSubtitleList(VideoPlayerJPActivity.this,xllxFileInfo);
 						mJoyplusSubManager.setSubUri(XunLeiLiXianUtil.
 								getSubtitleList(VideoPlayerJPActivity.this,xllxFileInfo));
 						mSubTitleView.displaySubtitle();
-//						currentSubtitleIndex = 0;
-//						initSubTitleCollection();
 						
 						if(list != null && list.size() > 0) {
 							
@@ -573,191 +563,8 @@ public void run() {
 			}
 			break;
 		}
-//		if(mProd_type != TYPE_XUNLEI) {
-//			
-//			if(mProd_type == TYPE_LOCAL){
-//				if(currentPlayUrl!=null){
-//					mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
-//				}
-//				return;
-//			}
-//			if (currentPlayUrl != null && URLUtil.isNetworkUrl(currentPlayUrl)) {
-//				if (mProd_type<0) {
-////					mHandler.sendEmptyMessage(MESSAGE_PALY_URL_OK);
-//					if(mProd_type == TYPE_PUSH){
-//						new Thread(new UrlRedirectTask()).start();
-//					}
-//					return ;
-//				} else {
-//					if (app.get_ReturnProgramView() != null) {// 如果不为空，获取服务器返回的详细数据
-//
-//						m_ReturnProgramView = app.get_ReturnProgramView();
-//						mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
-//					} else {// 如果为空，就重新获取
-//
-//						getProgramViewDetailServiceData();
-//					}
-//				}
-//			} else {
-//				if(mProd_type == TYPE_PUSH){
-//					MyApp.pool.execute(new getPlayList());
-//				}else if(){
-//					
-//				}else{
-//					if (app.get_ReturnProgramView() != null) {// 如果不为空，获取服务器返回的详细数据
-//
-//						m_ReturnProgramView = app.get_ReturnProgramView();
-//						mHandler.sendEmptyMessage(MESSAGE_RETURN_DATE_OK);
-//					} else {// 如果为空，就重新获取
-//
-//						getProgramViewDetailServiceData();
-//					}
-//				}
-//			}
-//		}else {//迅雷 传递-10
-//			
-//			//取list
-//			MyApp.pool.execute(new Runnable() {
-//				
-//				@Override
-//				public void run() {
-//					// TODO Auto-generated method stub
-//					
-//					XLLXFileInfo xllxFileInfo = (XLLXFileInfo) app.getmCurrentPlayDetailData().obj;
-//					if(xllxFileInfo != null && !xllxFileInfo.isDir) {
-//						
-//						ArrayList<VideoPlayUrl> list = 
-//								XunLeiLiXianUtil.getLXPlayUrl(VideoPlayerJPActivity.this, xllxFileInfo);
-//						//get subtitle
-//						subTitleUrlList = XunLeiLiXianUtil.getSubtitleList(VideoPlayerJPActivity.this,xllxFileInfo);
-//						currentSubtitleIndex = 0;
-//						initSubTitleCollection();
-//						
-//						if(list != null && list.size() > 0) {
-//							
-//							if(playUrls != null && playUrls.size() > 0) {
-//								
-//								playUrls.clear();
-//							}
-//							for(int i=0;i<list.size();i++) {
-//								
-//								VideoPlayUrl videoPlayUrl = list.get(i);
-//								Log.i(TAG, "VideoPlayUrl--->" + videoPlayUrl.toString());
-//								if(videoPlayUrl != null && videoPlayUrl.playurl != null) {
-//									
-//									URLS_INDEX url = new URLS_INDEX();
-//									url.url = videoPlayUrl.playurl;
-//									url.source_from = "XUNLEI";
-//									if(videoPlayUrl.isCanDrag){// can drag hd2 hd mp4 
-//										
-//										if(videoPlayUrl.sharp != null) {
-//											
-//											int index = videoPlayUrl.sharp.getIndex();
-//											switch (index) {
-//											case 0:
-//												url.defination_from_server ="mp4";
-//												break;
-//											case 2:
-//												url.defination_from_server ="hd";
-//												break;
-//											case 3:
-//												url.defination_from_server ="hd2";
-//												break;
-//
-//											default:
-//												break;
-//											}
-//										}
-//									}else {//can't drag flv
-//										url.defination_from_server ="flv";
-////										playUrls_flv.a
-//									}
-//								
-//									playUrls.add(url);
-//								}
-//							}
-//							
-//						}
-//					}
-//					initFourList();
-//					sortPushUrls(mDefination);
-//					mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
-//				}
-//			});
-////			URLS_INDEX url = new URLS_INDEX();
-////			url.defination_from_server ="hd2";
-////			url.source_from = "xunlei";
-////			url.url ="";
-//			
-////			playUrls = new ArrayList<URLS_INDEX>
-			
-//		}
 	}
 	
-//	private void initSubTitleCollection(){
-//		Log.i(TAG, "subTitleUrlList--->" + subTitleUrlList.size() + "currentSubtitleIndex--->" + currentSubtitleIndex);
-//		if(subTitleUrlList.size() > 0 && currentSubtitleIndex < subTitleUrlList.size()){
-//			byte[] subTitle = HttpUtils.getBinary(subTitleUrlList.get(currentSubtitleIndex), null,null);
-//			
-//			if(subTitle != null && subTitle.length > 3
-//					&& mSubTitleCollection == null){
-//				
-//				Parser parser = new Parser();
-//				
-//				String charsetName = Utils.getCharset(subTitle, 512);
-//				Log.d(TAG, "initSubTitleCollection-->charsetName:" + charsetName);
-//				if(charsetName.equals("")){
-//					
-//					boolean isUtf8 = Utils.isUTF_8(subTitle);
-//					Log.i(TAG, "isUtf8--->" + isUtf8);
-//					
-//					if(!isUtf8){
-//						
-//						parser.setCharset("GBK");
-//					} else {
-//						
-//						parser.setCharset("UTF-8");
-//					}
-//				}else {
-//					
-//					parser.setCharset(charsetName);
-//				}
-//				parser.parse(new ByteArrayInputStream(subTitle));
-//				Log.d(TAG, "getElements().size()--->" + parser.getCollection().getElements().size());
-//				if(parser.getCollection().getElements().size() > 2){
-//					mSubTitleCollection = parser.getCollection();
-//					if(mVideoView != null){
-//						long currentPosition = mVideoView.getCurrentPosition();
-//						org.blaznyoght.subtitles.model.Element element = getPreElement(currentPosition);
-//						if(element != null){
-//							Message messageShow = mHandler.obtainMessage(MESSAGE_SUBTITLE_BEGAIN_SHOW, element);
-//							Message messageHiden = mHandler.obtainMessage(MESSAGE_SUBTITLE_END_HIDEN, element);
-//							if(element.getStartTime().getTime() - currentPosition > SUBTITLE_DELAY_TIME_MAX){
-//								mHandler.sendMessageDelayed(messageShow, SUBTITLE_DELAY_TIME_MAX);
-//							}else {
-//								
-//								mHandler.sendMessageDelayed(messageShow, element.getStartTime().getTime() - currentPosition);
-//							}
-//							mHandler.sendMessageDelayed(messageHiden, element.getEndTime().getTime() - currentPosition);
-//						}
-//					}
-//				}else {
-//					Log.i(TAG, "restart init");
-//					if(subTitleUrlList.size() > 0 && currentSubtitleIndex < subTitleUrlList.size()){
-//						mHandler.removeMessages(MESSAGE_SUBTITLE_BEGAIN_SHOW);
-//						mHandler.removeMessages(MESSAGE_SUBTITLE_END_HIDEN);
-//						subTitleUrlList.remove(currentSubtitleIndex);
-//						currentSubtitleIndex = 0;
-//						mSubTitleCollection = null;
-//						initSubTitleCollection();
-//					}
-//				}
-////				Log.d(TAG, "mSubTitleCollection--->" + mSubTitleCollection.getElementSize());
-//				return;
-//			}
-//		}
-//	}
-	
 	public long getPlayerCurrentPosition(){
 		if(mVideoView == null) return 0;
 		return mVideoView.getCurrentPosition();
@@ -797,7 +604,9 @@ public void handleMessage(Message msg) {
 				mVideoView.pause();
 				mDateLoadingLayout.setVisibility(View.GONE);
 				mHandler.removeCallbacksAndMessages(null);
-				showDialog(2);
+				if(!isFinishing()){
+					showDialog(2);
+				}
 				break;
 			case MESSAGE_URLS_READY:// url 准备好了
 				if(playUrls.size()<=0){
@@ -852,23 +661,16 @@ public void run() {
 											+ "/joyplus/subtitle/?url="
 											+ URLEncoder.encode(play_info.getPush_url())
 											+ "&md5_code=" + getUmengMd5();
-									// subTitleUrlList =
-									// XunLeiLiXianUtil.getSubtitle4Push(subTitleUrl,
-									// Constant.APPKEY);
 									mJoyplusSubManager.setSubUri(XunLeiLiXianUtil
 													.getSubtitle4Push(subTitleUrl,
 															Constant.APPKEY));
 									mSubTitleView.displaySubtitle();
-									// currentSubtitleIndex = 0;
-									// initSubTitleCollection();
 								}
 							}
 						}
 					});
 				}
-				
-				if(mProd_type == TYPE_PUSH_BT_EPISODE)
-				
+//				if(mProd_type == TYPE_PUSH_BT_EPISODE)
 				currentPlayIndex = 0;
 				currentPlayUrl = playUrls.get(currentPlayIndex).url;
 				Log.d(TAG,"MESSAGE_URLS_READY--->currentPlayUrl:" + currentPlayUrl);
@@ -992,69 +794,6 @@ else if(mProd_type==TYPE_PUSH){
 			case MESSAGE_DATALOADING_UPDATE_NETSPEED:
 				updateDataLoadingSpeed();
 				break;
-//			case MESSAGE_SUBTITLE_BEGAIN_SHOW:
-//				org.blaznyoght.subtitles.model.Element element_show = 
-//				(org.blaznyoght.subtitles.model.Element) msg.obj;
-//				if(element_show != null){
-//					long currentPositionShow = mVideoView.getCurrentPosition();
-//					org.blaznyoght.subtitles.model.Element preElement_show = getPreElement(currentPositionShow);
-//					//在字幕的显示时间段内
-//					if(!element_show.getText().equals(mSubTitleTv.getText())){
-//						if(element_show.getStartTime().getTime() < currentPositionShow + SEEKBAR_REFRESH_TIME/2
-//								&& element_show.getStartTime().getTime() > currentPositionShow - SEEKBAR_REFRESH_TIME/2){
-//							mSubTitleTv.setText(element_show.getText());
-//							mSubTitleTv.setTag(element_show.getEndTime().getTime());
-//						}
-//					}
-//					if(element_show.getEndTime().getTime() < currentPositionShow){
-//						mSubTitleTv.setText("");
-//						mSubTitleTv.setTag(-1L);
-//						mHandler.removeMessages(MESSAGE_SUBTITLE_END_HIDEN);
-//						if(preElement_show != null){
-//							Message messageHiden = mHandler.obtainMessage(MESSAGE_SUBTITLE_END_HIDEN, preElement_show);
-//							mHandler.sendMessageDelayed(messageHiden, preElement_show.getEndTime().getTime() - currentPositionShow);
-//						}
-//					}
-//					
-//					long tagEndTime = -1;
-//					try {
-//						if(mSubTitleTv.getTag() != null)
-//						tagEndTime = (Long) mSubTitleTv.getTag();
-//					} catch (Exception e) {
-//						// TODO Auto-generated catch block
-//						e.printStackTrace();
-//					}
-//					if(!element_show.getText().equals(mSubTitleTv.getText()) && tagEndTime != -1
-//							&& tagEndTime < currentPositionShow){
-//						mSubTitleTv.setText("");
-//						mSubTitleTv.setTag(-1L);
-//					}
-//					if(preElement_show != null){
-//						Message messageShow = mHandler.obtainMessage(MESSAGE_SUBTITLE_BEGAIN_SHOW, preElement_show);
-//						if(preElement_show.getStartTime().getTime() - currentPositionShow > SUBTITLE_DELAY_TIME_MAX){
-//							mHandler.sendMessageDelayed(messageShow, SUBTITLE_DELAY_TIME_MAX);
-//						}else {
-//							mHandler.sendMessageDelayed(messageShow, preElement_show.getStartTime().getTime() - currentPositionShow);
-//						}
-//					}
-//				}
-//				break;
-//			case MESSAGE_SUBTITLE_END_HIDEN:
-//				org.blaznyoght.subtitles.model.Element element_end = 
-//				(org.blaznyoght.subtitles.model.Element) msg.obj;
-//				if(element_end != null){
-//					long currentPositionShow = mVideoView.getCurrentPosition();
-//					org.blaznyoght.subtitles.model.Element preElement_show = getPreElement(currentPositionShow);
-//					if(element_end.getEndTime().getTime() > currentPositionShow - SEEKBAR_REFRESH_TIME/2){
-//						mSubTitleTv.setText("");
-//						mSubTitleTv.setTag(-1L);
-//					}
-//					if(preElement_show != null){
-//						Message messageHiden = mHandler.obtainMessage(MESSAGE_SUBTITLE_END_HIDEN, preElement_show);
-//						mHandler.sendMessageDelayed(messageHiden, preElement_show.getEndTime().getTime() - currentPositionShow);
-//					}
-//				}
-//				break;
 			default:
 				break;
 			}
@@ -1283,153 +1022,21 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 				lastPlayTime = -1;
 				mSeekBar.setEnabled(true);
 				break;
+			case STATUE_PRE_LOADING:
+				if(lastTime>0){
+					lastTime = 0;
+					mVideoView.stopPlayback();
+					mVideoView.setVideoURI(Uri.parse(currentPlayUrl));
+//					mVideoView.seekTo(0);
+					mLastTimeTextView.setText("");
+					Log.d(TAG, "lastTime------------>" + lastTime);
+				}
+				break;
 			}
 			break;
 		case KeyEvent.KEYCODE_MENU:
-			if(mStatue == STATUE_PLAYING&&(mProd_type == TYPE_PUSH||mProd_type==TYPE_XUNLEI||mProd_type == TYPE_PUSH_BT_EPISODE)&&mDateLoadingLayout.getVisibility()!=View.VISIBLE){
-				try{
-					final Dialog dialog = new AlertDialog.Builder(this).create();
-					dialog.show();
-					LayoutInflater inflater = LayoutInflater.from(this);
-					View view = inflater.inflate(R.layout.video_choose_defination, null);
-					Button btn_ok = (Button) view.findViewById(R.id.btn_ok_def);
-					Button btn_cancel = (Button) view.findViewById(R.id.btn_cancle_def);
-//					final LinearLayout layout_def = (LinearLayout) view.findViewById(R.id.layout_def);
-//					final LinearLayout layout_zimu = (LinearLayout) view.findViewById(R.id.layout_zimu);
-					final Gallery gallery = (Gallery) view.findViewById(R.id.gallery_def);
-					final Gallery gallery_zm = (Gallery) view.findViewById(R.id.gallery_zimu);
-					
-					definationStrings.clear();
-					zimuStrings.clear();
-					
-//					gallery.setOnFocusChangeListener(new OnFocusChangeListener() {
-//						
-//						@Override
-//						public void onFocusChange(View v, boolean hasFocus) {
-//							// TODO Auto-generated method stub
-//							if(hasFocus){
-//								layout_def.setBackgroundColor(Color.DKGRAY);
-//								Log.d(TAG, "layout_def---DKGRAY-->");
-//							}else{
-//								layout_def.setBackgroundColor(Color.TRANSPARENT);
-//							}
-//						}
-//					});
-//					
-//					gallery_zm.setOnFocusChangeListener(new OnFocusChangeListener() {
-//						
-//						@Override
-//						public void onFocusChange(View v, boolean hasFocus) {
-//							// TODO Auto-generated method stub
-//							if(hasFocus){
-//								Log.d(TAG, "layout_zimu---DKGRAY-->");
-//								layout_zimu.setBackgroundColor(Color.DKGRAY);
-//							}else{
-//								layout_zimu.setBackgroundColor(Color.TRANSPARENT);
-//							}
-//						}
-//					});
-//					
-					if(mJoyplusSubManager.getSubList().size() == 0){
-						zimuStrings.add(-1);//暂无字幕
-					}else{
-						for(int i=0; i<=mJoyplusSubManager.getSubList().size(); i++){
-							zimuStrings.add(i);
-						}
-//						zimuStrings.add(0);//字幕关
-//						zimuStrings.add(1);//字幕开
-					}
-//					definationStrings.add("超    清");
-//					definationStrings.add("高    清");
-//					definationStrings.add("标    清");
-//					definationStrings.add("流    畅");
-					if(playUrls_hd2.size()>0){
-						definationStrings.add(Constant.DEFINATION_HD2);
-					}
-					if(playUrls_hd.size()>0){
-						definationStrings.add(Constant.DEFINATION_HD);
-					}
-					if(playUrls_mp4.size()>0){
-						definationStrings.add(Constant.DEFINATION_MP4);
-					}
-					if(playUrls_flv.size()>0){
-						definationStrings.add(Constant.DEFINATION_FLV);
-					}
-					
-					gallery.setAdapter(new DefinationAdapter(this, definationStrings));
-					gallery.setSelection(definationStrings.indexOf(mDefination));
-//					gallery.setOnKeyListener(new MenuKeyListener(dialog));
-//					gallery_zm.setOnKeyListener(new MenuKeyListener(dialog));
-					gallery_zm.setAdapter(new ZimuAdapter(this, zimuStrings));
-					if(!mJoyplusSubManager.CheckSubAviable()){
-						gallery_zm.setSelection(0);
-					}else{
-						if(zimuStrings.size()==1&&zimuStrings.get(0)==-1){
-							gallery_zm.setSelection(0);
-						}else{
-//							gallery_zm.setSelection(currentSubtitleIndex+1);
-							if(mSubTitleView.getVisibility() == View.INVISIBLE){
-								gallery_zm.setSelection(0);
-							}else{
-								
-								gallery_zm.setSelection(mJoyplusSubManager.getCurrentSubIndex() + 1);
-							}
-						}
-					}
-					
-					gallery.requestFocus();
-					btn_ok.setOnClickListener(new OnClickListener() {
-						
-						@Override
-						public void onClick(View v) {
-							// TODO Auto-generated method stub
-							dialog.dismiss();
-							if(gallery_zm.getChildCount()>1){
-								if(gallery_zm.getSelectedItemPosition()==0){
-//									mSubTitleTv.setVisibility(View.INVISIBLE);
-									mSubTitleView.hiddenSubtitle();
-								}else{
-//									mSubTitleTv.setVisibility(View.VISIBLE);
-									Log.i(TAG, "currentSubtitleIndex--->" + mJoyplusSubManager.getCurrentSubIndex()
-											+ " gallery_zm.getSelectedItemPosition()-->" + gallery_zm.getSelectedItemPosition());
-									if((gallery_zm.getSelectedItemPosition()!=0 && mSubTitleView.getVisibility() == View.INVISIBLE)||
-											mJoyplusSubManager.getCurrentSubIndex() + 1 !=  gallery_zm.getSelectedItemPosition()){
-										final int selection = gallery_zm.getSelectedItemPosition();
-										MyApp.pool.execute(new Runnable() {
-											
-											@Override
-											public void run() {
-												// TODO Auto-generated method stub
-//												currentSubtitleIndex = selection;
-//												currentSubtitleIndex -=1;
-												mJoyplusSubManager.SwitchSub(selection -1);
-												mSubTitleView.displaySubtitle();
-										
-//												initSubTitleCollection();
-											}
-										});
-									}
-								}
-							}
-							changeDefination(definationStrings.get(gallery.getSelectedItemPosition()));
-						}
-					});
-					btn_cancel.setOnClickListener(new OnClickListener() {
-						
-						@Override
-						public void onClick(View v) {
-							// TODO Auto-generated method stub
-							dialog.dismiss();
-						}
-					});
-					dialog.setContentView(view);
-				}catch (Exception e) {
-					// TODO: handle exception
-					e.printStackTrace();
-				}
-				
-			}
-			return true;
+			
+			break;
 		case KeyEvent.KEYCODE_VOLUME_UP:
 			if (mStatue == STATUE_PLAYING) {
 				mHandler.removeMessages(MESSAGE_HIDE_VOICE);
@@ -1544,6 +1151,25 @@ public void onClick(View v) {
 		return super.onKeyDown(keyCode, event);
 	}
 	
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		// TODO Auto-generated method stub
+		if(event.getAction()==KeyEvent.ACTION_UP
+				&&keyCode==KeyEvent.KEYCODE_MENU
+				&&mStatue == STATUE_PLAYING
+				&&(mProd_type == TYPE_PUSH||mProd_type==TYPE_XUNLEI||mProd_type == TYPE_PUSH_BT_EPISODE)&&mDateLoadingLayout.getVisibility()!=View.VISIBLE){
+			try{
+					mMenuDialog.init();
+					mMenuDialog.show();
+			}catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+			return true;
+		}
+		return super.onKeyUp(keyCode, event);
+	}
+	
 	private void startUpdateSeekBar(long time){
 		
 		mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, time);
@@ -1775,7 +1401,6 @@ private void updateSeekBar() {
 				long current1 = mVideoView.getCurrentPosition();// 当前进度
 				mSeekBar.setProgress((int) current1);
 				if(current1-lastPlayTime>0){
-					lastPlayTime = current1;
 					mDateLoadingLayout.setVisibility(View.GONE);
 					loadingCount=0;
 					mHandler.removeMessages(MESSAGE_DATALOADING_UPDATE_NETSPEED);
@@ -1808,7 +1433,7 @@ public void run() {
 						});
 					}
 				}
-				
+				lastPlayTime = current1;
 				// updateTimeNoticeView(mSeekBar.getProgress());
 			}
 //			mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, SEEKBAR_REFRESH_TIME);
@@ -2134,7 +1759,7 @@ private void updateSourceAndTime() {
 		}
 		if(lastTime>0){
 			mLastTimeTextView.setVisibility(View.VISIBLE);
-			mLastTimeTextView.setText("上次播放: " + Utils.formatDuration(lastTime));
+			mLastTimeTextView.setText("上次播放: " + Utils.formatDuration(lastTime)+"\n按【OK】键从头开始播放");
 		}else{
 			mLastTimeTextView.setVisibility(View.GONE);
 		}
@@ -2555,14 +2180,14 @@ private void saveToDB(long duration, long playBackTime) {
 			if(playBackTime>0){
 				play_info.getBtEpisodes().get(mEpisodeIndex).setPlayback_time((int) playBackTime);
 			}
-			play_info.getBtEpisodes().get(mEpisodeIndex).setDefination(mDefination);
+//			play_info.getBtEpisodes().get(mEpisodeIndex).setDefination(mDefination);
 			play_info.setCreat_time(System.currentTimeMillis());
 			services.updateMoviePlayHistory(play_info);
 		}else{
 			play_info.setDuration((int) duration);
 			play_info.setPlayback_time((int) playBackTime);
 			if(mProd_type == TYPE_PUSH){
-				play_info.setDefination(mDefination);
+//				play_info.setDefination(mDefination);
 //				play_info.setDownload_url(currentPlayUrl);
 			}else if(mProd_type == TYPE_LOCAL){
 				play_info.setLocal_url(currentPlayUrl);
@@ -2870,20 +2495,24 @@ public void run() {
 			playUrls.clear();
 			//updateXunleiurl
 			String url = null;
+			String url_param = play_info.getPush_url();
+			if(url_param.contains(":")){
+				url_param = URLEncoder.encode(url_param);
+			}
 			if(mProd_type==TYPE_PUSH_BT_EPISODE){
 				if(isOnline){
-					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + URLEncoder.encode(play_info.getPush_url())
+					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
 							+ "&id=" + play_info.getPush_id()
 							+ "&md5_code=" + getUmengMd5()
 							+ "&name=" + URLEncoder.encode(mProd_sub_name);
 				}else{
 					if(isRequset==1){
-						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + URLEncoder.encode(play_info.getPush_url())
+						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + url_param
 								+ "&id=" + play_info.getPush_id()
 								+ "&md5_code=" + getUmengMd5()
 								+ "&name=" + URLEncoder.encode(mProd_sub_name);
 					}else{
-						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + URLEncoder.encode(play_info.getPush_url())
+						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
 								+ "&id=" + play_info.getPush_id()
 								+ "&md5_code=" + getUmengMd5()
 								+ "&name=" + URLEncoder.encode(mProd_sub_name);
@@ -2891,23 +2520,23 @@ public void run() {
 				}
 			}else{
 				if(isOnline){
-					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + URLEncoder.encode(play_info.getPush_url())
+					url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
 							+ "&id=" + play_info.getPush_id()
 							+ "&md5_code=" + getUmengMd5();
 				}else{
 					if(isRequset==1){
-						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + URLEncoder.encode(play_info.getPush_url())
+						url = Constant.BASE_URL + "/updateJoyplusUrl?url=" + url_param
 								+ "&id=" + play_info.getPush_id()
 								+ "&md5_code=" + getUmengMd5();
 					}else{
-						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + URLEncoder.encode(play_info.getPush_url())
+						url = Constant.BASE_URL + "/updateJoyplusUrl/retry?url=" + url_param
 								+ "&id=" + play_info.getPush_id()
 								+ "&md5_code=" + getUmengMd5();
 					}
 				}
 				
 			}
-			
+			Log.d(TAG, "url--->" + url);
 			String response = HttpTools.get(VideoPlayerJPActivity.this, url);
 			Log.d(TAG, "response--->" + response);
 			try {
@@ -2918,7 +2547,7 @@ public void run() {
 				}
 				String downLoadurls = DesUtils.decode(Constant.DES_KEY, reciveData);
 				Log.d(TAG, "downLoadurls--->" + downLoadurls);
-				List<SubURI> subList = null;
+				List<com.joyplus.sub.SubURI> subList = null;
 				if(data.has("subtitle")){
 					Log.d(TAG, data.get("subtitle").toString());
 					if(!"".equals(data.get("subtitle").toString())){
@@ -3114,38 +2743,38 @@ private void sortPushUrls(int defination){
 	}
 	
 	
-	private void changeDefination(int defination){
-		if(mDefination == defination){
-			return ;
-		}
-		lastTime = mVideoView.getCurrentPosition();
-		rxByteslast = 0;
-		mLoadingPreparedPercent = 0;
-//		mEpisodeIndex = -1;
-		mPercentTextView.setText(", 已完成"
-				+ Long.toString(mLoadingPreparedPercent / 100) + "%");
-		mDefination = defination;
-		mVideoView.stopPlayback();
-		mStatue = STATUE_PRE_LOADING;
-		mDateLoadingLayout.setVisibility(View.GONE);
-		mSeekBar.setEnabled(false);
-		mSeekBar.setProgress(0);
-		mTotalTimeTextView.setText("--:--");
-		mPreLoadLayout.setVisibility(View.VISIBLE);
-		mNoticeLayout.setVisibility(View.VISIBLE);
-		mContinueLayout.setVisibility(View.GONE);
-		mControlLayout.setVisibility(View.GONE);
-		mStartRX = TrafficStats.getTotalRxBytes();// 获取网络速度
-		if (mStartRX == TrafficStats.UNSUPPORTED) {
-			mSpeedTextView
-					.setText("Your device does not support traffic stat monitoring.");
-		} else {
-
-			mHandler.postDelayed(mLoadingRunnable, 500);
-		}
-		sortPushUrls(mDefination);
-		mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
-	}
+//	private void changeDefination(int defination){
+//		if(mDefination == defination){
+//			return ;
+//		}
+//		lastTime = mVideoView.getCurrentPosition();
+//		rxByteslast = 0;
+//		mLoadingPreparedPercent = 0;
+////		mEpisodeIndex = -1;
+//		mPercentTextView.setText(", 已完成"
+//				+ Long.toString(mLoadingPreparedPercent / 100) + "%");
+//		mDefination = defination;
+//		mVideoView.stopPlayback();
+//		mStatue = STATUE_PRE_LOADING;
+//		mDateLoadingLayout.setVisibility(View.GONE);
+//		mSeekBar.setEnabled(false);
+//		mSeekBar.setProgress(0);
+//		mTotalTimeTextView.setText("--:--");
+//		mPreLoadLayout.setVisibility(View.VISIBLE);
+//		mNoticeLayout.setVisibility(View.VISIBLE);
+//		mContinueLayout.setVisibility(View.GONE);
+//		mControlLayout.setVisibility(View.GONE);
+//		mStartRX = TrafficStats.getTotalRxBytes();// 获取网络速度
+//		if (mStartRX == TrafficStats.UNSUPPORTED) {
+//			mSpeedTextView
+//					.setText("Your device does not support traffic stat monitoring.");
+//		} else {
+//
+//			mHandler.postDelayed(mLoadingRunnable, 500);
+//		}
+//		sortPushUrls(mDefination);
+//		mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+//	}
 	
 	
 	private void hidePreLoad(){
@@ -3363,4 +2992,126 @@ public void run() {
 		}
 		
 	}
+	
+	public List<String> getEpisode(){
+		List<String> date = null;
+		switch (mProd_type) {
+		case TYPE_PUSH_BT_EPISODE:
+			date = new ArrayList<String>();
+			for(BTEpisode b:play_info.getBtEpisodes()){
+				date.add(b.getName());
+			}
+			break;
+		case 2:
+		case 131:
+			date = new ArrayList<String>();
+			for(int i=0; i<m_ReturnProgramView.tv.episodes.length; i++){
+				date.add(m_ReturnProgramView.tv.episodes[i].name);
+			}
+			break;
+		case 3:
+			date = new ArrayList<String>();
+			for(int i=0; i<m_ReturnProgramView.show.episodes.length; i++){
+				date.add(m_ReturnProgramView.show.episodes[i].name);
+			}
+			break;
+		}
+		return date;
+	}
+	
+	public int getCurrentDefination(){
+		return mDefination;
+	}
+	
+	public String getCurrentProdSubName(){
+		return mProd_sub_name;
+	}
+	
+	public void changeDefination(int defination){
+		if(mDefination == defination){
+			return ;
+		}
+		Log.d(TAG, "changeDefination-------->" + defination);
+		lastTime = mVideoView.getCurrentPosition();
+		initUi();
+		mDefination = defination;
+		if(mProd_type == TYPE_PUSH){
+			play_info.setDefination(defination);
+		}else if(mProd_type == TYPE_PUSH_BT_EPISODE){
+			play_info.getBtEpisodes().get(mEpisodeIndex).setDefination(defination);
+		}
+		sortPushUrls(mDefination);
+		mHandler.sendEmptyMessage(MESSAGE_URLS_READY);
+	}
+	
+//	public void changeVideoSize(int type){
+//		mScreenManager.setScreenParams(type);
+//	}
+//	
+//	public int getVideoSizeType(){
+//		return mScreenManager.getScreenParams();
+//	}
+	
+	private void initUi(){
+		rxByteslast = 0;
+		mLoadingPreparedPercent = 0;
+		mPercentTextView.setText(", 已完成"
+				+ Long.toString(mLoadingPreparedPercent / 100) + "%");
+		mVideoView.stopPlayback();
+		mStatue = STATUE_PRE_LOADING;
+		mDateLoadingLayout.setVisibility(View.GONE);
+		mSeekBar.setEnabled(false);
+		mSeekBar.setProgress(0);
+		mTotalTimeTextView.setText("--:--");
+		mPreLoadLayout.setVisibility(View.VISIBLE);
+		mNoticeLayout.setVisibility(View.VISIBLE);
+		mContinueLayout.setVisibility(View.GONE);
+		mControlLayout.setVisibility(View.GONE);
+		mStartRX = TrafficStats.getTotalRxBytes();// 获取网络速度
+		if (mStartRX == TrafficStats.UNSUPPORTED) {
+			mSpeedTextView
+					.setText("Your device does not support traffic stat monitoring.");
+		} else {
+
+			mHandler.postDelayed(mLoadingRunnable, 500);
+		}
+	}
+	
+	public void changeEpisode(int index){
+		if(index<0||index>play_info.getBtEpisodes().size()||index==mEpisodeIndex){
+			return;
+		}
+		isRequset = 0;
+		BTEpisode bte = play_info.getBtEpisodes().get(index);
+		mProd_sub_name = bte.getName();
+		lastTime = bte.getPlayback_time()*1000;
+		play_info.getBtEpisodes().get(mEpisodeIndex).setPlayback_time((int)(mVideoView.getDuration()/1000));
+		play_info.getBtEpisodes().get(mEpisodeIndex).setDuration((int)(mVideoView.getDuration()/1000));
+		Log.d(TAG, "changeEpisode----lastTime---->" + lastTime);
+		mEpisodeIndex = index;
+		mDefination = bte.getDefination();
+		initUi();
+		playUrls.clear();
+		try {
+			JoyplusMediaPlayerManager.Init(this);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		mJoyplusSubManager = (JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager();
+		updateSourceAndTime();
+		updateName();
+		MyApp.pool.execute(new getEpisodePlayUrls());
+	}
+	public List<URLS_INDEX> getPlayUrls(){
+		return this.playUrls;
+	}
+	
+	public void changeSubViewVisible(boolean v){
+		if(v){
+			mSubTitleView.displaySubtitle();
+		}else{
+			mSubTitleView.hiddenSubtitle();
+		}
+	}
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/XunLeiLXActivity.java b/showkeyHelper/src/com/joyplus/tvhelper/XunLeiLXActivity.java
index dcd3960..b5cc3c4 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/XunLeiLXActivity.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/XunLeiLXActivity.java
@@ -4,9 +4,9 @@
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
@@ -23,8 +23,10 @@
 import android.widget.ExpandableListView;
 import android.widget.TextView;
 
+import com.joyplus.JoyplusMediaPlayerActivity;
 import com.joyplus.tvhelper.adapter.PlayExpandListAdapter;
 import com.joyplus.tvhelper.entity.CurrentPlayDetailData;
+import com.joyplus.tvhelper.entity.MoviePlayHistoryInfo;
 import com.joyplus.tvhelper.entity.XLLXFileInfo;
 import com.joyplus.tvhelper.entity.XLLXUserInfo;
 import com.joyplus.tvhelper.ui.WaitingDialog;
@@ -67,109 +69,48 @@ public class XunLeiLXActivity extends Activity {
 	private boolean isCanCache = false;
 	private boolean isFirstLogin = true;
 	private boolean isTempRefresh = false;
-
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.xunlei_login_main);
-
 		app = (MyApp) getApplication();
-
 		initView();
+		addViewListener();
+		initViewData();
+	}
+	
+	private void initViewData(){
+		if (!TextUtils.isEmpty(XunLeiLiXianUtil.getLoginUserName(this))) {
+			userNameEdit.setText(XunLeiLiXianUtil.getLoginUserName(this));
+		}
 
-		loginLayout.setVisibility(View.VISIBLE);
-		logoutLayout.setVisibility(View.INVISIBLE);
-
-		if (XunLeiLiXianUtil.getCookie(getApplicationContext()) != null
-				&& !XunLeiLiXianUtil.getCookie(getApplicationContext()).equals(
-						"")) {
-
+		if (!TextUtils.isEmpty(XunLeiLiXianUtil.getLoginUserPasswd(this))) {
+			passwdEdit.setText(XunLeiLiXianUtil.getLoginUserPasswd(this));
+		}
+		
+		if (!TextUtils.isEmpty(XunLeiLiXianUtil.getCookie(this))) {//already login
 			isFirstLogin = false;
-			// userNameEdit.setText(XunLeiLiXianUtil.getUsrname(getApplicationContext()));
-
 			handler.sendEmptyMessage(START_LOGIN);
-			MyApp.pool.execute(getUsrInfoRunnable);
 			showDialog(DIALOG_WAITING);
 		}
 	}
 
-	private void initView() {
-
-		loginLayout = findViewById(R.id.rl_login);
-		logoutLayout = findViewById(R.id.rl_logout);
-
-		userNameEdit = (EditText) findViewById(R.id.et_username);
-		passwdEdit = (EditText) findViewById(R.id.et_passwd);
-
-		userNameLayout = findViewById(R.id.rl_username);
-		passwdLayout = findViewById(R.id.rl_passwd);
-
-		loginBt = (Button) findViewById(R.id.bt_login);
-		logoutBt = (Button) findViewById(R.id.bt_logout);
-
-		nickNameTv = (TextView) findViewById(R.id.tv_lx_logout_nickname_content);
-		userIdTv = (TextView) findViewById(R.id.tv_lx_logout_userid_content);
-		vipRankTv = (TextView) findViewById(R.id.tv_lx_logout_rank_content);
-		outDateTv = (TextView) findViewById(R.id.tv_lx_logout_outofdate_content);
-
-		returnBt = (Button) findViewById(R.id.bt_back);
-		refreshBt = (Button) findViewById(R.id.bt_refresh_list);
-		
-		verifyEdit = (EditText) findViewById(R.id.et_verify_code);
-		verifyBt = (Button) findViewById(R.id.bt_verify_code);
-		
-		verifyEtLayout = findViewById(R.id.ll_et_verify_code);
-		verifyBtLayout = findViewById(R.id.ll_bt_verify_code);
-		
-		verifyLayout = findViewById(R.id.ll_verify_code);
-
-		playerListView = (ExpandableListView) findViewById(R.id.lv_movie);
-		playerListView.setGroupIndicator(null);
-
-		if (XunLeiLiXianUtil.getLoginUserName(getApplicationContext()) != null
-				&& !XunLeiLiXianUtil.getLoginUserName(getApplicationContext())
-						.equals("")) {
-
-			userNameEdit.setText(XunLeiLiXianUtil
-					.getLoginUserName(getApplicationContext()));
-		}
-
-		if (XunLeiLiXianUtil.getLoginUserPasswd(getApplicationContext()) != null
-				&& !XunLeiLiXianUtil
-						.getLoginUserPasswd(getApplicationContext()).equals("")) {
-
-			passwdEdit.setText(XunLeiLiXianUtil
-					.getLoginUserPasswd(getApplicationContext()));
-		}
-
-		addViewListener();
-
-	}
-
 	private void addViewListener() {
 		
 		verifyBt.setOnClickListener(new View.OnClickListener() {
-			
-			@Override
 			public void onClick(View v) {
-				// TODO Auto-generated method stub
-				if(userNameEdit.getText().toString() != null 
-						&& !"".equals(userNameEdit.getText().toString())){
+				if(!TextUtils.isEmpty(userNameEdit.getText().toString())){
 					MyApp.pool.execute(getVerifyBitmap);
 				}
 			}
 		});
 		
 		refreshBt.setOnClickListener(new View.OnClickListener() {
-			
-			@Override
 			public void onClick(View v) {
-				// TODO Auto-generated method stub
 				 pageIndex = 1;
 				 playerList.clear();
-
 				 if (playerExpandListAdapter != null) {
-
 					 playerExpandListAdapter.notifyDataSetChanged();
 				 }
 				 isTempRefresh = true;
@@ -179,98 +120,54 @@ public void onClick(View v) {
 		});
 
 		returnBt.setOnClickListener(new View.OnClickListener() {
-
-			@Override
 			public void onClick(View v) {
-				// TODO Auto-generated method stub
-
 				finish();
 			}
 		});
 
 		userNameEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-
-			@Override
 			public void onFocusChange(View v, boolean hasFocus) {
-				// TODO Auto-generated method stub
-				if (hasFocus) {
-
-					userNameLayout
-							.setBackgroundResource(R.drawable.edit_focused);
-				} else {
-
+				if (hasFocus)
+					userNameLayout.setBackgroundResource(R.drawable.edit_focused);
+				else
 					userNameLayout.setBackgroundDrawable(null);
-				}
 			}
 		});
-
 		passwdEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-
-			@Override
 			public void onFocusChange(View v, boolean hasFocus) {
-				// TODO Auto-generated method stub
-				if (hasFocus) {
-
+				if (hasFocus)
 					passwdLayout.setBackgroundResource(R.drawable.edit_focused);
-				} else {
-
+				else
 					passwdLayout.setBackgroundDrawable(null);
-				}
 			}
 		});
-		
 		verifyEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-
-			@Override
 			public void onFocusChange(View v, boolean hasFocus) {
-				// TODO Auto-generated method stub
-				if (hasFocus) {
-
-					verifyEtLayout
-							.setBackgroundResource(R.drawable.edit_focused);
-				} else {
-
+				if (hasFocus)
+					verifyEtLayout.setBackgroundResource(R.drawable.edit_focused);
+				else
 					verifyEtLayout.setBackgroundDrawable(null);
-				}
 			}
 		});
-		
 		verifyBt.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-			
-			@Override
 			public void onFocusChange(View v, boolean hasFocus) {
-				// TODO Auto-generated method stub
-				if (hasFocus) {
-					
-					verifyBtLayout
-					.setBackgroundResource(R.drawable.edit_focused);
-				} else {
-					
+				if (hasFocus)
+					verifyBtLayout.setBackgroundResource(R.drawable.edit_focused);
+				else
 					verifyBtLayout.setBackgroundDrawable(null);
-				}
 			}
 		});
 
 		loginBt.setOnClickListener(new View.OnClickListener() {
-
-			@Override
 			public void onClick(View v) {
-				// TODO Auto-generated method stub
-
 				if (TextUtils.isEmpty(userNameEdit.getText().toString())) {
-
 					Utils.showToast(XunLeiLXActivity.this, "请输入用户名");
-
 					return;
 				}
-
 				if (TextUtils.isEmpty(passwdEdit.getText().toString())) {
-
 					Utils.showToast(XunLeiLXActivity.this, "请输入密码");
-
 					return;
 				}
-
 				MyApp.pool.execute(loginRunnable);
 				showDialog(DIALOG_WAITING);
 			}
@@ -281,116 +178,52 @@ public void onClick(View v) {
 			@Override
 			public void onClick(View v) {
 				// TODO Auto-generated method stub
-
-				reset2Login();
+				reset2Login(-1);
 				verifyLayout.setVisibility(View.INVISIBLE);
 			}
 		});
 
-		playerListView
-				.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
-
-					@Override
+		playerListView.setOnGroupClickListener(
+				new ExpandableListView.OnGroupClickListener() {
 					public boolean onGroupClick(ExpandableListView parent,
 							View v, final int groupPosition, long id) {
-						// TODO Auto-generated method stub
-
 						if (playerList.size() > groupPosition) {
-
 							final XLLXFileInfo xllxFileInfo = playerList
 									.get(groupPosition);
 							if (xllxFileInfo != null) {
-
 								if (!xllxFileInfo.isDir) {
-
-									Log.i(TAG, "onItemClick--->xllxFileInfo:"
-											+ xllxFileInfo.toString());
-									if (xllxFileInfo.file_name != null
-											&& !xllxFileInfo.file_name
-													.equals("")) {
-
+									if (!TextUtils.isEmpty(xllxFileInfo.file_name)) {
 										// 如果url不为空，直接传给播放器
 										CurrentPlayDetailData currentPlayDetailData = new CurrentPlayDetailData();
 										currentPlayDetailData.prod_url = xllxFileInfo.src_url;
-										currentPlayDetailData.prod_type = -10;
+										currentPlayDetailData.prod_type = JoyplusMediaPlayerActivity.TYPE_XUNLEI;
 										currentPlayDetailData.prod_name = xllxFileInfo.file_name;
 
-										if (xllxFileInfo.duration != null
-												&& !xllxFileInfo.duration
-														.equals("")
-												&& !xllxFileInfo.duration
-														.equals("0")) {
-
-											long tempDuration = 0l;
-											try {
-												tempDuration = Long
-														.valueOf(xllxFileInfo.duration);
-											} catch (NumberFormatException e) {
-												// TODO Auto-generated catch
-												// block
-												e.printStackTrace();
-											}
-
-											if (tempDuration > 0) {
-
-												// currentPlayDetailData.prod_time
-												// = tempDuration;
-											}
-										}
 										currentPlayDetailData.obj = xllxFileInfo;
 										app.setmCurrentPlayDetailData(currentPlayDetailData);
-
-										// if(currentPlayDetailData.prod_src !=
-										// null )
-										startActivity(new Intent(
-												XunLeiLXActivity.this,
-												VideoPlayerJPActivity.class));
+										startActivity(Utils.getIntent(XunLeiLXActivity.this));
 									}
 								} else {
-
 									if (xllxFileInfo.btFiles == null) {
-
 										new Thread(new Runnable() {
-
 											public void run() {
-												if (XunLeiLiXianUtil
-														.getSubFile(
-																XunLeiLXActivity.this,
-																xllxFileInfo) != null)
-
+												if (XunLeiLiXianUtil.getSubFile(
+												    XunLeiLXActivity.this,xllxFileInfo) != null)
 													handler.post(new Runnable() {
 														public void run() {
-
-															Log.i(TAG,
-																	"handler.post(new Runnable()--->groupPosition:"
-																			+ groupPosition);
-															playerExpandListAdapter
-																	.notifyDataSetChanged();
-															playerListView
-																	.expandGroup(groupPosition);
+															playerExpandListAdapter.notifyDataSetChanged();
+															playerListView.expandGroup(groupPosition);
 															expandFlag = groupPosition;
 														}
 													});
 											}
 										}).start();
 									} else {
-
-										Log.i(TAG,
-												"!= null handler.post(new Runnable()--->groupPosition:"
-														+ groupPosition
-														+ " expandFlag--->"
-														+ expandFlag
-														+ "  btFiles--->"
-														+ xllxFileInfo.btFiles.length);
-
 										if (expandFlag == groupPosition) {
-
-											playerListView
-													.collapseGroup(expandFlag);
+											playerListView.collapseGroup(expandFlag);
 											expandFlag = -1;
 										} else {
-											playerListView
-													.expandGroup(groupPosition);
+											playerListView.expandGroup(groupPosition);
 											expandFlag = groupPosition;
 										}
 									}
@@ -401,86 +234,38 @@ public void run() {
 					}
 				});
 
-		playerListView
-				.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
-
-					@Override
+		playerListView.setOnGroupExpandListener(
+				new ExpandableListView.OnGroupExpandListener() {
 					public void onGroupExpand(int groupPosition) {
-						// TODO Auto-generated method stub
-
-						Log.i(TAG, "onGroupExpand--->" + groupPosition);
-						XLLXFileInfo xllxFileInfo = playerList
-								.get(groupPosition);
-						if (xllxFileInfo != null
-								&& xllxFileInfo.btFiles != null)
-							Log.i(TAG, "  btFiles--->"
-									+ xllxFileInfo.btFiles.length);
+						if(playerList.size() <= groupPosition) return;
+						XLLXFileInfo xllxFileInfo = playerList.get(groupPosition);
+						if (xllxFileInfo != null&& xllxFileInfo.btFiles != null)
 						for (int i = 0; i < playerList.size(); i++) {
-
 							if (i != groupPosition) {
-
 								playerListView.collapseGroup(i);
 							}
 						}
-
 						expandFlag = groupPosition;
 					}
 				});
 
-		playerListView
-				.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
-
-					@Override
+		playerListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
 					public void onGroupCollapse(int groupPosition) {
-						// TODO Auto-generated method stub
-
 						if (playerListView.isGroupExpanded(groupPosition)) {
-
 							playerListView.collapseGroup(groupPosition);
 						}
 					}
 				});
 
-		// playerListView.setOnFocusChangeListener(new
-		// View.OnFocusChangeListener() {
-		//
-		// @Override
-		// public void onFocusChange(View v, boolean hasFocus) {
-		// // TODO Auto-generated method stub
-		//
-		// if(!hasFocus){
-		//
-		// // playerListView.collapseGroup(expandFlag);
-		// for (int i = 0; i < playerList.size(); i++) {
-		//
-		// playerListView.collapseGroup(i);
-		// }
-		// expandFlag = -1;
-		// }
-		// }
-		// });
-
 		logoutBt.setOnKeyListener(new View.OnKeyListener() {
-
-			@Override
 			public boolean onKey(View v, int keyCode, KeyEvent event) {
-				// TODO Auto-generated method stub
 				switch (keyCode) {
 				case KeyEvent.KEYCODE_DPAD_LEFT:
-
-					if (expandFlag != -1)
-						Log.i(TAG,
-								"KEYCODE_DPAD_LEFT"
-										+ playerListView
-												.isGroupExpanded(expandFlag));
-
 					for (int i = 0; i < playerList.size(); i++) {
-
 						playerListView.collapseGroup(i);
 					}
 					expandFlag = -1;
 					break;
-
 				default:
 					break;
 				}
@@ -488,128 +273,57 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
 			}
 		});
 
-		playerListView
-				.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
-
-					@Override
+		playerListView.setOnChildClickListener(
+				new ExpandableListView.OnChildClickListener() {
 					public boolean onChildClick(ExpandableListView parent,
-							View v, int groupPosition, int childPosition,
-							long id) {
-						// TODO Auto-generated method stub
-
-						if (playerList.size() > groupPosition
-								&& playerList.get(groupPosition) != null) {
-
-							if (playerList.get(groupPosition).btFiles != null
-									&& playerList.get(groupPosition).btFiles.length > childPosition) {
-
-								if (playerList.get(groupPosition).btFiles[childPosition] != null
-										&& !playerList.get(groupPosition).btFiles[childPosition].isDir) {
-									Log.i(TAG,
-											"setOnChildClickListener groupPosition:"
-													+ groupPosition
-													+ " childPosition:"
-													+ childPosition
-													+ " length:"
-													+ playerList
-															.get(groupPosition).btFiles.length
-													+ " id:" + id);
-									XLLXFileInfo xllxFileInfo = playerList
-											.get(groupPosition).btFiles[childPosition];
-
-									if (xllxFileInfo.file_name != null
-											&& !xllxFileInfo.file_name
-													.equals("")) {
-
+							View v, int groupPosition, int childPosition,long id) {
+						if (playerList.size() > groupPosition && playerList.get(groupPosition) != null) {
+							XLLXFileInfo parentInfo = playerList.get(groupPosition);
+							if (parentInfo.btFiles != null&& parentInfo.btFiles.length > childPosition) {
+								if (parentInfo.btFiles[childPosition] != null&& !parentInfo.btFiles[childPosition].isDir) {
+									XLLXFileInfo xllxFileInfo = parentInfo.btFiles[childPosition];
+									if (!TextUtils.isEmpty(xllxFileInfo.file_name)) {
 										// 如果url不为空，直接传给播放器
 										CurrentPlayDetailData currentPlayDetailData = new CurrentPlayDetailData();
 										currentPlayDetailData.prod_url = xllxFileInfo.src_url;
-										currentPlayDetailData.prod_type = -10;
-										currentPlayDetailData.prod_name = xllxFileInfo.file_name;
-
-										if (xllxFileInfo.duration != null
-												&& !xllxFileInfo.duration
-														.equals("")
-												&& !xllxFileInfo.duration
-														.equals("0")) {
-
-											long tempDuration = 0l;
-											try {
-												tempDuration = Long
-														.valueOf(xllxFileInfo.duration);
-											} catch (NumberFormatException e) {
-												// TODO Auto-generated catch
-												// block
-												e.printStackTrace();
-											}
-
-											if (tempDuration > 0) {
-
-												// currentPlayDetailData.prod_time
-												// = tempDuration;
-											}
-										}
-										currentPlayDetailData.obj = xllxFileInfo;
+										currentPlayDetailData.prod_type = JoyplusMediaPlayerActivity.TYPE_XUNLEI_BT_EPISODE;
+										currentPlayDetailData.prod_sub_name = xllxFileInfo.file_name;										
+										currentPlayDetailData.obj = parentInfo.btFiles;
 										app.setmCurrentPlayDetailData(currentPlayDetailData);
-
-										// if(currentPlayDetailData.prod_src !=
-										// null )
-										startActivity(new Intent(
-												XunLeiLXActivity.this,
-												VideoPlayerJPActivity.class));
+										startActivity(Utils.getIntent(XunLeiLXActivity.this));
 									}
 								}
 							}
 						}
-
 						return false;
 					}
 				});
 
-		playerListView
-				.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-					@Override
+		playerListView.setOnItemSelectedListener(
+				new AdapterView.OnItemSelectedListener() {
 					public void onItemSelected(AdapterView<?> parent,
 							View view, int position, long id) {
-						// TODO Auto-generated method stub
-						Log.i(TAG, "onItemSelected--->" + position + " id:"
-								+ id);
-
 						if (isCanCache) {
-
 							int lastVisiblePosition = playerListView
 									.getLastVisiblePosition();
 							int totalSize = playerList.size();
-							if (expandFlag != -1
+							if (expandFlag != -1 && totalSize > expandFlag
 									&& playerList.get(expandFlag) != null
 									&& playerList.get(expandFlag).btFiles != null
 									&& playerList.get(expandFlag).btFiles.length > 0) {
-
 								totalSize = playerList.size()
 										+ playerList.get(expandFlag).btFiles.length;
 							}
-
+							
 							if (totalSize - lastVisiblePosition < XunLeiLiXianUtil.CACHE_NUM) {
-
 								pageIndex++;
-
 								new Thread(new Runnable() {
-
-									@Override
 									public void run() {
-										// TODO Auto-generated method stub
-										final ArrayList<XLLXFileInfo> list = XunLeiLiXianUtil
-												.getVideoList(
-														getApplicationContext(),
-														XunLeiLiXianUtil.CACHE_NUM,
-														pageIndex);
+										final ArrayList<XLLXFileInfo> list 
+										= XunLeiLiXianUtil.getVideoList(XunLeiLXActivity.this,
+										XunLeiLiXianUtil.CACHE_NUM,pageIndex);
 										handler.post(new Runnable() {
-
-											@Override
 											public void run() {
-												// TODO Auto-generated method
-												// stub
 												refreshListView(list);
 											}
 										});
@@ -617,71 +331,40 @@ public void run() {
 								}).start();
 							}
 						}
-
-					}
-
-					@Override
-					public void onNothingSelected(AdapterView<?> parent) {
-						// TODO Auto-generated method stub
-
 					}
+					public void onNothingSelected(AdapterView<?> parent) {}
 				});
 
 		playerListView.setOnScrollListener(new AbsListView.OnScrollListener() {
-
 			int lastVisiblePosition;
-
-			@Override
 			public void onScrollStateChanged(AbsListView view, int scrollState) {
-				// TODO Auto-generated method stub
 				switch (scrollState) {
 				case OnScrollListener.SCROLL_STATE_IDLE:
-					Log.i(TAG, "playerListView--->SCROLL_STATE_IDLE"
-							+ " tempfirstVisibleItem--->" + lastVisiblePosition);
-
-					// 缓存
-					if (playerExpandListAdapter != null) {
-
+					if (playerExpandListAdapter != null) {// 缓存
 						if (playerExpandListAdapter.getFiles() != null) {
-
 							if (isCanCache) {
-
 								int totalSize = playerList.size();
 								if (expandFlag != -1
 										&& playerList.get(expandFlag) != null
 										&& playerList.get(expandFlag).btFiles != null
 										&& playerList.get(expandFlag).btFiles.length > 0) {
-
-									totalSize = playerList.size()
-											+ playerList.get(expandFlag).btFiles.length;
+									totalSize = playerList.size()+ playerList.get(expandFlag).btFiles.length;
 								}
-
+								
 								if (totalSize - lastVisiblePosition < XunLeiLiXianUtil.CACHE_NUM) {
-
 									pageIndex++;
-
 									new Thread(new Runnable() {
-
-										@Override
 										public void run() {
-											// TODO Auto-generated method stub
-											final ArrayList<XLLXFileInfo> list = XunLeiLiXianUtil
-													.getVideoList(
-															getApplicationContext(),
-															XunLeiLiXianUtil.CACHE_NUM,
-															pageIndex);
+											final ArrayList<XLLXFileInfo> list 
+											= XunLeiLiXianUtil.getVideoList(
+											XunLeiLXActivity.this,XunLeiLiXianUtil.CACHE_NUM,pageIndex);
 											handler.post(new Runnable() {
-
-												@Override
 												public void run() {
-													// TODO Auto-generated
-													// method stub
 													refreshListView(list);
 												}
 											});
 										}
 									}).start();
-
 								}
 							}
 						}
@@ -689,40 +372,24 @@ public void run() {
 
 					break;
 				case OnScrollListener.SCROLL_STATE_TOUCH_SCROLL:
-					Log.i(TAG, "playGv--->SCROLL_STATE_TOUCH_SCROLL");
-
 					break;
 				case OnScrollListener.SCROLL_STATE_FLING:
-					Log.i(TAG, "playGv--->SCROLL_STATE_FLING");
-
-					// isDragGridView = false;
 					break;
 				default:
 					break;
 				}
 			}
 
-			@Override
 			public void onScroll(AbsListView view, int firstVisibleItem,
 					int visibleItemCount, int totalItemCount) {
-				// TODO Auto-generated method stub
 				lastVisiblePosition = firstVisibleItem + visibleItemCount;
 			}
 		});
 	}
 
 	private void refreshListView(ArrayList<XLLXFileInfo> list) {
-
 		if (list != null && list.size() > 0) {
-
-			if (list.size() >= XunLeiLiXianUtil.CACHE_NUM) {
-
-				isCanCache = true;
-			} else {
-
-				isCanCache = false;
-			}
-
+			isCanCache = list.size() >= XunLeiLiXianUtil.CACHE_NUM;
 			playerList.addAll(list);
 			playerExpandListAdapter.setFiles(playerList);
 			playerExpandListAdapter.notifyDataSetChanged();
@@ -731,28 +398,20 @@ private void refreshListView(ArrayList<XLLXFileInfo> list) {
 	}
 
 	private void setLogin(boolean isLogin) {
-
 		if (!isLogin) {
-
 			loginLayout.setVisibility(View.VISIBLE);
 			logoutLayout.setVisibility(View.INVISIBLE);
-
 		} else {
-
 			logoutLayout.setVisibility(View.VISIBLE);
 			loginLayout.setVisibility(View.INVISIBLE);
 		}
 	}
 
-	private void reset2Login() {
-
+	private void reset2Login(int loginErrorFlag) {
 		XunLeiLiXianUtil.Logout(getApplicationContext());
 		setLogin(false);
-
 		playerList.clear();
-
 		if (playerExpandListAdapter != null) {
-
 			playerExpandListAdapter.notifyDataSetChanged();
 		}
 
@@ -760,8 +419,14 @@ private void reset2Login() {
 		isFirstLogin = true;
 		refreshBt.setVisibility(View.INVISIBLE);
 
+		if(loginErrorFlag == 10 || loginErrorFlag == 11) {
+			passwdEdit.setText(XunLeiLiXianUtil.getLoginUserPasswd(getApplicationContext()));
+			return;
+		}
+	}
+	
+	private void clearPasswdRecord(){
 		passwdEdit.setText("");
-
 		XunLeiLiXianUtil.saveLoginUserPasswd(getApplicationContext(), "");
 	}
 
@@ -791,61 +456,39 @@ public void onCancel(DialogInterface dialog) {
 	}
 
 	private Handler handler = new Handler() {
-
-		@Override
 		public void handleMessage(Message msg) {
-			// TODO Auto-generated method stub
-			// super.handleMessage(msg);
-
-			int what = msg.what;
-
-			switch (what) {
+			switch (msg.what) {
 			case LOGIN_SUCESS:// 登录成功
-
 				Utils.showToast(XunLeiLXActivity.this, "登陆成功");
 				MyApp.pool.execute(getUsrInfoRunnable);
 
-				if (XunLeiLiXianUtil.getLoginUserName(getApplicationContext()) != null
-						&& !XunLeiLiXianUtil.getLoginUserName(
-								getApplicationContext()).equals("")) {
-
-					if (!XunLeiLiXianUtil.getLoginUserName(
-							getApplicationContext()).equals(
+				if (!TextUtils.isEmpty(XunLeiLiXianUtil.getLoginUserName(XunLeiLXActivity.this))) {
+					if (!XunLeiLiXianUtil.getLoginUserName(XunLeiLXActivity.this).equals(
 							userNameEdit.getText().toString())) {
-						XunLeiLiXianUtil.saveLoginUserName(
-								getApplicationContext(), userNameEdit.getText()
-										.toString());
+						XunLeiLiXianUtil.saveLoginUserName(XunLeiLXActivity.this,
+								userNameEdit.getText().toString());
 						XunLeiLiXianUtil.saveLoginUserPasswd(
-								getApplicationContext(), MD5Util
-										.getMD5String(passwdEdit.getText()
-												.toString()));
+								XunLeiLXActivity.this, 
+								MD5Util.getMD5String(passwdEdit.getText().toString()));
 					}
 				} else {
-
-					XunLeiLiXianUtil.saveLoginUserName(getApplicationContext(),
+					XunLeiLiXianUtil.saveLoginUserName(XunLeiLXActivity.this,
 							userNameEdit.getText().toString());
 					XunLeiLiXianUtil.saveLoginUserPasswd(
-							getApplicationContext(), MD5Util
-									.getMD5String(passwdEdit.getText()
-											.toString()));
+							XunLeiLXActivity.this,
+							MD5Util.getMD5String(passwdEdit.getText().toString()));
 				}
-
 				break;
 			case REFESH_USERINFO:// 刷新用户信息成功
 				setLogin(true);// 跳转到用户信息界面
-
 				isFirstLogin = false;
-				
 				refreshBt.setVisibility(View.VISIBLE);
-
 				XLLXUserInfo xllxUserInfo = (XLLXUserInfo) msg.obj;
 				if (xllxUserInfo != null) {
-
 					nickNameTv.setText(xllxUserInfo.nickname);
 					userIdTv.setText(xllxUserInfo.usrname);
 					vipRankTv.setText("VIP" + xllxUserInfo.level + "");
-					outDateTv.setText(xllxUserInfo.expiredate.replaceAll("-",
-							"."));
+					outDateTv.setText(xllxUserInfo.expiredate.replaceAll("-","."));
 				}
 
 				MyApp.pool.execute(getVideoList);
@@ -854,19 +497,23 @@ public void handleMessage(Message msg) {
 			case REFRESH_LIST:// 刷新用户信息成功
 				// removeDialog(DIALOG_WAITING);
 				ArrayList<XLLXFileInfo> list = (ArrayList<XLLXFileInfo>) msg.obj;
-
+				boolean flag = false;
 				if (list != null && list.size() > 0) {
 					playerList = list;
 					playerExpandListAdapter = new PlayExpandListAdapter(
 							XunLeiLXActivity.this, playerList);
 					playerListView.setAdapter(playerExpandListAdapter);
+					flag = true;
 				}
-				
 				if(isTempRefresh){
-					
 					removeDialog(DIALOG_WAITING);
 					isTempRefresh = false;
 				}
+				if(flag){
+					playerListView.setSelection(0);
+					playerListView.requestFocus();
+				}
+				
 				break;
 			case START_LOGIN:// 直接进入用户界面
 				MyApp.pool.execute(getUsrInfoRunnable);
@@ -885,6 +532,7 @@ public void handleMessage(Message msg) {
 					break;
 				case 2:
 					Utils.showToast(XunLeiLXActivity.this, "密码错误");
+					clearPasswdRecord();
 					break;
 				case 4:
 				case 5:
@@ -905,7 +553,7 @@ public void handleMessage(Message msg) {
 				}
 
 				// 清空数据重新获取数据
-				reset2Login();
+				reset2Login(msg.arg1);
 				removeDialog(DIALOG_WAITING);
 				break;
 			case VERIFY_CODE_SUCCESS:
@@ -929,35 +577,22 @@ public void handleMessage(Message msg) {
 	};
 
 	private Runnable loginRunnable = new Runnable() {
-
-		@Override
 		public void run() {
-			// TODO Auto-generated method stub
-
 			int loginFlag = -10;
-
-			if (passwdEdit.getText().toString() != null
-					&& passwdEdit.getText().toString()
-							.equals(XunLeiLiXianUtil
-									.getLoginUserPasswd(getApplicationContext()))) {
-
-				loginFlag = XunLeiLiXianUtil.Login(XunLeiLXActivity.this,
-						userNameEdit.getText().toString(), passwdEdit.getText()
-								.toString(), verifyEdit.getText().toString());
+			String username = userNameEdit.getText().toString();
+			String passwd = passwdEdit.getText().toString();
+			String verify = verifyEdit.getText().toString();
+			if (passwd != null&& passwd.equals(XunLeiLiXianUtil
+				.getLoginUserPasswd(XunLeiLXActivity.this))) {
+				loginFlag = XunLeiLiXianUtil.Login(XunLeiLXActivity.this,username, passwd, verify,true);
 			} else {
-
-				loginFlag = XunLeiLiXianUtil.Login(XunLeiLXActivity.this,
-						userNameEdit.getText().toString(), passwdEdit.getText()
-								.toString(), verifyEdit.getText().toString());
+				loginFlag = XunLeiLiXianUtil.Login(XunLeiLXActivity.this,username, passwd, verify);
 			}
 
 			if (loginFlag == 0) {
-
 				handler.sendEmptyMessage(LOGIN_SUCESS);
 			} else {
-
-				Message message = handler.obtainMessage(LOGIN_ERROR, loginFlag,
-						-1);
+				Message message = handler.obtainMessage(LOGIN_ERROR, loginFlag,-1);
 				handler.sendMessage(message);
 			}
 		}
@@ -970,39 +605,23 @@ public void run() {
 			// TODO Auto-generated method stub
 
 			XLLXUserInfo xllxUserInfo = null;
-			Log.d(TAG, "getUsrInfoRunnable--->");
 			if (!isFirstLogin) {
-
-				xllxUserInfo = XunLeiLiXianUtil
-						.getUserInfoFromLocal(getApplicationContext());
+				xllxUserInfo = XunLeiLiXianUtil.getUserInfoFromLocal(XunLeiLXActivity.this);
 				if (xllxUserInfo != null) {
-
-					Message message = handler.obtainMessage(REFESH_USERINFO,
-							xllxUserInfo);
+					Message message = handler.obtainMessage(REFESH_USERINFO,xllxUserInfo);
 					handler.sendMessage(message);
 				} else {
-
-					Message message = handler
-							.obtainMessage(LOGIN_ERROR, 10, -1);
+					Message message = handler.obtainMessage(LOGIN_ERROR, 10, -1);
 					handler.sendMessage(message);
 				}
 			} else {
-
-				xllxUserInfo = XunLeiLiXianUtil
-						.getUser(XunLeiLXActivity.this, XunLeiLiXianUtil
-								.getCookieHeader(XunLeiLXActivity.this));
-
+				xllxUserInfo = XunLeiLiXianUtil.getUser(XunLeiLXActivity.this, 
+						XunLeiLiXianUtil.getCookieHeader(XunLeiLXActivity.this));
 				if (xllxUserInfo != null) {
-
-					Log.i(TAG, "getUsrInfoRunnable--->xllxUserInfo:"
-							+ xllxUserInfo.toString());
-					Message message = handler.obtainMessage(REFESH_USERINFO,
-							xllxUserInfo);
+					Message message = handler.obtainMessage(REFESH_USERINFO,xllxUserInfo);
 					handler.sendMessage(message);
 				} else {
-
-					Message message = handler
-							.obtainMessage(LOGIN_ERROR, 10, -1);
+					Message message = handler.obtainMessage(LOGIN_ERROR, 10, -1);
 					handler.sendMessage(message);
 				}
 
@@ -1021,19 +640,10 @@ public void run() {
 					pageIndex);
 
 			if (list != null && list.size() > 0) {
-
 				Message message = handler.obtainMessage(REFRESH_LIST, list);
 				handler.sendMessage(message);
-
-				if (list.size() >= XunLeiLiXianUtil.CACHE_NUM) {
-
-					isCanCache = true;
-				} else {
-
-					isCanCache = false;
-				}
+				isCanCache = list.size() >= XunLeiLiXianUtil.CACHE_NUM;
 			} else {
-
 				Message message = handler.obtainMessage(LOGIN_ERROR, 11, -1);
 				handler.sendMessage(message);
 			}
@@ -1045,12 +655,10 @@ public void run() {
 		@Override
 		public void run() {
 			// TODO Auto-generated method stub
-			if(userNameEdit.getText().toString() != null 
-					&& !"".equals(userNameEdit.getText().toString())){
+			if(TextUtils.isEmpty(userNameEdit.getText().toString())){
 				Bitmap bitmap = XunLeiLiXianUtil.getVerifyCodeBitmap(getApplicationContext(),
 						userNameEdit.getText().toString());
 				if(bitmap != null){
-					
 					Message message = handler.obtainMessage(VERIFY_CODE_SUCCESS, bitmap);
 					handler.sendMessage(message);
 					return;
@@ -1078,8 +686,45 @@ protected void onResume() {
 	@Override
 	protected void onDestroy() {
 		// TODO Auto-generated method stub
-		XunLeiLiXianUtil.saveVerifyCookies(getApplicationContext(), "");
+		XunLeiLiXianUtil.saveVerifyCookies(this, "");
 		super.onDestroy();
 	}
+	
+	private void initView() {
+
+		loginLayout = findViewById(R.id.rl_login);
+		logoutLayout = findViewById(R.id.rl_logout);
+
+		userNameEdit = (EditText) findViewById(R.id.et_username);
+		passwdEdit = (EditText) findViewById(R.id.et_passwd);
+
+		userNameLayout = findViewById(R.id.rl_username);
+		passwdLayout = findViewById(R.id.rl_passwd);
+
+		loginBt = (Button) findViewById(R.id.bt_login);
+		logoutBt = (Button) findViewById(R.id.bt_logout);
+
+		nickNameTv = (TextView) findViewById(R.id.tv_lx_logout_nickname_content);
+		userIdTv = (TextView) findViewById(R.id.tv_lx_logout_userid_content);
+		vipRankTv = (TextView) findViewById(R.id.tv_lx_logout_rank_content);
+		outDateTv = (TextView) findViewById(R.id.tv_lx_logout_outofdate_content);
+
+		returnBt = (Button) findViewById(R.id.bt_back);
+		refreshBt = (Button) findViewById(R.id.bt_refresh_list);
+		
+		verifyEdit = (EditText) findViewById(R.id.et_verify_code);
+		verifyBt = (Button) findViewById(R.id.bt_verify_code);
+		
+		verifyEtLayout = findViewById(R.id.ll_et_verify_code);
+		verifyBtLayout = findViewById(R.id.ll_bt_verify_code);
+		
+		verifyLayout = findViewById(R.id.ll_verify_code);
+
+		playerListView = (ExpandableListView) findViewById(R.id.lv_movie);
+		playerListView.setGroupIndicator(null);
+		
+		loginLayout.setVisibility(View.VISIBLE);
+		logoutLayout.setVisibility(View.INVISIBLE);
+	}
 
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/adapter/MoviePlayHistoryAdapter.java b/showkeyHelper/src/com/joyplus/tvhelper/adapter/MoviePlayHistoryAdapter.java
index 2810dac..5221813 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/adapter/MoviePlayHistoryAdapter.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/adapter/MoviePlayHistoryAdapter.java
@@ -16,6 +16,7 @@
 import com.joyplus.tvhelper.entity.BTEpisode;
 import com.joyplus.tvhelper.entity.MoviePlayHistoryInfo;
 import com.joyplus.tvhelper.entity.PushedApkDownLoadInfo;
+import com.joyplus.tvhelper.utils.Constant;
 import com.joyplus.tvhelper.utils.Utils;
 
 public class MoviePlayHistoryAdapter extends BaseExpandableListAdapter {
@@ -223,7 +224,7 @@ public View getGroupView(int groupPosition, boolean isExpanded,
 				if(info.getDuration()<10){
 					holder.size.setText("已观看："+Utils.formatDuration(info.getPlayback_time()*1000)+
 							"  /  "+ "--:--:--");
-				}else if(info.getDuration()<=info.getPlayback_time()+10&&info.getDuration()>10){
+				}else if(info.getDuration()<=info.getPlayback_time()+Constant.END_TIME&&info.getDuration()>10){
 					holder.size.setText("已看完");
 				}else{
 					holder.size.setText("已观看："+Utils.formatDuration(info.getPlayback_time()*1000)+
@@ -287,7 +288,7 @@ public View getChildView(int groupPosition, int childPosition,
 		if(info.getDuration()<10){
 			holder.size.setText("已观看："+Utils.formatDuration(info.getPlayback_time()*1000)+
 					"  /  "+ "--:--:--");
-		}else if(info.getDuration()<=info.getPlayback_time()+10&&info.getDuration()>10){
+		}else if(info.getDuration()<=info.getPlayback_time()+Constant.END_TIME&&info.getDuration()>10){
 			holder.size.setText("已看完");
 		}else{
 			holder.size.setText("已观看："+Utils.formatDuration(info.getPlayback_time()*1000)+
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/entity/CurrentPlayDetailData.java b/showkeyHelper/src/com/joyplus/tvhelper/entity/CurrentPlayDetailData.java
index 71e749b..a64ca7a 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/entity/CurrentPlayDetailData.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/entity/CurrentPlayDetailData.java
@@ -12,6 +12,6 @@ public class CurrentPlayDetailData {
 	public boolean prod_favority = false;// 是否收藏
 	public int prod_type = 1;// 视频类别 1：电影，2：电视剧，3：综艺，131动漫
 	public boolean hasReturnData = false;// 是否有详情信息
-	
+	public boolean isOnline;
 	public Object obj;
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/entity/MoviePlayHistoryInfo.java b/showkeyHelper/src/com/joyplus/tvhelper/entity/MoviePlayHistoryInfo.java
index de596fc..cb93e28 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/entity/MoviePlayHistoryInfo.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/entity/MoviePlayHistoryInfo.java
@@ -6,7 +6,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 
-import com.joyplus.Sub.SubURI;
+import com.joyplus.sub.SubURI;
 
 public class MoviePlayHistoryInfo {
 
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/faye/FayeService.java b/showkeyHelper/src/com/joyplus/tvhelper/faye/FayeService.java
index 03a3d64..226c543 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/faye/FayeService.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/faye/FayeService.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.net.URI;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Observable;
@@ -26,11 +25,11 @@
 import android.os.IBinder;
 import android.os.Message;
 
-import com.joyplus.Sub.SUBTYPE;
-import com.joyplus.Sub.SubURI;
 import com.joyplus.network.filedownload.manager.DownLoadListner;
 import com.joyplus.network.filedownload.manager.DownloadManager;
 import com.joyplus.network.filedownload.model.DownloadTask;
+import com.joyplus.sub.SUBTYPE;
+import com.joyplus.sub.SubURI;
 import com.joyplus.tvhelper.DialogActivity;
 import com.joyplus.tvhelper.MyApp;
 import com.joyplus.tvhelper.PlayBaiduActivity;
@@ -138,7 +137,9 @@ public void onReceive(Context context, Intent intent) {
 //						}
 					}else{
 						CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-						Intent intent_play = new Intent(FayeService.this,VideoPlayerJPActivity.class);
+//						final Intent intent_play = new Intent(FayeService.this,VideoPlayerJPActivity.class);
+						final Intent intent_play = Utils.getIntent(FayeService.this);
+						
 						intent_play.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 						if(play_info.getPlay_type()==MoviePlayHistoryInfo.PLAY_TYPE_BT_EPISODES){
 							playDate.prod_type = VideoPlayerJPActivity.TYPE_PUSH_BT_EPISODE;
@@ -152,10 +153,19 @@ public void onReceive(Context context, Intent intent) {
 						playDate.prod_name = play_info.getName();
 //						playDate.prod_time =  Math.round(play_info.getPlayback_time()*1000);
 						playDate.obj = play_info;
+						playDate.isOnline = true;
 //						playDate.prod_url = play_info.getDownload_url();
 						app.setmCurrentPlayDetailData(playDate);
 						app.set_ReturnProgramView(null);
-						startActivity(intent_play);
+						handler.postDelayed(new Runnable() {
+							
+							@Override
+							public void run() {
+								// TODO Auto-generated method stub
+								startActivity(intent_play);
+							}
+						}, 0);
+						sendBroadcast(new Intent(Global.ACTION_RECIVE_NEW_PUSH_MOVIE));
 					}
 				}
 				
@@ -1410,7 +1420,8 @@ public void messageReceived(JSONObject json) {
 						if(PreferencesUtils.getPincodeMd5(FayeService.this)!=null
 								&&PreferencesUtils.getPincodeMd5(FayeService.this).equals(pincode_md5)){
 							CurrentPlayDetailData playDate = new CurrentPlayDetailData();
-							Intent intent = new Intent(FayeService.this,VideoPlayerJPActivity.class);
+//							final Intent intent = new Intent(FayeService.this,VideoPlayerJPActivity.class);
+							final Intent intent = Utils.getIntent(FayeService.this);
 							intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 //							playDate.prod_id = data.getString("id");
 							
@@ -1441,9 +1452,19 @@ public void messageReceived(JSONObject json) {
 //									playDate.prod_type = -1;
 //								}
 //							}
+							playDate.isOnline = true;
 							app.setmCurrentPlayDetailData(playDate);
 							app.set_ReturnProgramView(null);
-							startActivity(intent);
+							sendBroadcast(new Intent(Global.ACTION_RECIVE_NEW_PUSH_MOVIE));
+							handler.postDelayed(new Runnable() {
+								
+								@Override
+								public void run() {
+									// TODO Auto-generated method stub
+									startActivity(intent);
+								}
+							}, 0);
+							
 						}else{
 							handler.sendEmptyMessage(MESSAGE_SHOW_DIALOG);
 						}
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ui/GuideScrollLayout.java b/showkeyHelper/src/com/joyplus/tvhelper/ui/GuideScrollLayout.java
new file mode 100644
index 0000000..071a5c4
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ui/GuideScrollLayout.java
@@ -0,0 +1,266 @@
+package com.joyplus.tvhelper.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Scroller;
+
+public class GuideScrollLayout extends ViewGroup{  
+  
+    private static final String TAG = "ScrollLayout";        
+    private VelocityTracker mVelocityTracker;           // �����ж�˦������      
+    private static final int SNAP_VELOCITY = 600;          
+    private Scroller  mScroller;                        // ����������      
+    private int mCurScreen;                               
+    private int mDefaultScreen = 0;                            
+    private float mLastMotionX;         
+      
+    private OnViewChangeListener mOnViewChangeListener;    
+    public GuideScrollLayout(Context context) {  
+        super(context);  
+        init(context);  
+    }     
+    public GuideScrollLayout(Context context, AttributeSet attrs) {  
+        super(context, attrs);  
+        init(context);  
+    }     
+    public GuideScrollLayout(Context context, AttributeSet attrs, int defStyle) {  
+        super(context, attrs, defStyle);      
+        init(context);  
+    }     
+    private void init(Context context)  
+    {  
+        mCurScreen = mDefaultScreen;                          
+        mScroller = new Scroller(context);        
+    }  
+  
+    @Override  
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {  
+        // TODO Auto-generated method stub        
+         if (changed) {      
+                int childLeft = 0;      
+                final int childCount = getChildCount();                       
+                for (int i=0; i<childCount; i++) {      
+                    final View childView = getChildAt(i);      
+                    if (childView.getVisibility() != View.GONE) {      
+                        final int childWidth = childView.getMeasuredWidth();
+                        Log.d(TAG, "childLeft------------------->" + childLeft);
+                        childView.layout(childLeft, 0,       
+                                childLeft+childWidth, childView.getMeasuredHeight());      
+                        childLeft += childWidth;      
+                    }      
+                }      
+            } 
+         
+//         updateAlpha();
+    }  
+  
+    @Override  
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {  
+        // TODO Auto-generated method stub  
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);         
+//        final int width = MeasureSpec.getSize(widthMeasureSpec);         
+//        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);                      
+//        final int count = getChildCount();         
+//        for (int i = 0; i < count; i++) {     
+//            getChildAt(i).measure(widthMeasureSpec, heightMeasureSpec);         
+//        }                 
+//        Log.d(TAG, "width------------------------->" + width);
+//        scrollTo(mCurScreen * width, 0);     
+        int measureWidth = MeasureSpec.getSize(widthMeasureSpec);
+		int measureHeigth = MeasureSpec.getSize(heightMeasureSpec);
+		setMeasuredDimension(measureWidth, measureHeigth);
+		// TODO Auto-generated method stub
+		for(int i= 0;i<getChildCount();i++){
+			View v = getChildAt(i);
+			int widthSpec = 0;
+			int heightSpec = 0;
+			LayoutParams params = v.getLayoutParams();
+			if(params.width > 0){
+				widthSpec = MeasureSpec.makeMeasureSpec(params.width, MeasureSpec.EXACTLY);
+			}else if (params.width == -1) {
+				widthSpec = MeasureSpec.makeMeasureSpec(measureWidth, MeasureSpec.EXACTLY);
+			} else if (params.width == -2) {
+				widthSpec = MeasureSpec.makeMeasureSpec(measureWidth, MeasureSpec.AT_MOST);
+			}
+			
+			if(params.height > 0){
+				heightSpec = MeasureSpec.makeMeasureSpec(params.height, MeasureSpec.EXACTLY);
+			}else if (params.height == -1) {
+				heightSpec = MeasureSpec.makeMeasureSpec(measureHeigth, MeasureSpec.EXACTLY);
+			} else if (params.height == -2) {
+				heightSpec = MeasureSpec.makeMeasureSpec(measureWidth, MeasureSpec.AT_MOST);
+			}
+			v.measure(widthSpec, heightSpec);
+		}
+    }  
+    
+    public int getSelected(){
+    	return mCurScreen;
+    }
+  
+     public void snapToDestination() {      
+//            final int screenWidth = getWidth();     
+            final int left = getChildLeft(mCurScreen);
+            final int width = getChildAt(mCurScreen).getMeasuredWidth();
+            Log.d(TAG, "x----->" + getScrollX());
+            Log.d(TAG, "left----->" + left);
+            Log.d(TAG, "width----->" + width);
+            int destScreen;
+            if(getScrollX()>left){
+            	destScreen = mCurScreen + ((getScrollX() - left + width/2)/width);
+            }else{
+            	destScreen = mCurScreen - ((left - getScrollX() + width/2)/width);
+            }
+            snapToScreen(destScreen);      
+     }    
+      
+     public void snapToScreen(int whichScreen) {          
+            // get the valid layout page      
+	 		whichScreen = Math.max(0, Math.min(whichScreen, getChildCount()-1));      
+            if (getScrollX() != (getChildLeft(whichScreen))) {      
+                final int delta = getChildLeft(whichScreen)-getScrollX();      
+//                        mScroller.startScroll(getScrollX(), 0,       
+//                        delta, 0, Math.abs(delta)*2);                 
+                        mScroller.startScroll(getScrollX(), 0,       
+                        		delta, 0, Math.min(Math.abs(delta)*2, 500));                 
+                mCurScreen = whichScreen;      
+                invalidate();       // Redraw the layout                      
+                if (mOnViewChangeListener != null)  
+                {  
+                    mOnViewChangeListener.OnViewChange(mCurScreen);  
+                }  
+            } 
+            
+//            updateAlpha();
+        }     
+     
+//    private void updateAlpha(){
+//    	for(int i=0; i<getChildCount(); i++){
+//    		Log.d("ssss", "i***********>" + i);
+//        	if(i==mCurScreen){
+//        		getChildAt(i).setAlpha(1.0F);
+//        	}else{
+//        		getChildAt(i).setAlpha(0.2F);
+//        		Log.d("ssss", "i------>" + i);
+//        	}
+//        }
+//    }
+     
+    public void showPre(){
+    	if(mCurScreen>0){
+    		snapToScreen(mCurScreen-1);
+    	}
+    }
+    
+    public void showNext(){
+    	if(mCurScreen<getChildCount()-1){
+    		snapToScreen(mCurScreen+1);
+    	}
+    }
+     
+    @Override  
+    public void computeScroll() {  
+        // TODO Auto-generated method stub  
+        if (mScroller.computeScrollOffset()) {      
+            scrollTo(mScroller.getCurrX(), mScroller.getCurrY());    
+            postInvalidate();      
+        }     
+    }  
+  
+//    @Override  
+//    public boolean onTouchEvent(MotionEvent event) {  
+//        // TODO Auto-generated method stub                            
+//            final int action = event.getAction();      
+//            final float x = event.getX();      
+//            final float y = event.getY();                     
+//            switch (action) {      
+//            case MotionEvent.ACTION_DOWN:                 
+//                  Log.i("", "onTouchEvent  ACTION_DOWN");                   
+//                if (mVelocityTracker == null) {      
+//                        mVelocityTracker = VelocityTracker.obtain();      
+//                        mVelocityTracker.addMovement(event);   
+//                }              
+//                if (!mScroller.isFinished()){      
+//                    mScroller.abortAnimation();      
+//                }                  
+//                mLastMotionX = x;                
+//                break;                        
+//            case MotionEvent.ACTION_MOVE:    
+//               int deltaX = (int)(mLastMotionX - x);                 
+//               if (IsCanMove(deltaX)){  
+//                 if (mVelocityTracker != null){  
+//                        mVelocityTracker.addMovement(event);   
+//                 }     
+//                mLastMotionX = x;       
+//                scrollBy(deltaX, 0);      
+//               }         
+//               break;                         
+//            case MotionEvent.ACTION_UP:                       
+//                int velocityX = 0;  
+//                if (mVelocityTracker != null){  
+//                    mVelocityTracker.addMovement(event);   
+//                    mVelocityTracker.computeCurrentVelocity(1000);    
+//                    velocityX = (int) mVelocityTracker.getXVelocity();  
+//                }                                     
+//                if (velocityX > SNAP_VELOCITY && mCurScreen > 0) {               
+//                    Log.e(TAG, "snap left");      
+//                    snapToScreen(mCurScreen - 1);         
+//                } else if (velocityX < -SNAP_VELOCITY         
+//                        && mCurScreen < getChildCount() - 1) {             
+//                    Log.e(TAG, "snap right");      
+//                    snapToScreen(mCurScreen + 1);         
+//                } else {         
+//                    snapToDestination();         
+//                }                                     
+//                if (mVelocityTracker != null) {         
+//                    mVelocityTracker.recycle();         
+//                    mVelocityTracker = null;         
+//                }         
+//                break;        
+//            }                     
+//            return true;      
+//    }  
+  
+    private boolean IsCanMove(int deltaX)  
+    {  
+        if (getScrollX() <= 0 && deltaX < 0 ){  
+            return false;  
+        }     
+        
+        if  (getScrollX() >=  getChildLeft(getChildCount()-1) && deltaX > 0){  
+            return false;  
+        }         
+        return true;  
+    }  
+      
+    public void SetOnViewChangeListener(OnViewChangeListener listener)  
+    {  
+        mOnViewChangeListener = listener;  
+    }  
+    
+    private int getChildLeft(int index){
+    	int x = 0;
+    	for(int i=0; i<index; i++){
+    		x += getChildAt(i).getMeasuredWidth();
+    	}
+    	
+    	if(index>0){
+    		if(index==getChildCount()-1){
+    			return x-(getWidth()-getChildAt(index).getMeasuredWidth());
+    		}else{
+    			return x-(getWidth()-getChildAt(index).getMeasuredWidth())/2;
+    		}
+    	}else{
+    		return x;
+    	}
+    }
+    
+    public interface OnViewChangeListener {  
+        public void OnViewChange(int view);  
+    } 
+}  
\ No newline at end of file
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ui/MyScrollLayout.java b/showkeyHelper/src/com/joyplus/tvhelper/ui/MyScrollLayout.java
index aa97e6f..78969c2 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/ui/MyScrollLayout.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ui/MyScrollLayout.java
@@ -1,5 +1,6 @@
 package com.joyplus.tvhelper.ui;
 
+import com.joyplus.tvhelper.utils.Constant;
 import com.joyplus.tvhelper.utils.Log;
 
 import android.content.Context;
@@ -125,7 +126,11 @@ public void snapToDestination() {
       
      public void snapToScreen(int whichScreen) {          
             // get the valid layout page      
-            whichScreen = Math.max(0, Math.min(whichScreen, getChildCount()-1));      
+    	 	if(Constant.isSimple){
+    	 		whichScreen = 0;
+    	 	}else{
+    	 		whichScreen = Math.max(0, Math.min(whichScreen, getChildCount()-1));      
+    	 	}
             if (getScrollX() != (getChildLeft(whichScreen))) {      
                 final int delta = getChildLeft(whichScreen)-getScrollX();      
 //                        mScroller.startScroll(getScrollX(), 0,       
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ui/PlayerMenuDialog.java b/showkeyHelper/src/com/joyplus/tvhelper/ui/PlayerMenuDialog.java
new file mode 100644
index 0000000..933fb88
--- /dev/null
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ui/PlayerMenuDialog.java
@@ -0,0 +1,508 @@
+package com.joyplus.tvhelper.ui;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.AlertDialog;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils.TruncateAt;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.MarginLayoutParams;
+import android.widget.AbsListView.LayoutParams;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerScreenManager;
+import com.joyplus.sub_old_1.JoyplusSubManager;
+import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.VideoPlayerJPActivity;
+import com.joyplus.tvhelper.entity.URLS_INDEX;
+import com.joyplus.tvhelper.utils.Constant;
+import com.joyplus.tvhelper.utils.Log;
+import com.joyplus.tvhelper.utils.Utils;
+
+public class PlayerMenuDialog extends AlertDialog implements OnItemClickListener {
+
+	private static final String TAG = "JoyplusMediaPlayerMenuDialog";
+	private VideoPlayerJPActivity mContext;
+	private static final int MAX = 2;
+	private int MIN = 0;
+	
+//	private String[] list1 = {"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111","222222222222222","33333333333333333","44444444444444","555555555555555555555555555555555555","222222222222222","33333333333333333","44444444444444","555555555555555555555555555555555555"};
+//	private String[] list3 = {"超清","高清","标清","普清"};
+//	private String[] list2 = {"字幕关","字幕1","字幕2","字幕3"};
+//	private String[] list4 = {"全屏","4:3","自适应"};
+	
+	private List<String> list_juji;
+	private List<String> list_zimu;
+	private List<Integer> list_definition;
+	private List<Integer> list_size;
+	private Map<Integer, Integer> selectionPosions = new HashMap<Integer, Integer>();
+	
+	private ListView list;
+	private MyAdapter adapter;
+	private ImageView bg_image;
+	private ImageView bg_title_selceted;
+	private TextView title_xuanji;
+	private TextView title_zimu;
+	private TextView title_definition;
+	private TextView title_size;
+	private TextView selectedTitle;
+	
+	private int title_selecet_index = 0;
+	
+	private Handler mHandler = new Handler();
+	
+	public PlayerMenuDialog(VideoPlayerJPActivity context) {
+		super(context,R.style.Transparent);
+		// TODO Auto-generated constructor stub
+		mContext = context;		
+	}	
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		// TODO Auto-generated method stub
+		super.onCreate(savedInstanceState);
+		getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+		this.setContentView(R.layout.player_menu_dialog);
+		findViews();
+		title_size.setVisibility(View.GONE);
+//		initView();
+	}
+	
+	private void findViews(){
+		list = (ListView) findViewById(R.id.list_choice);
+		bg_image = (ImageView) findViewById(R.id.highlight_bg);
+		bg_image.setVisibility(View.INVISIBLE);
+		bg_title_selceted = (ImageView) findViewById(R.id.title_selected_background);
+		title_xuanji = (TextView) findViewById(R.id.title_xuanji);
+		title_zimu = (TextView) findViewById(R.id.title_zimu);
+		title_definition = (TextView) findViewById(R.id.title_definition);
+		title_size = (TextView) findViewById(R.id.title_size);
+		list.setOnItemClickListener(this);
+	}
+	
+	private void initView(){
+		Log.d(TAG, "initView called------------------>");
+		if(selectedTitle!=null){
+			selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+			selectedTitle.setTextSize(25);
+		}
+		MIN = list_juji!=null?0:1;
+		title_selecet_index = MIN;
+		updateTitleSelceted();
+		if(MIN == 0){
+			title_xuanji.setTextSize(35);
+			title_xuanji.setPadding(0, 0, 0, 0);
+			selectedTitle = title_xuanji;
+		}else{
+			title_zimu.setTextSize(35);
+			title_zimu.setPadding(0, 0, 0, 0);
+			selectedTitle = title_zimu;
+			title_xuanji.setVisibility(View.GONE);
+		}
+		adapter = new MyAdapter();
+		list.setAdapter(adapter);
+		list.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view,
+					int position, long id) {
+				// TODO Auto-generated method stub
+				Log.d(TAG, "top--------->" + (view.getTop()-Utils.getStandardValue(mContext, 10)));
+				Log.d(TAG, "bottom----------------->"+(view.getBottom()+Utils.getStandardValue(mContext, 45)));
+				if(position>=0){
+					bg_image.setVisibility(View.VISIBLE);
+					bg_image.layout(bg_image.getLeft(), view.getTop()-Utils.getStandardValue(mContext, 10), 
+							bg_image.getRight(), view.getBottom()+Utils.getStandardValue(mContext, 45));
+				}else{
+					bg_image.setVisibility(View.INVISIBLE);
+				}
+//				if(title_selecet_index == 3){
+//					if(list_size.get(position)!=mContext.getVideoSizeType()){
+//						mContext.changeVideoSize(list_size.get(position));
+//					}
+//				}
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+				// TODO Auto-generated method stub
+			}
+		});
+		list.setOnKeyListener(new View.OnKeyListener() {
+			
+			@Override
+			public boolean onKey(View v, int keyCode, KeyEvent event) {
+				// TODO Auto-generated method stub
+				if(keyCode == KeyEvent.KEYCODE_DPAD_LEFT&& event.getAction() == KeyEvent.ACTION_UP){
+					title_selecet_index -= 1;
+					if(title_selecet_index<MIN){
+						title_selecet_index = MIN;
+					}else{
+						updateTitleSelceted();
+						adapter = new MyAdapter();
+						list.setAdapter(adapter);
+						list.setSelection(selectionPosions.get(title_selecet_index));
+					}
+					return true;
+				}else if(keyCode == KeyEvent.KEYCODE_DPAD_RIGHT&&event.getAction() == KeyEvent.ACTION_UP){
+					title_selecet_index += 1;
+					if(title_selecet_index>MAX){
+						title_selecet_index = MAX;
+					}else{
+						updateTitleSelceted();
+						adapter = new MyAdapter();
+						list.setAdapter(adapter);
+						list.setSelection(selectionPosions.get(title_selecet_index));
+					}
+					return true;
+				}else if(keyCode == KeyEvent.KEYCODE_MENU&&event.getAction() == KeyEvent.ACTION_UP){
+					dismiss();
+					return true;
+				}
+				return false;
+			}
+		});
+		
+		mHandler.postDelayed(new Runnable() {
+			
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+				Log.d(TAG, "postDelayed --->" +selectionPosions.get(title_selecet_index));
+				list.setSelection(selectionPosions.get(title_selecet_index));
+			}
+		}, 150);
+//		list.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+//			
+//			@Override
+//			public void onFocusChange(View v, boolean hasFocus) {
+//				// TODO Auto-generated method stub
+//				if(hasFocus){
+//					list.setSelection(selectionPosions.get(title_selecet_index));
+//					Log.d(TAG, "requst  hasFocus ------------->");
+//				}
+//			}
+//		});
+	}
+	
+	class MyAdapter extends BaseAdapter{
+
+		@Override
+		public int getCount() {
+			// TODO Auto-generated method stub
+			int count = 0;
+			switch (title_selecet_index) {
+			case 0:
+				count = list_juji.size();
+				break;
+			case 1:
+				count = list_zimu.size();
+				break;
+			case 2:
+				count = list_definition.size();
+				break;
+			case 3:
+				count = list_size.size();
+				break;
+			}
+			return count;
+		}
+
+		@Override
+		public Object getItem(int position) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public long getItemId(int position) {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+			// TODO Auto-generated method stub
+			TextView view;
+			if(convertView == null){
+				view = new TextView(mContext);
+				LayoutParams layoutParams = new LayoutParams(parent.getWidth(), Utils.getStandardValue(mContext, 70));
+				view.setLayoutParams(layoutParams);
+				view.setGravity(Gravity.CENTER);
+				view.setTextColor(Color.WHITE);
+				view.setTextSize(25);
+				view.setSingleLine(true);
+				view.setEllipsize(TruncateAt.MARQUEE);
+			}else{
+				view = (TextView) convertView;
+			}
+			if(title_selecet_index == 0){
+				view.setGravity(Gravity.LEFT|Gravity.CENTER_VERTICAL);
+				view.setPadding(Utils.getStandardValue(mContext, 35), 0, Utils.getStandardValue(mContext, 35), 0);
+			}else{
+				view.setGravity(Gravity.CENTER);
+				view.setPadding(0, 0, 0, 0);
+			}
+			switch (title_selecet_index) {
+			case 0:
+				view.setText(list_juji.get(position));
+				break;
+			case 1:
+				view.setText(list_zimu.get(position));
+				break;
+			case 2:
+				switch (list_definition.get(position)) {
+				case Constant.DEFINATION_HD2:
+					view.setText("超    清");
+					break;
+				case Constant.DEFINATION_HD:
+					view.setText("高    清");
+					break;
+				case Constant.DEFINATION_MP4:
+					view.setText("标    清");
+					break;
+				case Constant.DEFINATION_FLV:
+					view.setText("流    畅");
+					break;
+				}
+				break;
+			case 3:
+				switch (list_size.get(position)) {
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL:
+					view.setText("全    屏");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9:
+					view.setText("16 : 9");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3:
+					view.setText("4 : 3");
+					break;
+				case JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL:
+					view.setText("自 适 应");
+					break;
+				}
+				break;
+			}
+			return view;
+		}
+	}
+	
+	private void updateTitleSelceted(){
+		MarginLayoutParams p = (MarginLayoutParams) bg_title_selceted.getLayoutParams();
+		p.setMargins(Utils.getStandardValue(mContext, 15)+(title_selecet_index-MIN)*title_zimu.getWidth(), p.topMargin, 
+				p.rightMargin, p.bottomMargin);
+		bg_title_selceted.setLayoutParams(p);
+//		bg_title_selceted.layout(15+(title_selecet_index-MIN)*title_xuanji.getWidth(), 
+//				bg_title_selceted.getTop(), 
+//				15+(title_selecet_index-MIN)*title_xuanji.getWidth()+bg_title_selceted.getWidth(),
+//				bg_title_selceted.getBottom());
+		switch (title_selecet_index) {
+		case 0:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_xuanji.setPadding(0, 0, 0, 0);
+			title_xuanji.setTextSize(35);
+			selectedTitle = title_xuanji;
+			break;
+		case 1:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_zimu.setPadding(0, 0, 0, 0);
+			title_zimu.setTextSize(35);
+			selectedTitle = title_zimu;
+			break;
+		case 2:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			
+			title_definition.setPadding(0, 0, 0, 0);
+			title_definition.setTextSize(35);
+			selectedTitle = title_definition;
+			break;
+		case 3:
+			if(selectedTitle!=null){
+				selectedTitle.setPadding(0, Utils.getStandardValue(mContext, 10), 0, Utils.getStandardValue(mContext, 10));
+				selectedTitle.setTextSize(25);
+			}
+			title_size.setPadding(0, 0, 0, 0);
+			title_size.setTextSize(35);
+			selectedTitle = title_size;
+			break;
+		}
+	}
+
+	public void init() {
+		// TODO Auto-generated method stub
+		initLists();
+//		if(findViewById(R.id.title_definition)!=null){
+//			initView();
+//		}
+	}
+	
+	@Override
+	public void onAttachedToWindow() {
+		// TODO Auto-generated method stub
+		super.onAttachedToWindow();
+		initView();
+	}
+	
+	private void initLists(){
+		
+		selectionPosions.clear();
+		
+		list_juji = mContext.getEpisode();
+		if(list_juji!=null){
+			int prod_Sub_index = list_juji.indexOf(mContext.getCurrentProdSubName());
+			if(prod_Sub_index<0){
+				selectionPosions.put(0, 0);
+			}else{
+				selectionPosions.put(0, prod_Sub_index);
+			}
+		}else{
+			selectionPosions.put(0, 0);
+		}
+		
+		list_definition = new ArrayList<Integer>();
+		list_zimu = new ArrayList<String>();
+		//清晰度
+		List<URLS_INDEX> playUrls = mContext.getPlayUrls();
+		JoyplusSubManager subManager = (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
+		if(playUrls!=null){
+			for(URLS_INDEX url_index_info:playUrls){
+				if("hd2".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_HD2)){
+					list_definition.add(Constant.DEFINATION_HD2);
+				}else if("hd".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_HD)){
+					list_definition.add(Constant.DEFINATION_HD);
+				}else if("mp4".equalsIgnoreCase(url_index_info.defination_from_server)&&!list_definition.contains(Constant.DEFINATION_MP4)){
+					list_definition.add(Constant.DEFINATION_MP4);
+				}else if(!list_definition.contains(Constant.DEFINATION_FLV)){
+					list_definition.add(Constant.DEFINATION_FLV);
+				}
+			}
+		}
+		if(list_definition.size()>1){
+			Collections.sort(list_definition, new Comparator<Integer>(){
+
+				@Override
+				public int compare(Integer l, Integer r) {
+					// TODO Auto-generated method stub.
+					if(l>r){
+						return -1;
+					}else if(r<l){
+						return 1;
+					}else{ 
+						return 0;
+					}
+				}
+			});
+		}
+		int defanition_index = list_definition.indexOf(mContext.getCurrentDefination());
+		if(defanition_index<0){
+			defanition_index = 0;
+		}
+		selectionPosions.put(2 , defanition_index);
+		//字幕
+		if(subManager!=null){
+			if(subManager.CheckSubAviable()){
+				list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_closesub));
+            	for(int i = 0;i<subManager.getSubList().size();i++){
+            		list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_sub,(i+1)));
+            	}
+            	Log.i(TAG, "subManager.getCurrentSubIndex()+1--->" + (subManager.getCurrentSubIndex()+1));
+            	if(subManager.IsSubEnable()){
+            		selectionPosions.put(1, subManager.getCurrentSubIndex()+1);
+            	}else {
+            		selectionPosions.put(1, 0);
+            	}
+            }else{
+            	list_zimu.add(mContext.getResources().getString(R.string.meidaplayer_sub_string_nosub));
+            	selectionPosions.put(1, 0);
+            }
+		}
+		list_size = new ArrayList<Integer>();
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3);
+		list_size.add(JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL);
+//		Log.d(TAG, "size type -- >" + mContext.getVideoSizeType());
+//		int index_size = list_size.indexOf(mContext.getVideoSizeType());
+//		if(index_size<0){
+//			index_size = 0;
+//		}
+		selectionPosions.put(3 , 0);
+		Log.d(TAG, "0----->"+selectionPosions.get(0));
+		Log.d(TAG, "1----->"+selectionPosions.get(1));
+		Log.d(TAG, "2----->"+selectionPosions.get(2));
+		Log.d(TAG, "3----->"+selectionPosions.get(3));
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position,
+			long id) {
+		// TODO Auto-generated method stub
+		switch (title_selecet_index) {
+		case 0://切换剧集
+			String newPord_sub_name = list_juji.get(position);
+			if(!newPord_sub_name.equals(mContext.getCurrentProdSubName())){
+				//通知改变剧集
+				mContext.changeEpisode(position);
+			}
+			break;
+		case 1://切换字幕
+			JoyplusSubManager subManager = (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
+			if(subManager!=null&&subManager.CheckSubAviable()){
+				if(position==0){
+					if(subManager.IsSubEnable()){
+						subManager.setSubEnable(false);
+						mContext.changeSubViewVisible(false);
+					}
+				}else{
+					if(subManager.getCurrentSubIndex()!=(position-1)){
+						subManager.setSubEnable(true);
+						mContext.changeSubViewVisible(true);
+						final int zimu_index = position-1;
+						new Thread(new Runnable() {
+							@Override
+							public void run() {
+								// TODO Auto-generated method stub
+								((JoyplusSubManager)JoyplusMediaPlayerManager.getInstance().getSubManager()).SwitchSub(zimu_index);
+							}
+						}).start();
+					}
+				}
+			}
+			break;
+		case 2://切换清晰度
+			mContext.changeDefination(list_definition.get(position));
+			break;
+		case 3://切换画面比例
+			break;
+		default:
+			break;
+		}
+		dismiss();
+	}
+}
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/ui/SubTitleView.java b/showkeyHelper/src/com/joyplus/tvhelper/ui/SubTitleView.java
index b79cc1d..6173397 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/ui/SubTitleView.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/ui/SubTitleView.java
@@ -7,12 +7,12 @@
 import android.util.Log;
 import android.widget.TextView;
 
-import com.joyplus.Sub.Element;
-import com.joyplus.Sub.JoyplusSubManager;
-import com.joyplus.manager.JoyplusMediaPlayerManager;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
+import com.joyplus.sub_old_1.Element;
+import com.joyplus.sub_old_1.JoyplusSubManager;
 import com.joyplus.tvhelper.VideoPlayerJPActivity;
 
-public class SubTitleView extends TextView {
+public class SubTitleView extends TextView{
 	private static final String TAG = "SubTitleView";
 	
 	private static final int SUBTITLE_DELAY_TIME_MAX = 500;
@@ -146,13 +146,16 @@ private void startSubtitle(){
 			}else {
 				mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_BEGAIN_SHOW, startTime - currentPosition);
 			}
+		}else{
+			mHandler.sendEmptyMessageDelayed(MESSAGE_SUBTITLE_START, SUBTITLE_DELAY_TIME_MAX);
 		}
 		lastTime = currentPosition;
 	}
 	
 	private void messageDisplay(){
 		Log.i(TAG, "messageDisplay-->");
-		if(getSubManager().CheckSubAviable()){
+		setText("");
+		if(getSubManager() != null && getSubManager().CheckSubAviable()){
 			setVisibility(VISIBLE);
 			mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_START);
 		}
@@ -169,10 +172,13 @@ private long getCurrentTime(){
 		return mActivity.getPlayerCurrentPosition();
 	}
 	private JoyplusSubManager getSubManager(){
-		return JoyplusMediaPlayerManager.getInstance().getSubManager();
+		return (JoyplusSubManager) JoyplusMediaPlayerManager.getInstance().getSubManager();
 	}
+	
 	private Element getElement(long time){
-		return getSubManager().getElement(time);
+		if(getSubManager() == null) return null;
+		Element element= getSubManager().getElement(time);
+		return element;
 	}
 	
 	public SubTitleView(Context context) {
@@ -200,7 +206,7 @@ private void initView(){
 	
 	public void displaySubtitle(){
 		mHandler.removeCallbacksAndMessages(null);
-		Log.i(TAG, "displaySubtitle--->" + getSubManager().CheckSubAviable());
+		Log.i(TAG, "displaySubtitle--->");
 		mHandler.sendEmptyMessage(MESSAGE_SUBTITLE_DISPLAY);
 	}
 	
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/Constant.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/Constant.java
index abf60ed..4cdbc0b 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/Constant.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/Constant.java
@@ -6,16 +6,21 @@ public class Constant {
 	
 	public static boolean isJoyPlus = true;//是否是JoyPlus本身应用，还是其他应用
 	
+	public static boolean isSimple = false;
+	public static boolean isNeedGuid = true;
 	 //正式环境
-//	 public static final boolean TestEnv = false;
-//	 public static String APPKEY = "ijoyplus_android_0001bj";
-//	 public static String BASE_URL = "http://tt.showkey.tv";//视频直播源
-//	 public static final String URL_FAQ = "http://tt.showkey.tv/helptv.html";//视频直播源
-	//测试环境控制
-	public static final boolean TestEnv = true;
+	 public static final boolean TestEnv = false;
 	 public static String APPKEY = "ijoyplus_android_0001bj";
-	 public static final String BASE_URL = "http://tt.yue001.com:8080";//视频直播源
-	 public static final String URL_FAQ = "http://tt.yue001.com:8080/helptv.html";//视频直播源
+	 public static String BASE_URL = "http://tt.showkey.tv";//视频直播源
+	public static final String URL_FAQ = "http://tt.showkey.tv/helptv.html";//视频直播源
+	 
+//	 public static String BASE_URL = "http://comet.showkey.tv/uploadApk";//视频直播源
+	 
+	//测试环境控制
+//	public static final boolean TestEnv = true;
+//	 public static String APPKEY = "ijoyplus_android_0001bj";
+//	 public static final String BASE_URL = "http://tt.yue001.com:8080";//视频直播源
+//	 public static final String URL_FAQ = "http://tt.yue001.com:8080/helptv.html";//视频直播源
 	 
 	//刘洋环境
 //	 public static String APPKEY = "ijoyplus_android_0001bj";
@@ -28,6 +33,7 @@ public class Constant {
 	 
 	public static final String VIDEOPLAYERCMD = "com.joyplus.tv.videoservicecommand";
 
+	public static String PLAYERPACH_ADV_PUBLISHERID = "4083958c3dc3360dafe7287ae997070c";
 	
 	
 	public static final String[] video_dont_support_extensions = { ".m3u",".m3u8"};//不支持的格式
@@ -65,4 +71,6 @@ public class Constant {
 	public static final int DEFINATION_HD = 7; 
 	public static final int DEFINATION_MP4 = 6; 
 	public static final int DEFINATION_FLV = 5; 
+	
+	public static final int END_TIME = 30;
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/Global.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/Global.java
index 1559813..4d26cdd 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/Global.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/Global.java
@@ -98,5 +98,9 @@ public class Global {
 	 * 断开
 	 */
 	public static final String ACTION_DISCONNECT_SERVER_MAIN= "action_disconnect_server_main";
+	/**
+	 * 收到新的推送
+	 */
+	public static final String ACTION_RECIVE_NEW_PUSH_MOVIE = "action_recive_new_push_movie";
 	
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/Log.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/Log.java
index 919649f..2cae66b 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/Log.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/Log.java
@@ -4,8 +4,8 @@
 
 public final class Log {
 	
-	private static boolean mbLoggable = true;; 
-//	private static boolean mbLoggable = false;
+//	private static boolean mbLoggable = true;
+	private static boolean mbLoggable = false;
 	
 	public static void setLoggable(boolean bLoggable)
 	{
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/PreferencesUtils.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/PreferencesUtils.java
index 14abfb1..0af6e56 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/PreferencesUtils.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/PreferencesUtils.java
@@ -15,6 +15,7 @@ public class PreferencesUtils {
 	private static final String PINCODE_MD5 = "md5_code";
 	private static final String MAC_ADDR = "mac_addr";
 	private static final String DISPLAYURL = "web_url";
+	private static final String LASTVERSION = "last_version";
 	
 	public static void changeAcceptedStatue(Context c ,boolean isAccepted){
 		SharedPreferences s = c.getSharedPreferences(JOYPLUS, 0);
@@ -108,4 +109,16 @@ public static String getPincodeMd5(Context c){
 		SharedPreferences s = c.getSharedPreferences(JOYPLUS, 0);
 		return s.getString(PINCODE_MD5, null);
 	}
+	
+	public static int getGuidLastVersion(Context c){
+		SharedPreferences s = c.getSharedPreferences(JOYPLUS, 0);
+		return s.getInt(LASTVERSION, -1);
+	}
+	
+	public static void setGuidLastVersion(Context c, int version){
+		SharedPreferences s = c.getSharedPreferences(JOYPLUS, 0);
+		Editor editor = s.edit();
+		editor.putInt(LASTVERSION, version);
+		editor.commit();
+	}
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/Utils.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/Utils.java
index ec986f5..b7c3f00 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/Utils.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/Utils.java
@@ -37,6 +37,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.http.AndroidHttpClient;
@@ -46,7 +48,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.joyplus.JoyplusMediaPlayerActivity;
+import com.joyplus.mediaplayer.JoyplusMediaPlayerManager;
 import com.joyplus.tvhelper.R;
+import com.joyplus.tvhelper.VideoPlayerJPActivity;
 import com.joyplus.tvhelper.entity.URLS_INDEX;
 
 public class Utils {
@@ -608,36 +613,6 @@ public static boolean isUTF_8(byte[] file){
         return false;
     }
     
-    public static String getCharset(byte[] subTitle,int length){
-    	
-    	if(subTitle != null){
-    		
-    		if(subTitle.length < length){
-    			
-    			length = subTitle.length;
-    		}
-    		
-    		ByteArrayInputStream in = new ByteArrayInputStream(subTitle);
-    		
-    		CodepageDetectorProxy detector = CodepageDetectorProxy.getInstance();
-//    		detector.add(new ParsingDetector(false));
-    		detector.add(JChardetFacade.getInstance());
-    		try {
-    			Charset charset = detector.detectCodepage(in, length);
-    			
-    			return charset!= null ? charset.name() : "";
-    		} catch (IllegalArgumentException e) {
-    			// TODO Auto-generated catch block
-    			e.printStackTrace();
-    		} catch (IOException e) {
-    			// TODO Auto-generated catch block
-    			e.printStackTrace();
-    		}
-    	}
-		
-		return "";
-    }
-    
     public static String getBaiduName(String url){
     	String[] str = url.split("\\|");
 		String name = null;
@@ -650,5 +625,26 @@ public static String getBaiduName(String url){
 	public static int getStandardValue(Context context,int value){
 		float standardDp = context.getResources().getDimension(R.dimen.standard_1_dp);
 		return standardDp == 0 ? value:(int)(value * standardDp);
+	}
+	
+	public static Intent getIntent(Context context){
+		if(JoyplusMediaPlayerManager.SubanagerUseNEW){
+			return new Intent(context,JoyplusMediaPlayerActivity.class);
+		}else{
+			return new Intent(context,VideoPlayerJPActivity.class);
+		}
+		
+	}
+	
+	public static int getVersionCode(Context context)//获取版本号(内部识别号)
+	{
+		try {
+			PackageInfo pi=context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			return pi.versionCode;
+		} catch (NameNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return 0;
+		}
 	}
 }
diff --git a/showkeyHelper/src/com/joyplus/tvhelper/utils/XunLeiLiXianUtil.java b/showkeyHelper/src/com/joyplus/tvhelper/utils/XunLeiLiXianUtil.java
index 6953e85..dd9ed8e 100644
--- a/showkeyHelper/src/com/joyplus/tvhelper/utils/XunLeiLiXianUtil.java
+++ b/showkeyHelper/src/com/joyplus/tvhelper/utils/XunLeiLiXianUtil.java
@@ -22,8 +22,8 @@
 import android.text.TextUtils;
 import android.webkit.URLUtil;
 
-import com.joyplus.Sub.SUBTYPE;
-import com.joyplus.Sub.SubURI;
+import com.joyplus.sub.SUBTYPE;
+import com.joyplus.sub.SubURI;
 import com.joyplus.tvhelper.entity.SharpnessEnum;
 import com.joyplus.tvhelper.entity.VideoPlayUrl;
 import com.joyplus.tvhelper.entity.XLLXFileInfo;
@@ -286,26 +286,28 @@ public static ArrayList<XLLXFileInfo> getVideoList(Context context,
 					XLLXFileInfo xllxFileInfo = new XLLXFileInfo();
 					JSONObject jsonObject = historyPlayListJsonObject
 							.getJSONObject(j);
-					xllxFileInfo.file_name = jsonObject.getString("file_name");
-					xllxFileInfo.src_url = jsonObject.getString("src_url");
-					xllxFileInfo.createTime = jsonObject
-							.getString("createtime");
-					xllxFileInfo.duration = jsonObject.getString("duration");
-					xllxFileInfo.filesize = jsonObject.getString("file_size");
-					xllxFileInfo.userid = jsonObject.getString("userid");
-					xllxFileInfo.gcid = jsonObject.getString("gcid");
+					if(jsonObject.has("file_name"))
+						xllxFileInfo.file_name = jsonObject.getString("file_name");
+					if(jsonObject.has("src_url"))
+						xllxFileInfo.src_url = jsonObject.getString("src_url");
+					if(jsonObject.has("createtime"))
+						xllxFileInfo.createTime = jsonObject.getString("createtime");
+					if(jsonObject.has("duration"))
+						xllxFileInfo.duration = jsonObject.getString("duration");
+					if(jsonObject.has("file_size"))
+						xllxFileInfo.filesize = jsonObject.getString("file_size");
+					if(jsonObject.has("userid"))
+						xllxFileInfo.userid = jsonObject.getString("userid");
+					if(jsonObject.has("gcid"))
+						xllxFileInfo.gcid = jsonObject.getString("gcid");
 					xllxFileInfo.recordeNum = record_num;
-
 					if (xllxFileInfo.src_url.contains("bt://")) {
-
 						xllxFileInfo.isDir = true;
 					}
-
 					list.add(xllxFileInfo);
 				}
 			}
 		} catch (Exception localException) {
-
 			localException.printStackTrace();
 		}
 		return list;
@@ -612,7 +614,7 @@ public static List<SubURI> getSubtitle4Push(String url,String appkey){
 						
 					}
 				}
-			} catch (JSONException e) {
+			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
diff --git a/showkeyHelper/src/io/vov/vitamio/BuildConfig.java b/showkeyHelper/src/io/vov/vitamio/BuildConfig.java
new file mode 100644
index 0000000..a8ec60a
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/BuildConfig.java
@@ -0,0 +1,5 @@
+package io.vov.vitamio;
+
+public class BuildConfig {
+       public static final boolean DEBUG = true;
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/EGL.java b/showkeyHelper/src/io/vov/vitamio/EGL.java
new file mode 100644
index 0000000..8ebd481
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/EGL.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGL11;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+import javax.microedition.khronos.opengles.GL;
+import android.util.Log;
+import android.view.SurfaceHolder;
+
+
+/**
+ * DON'T MODIFY THIS FILE IF YOU'RE NOT FAMILIAR WITH EGL, IT'S USED BY NATIVE CODE!!!
+ */
+public class EGL {
+  private EGL10 mEgl;
+  private EGLDisplay mEglDisplay;
+  private EGLSurface mEglSurface;
+  private EGLConfig mEglConfig;
+  private EGLContext mEglContext;
+  private EGLConfigChooser mEGLConfigChooser;
+  private EGLContextFactory mEGLContextFactory;
+  private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory;
+
+  public EGL() {
+    mEGLConfigChooser = new SimpleEGLConfigChooser();
+    mEGLContextFactory = new EGLContextFactory();
+    mEGLWindowSurfaceFactory = new EGLWindowSurfaceFactory();
+  }
+
+  public boolean initialize(SurfaceHolder holder) {
+    start();
+    return createSurface(holder) != null;
+  }
+
+  public void release() {
+    destroySurface();
+    finish();
+  }
+
+  public void start() {
+    mEgl = (EGL10) EGLContext.getEGL();
+    mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+
+    if (mEglDisplay == EGL10.EGL_NO_DISPLAY) {
+      throw new RuntimeException("eglGetDisplay failed");
+    }
+
+    int[] version = new int[2];
+    if (!mEgl.eglInitialize(mEglDisplay, version)) {
+      throw new RuntimeException("eglInitialize failed");
+    }
+    mEglConfig = mEGLConfigChooser.chooseConfig(mEgl, mEglDisplay);
+
+    mEglContext = mEGLContextFactory.createContext(mEgl, mEglDisplay, mEglConfig);
+    if (mEglContext == null || mEglContext == EGL10.EGL_NO_CONTEXT) {
+      mEglContext = null;
+      throwEglException("createContext");
+    }
+
+    mEglSurface = null;
+  }
+
+  public GL createSurface(SurfaceHolder holder) {
+    if (mEgl == null)
+      throw new RuntimeException("egl not initialized");
+    if (mEglDisplay == null)
+      throw new RuntimeException("eglDisplay not initialized");
+    if (mEglConfig == null)
+      throw new RuntimeException("mEglConfig not initialized");
+
+    if (mEglSurface != null && mEglSurface != EGL10.EGL_NO_SURFACE) {
+      mEgl.eglMakeCurrent(mEglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+      mEGLWindowSurfaceFactory.destroySurface(mEgl, mEglDisplay, mEglSurface);
+    }
+
+    mEglSurface = mEGLWindowSurfaceFactory.createWindowSurface(mEgl, mEglDisplay, mEglConfig, holder);
+
+    if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
+      int error = mEgl.eglGetError();
+      if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
+        Log.e("EglHelper", "createWindowSurface returned EGL_BAD_NATIVE_WINDOW.");
+        return null;
+      }
+      throwEglException("createWindowSurface", error);
+    }
+
+    if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+      throwEglException("eglMakeCurrent");
+    }
+
+    GL gl = mEglContext.getGL();
+
+    return gl;
+  }
+
+  public boolean swap() {
+    if (!mEgl.eglSwapBuffers(mEglDisplay, mEglSurface)) {
+      int error = mEgl.eglGetError();
+      switch (error) {
+        case EGL11.EGL_CONTEXT_LOST:
+          return false;
+        case EGL10.EGL_BAD_NATIVE_WINDOW:
+          Log.e("EglHelper", "eglSwapBuffers returned EGL_BAD_NATIVE_WINDOW. tid=" + Thread.currentThread().getId());
+          break;
+        case EGL10.EGL_BAD_SURFACE:
+          Log.e("EglHelper", "eglSwapBuffers returned EGL_BAD_SURFACE. tid=" + Thread.currentThread().getId());
+          return false;
+        default:
+          throwEglException("eglSwapBuffers", error);
+      }
+    }
+    return true;
+  }
+
+  public void destroySurface() {
+    if (mEglSurface != null && mEglSurface != EGL10.EGL_NO_SURFACE) {
+      mEgl.eglMakeCurrent(mEglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+      mEGLWindowSurfaceFactory.destroySurface(mEgl, mEglDisplay, mEglSurface);
+      mEglSurface = null;
+    }
+  }
+
+  public void finish() {
+    if (mEglContext != null) {
+      mEGLContextFactory.destroyContext(mEgl, mEglDisplay, mEglContext);
+      mEglContext = null;
+    }
+    if (mEglDisplay != null) {
+      mEgl.eglTerminate(mEglDisplay);
+      mEglDisplay = null;
+    }
+  }
+
+  private void throwEglException(String function) {
+    throwEglException(function, mEgl.eglGetError());
+  }
+
+  private void throwEglException(String function, int error) {
+    String message = String.format("%s failed: %x", function, error);
+    Log.e("EglHelper", "throwEglException tid=" + Thread.currentThread().getId() + " " + message);
+    throw new RuntimeException(message);
+  }
+
+  private static class EGLWindowSurfaceFactory {
+
+    public EGLSurface createWindowSurface(EGL10 egl, EGLDisplay display, EGLConfig config, Object nativeWindow) {
+      return egl.eglCreateWindowSurface(display, config, nativeWindow, null);
+    }
+
+    public void destroySurface(EGL10 egl, EGLDisplay display, EGLSurface surface) {
+      egl.eglDestroySurface(display, surface);
+    }
+  }
+
+  private class EGLContextFactory {
+    private int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+
+    public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig config) {
+      int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE};
+
+      return egl.eglCreateContext(display, config, EGL10.EGL_NO_CONTEXT, attrib_list);
+    }
+
+    public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
+      if (!egl.eglDestroyContext(display, context)) {
+        Log.e("DefaultContextFactory", "display:" + display + " context: " + context);
+        throw new RuntimeException("eglDestroyContext failed: ");
+      }
+    }
+  }
+
+  private abstract class EGLConfigChooser {
+    protected int[] mConfigSpec;
+
+    public EGLConfigChooser(int[] configSpec) {
+      mConfigSpec = filterConfigSpec(configSpec);
+    }
+
+    public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+      int[] num_config = new int[1];
+      if (!egl.eglChooseConfig(display, mConfigSpec, null, 0, num_config)) {
+        throw new IllegalArgumentException("eglChooseConfig failed");
+      }
+
+      int numConfigs = num_config[0];
+
+      if (numConfigs <= 0) {
+        throw new IllegalArgumentException("No configs match configSpec");
+      }
+
+      EGLConfig[] configs = new EGLConfig[numConfigs];
+      if (!egl.eglChooseConfig(display, mConfigSpec, configs, numConfigs, num_config)) {
+        throw new IllegalArgumentException("eglChooseConfig#2 failed");
+      }
+      EGLConfig config = chooseConfig(egl, display, configs);
+      if (config == null) {
+        throw new IllegalArgumentException("No config chosen");
+      }
+      return config;
+    }
+
+    abstract EGLConfig chooseConfig(EGL10 egl, EGLDisplay display, EGLConfig[] configs);
+
+    private int[] filterConfigSpec(int[] configSpec) {
+      int len = configSpec.length;
+      int[] newConfigSpec = new int[len + 2];
+      System.arraycopy(configSpec, 0, newConfigSpec, 0, len - 1);
+      newConfigSpec[len - 1] = EGL10.EGL_RENDERABLE_TYPE;
+      newConfigSpec[len] = 4; /* EGL_OPENGL_ES2_BIT */
+      newConfigSpec[len + 1] = EGL10.EGL_NONE;
+      return newConfigSpec;
+    }
+  }
+
+  private class ComponentSizeChooser extends EGLConfigChooser {
+    protected int mRedSize;
+    protected int mGreenSize;
+    protected int mBlueSize;
+    protected int mAlphaSize;
+    protected int mDepthSize;
+    protected int mStencilSize;
+    private int[] mValue;
+
+    public ComponentSizeChooser(int redSize, int greenSize, int blueSize, int alphaSize, int depthSize, int stencilSize) {
+      super(new int[]{EGL10.EGL_RED_SIZE, redSize, EGL10.EGL_GREEN_SIZE, greenSize, EGL10.EGL_BLUE_SIZE, blueSize, EGL10.EGL_ALPHA_SIZE, alphaSize, EGL10.EGL_DEPTH_SIZE, depthSize, EGL10.EGL_STENCIL_SIZE, stencilSize, EGL10.EGL_NONE});
+      mValue = new int[1];
+      mRedSize = redSize;
+      mGreenSize = greenSize;
+      mBlueSize = blueSize;
+      mAlphaSize = alphaSize;
+      mDepthSize = depthSize;
+      mStencilSize = stencilSize;
+    }
+
+    @Override
+    public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display, EGLConfig[] configs) {
+      for (EGLConfig config : configs) {
+        int d = findConfigAttrib(egl, display, config, EGL10.EGL_DEPTH_SIZE, 0);
+        int s = findConfigAttrib(egl, display, config, EGL10.EGL_STENCIL_SIZE, 0);
+        if ((d >= mDepthSize) && (s >= mStencilSize)) {
+          int r = findConfigAttrib(egl, display, config, EGL10.EGL_RED_SIZE, 0);
+          int g = findConfigAttrib(egl, display, config, EGL10.EGL_GREEN_SIZE, 0);
+          int b = findConfigAttrib(egl, display, config, EGL10.EGL_BLUE_SIZE, 0);
+          int a = findConfigAttrib(egl, display, config, EGL10.EGL_ALPHA_SIZE, 0);
+          if ((r == mRedSize) && (g == mGreenSize) && (b == mBlueSize) && (a == mAlphaSize)) {
+            return config;
+          }
+        }
+      }
+      return null;
+    }
+
+    private int findConfigAttrib(EGL10 egl, EGLDisplay display, EGLConfig config, int attribute, int defaultValue) {
+
+      if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
+        return mValue[0];
+      }
+      return defaultValue;
+    }
+  }
+
+  private class SimpleEGLConfigChooser extends ComponentSizeChooser {
+    public SimpleEGLConfigChooser() {
+      super(5, 6, 5, 0, 0, 0);
+    }
+  }
+
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/InitActivity.java b/showkeyHelper/src/io/vov/vitamio/InitActivity.java
new file mode 100644
index 0000000..5fb7a6a
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/InitActivity.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import java.lang.ref.WeakReference;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.WindowManager;
+
+import com.joyplus.tvhelper.R;
+
+public class InitActivity extends Activity {
+  public static final String FROM_ME = "fromVitamioInitActivity";
+  private ProgressDialog mPD;
+  private UIHandler uiHandler;
+
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    uiHandler = new UIHandler(this);
+
+    new AsyncTask<Object, Object, Boolean>() {
+      @Override
+      protected void onPreExecute() {
+        mPD = new ProgressDialog(InitActivity.this);
+        mPD.setCancelable(false);
+        mPD.setMessage(InitActivity.this.getString(R.string.vitamio_init_decoders));
+        mPD.show();
+      }
+
+      @Override
+      protected Boolean doInBackground(Object... params) {
+        return Vitamio.initialize(InitActivity.this);
+      }
+
+      @Override
+      protected void onPostExecute(Boolean inited) {
+        if (inited) {
+          uiHandler.sendEmptyMessage(0);
+        }
+      }
+
+    }.execute();
+  }
+
+  private static class UIHandler extends Handler {
+    private WeakReference<Context> mContext;
+
+    public UIHandler(Context c) {
+      mContext = new WeakReference<Context>(c);
+    }
+
+    public void handleMessage(Message msg) {
+      InitActivity ctx = (InitActivity) mContext.get();
+      switch (msg.what) {
+        case 0:
+          ctx.mPD.dismiss();
+          Intent src = ctx.getIntent();
+          Intent i = new Intent();
+          i.setClassName(src.getStringExtra("package"), src.getStringExtra("className"));
+          i.setData(src.getData());
+          i.putExtras(src);
+          i.putExtra(FROM_ME, true);
+          ctx.startActivity(i);
+          ctx.finish();
+          break;
+      }
+    }
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/LibsChecker.java b/showkeyHelper/src/io/vov/vitamio/LibsChecker.java
new file mode 100644
index 0000000..5661022
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/LibsChecker.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.app.Activity;
+import android.content.Intent;
+
+/**
+ * LibsChecker is a wrapper of {@link Vitamio}, it helps to initialize Vitamio
+ * easily.
+ * <p/>
+ * <pre>
+ * public void onCreate(Bundle b) {
+ * 	super.onCreate(b);
+ * 	if (!io.vov.vitamio.LibsChecker.checkVitamioLibs(this))
+ * 		return;
+ *
+ * 	// Code using Vitamio should go below {@link LibsChecker#checkVitamioLibs}
+ * }
+ * </pre>
+ */
+public final class LibsChecker {
+  public static final String FROM_ME = "fromVitamioInitActivity";
+
+  public static final boolean checkVitamioLibs(Activity ctx) {
+    if (!Vitamio.isInitialized(ctx) && !ctx.getIntent().getBooleanExtra(FROM_ME, false)) {
+      Intent i = new Intent();
+      i.setClassName(Vitamio.getVitamioPackage(), "io.vov.vitamio.InitActivity");
+      i.putExtras(ctx.getIntent());
+      i.setData(ctx.getIntent().getData());
+      i.putExtra("package", ctx.getPackageName());
+      i.putExtra("className", ctx.getClass().getName());
+      ctx.startActivity(i);
+      ctx.finish();
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/MediaFile.java b/showkeyHelper/src/io/vov/vitamio/MediaFile.java
new file mode 100644
index 0000000..d1a6759
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/MediaFile.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+
+public class MediaFile {
+	protected final static String sFileExtensions;
+
+	public static final int FILE_TYPE_MP3 = 1;
+	public static final int FILE_TYPE_M4A = 2;
+	public static final int FILE_TYPE_WAV = 3;
+	public static final int FILE_TYPE_AMR = 4;
+	public static final int FILE_TYPE_AWB = 5;
+	public static final int FILE_TYPE_WMA = 6;
+	public static final int FILE_TYPE_OGG = 7;
+	public static final int FILE_TYPE_AAC = 8;
+	public static final int FILE_TYPE_MKA = 9;
+	public static final int FILE_TYPE_MID = 10;
+	public static final int FILE_TYPE_SMF = 11;
+	public static final int FILE_TYPE_IMY = 12;
+	public static final int FILE_TYPE_APE = 13;
+	public static final int FILE_TYPE_FLAC = 14;
+	private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;
+	private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;
+
+	public static final int FILE_TYPE_MP4 = 701;
+	public static final int FILE_TYPE_M4V = 702;
+	public static final int FILE_TYPE_3GPP = 703;
+	public static final int FILE_TYPE_3GPP2 = 704;
+	public static final int FILE_TYPE_WMV = 705;
+	public static final int FILE_TYPE_ASF = 706;
+	public static final int FILE_TYPE_MKV = 707;
+	public static final int FILE_TYPE_MP2TS = 708;
+	public static final int FILE_TYPE_FLV = 709;
+	public static final int FILE_TYPE_MOV = 710;
+	public static final int FILE_TYPE_RM = 711;
+	public static final int FILE_TYPE_DVD = 712;
+	public static final int FILE_TYPE_DIVX = 713;
+	public static final int FILE_TYPE_OGV = 714;
+	public static final int FILE_TYPE_VIVO = 715;
+	public static final int FILE_TYPE_WTV = 716;
+	public static final int FILE_TYPE_AVS = 717;
+	public static final int FILE_TYPE_SWF = 718;
+	public static final int FILE_TYPE_RAW = 719;
+	private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;
+	private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_RAW;
+
+	protected static class MediaFileType {
+		int fileType;
+		String mimeType;
+
+		MediaFileType(int fileType, String mimeType) {
+			this.fileType = fileType;
+			this.mimeType = mimeType;
+		}
+	}
+
+	private static HashMap<String, MediaFileType> sFileTypeMap = new HashMap<String, MediaFileType>();
+	private static HashMap<String, Integer> sMimeTypeMap = new HashMap<String, Integer>();
+
+	static void addFileType(String extension, int fileType, String mimeType) {
+		sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType));
+		sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
+	}
+
+	static {
+		// addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg");
+		// addFileType("M4A", FILE_TYPE_M4A, "audio/mp4");
+		// addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav");
+		// addFileType("AMR", FILE_TYPE_AMR, "audio/amr");
+		// addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb");
+		// addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma");
+		// addFileType("OGG", FILE_TYPE_OGG, "application/ogg");
+		// addFileType("OGA", FILE_TYPE_OGG, "application/ogg");
+		// addFileType("AAC", FILE_TYPE_AAC, "audio/aac");
+		// addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");
+		// addFileType("MID", FILE_TYPE_MID, "audio/midi");
+		// addFileType("MIDI", FILE_TYPE_MID, "audio/midi");
+		// addFileType("XMF", FILE_TYPE_MID, "audio/midi");
+		// addFileType("RTTTL", FILE_TYPE_MID, "audio/midi");
+		// addFileType("SMF", FILE_TYPE_SMF, "audio/sp-midi");
+		// addFileType("IMY", FILE_TYPE_IMY, "audio/imelody");
+		// addFileType("RTX", FILE_TYPE_MID, "audio/midi");
+		// addFileType("OTA", FILE_TYPE_MID, "audio/midi");
+		// addFileType("APE", FILE_TYPE_APE, "audio/x-ape");
+		// addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac");
+
+		addFileType("M1V", FILE_TYPE_MP4, "video/mpeg");
+		addFileType("MP2", FILE_TYPE_MP4, "video/mpeg");
+		addFileType("MPE", FILE_TYPE_MP4, "video/mpeg");
+		addFileType("MPG", FILE_TYPE_MP4, "video/mpeg");
+		addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg");
+		addFileType("MP4", FILE_TYPE_MP4, "video/mp4");
+		addFileType("M4V", FILE_TYPE_M4V, "video/mp4");
+		addFileType("3GP", FILE_TYPE_3GPP, "video/3gpp");
+		addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp");
+		addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2");
+		addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2");
+		addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");
+		addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");
+		addFileType("MTS", FILE_TYPE_MP2TS, "video/mp2ts");
+		addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");
+		addFileType("TP", FILE_TYPE_MP2TS, "video/mp2ts");
+		addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv");
+		addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");
+		addFileType("ASX", FILE_TYPE_ASF, "video/x-ms-asf");
+		addFileType("FLV", FILE_TYPE_FLV, "video/x-flv");
+		addFileType("F4V", FILE_TYPE_FLV, "video/x-flv");
+		addFileType("HLV", FILE_TYPE_FLV, "video/x-flv");
+		addFileType("MOV", FILE_TYPE_MOV, "video/quicktime");
+		addFileType("QT", FILE_TYPE_MOV, "video/quicktime");
+		addFileType("RM", FILE_TYPE_RM, "video/x-pn-realvideo");
+		addFileType("RMVB", FILE_TYPE_RM, "video/x-pn-realvideo");
+		addFileType("VOB", FILE_TYPE_DVD, "video/dvd");
+		addFileType("DAT", FILE_TYPE_DVD, "video/dvd");
+		addFileType("AVI", FILE_TYPE_DIVX, "video/x-divx");
+		addFileType("OGV", FILE_TYPE_OGV, "video/ogg");
+		addFileType("OGG", FILE_TYPE_OGV, "video/ogg");
+		addFileType("VIV", FILE_TYPE_VIVO, "video/vnd.vivo");
+		addFileType("VIVO", FILE_TYPE_VIVO, "video/vnd.vivo");
+		addFileType("WTV", FILE_TYPE_WTV, "video/wtv");
+		addFileType("AVS", FILE_TYPE_AVS, "video/avs-video");
+		addFileType("SWF", FILE_TYPE_SWF, "video/x-shockwave-flash");
+		addFileType("YUV", FILE_TYPE_RAW, "video/x-raw-yuv");
+
+		StringBuilder builder = new StringBuilder();
+		Iterator<String> iterator = sFileTypeMap.keySet().iterator();
+
+		while (iterator.hasNext()) {
+			if (builder.length() > 0)
+				builder.append(',');
+			builder.append(iterator.next());
+		}
+		sFileExtensions = builder.toString();
+	}
+
+	public static boolean isAudioFileType(int fileType) {
+		return (fileType >= FIRST_AUDIO_FILE_TYPE && fileType <= LAST_AUDIO_FILE_TYPE);
+	}
+
+	public static boolean isVideoFileType(int fileType) {
+		return (fileType >= FIRST_VIDEO_FILE_TYPE && fileType <= LAST_VIDEO_FILE_TYPE);
+	}
+
+	public static MediaFileType getFileType(String path) {
+		int lastDot = path.lastIndexOf(".");
+		if (lastDot < 0)
+			return null;
+		return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase());
+	}
+
+	public static int getFileTypeForMimeType(String mimeType) {
+		Integer value = sMimeTypeMap.get(mimeType);
+		return (value == null ? 0 : value.intValue());
+	}
+
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/MediaMetadataRetriever.java b/showkeyHelper/src/io/vov/vitamio/MediaMetadataRetriever.java
new file mode 100644
index 0000000..0045f6a
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/MediaMetadataRetriever.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Log;
+
+import io.vov.vitamio.utils.FileUtils;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+
+/**
+ * MediaMetadataRetriever is used to get meta data from any media file
+ * <p/>
+ * <pre>
+ * MediaMetadataRetriever mmr = new MediaMetadataRetriever(this);
+ * mmr.setDataSource(this, mediaUri);
+ * String title = mmr.extractMetadata(METADATA_KEY_TITLE);
+ * Bitmap frame = mmr.getFrameAtTime(-1);
+ * </pre>
+ */
+public class MediaMetadataRetriever {
+  private Context mContext;
+  private AssetFileDescriptor mFD = null;
+
+  public MediaMetadataRetriever(Context ctx) {
+    mContext = ctx;
+    native_init();
+  }
+
+  private static native boolean loadFFmpeg_native(String ffmpegPath);
+
+  public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+    if (context == null || uri == null)
+      throw new IllegalArgumentException();
+    String scheme = uri.getScheme();
+    if (scheme == null || scheme.equals("file")) {
+      setDataSource(FileUtils.getPath(uri.toString()));
+      return;
+    }
+
+    try {
+      ContentResolver resolver = context.getContentResolver();
+      mFD = resolver.openAssetFileDescriptor(uri, "r");
+      if (mFD == null)
+        return;
+      setDataSource(mFD.getParcelFileDescriptor().getFileDescriptor());
+      return;
+    } catch (Exception e) {
+      closeFD();
+    }
+    Log.e("Couldn't open file on client side, trying server side %s", uri.toString());
+    setDataSource(uri.toString());
+    return;
+  }
+
+  public native void setDataSource(String path) throws IOException, IllegalArgumentException, IllegalStateException;
+
+  public native void setDataSource(FileDescriptor fd) throws IOException, IllegalArgumentException, IllegalStateException;
+  
+  /**
+   * Call this method after setDataSource(). This method retrieves the 
+   * meta data value associated with the keyCode.
+   * 
+   * The keyCode currently supported is listed below as METADATA_XXX
+   * constants. With any other value, it returns a null pointer.
+   * 
+   * @param keyCode One of the constants listed below at the end of the class.
+   * @return The meta data value associate with the given keyCode on success; 
+   * null on failure.
+   */
+  public native String extractMetadata(String keyCode) throws IllegalStateException;
+
+  public native Bitmap getFrameAtTime(long timeUs) throws IllegalStateException;
+
+  private native void _release();
+
+  public void release() {
+    _release();
+    closeFD();
+  }
+
+  static {
+    String LIB_ROOT = Vitamio.getLibraryPath();
+    Log.i("LIB ROOT: %s", LIB_ROOT);
+    System.load(LIB_ROOT + "libstlport_shared.so");
+    System.load(LIB_ROOT + "libvscanner.so");
+    loadFFmpeg_native(LIB_ROOT + "libffmpeg.so");
+  }
+
+  private native final void native_init();
+
+  private native final void native_finalize();
+
+  @Override
+  protected void finalize() throws Throwable {
+    try {
+      native_finalize();
+    } finally {
+      super.finalize();
+    }
+  }
+
+  private void closeFD() {
+    if (mFD != null) {
+      try {
+        mFD.close();
+      } catch (IOException e) {
+      }
+      mFD = null;
+    }
+  }
+  
+  /*
+   * Do not change these metadata key values without updating their
+   * counterparts in c file
+   */
+  
+  /**
+   * The metadata key to retrieve the information about the album title
+   * of the data source.
+   */
+  public static final String METADATA_KEY_ALBUM           = "album";
+  /**
+   * The metadata key to retrieve the information about the artist of
+   * the data source.
+   */
+  public static final String METADATA_KEY_ARTIST          = "artist";
+  /**
+   * The metadata key to retrieve the information about the author of
+   * the data source.
+   */
+  public static final String METADATA_KEY_AUTHOR          = "author";
+  /**
+   * The metadata key to retrieve the information about the composer of
+   * the data source.
+   */
+  public static final String METADATA_KEY_COMPOSER        = "composer";
+  /**
+   * The metadata key to retrieve the content type or genre of the data
+   * source.
+   */
+  public static final String METADATA_KEY_GENRE           = "genre";
+  /**
+   * The metadata key to retrieve the data source title.
+   */
+  public static final String METADATA_KEY_TITLE           = "title";
+  /**
+   * The metadata key to retrieve the playback duration of the data source.
+   */
+  public static final String METADATA_KEY_DURATION        = "duration";
+  /**
+   * If the media contains video, this key retrieves its width.
+   */
+  public static final String METADATA_KEY_VIDEO_WIDTH     = "width";
+  /**
+   * If the media contains video, this key retrieves its height.
+   */
+  public static final String METADATA_KEY_VIDEO_HEIGHT    = "height";
+  
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/MediaPlayer.java b/showkeyHelper/src/io/vov/vitamio/MediaPlayer.java
new file mode 100644
index 0000000..552136d
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/MediaPlayer.java
@@ -0,0 +1,1428 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.annotation.SuppressLint;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PowerManager;
+import android.util.SparseArray;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import io.vov.vitamio.utils.FileUtils;
+import io.vov.vitamio.utils.Log;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * MediaPlayer class can be used to control playback of audio/video files and
+ * streams. An example on how to use the methods in this class can be found in
+ * {@link io.vov.vitamio.widget.VideoView}. This class will function the same as
+ * android.media.MediaPlayer in most cases. Please see <a
+ * href="http://developer.android.com/guide/topics/media/index.html">Audio and
+ * Video</a> for additional help using MediaPlayer.
+ */
+public class MediaPlayer {
+  public static final int CACHE_TYPE_NOT_AVAILABLE = 1;
+  public static final int CACHE_TYPE_UPDATE = 2;
+  public static final int CACHE_TYPE_SPEED = 3;
+  public static final int CACHE_INFO_NO_SPACE = 1;
+  public static final int CACHE_INFO_STREAM_NOT_SUPPORT = 2;
+  public static final int MEDIA_ERROR_UNKNOWN = 1;
+  public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200;
+  /**
+   * The video is too complex for the decoder: it can't decode frames fast
+   * enough. Possibly only the audio plays fine at this stage.
+   *
+   * @see io.vov.vitamio.MediaPlayer.OnInfoListener
+   */
+  public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700;
+  /**
+   * MediaPlayer is temporarily pausing playback internally in order to buffer
+   * more data.
+   */
+  public static final int MEDIA_INFO_BUFFERING_START = 701;
+  /**
+   * MediaPlayer is resuming playback after filling buffers.
+   */
+  public static final int MEDIA_INFO_BUFFERING_END = 702;
+  /**
+   * The media cannot be seeked (e.g live stream)
+   *
+   * @see io.vov.vitamio.MediaPlayer.OnInfoListener
+   */
+  public static final int MEDIA_INFO_NOT_SEEKABLE = 801;
+  /**
+   * The rate in KB/s of av_read_frame()
+   *
+   * @see io.vov.vitamio.MediaPlayer.OnInfoListener
+   */
+  public static final int MEDIA_INFO_DOWNLOAD_RATE_CHANGED = 901;
+  public static final int VIDEOQUALITY_LOW = -16;
+  public static final int VIDEOQUALITY_MEDIUM = 0;
+  public static final int VIDEOQUALITY_HIGH = 16;
+
+  public static final int VIDEOCHROMA_RGB565 = 0;
+  public static final int VIDEOCHROMA_RGBA = 1;
+  /**
+   * The subtitle displayed is embeded in the movie
+   */
+  public static final int SUBTITLE_INTERNAL = 0;
+  /**
+   * The subtitle displayed is an external file
+   */
+  public static final int SUBTITLE_EXTERNAL = 1;
+  /**
+   * The external subtitle types which Vitamio supports.
+   */
+  public static final String[] SUB_TYPES = {".srt", ".ssa", ".smi", ".txt", ".sub", ".ass"};
+  private static final int MEDIA_NOP = 0;
+  private static final int MEDIA_PREPARED = 1;
+  private static final int MEDIA_PLAYBACK_COMPLETE = 2;
+  private static final int MEDIA_BUFFERING_UPDATE = 3;
+  private static final int MEDIA_SEEK_COMPLETE = 4;
+  private static final int MEDIA_SET_VIDEO_SIZE = 5;
+  private static final int MEDIA_ERROR = 100;
+  private static final int MEDIA_INFO = 200;
+  private static final int MEDIA_CACHE = 300;
+  private static final int MEDIA_HW_ERROR = 400;
+  private static final int MEDIA_TIMED_TEXT = 1000;
+  private static final int MEDIA_CACHING_UPDATE = 2000;
+  private static final String MEDIA_CACHING_SEGMENTS = "caching_segment";
+  private static final String MEDIA_CACHING_TYPE = "caching_type";
+  private static final String MEDIA_CACHING_INFO = "caching_info";
+  private static final String MEDIA_SUBTITLE_STRING = "sub_string";
+  private static final String MEDIA_SUBTITLE_BYTES = "sub_bytes";
+  private static final String MEDIA_SUBTITLE_TYPE = "sub_type";
+  private static final int SUBTITLE_TEXT = 0;
+  private static final int SUBTITLE_BITMAP = 1;
+  private static AtomicBoolean NATIVE_OMX_LOADED = new AtomicBoolean(false);
+  private Context mContext;
+  private Surface mSurface;
+  private SurfaceHolder mSurfaceHolder;
+  private EventHandler mEventHandler;
+  private PowerManager.WakeLock mWakeLock = null;
+  private boolean mScreenOnWhilePlaying;
+  private boolean mStayAwake;
+  private Metadata mMeta;
+  private AssetFileDescriptor mFD = null;
+  private OnHWRenderFailedListener mOnHWRenderFailedListener;
+  private OnPreparedListener mOnPreparedListener;
+  private OnCompletionListener mOnCompletionListener;
+  private OnBufferingUpdateListener mOnBufferingUpdateListener;
+  private OnCachingUpdateListener mOnCachingUpdateListener;
+  private OnSeekCompleteListener mOnSeekCompleteListener;
+  private OnVideoSizeChangedListener mOnVideoSizeChangedListener;
+  private OnErrorListener mOnErrorListener;
+  /**
+   * Register a callback to be invoked when an info/warning is available.
+   *
+   * @param listener
+   * the callback that will be run
+   */
+  private OnInfoListener mOnInfoListener;
+  private OnTimedTextListener mOnTimedTextListener;
+  private AudioTrack mAudioTrack;
+  private int mAudioTrackBufferSize;
+  private Surface mLocalSurface;
+  private Bitmap mBitmap;
+  private ByteBuffer mByteBuffer;
+
+  /**
+   * Default constructor. The same as Android's MediaPlayer().
+   * <p>
+   * When done with the MediaPlayer, you should call {@link #release()}, to free
+   * the resources. If not released, too many MediaPlayer instances may result
+   * in an exception.
+   * </p>
+   */
+  public MediaPlayer(Context ctx) {
+    this(ctx, false);
+  }
+
+  /**
+   * Default constructor. The same as Android's MediaPlayer().
+   * <p>
+   * When done with the MediaPlayer, you should call {@link #release()}, to free
+   * the resources. If not released, too many MediaPlayer instances may result
+   * in an exception.
+   * </p>
+   *
+   * @param preferHWDecoder MediaPlayer will try to use hardware accelerated decoder if true
+   */
+  public MediaPlayer(Context ctx, boolean preferHWDecoder) {
+    mContext = ctx;
+
+    String LIB_ROOT = Vitamio.getLibraryPath();
+    if (preferHWDecoder) {
+      if (!NATIVE_OMX_LOADED.get()) {
+        if (Build.VERSION.SDK_INT > 15)
+          loadOMX_native(LIB_ROOT + "libOMX.16.so");
+        else if (Build.VERSION.SDK_INT > 13)
+          loadOMX_native(LIB_ROOT + "libOMX.14.so");
+        else if (Build.VERSION.SDK_INT > 10)
+          loadOMX_native(LIB_ROOT + "libOMX.11.so");
+        else
+          loadOMX_native(LIB_ROOT + "libOMX.9.so");
+        NATIVE_OMX_LOADED.set(true);
+      }
+    } else {
+      unloadOMX_native();
+      NATIVE_OMX_LOADED.set(false);
+    }
+
+    Looper looper;
+    if ((looper = Looper.myLooper()) != null)
+      mEventHandler = new EventHandler(this, looper);
+    else if ((looper = Looper.getMainLooper()) != null)
+      mEventHandler = new EventHandler(this, looper);
+    else
+      mEventHandler = null;
+
+    native_init();
+  }
+
+  static {
+    String LIB_ROOT = Vitamio.getLibraryPath();
+    try {
+      Log.i("LIB ROOT: %s", LIB_ROOT);
+      System.load(LIB_ROOT + "libstlport_shared.so");
+      System.load(LIB_ROOT + "libvplayer.so");
+      loadFFmpeg_native(LIB_ROOT + "libffmpeg.so");
+      boolean vvo_loaded = false;
+      if (Build.VERSION.SDK_INT > 8)
+        vvo_loaded = loadVVO_native(LIB_ROOT + "libvvo.9.so");
+      else if (Build.VERSION.SDK_INT > 7)
+        vvo_loaded = loadVVO_native(LIB_ROOT + "libvvo.8.so");
+      else
+        vvo_loaded = loadVVO_native(LIB_ROOT + "libvvo.7.so");
+      if (!vvo_loaded) {
+        vvo_loaded = loadVVO_native(LIB_ROOT + "libvvo.j.so");
+        Log.d("FALLBACK TO VVO JNI " + vvo_loaded);
+      }
+      loadVAO_native(LIB_ROOT + "libvao.0.so");
+    } catch (java.lang.UnsatisfiedLinkError e) {
+      Log.e("Error loading libs", e);
+    }
+  }
+
+  private static void postEventFromNative(Object mediaplayer_ref, int what, int arg1, int arg2, Object obj) {
+    MediaPlayer mp = (MediaPlayer) (mediaplayer_ref);
+    if (mp == null)
+      return;
+
+    if (mp.mEventHandler != null) {
+      Message m = mp.mEventHandler.obtainMessage(what, arg1, arg2, obj);
+      mp.mEventHandler.sendMessage(m);
+    }
+  }
+
+  private static native boolean loadVAO_native(String vaoPath);
+
+  private static native boolean loadVVO_native(String vvoPath);
+
+  private static native boolean loadOMX_native(String omxPath);
+
+  private static native void unloadOMX_native();
+
+  private static native boolean loadFFmpeg_native(String ffmpegPath);
+
+  private native void _setVideoSurface();
+
+  /**
+   * Sets the SurfaceHolder to use for displaying the video portion of the
+   * media. This call is optional. Not calling it when playing back a video will
+   * result in only the audio track being played.
+   *
+   * @param sh the SurfaceHolder to use for video display
+   */
+  public void setDisplay(SurfaceHolder sh) {
+    if (sh == null) {
+      releaseDisplay();
+    } else {
+      mSurfaceHolder = sh;
+      mSurface = sh.getSurface();
+      _setVideoSurface();
+      updateSurfaceScreenOn();
+    }
+  }
+
+  /**
+   * Sets the Surface to use for displaying the video portion of the media. This
+   * is similar to {@link #setDisplay(SurfaceHolder)}.
+   *
+   * @param surface the Surface to use for video display
+   */
+  public void setSurface(Surface surface) {
+    if (surface == null) {
+      releaseDisplay();
+    } else {
+      mSurfaceHolder = null;
+      mSurface = surface;
+      _setVideoSurface();
+      updateSurfaceScreenOn();
+    }
+  }
+
+  /**
+   * Sets the data source (file-path or http/rtsp URL) to use.
+   *
+   * @param path the path of the file, or the http/rtsp URL of the stream you want
+   *             to play
+   * @throws IllegalStateException if it is called in an invalid state
+   *                               <p/>
+   *                               <p/>
+   *                               When <code>path</code> refers to a local file, the file may
+   *                               actually be opened by a process other than the calling
+   *                               application. This implies that the pathname should be an absolute
+   *                               path (as any other process runs with unspecified current working
+   *                               directory), and that the pathname should reference a
+   *                               world-readable file. As an alternative, the application could
+   *                               first open the file for reading, and then use the file descriptor
+   *                               form {@link #setDataSource(FileDescriptor)}.
+   */
+  public void setDataSource(String path) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+    _setDataSource(path, null);
+  }
+
+  /**
+   * Sets the data source as a content Uri.
+   *
+   * @param context the Context to use when resolving the Uri
+   * @param uri     the Content URI of the data you want to play
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+    setDataSource(context, uri, "");
+  }
+
+  public void setDataSource(Context context, Uri uri, String headers) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+    if (context == null || uri == null)
+      throw new IllegalArgumentException();
+    String scheme = uri.getScheme();
+    if (scheme == null || scheme.equals("file")) {
+      setDataSource(FileUtils.getPath(uri.toString()));
+      return;
+    }
+
+    try {
+      ContentResolver resolver = context.getContentResolver();
+      mFD = resolver.openAssetFileDescriptor(uri, "r");
+      if (mFD == null)
+        return;
+      setDataSource(mFD.getParcelFileDescriptor().getFileDescriptor());
+      return;
+    } catch (Exception e) {
+      closeFD();
+    }
+    _setDataSource(uri.toString(), headers);
+  }
+
+  /**
+   * Sets the data source as a content Uri.
+   *
+   * @param context the Context to use when resolving the Uri
+   * @param uri     the Content URI of the data you want to play
+   * @param headers the headers to be sent together with the request for the data
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public void setDataSource(Context context, Uri uri, Map<String, String> headers) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+    StringBuffer headerBuffer = null;
+    if (headers != null) {
+      headerBuffer = new StringBuffer();
+      for (Map.Entry<String, String> entry : headers.entrySet()) {
+        headerBuffer.append(entry.getKey()).append(":").append(entry.getValue()).append("\r\n");
+      }
+    }
+    setDataSource(context, uri, headerBuffer == null ? null : headerBuffer.toString());
+    return;
+  }
+
+  public void setOnHWRenderFailedListener(OnHWRenderFailedListener l) {
+    mOnHWRenderFailedListener = l;
+  }
+
+  /**
+   * Sets the data source (file-path or http/rtsp/mms URL) to use.
+   *
+   * @param path    the path of the file, or the http/rtsp/mms URL of the stream you
+   *                want to play
+   * @param headers protocol headers, e.g. HTTP header
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public native void _setDataSource(String path, String headers) throws IOException, IllegalArgumentException, IllegalStateException;
+
+  /**
+   * Sets the data source (FileDescriptor) to use. It is the caller's
+   * responsibility to close the file descriptor. It is safe to do so as soon as
+   * this call returns.
+   *
+   * @param fd the FileDescriptor for the file you want to play
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public native void setDataSource(FileDescriptor fd) throws IOException, IllegalArgumentException, IllegalStateException;
+
+  /**
+   * Prepares the player for playback, synchronously.
+   * <p/>
+   * After setting the datasource and the display surface, you need to either
+   * call prepare() or prepareAsync(). For files, it is OK to call prepare(),
+   * which blocks until MediaPlayer is ready for playback.
+   *
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public native void prepare() throws IOException, IllegalStateException;
+
+  /**
+   * Prepares the player for playback, asynchronously.
+   * <p/>
+   * After setting the datasource and the display surface, you need to either
+   * call prepare() or prepareAsync(). For streams, you should call
+   * prepareAsync(), which returns immediately, rather than blocking until
+   * enough data has been buffered.
+   *
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public native void prepareAsync() throws IllegalStateException;
+
+  /**
+   * Starts or resumes playback. If playback had previously been paused,
+   * playback will continue from where it was paused. If playback had been
+   * stopped, or never started before, playback will start at the beginning.
+   *
+   * @throws IllegalStateException if it is called in an invalid state
+   */
+  public void start() throws IllegalStateException {
+    stayAwake(true);
+    _start();
+  }
+
+  private native void _start() throws IllegalStateException;
+
+  /**
+   * The same as {@link #pause()}
+   *
+   * @throws IllegalStateException if the internal player engine has not been initialized.
+   */
+  public void stop() throws IllegalStateException {
+    stayAwake(false);
+    _stop();
+  }
+
+  private native void _stop() throws IllegalStateException;
+
+  /**
+   * Pauses playback. Call start() to resume.
+   *
+   * @throws IllegalStateException if the internal player engine has not been initialized.
+   */
+  public void pause() throws IllegalStateException {
+    stayAwake(false);
+    _pause();
+  }
+
+  private native void _pause() throws IllegalStateException;
+
+  /**
+   * Set the low-level power management behavior for this MediaPlayer. This can
+   * be used when the MediaPlayer is not playing through a SurfaceHolder set
+   * with {@link #setDisplay(SurfaceHolder)} and thus can use the high-level
+   * {@link #setScreenOnWhilePlaying(boolean)} feature.
+   * <p/>
+   * This function has the MediaPlayer access the low-level power manager
+   * service to control the device's power usage while playing is occurring. The
+   * parameter is a combination of {@link android.os.PowerManager} wake flags.
+   * Use of this method requires {@link android.Manifest.permission#WAKE_LOCK}
+   * permission. By default, no attempt is made to keep the device awake during
+   * playback.
+   *
+   * @param context the Context to use
+   * @param mode    the power/wake mode to set
+   * @see android.os.PowerManager
+   */
+  @SuppressLint("Wakelock")
+  public void setWakeMode(Context context, int mode) {
+    boolean washeld = false;
+    if (mWakeLock != null) {
+      if (mWakeLock.isHeld()) {
+        washeld = true;
+        mWakeLock.release();
+      }
+      mWakeLock = null;
+    }
+
+    PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+    mWakeLock = pm.newWakeLock(mode | PowerManager.ON_AFTER_RELEASE, MediaPlayer.class.getName());
+    mWakeLock.setReferenceCounted(false);
+    if (washeld) {
+      mWakeLock.acquire();
+    }
+  }
+
+  /**
+   * Control whether we should use the attached SurfaceHolder to keep the screen
+   * on while video playback is occurring. This is the preferred method over
+   * {@link #setWakeMode} where possible, since it doesn't require that the
+   * application have permission for low-level wake lock access.
+   *
+   * @param screenOn Supply true to keep the screen on, false to allow it to turn off.
+   */
+  public void setScreenOnWhilePlaying(boolean screenOn) {
+    if (mScreenOnWhilePlaying != screenOn) {
+      mScreenOnWhilePlaying = screenOn;
+      updateSurfaceScreenOn();
+    }
+  }
+
+  @SuppressLint("Wakelock")
+  private void stayAwake(boolean awake) {
+    if (mWakeLock != null) {
+      if (awake && !mWakeLock.isHeld()) {
+        mWakeLock.acquire();
+      } else if (!awake && mWakeLock.isHeld()) {
+        mWakeLock.release();
+      }
+    }
+    mStayAwake = awake;
+    updateSurfaceScreenOn();
+  }
+
+  private void updateSurfaceScreenOn() {
+    if (mSurfaceHolder != null)
+      mSurfaceHolder.setKeepScreenOn(mScreenOnWhilePlaying && mStayAwake);
+  }
+
+  /**
+   * Returns the width of the video.
+   *
+   * @return the width of the video, or 0 if there is no video, or the width has
+   *         not been determined yet. The OnVideoSizeChangedListener can be
+   *         registered via
+   *         {@link #setOnVideoSizeChangedListener(OnVideoSizeChangedListener)}
+   *         to provide a notification when the width is available.
+   */
+  public native int getVideoWidth();
+
+  private native int getVideoWidth_a();
+
+  /**
+   * Returns the height of the video.
+   *
+   * @return the height of the video, or 0 if there is no video, or the height
+   *         has not been determined yet. The OnVideoSizeChangedListener can be
+   *         registered via
+   *         {@link #setOnVideoSizeChangedListener(OnVideoSizeChangedListener)}
+   *         to provide a notification when the height is available.
+   */
+  public native int getVideoHeight();
+
+  private native int getVideoHeight_a();
+
+  /**
+   * Checks whether the MediaPlayer is playing.
+   *
+   * @return true if currently playing, false otherwise
+   */
+  public native boolean isPlaying();
+
+
+	/**
+   * Adaptive streaming support, default is false
+   *
+   * @param adaptive true if wanna adaptive steam
+   *
+   */
+  public native void setAdaptiveStream(boolean adaptive);
+
+  /**
+   * Seeks to specified time position.
+   *
+   * @param msec the offset in milliseconds from the start to seek to
+   * @throws IllegalStateException if the internal player engine has not been initialized
+   */
+  public native void seekTo(long msec) throws IllegalStateException;
+
+  /**
+   * Gets the current playback position.
+   *
+   * @return the current position in milliseconds
+   */
+  public native long getCurrentPosition();
+
+  /**
+   * Get the current video frame
+   *
+   * @return bitmap object
+   */
+  public native Bitmap getCurrentFrame();
+
+  /**
+   * Gets the duration of the file.
+   *
+   * @return the duration in milliseconds
+   */
+  public native long getDuration();
+
+  /**
+   * Gets the media metadata.
+   *
+   * @return The metadata, possibly empty. null if an error occurred.
+   */
+  public Metadata getMetadata() {
+    if (mMeta == null) {
+      mMeta = new Metadata();
+      Map<byte[], byte[]> meta = new HashMap<byte[], byte[]>();
+
+      if (!native_getMetadata(meta)) {
+        return null;
+      }
+
+      if (!mMeta.parse(meta, getMetaEncoding())) {
+        return null;
+      }
+    }
+    return mMeta;
+  }
+
+  /**
+   * Releases resources associated with this MediaPlayer object. It is
+   * considered good practice to call this method when you're done using the
+   * MediaPlayer.
+   */
+  public void release() {
+    stayAwake(false);
+    updateSurfaceScreenOn();
+    mOnPreparedListener = null;
+    mOnBufferingUpdateListener = null;
+    mOnCompletionListener = null;
+    mOnSeekCompleteListener = null;
+    mOnErrorListener = null;
+    mOnInfoListener = null;
+    mOnVideoSizeChangedListener = null;
+    mOnCachingUpdateListener = null;
+    mOnHWRenderFailedListener = null;
+    _release();
+    closeFD();
+  }
+
+  private native void _release();
+
+  /**
+   * Resets the MediaPlayer to its uninitialized state. After calling this
+   * method, you will have to initialize it again by setting the data source and
+   * calling prepare().
+   */
+  public void reset() {
+    stayAwake(false);
+    _reset();
+    mEventHandler.removeCallbacksAndMessages(null);
+    closeFD();
+  }
+
+  private native void _reset();
+
+  private void closeFD() {
+    if (mFD != null) {
+      try {
+        mFD.close();
+      } catch (IOException e) {
+        Log.e("closeFD", e);
+      }
+      mFD = null;
+    }
+  }
+
+  /**
+   * Amplify audio
+   *
+   * @param ratio  e.g. 3.5
+   */
+  public native void setAudioAmplify(float ratio);
+
+  public native void setVolume(float leftVolume, float rightVolume);
+
+  private native final boolean native_getTrackInfo(SparseArray<byte[]> trackSparse);
+
+  private native final boolean native_getMetadata(Map<byte[], byte[]> meta);
+
+  private native final void native_init();
+
+  private native final void native_finalize();
+
+  /**
+   * Returns an array of track information.
+   *
+   * @return Array of track info. The total number of tracks is the array
+   *         length. Must be called again if an external timed text source has
+   *         been added after any of the addTimedTextSource methods are called.
+   */
+  public TrackInfo[] getTrackInfo(String encoding) {
+    SparseArray<byte[]> trackSparse = new SparseArray<byte[]>();
+    if (!native_getTrackInfo(trackSparse)) {
+      return null;
+    }
+
+    int size = trackSparse.size();
+    TrackInfo[] trackInfos = new TrackInfo[size];
+    for (int i = 0; i < size; i++) {
+      TrackInfo trackInfo = new TrackInfo(trackSparse.keyAt(i), parseTrackInfo(trackSparse.valueAt(i), encoding));
+      trackInfos[i] = trackInfo;
+    }
+    return trackInfos;
+  }
+
+  /**
+   * Use default chartset {@link #getTrackInfo()} method.
+   *
+   * @return array of {@link TrackInfo}
+   */
+  public TrackInfo[] getTrackInfo() {
+    return getTrackInfo(Charset.defaultCharset().name());
+  }
+
+  private SparseArray<String> parseTrackInfo(byte[] tracks, String encoding) {
+    SparseArray<String> trackSparse = new SparseArray<String>();
+    String trackString;
+    int trackNum;
+    try {
+      trackString = new String(tracks, encoding);
+    } catch (Exception e) {
+      Log.e("getTrackMap exception");
+      trackString = new String(tracks);
+    }
+    for (String s : trackString.split("!#!")) {
+      try {
+        if (s.contains("."))
+          trackNum = Integer.parseInt(s.split("\\.")[0]);
+        else
+          trackNum = Integer.parseInt(s);
+        trackSparse.put(trackNum, s);
+      } catch (NumberFormatException e) {
+      }
+    }
+
+    return trackSparse;
+  }
+
+  /**
+   * @param mediaTrackType
+   * @param trackInfo
+   * @return {@link TrackInfo#getTrackInfoArray()}
+   */
+  public SparseArray<String> findTrackFromTrackInfo(int mediaTrackType, TrackInfo[] trackInfo) {
+    for (int i = 0; i < trackInfo.length; i++) {
+      if (trackInfo[i].getTrackType() == mediaTrackType) {
+        return trackInfo[i].getTrackInfoArray();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Set the file-path of an external timed text.
+   *
+   * @param path must be a local file
+   */
+  public native void addTimedTextSource(String path);
+
+  /**
+   * Selects a track.
+   * <p>
+   * In any valid state, if it is called multiple times on the same type of
+   * track (ie. Video, Audio, Timed Text), the most recent one will be chosen.
+   * </p>
+   * <p>
+   * The first audio and video tracks are selected by default if available, even
+   * though this method is not called. However, no timed text track will be
+   * selected until this function is called.
+   * </p>
+   *
+   * @param index the index of the track to be selected. The valid range of the
+   *              index is 0..total number of track - 1. The total number of tracks
+   *              as well as the type of each individual track can be found by
+   *              calling {@link #getTrackInfo()} method.
+   * @see io.vov.vitamio.MediaPlayer#getTrackInfo
+   */
+  public void selectTrack(int index) {
+    selectOrDeselectTrack(index, true /* select */);
+  }
+
+  /**
+   * Deselect a track.
+   * <p>
+   * Currently, the track must be a timed text track and no audio or video
+   * tracks can be deselected.
+   * </p>
+   *
+   * @param index the index of the track to be deselected. The valid range of the
+   *              index is 0..total number of tracks - 1. The total number of tracks
+   *              as well as the type of each individual track can be found by
+   *              calling {@link #getTrackInfo()} method.
+   * @see io.vov.vitamio.MediaPlayer#getTrackInfo
+   */
+  public void deselectTrack(int index) {
+    selectOrDeselectTrack(index, false /* select */);
+  }
+
+  private native void selectOrDeselectTrack(int index, boolean select);
+
+  @Override
+  protected void finalize() {
+    native_finalize();
+  }
+
+  /**
+   * Register a callback to be invoked when the media source is ready for
+   * playback.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnPreparedListener(OnPreparedListener listener) {
+    mOnPreparedListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when the end of a media source has been
+   * reached during playback.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnCompletionListener(OnCompletionListener listener) {
+    mOnCompletionListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when the status of a network stream's
+   * buffer has changed.
+   *
+   * @param listener the callback that will be run.
+   */
+  public void setOnBufferingUpdateListener(OnBufferingUpdateListener listener) {
+    mOnBufferingUpdateListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when the segments cached on storage has
+   * changed.
+   *
+   * @param listener the callback that will be run.
+   */
+  public void setOnCachingUpdateListener(OnCachingUpdateListener listener) {
+    mOnCachingUpdateListener = listener;
+  }
+
+  private void updateCacheStatus(int type, int info, long[] segments) {
+    if (mEventHandler != null) {
+      Message m = mEventHandler.obtainMessage(MEDIA_CACHING_UPDATE);
+      Bundle b = m.getData();
+      b.putInt(MEDIA_CACHING_TYPE, type);
+      b.putInt(MEDIA_CACHING_INFO, info);
+      b.putLongArray(MEDIA_CACHING_SEGMENTS, segments);
+      mEventHandler.sendMessage(m);
+    }
+  }
+
+  /**
+   * Register a callback to be invoked when a seek operation has been completed.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnSeekCompleteListener(OnSeekCompleteListener listener) {
+    mOnSeekCompleteListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when the video size is known or updated.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnVideoSizeChangedListener(OnVideoSizeChangedListener listener) {
+    mOnVideoSizeChangedListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when an error has happened during an
+   * asynchronous operation.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnErrorListener(OnErrorListener listener) {
+    mOnErrorListener = listener;
+  }
+
+  public void setOnInfoListener(OnInfoListener listener) {
+    mOnInfoListener = listener;
+  }
+
+  /**
+   * Register a callback to be invoked when a timed text need to display.
+   *
+   * @param listener the callback that will be run
+   */
+  public void setOnTimedTextListener(OnTimedTextListener listener) {
+    mOnTimedTextListener = listener;
+  }
+
+  private void updateSub(int subType, byte[] bytes, String encoding, int width, int height) {
+    if (mEventHandler != null) {
+      Message m = mEventHandler.obtainMessage(MEDIA_TIMED_TEXT, width, height);
+      Bundle b = m.getData();
+      if (subType == SUBTITLE_TEXT) {
+        b.putInt(MEDIA_SUBTITLE_TYPE, SUBTITLE_TEXT);
+        if (encoding == null) {
+          b.putString(MEDIA_SUBTITLE_STRING, new String(bytes));
+        } else {
+          try {
+            b.putString(MEDIA_SUBTITLE_STRING, new String(bytes, encoding.trim()));
+          } catch (UnsupportedEncodingException e) {
+            Log.e("updateSub", e);
+            b.putString(MEDIA_SUBTITLE_STRING, new String(bytes));
+          }
+        }
+      } else if (subType == SUBTITLE_BITMAP) {
+        b.putInt(MEDIA_SUBTITLE_TYPE, SUBTITLE_BITMAP);
+        b.putByteArray(MEDIA_SUBTITLE_BYTES, bytes);
+      }
+      mEventHandler.sendMessage(m);
+    }
+  }
+
+  protected native void _releaseVideoSurface();
+
+  /**
+   * Calling this result in only the audio track being played.
+   */
+  public void releaseDisplay() {
+    _releaseVideoSurface();
+    mSurfaceHolder = null;
+    mSurface = null;
+  }
+
+  /**
+   * Returns the aspect ratio of the video.
+   *
+   * @return the aspect ratio of the video, or 0 if there is no video, or the
+   *         width and height is not available.
+	 *         @see io.vov.vitamio.widget.VideoView#setVideoLayout(int, float)
+   */
+  public native float getVideoAspectRatio();
+
+  /**
+   * Set the quality when play video, if the video is too lag, you may try
+   * VIDEOQUALITY_LOW, default is VIDEOQUALITY_LOW.
+   *
+   * @param quality <ul>
+   *                <li>{@link #VIDEOQUALITY_HIGH}
+   *                <li>{@link #VIDEOQUALITY_MEDIUM}
+   *                <li>{@link #VIDEOQUALITY_LOW}
+   *                </ul>
+   */
+  public native void setVideoQuality(int quality);
+
+  /**
+   * Set the Video Chroma quality when play video, default is VIDEOCHROMA_RGB565
+   * You can set on after {@link #prepareAsync()}.
+   * @param chroma <ul>
+   *                <li>{@link #VIDEOCHROMA_RGB565}
+   *                <li>{@link #VIDEOCHROMA_RGBA}
+   *                </ul>
+   */
+  public native void setVideoChroma(int chroma);
+
+  /**
+   * Set if should deinterlace the video picture
+   *
+   * @param deinterlace
+   */
+  public native void setDeinterlace(boolean deinterlace);
+
+  /**
+   * The buffer to fill before playback, default is 1024KB
+   *
+   * @param bufSize buffer size in Byte
+   */
+  public native void setBufferSize(long bufSize);
+
+  /**
+   * Set video and audio playback speed
+   *
+   * @param speed e.g. 0.8 or 2.0, default to 1.0, range in [0.5-2]
+   */
+  public native void setPlaybackSpeed(float speed);
+
+  /**
+   * Checks whether the buffer is filled
+   *
+   * @return false if buffer is filled
+   */
+  public native boolean isBuffering();
+
+  /**
+   * @return the percent
+   * @see io.vov.vitamio.MediaPlayer.OnBufferingUpdateListener
+   */
+  public native int getBufferProgress();
+
+  /**
+   * Get the encoding if haven't set with {@link #setMetaEncoding(String)}
+   *
+   * @return the encoding
+   */
+  public native String getMetaEncoding();
+
+  /**
+   * Set the encoding MediaPlayer will use to determine the metadata
+   *
+   * @param encoding e.g. "UTF-8"
+   */
+  public native void setMetaEncoding(String encoding);
+
+  /**
+   * Get the audio track number in playback
+   *
+   * @return track number
+   */
+	public native int getAudioTrack();
+
+	/**
+   * Get the video track number in playback
+	 *
+	 * @return track number
+	 */
+	public native int getVideoTrack();
+
+  /**
+   * Tell the MediaPlayer whether to show timed text
+   *
+   * @param shown true if wanna show
+   */
+  public native void setTimedTextShown(boolean shown);
+
+  /**
+   * Set the encoding to display timed text.
+   *
+   * @param encoding MediaPlayer will detet it if null
+   */
+  public native void setTimedTextEncoding(String encoding);
+
+  /**
+   * @return <ul>
+   *         <li>{@link #SUBTITLE_EXTERNAL}
+   *         <li>{@link #SUBTITLE_INTERNAL}
+   *         </ul>
+   */
+  public native int getTimedTextLocation();
+
+  /**
+   * You can get the file-path of the external subtitle in use.
+   *
+   * @return null if no external subtitle
+   */
+  public native String getTimedTextPath();
+
+  /**
+   * Get the subtitle track number in playback
+   *
+   * @return track number
+   */
+  public native int getTimedTextTrack();
+
+  private int audioTrackInit(int sampleRateInHz, int channels) {
+    audioTrackRelease();
+    int channelConfig = channels >= 2 ? AudioFormat.CHANNEL_OUT_STEREO : AudioFormat.CHANNEL_OUT_MONO;
+    try {
+      mAudioTrackBufferSize = AudioTrack.getMinBufferSize(sampleRateInHz, channelConfig, AudioFormat.ENCODING_PCM_16BIT);
+      mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRateInHz, channelConfig, AudioFormat.ENCODING_PCM_16BIT, mAudioTrackBufferSize, AudioTrack.MODE_STREAM);
+    } catch (Exception e) {
+      mAudioTrackBufferSize = 0;
+      Log.e("audioTrackInit", e);
+    }
+    return mAudioTrackBufferSize;
+  }
+
+  private void audioTrackSetVolume(float leftVolume, float rightVolume) {
+    if (mAudioTrack != null)
+      mAudioTrack.setStereoVolume(leftVolume, rightVolume);
+  }
+
+  private void audioTrackWrite(byte[] audioData, int offsetInBytes, int sizeInBytes) {
+    if (mAudioTrack != null) {
+      audioTrackStart();
+      int written;
+      while (sizeInBytes > 0) {
+        written = sizeInBytes > mAudioTrackBufferSize ? mAudioTrackBufferSize : sizeInBytes;
+        mAudioTrack.write(audioData, offsetInBytes, written);
+        sizeInBytes -= written;
+        offsetInBytes += written;
+      }
+    }
+  }
+
+  private void audioTrackStart() {
+    if (mAudioTrack != null && mAudioTrack.getState() == AudioTrack.STATE_INITIALIZED && mAudioTrack.getPlayState() != AudioTrack.PLAYSTATE_PLAYING)
+      mAudioTrack.play();
+  }
+
+  private void audioTrackPause() {
+    if (mAudioTrack != null && mAudioTrack.getState() == AudioTrack.STATE_INITIALIZED)
+      mAudioTrack.pause();
+  }
+
+  private void audioTrackRelease() {
+    if (mAudioTrack != null) {
+      if (mAudioTrack.getState() == AudioTrack.STATE_INITIALIZED)
+        mAudioTrack.stop();
+      mAudioTrack.release();
+    }
+    mAudioTrack = null;
+  }
+
+  private ByteBuffer surfaceInit() {
+    synchronized (this) {
+      mLocalSurface = mSurface;
+      int w = getVideoWidth_a();
+      int h = getVideoHeight_a();
+      if (mLocalSurface != null && w != 0 && h != 0) {
+        mBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.RGB_565);
+        mByteBuffer = ByteBuffer.allocateDirect(w * h * 2);
+      } else {
+        mBitmap = null;
+        mByteBuffer = null;
+      }
+      return mByteBuffer;
+    }
+  }
+
+  private void surfaceRender() {
+    synchronized (this) {
+      if (mLocalSurface == null || !mLocalSurface.isValid() || mBitmap == null || mByteBuffer == null)
+        return;
+
+      try {
+        Canvas c = mLocalSurface.lockCanvas(null);
+        mBitmap.copyPixelsFromBuffer(mByteBuffer);
+        c.drawBitmap(mBitmap, 0, 0, null);
+        mLocalSurface.unlockCanvasAndPost(c);
+      } catch (Exception e) {
+        Log.e("surfaceRender", e);
+      }
+    }
+  }
+
+  private void surfaceRelease() {
+    synchronized (this) {
+      mLocalSurface = null;
+      mBitmap = null;
+      mByteBuffer = null;
+    }
+  }
+
+  public interface OnHWRenderFailedListener {
+    public void onFailed();
+  }
+
+  public interface OnPreparedListener {
+    /**
+     * Called when the media file is ready for playback.
+     *
+     * @param mp the MediaPlayer that is ready for playback
+     */
+    void onPrepared(MediaPlayer mp);
+  }
+
+  public interface OnCompletionListener {
+    /**
+     * Called when the end of a media source is reached during playback.
+     *
+     * @param mp the MediaPlayer that reached the end of the file
+     */
+    void onCompletion(MediaPlayer mp);
+  }
+
+  public interface OnBufferingUpdateListener {
+    /**
+     * Called to update status in buffering a media stream. Buffering is storing
+     * data in memory while caching on external storage.
+     *
+     * @param mp      the MediaPlayer the update pertains to
+     * @param percent the percentage (0-100) of the buffer that has been filled thus
+     *                far
+     */
+    void onBufferingUpdate(MediaPlayer mp, int percent);
+  }
+
+  public interface OnCachingUpdateListener {
+    /**
+     * Called to update status in caching a media stream. Caching is storing
+     * data on external storage while buffering in memory.
+     *
+     * @param mp       the MediaPlayer the update pertains to
+     * @param segments the cached segments in bytes, in format [s1begin, s1end,
+     *                 s2begin, s2end], s1begin < s1end < s2begin < s2end. e.g. [124,
+     *                 100423, 4321412, 214323433]
+     */
+    void onCachingUpdate(MediaPlayer mp, long[] segments);
+
+    /**
+     * Cache speed
+     *
+     * @param mp    the MediaPlayer the update pertains to
+     * @param speed the cached speed size kb/s
+     */
+    void onCachingSpeed(MediaPlayer mp, int speed);
+
+    /**
+     * Cache not available
+     *
+     * @param mp   the MediaPlayer the update pertains to
+     * @param info the not available info
+     *             <ul>
+     *             <li>{@link #CACHE_INFO_NO_SPACE}
+     *             <li>{@link #CACHE_INFO_STREAM_NOT_SUPPORT}
+     *             </ul>
+     */
+    void onCachingNotAvailable(MediaPlayer mp, int info);
+  }
+
+  public interface OnSeekCompleteListener {
+    /**
+     * Called to indicate the completion of a seek operation.
+     *
+     * @param mp the MediaPlayer that issued the seek operation
+     */
+    public void onSeekComplete(MediaPlayer mp);
+  }
+
+  public interface OnVideoSizeChangedListener {
+    /**
+     * Called to indicate the video size
+     *
+     * @param mp     the MediaPlayer associated with this callback
+     * @param width  the width of the video
+     * @param height the height of the video
+     */
+    public void onVideoSizeChanged(MediaPlayer mp, int width, int height);
+  }
+
+  public interface OnErrorListener {
+    /**
+     * Called to indicate an error.
+     *
+     * @param mp    the MediaPlayer the error pertains to
+     * @param what  the type of error that has occurred:
+     *              <ul>
+     *              <li>{@link #MEDIA_ERROR_UNKNOWN}
+     *              <li>
+     *              {@link #MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK}
+     *              </ul>
+     * @param extra an extra code, specific to the error. Typically implementation
+     *              dependant.
+     * @return True if the method handled the error, false if it didn't.
+     *         Returning false, or not having an OnErrorListener at all, will
+     *         cause the OnCompletionListener to be called.
+     */
+    boolean onError(MediaPlayer mp, int what, int extra);
+  }
+
+  public interface OnInfoListener {
+    /**
+     * Called to indicate an info or a warning.
+     *
+     * @param mp    the MediaPlayer the info pertains to.
+     * @param what  the type of info or warning.
+     *              <ul>
+     *              <li>{@link #MEDIA_INFO_VIDEO_TRACK_LAGGING}
+     *              <li>{@link #MEDIA_INFO_BUFFERING_START}
+     *              <li>{@link #MEDIA_INFO_BUFFERING_END}
+     *              <li>{@link #MEDIA_INFO_NOT_SEEKABLE}
+     *              <li>{@link #MEDIA_INFO_DOWNLOAD_RATE_CHANGED}
+     *              </ul>
+     * @param extra an extra code, specific to the info. Typically implementation
+     *              dependant.
+     * @return True if the method handled the info, false if it didn't.
+     *         Returning false, or not having an OnErrorListener at all, will
+     *         cause the info to be discarded.
+     */
+    boolean onInfo(MediaPlayer mp, int what, int extra);
+  }
+
+  public interface OnTimedTextListener {
+    /**
+     * Called to indicate that a text timed text need to display
+     *
+     * @param text the timedText to display
+     */
+    public void onTimedText(String text);
+
+    /**
+     * Called to indicate that an image timed text need to display
+     *
+     * @param pixels the pixels of the timed text image
+     * @param width  the width of the timed text image
+     * @param height the height of the timed text image
+     */
+    public void onTimedTextUpdate(byte[] pixels, int width, int height);
+  }
+
+  /**
+   * Class for MediaPlayer to return each audio/video/subtitle track's metadata.
+   *
+   * @see io.vov.vitamio.MediaPlayer#getTrackInfo
+   */
+  static public class TrackInfo {
+    public static final int MEDIA_TRACK_TYPE_UNKNOWN = 0;
+    public static final int MEDIA_TRACK_TYPE_VIDEO = 1;
+    public static final int MEDIA_TRACK_TYPE_AUDIO = 2;
+    public static final int MEDIA_TRACK_TYPE_TIMEDTEXT = 3;
+    final int mTrackType;
+    final SparseArray<String> mTrackInfoArray;
+
+    TrackInfo(int trackType, SparseArray<String> trackInfoArray) {
+      mTrackType = trackType;
+      mTrackInfoArray = trackInfoArray;
+    }
+
+    /**
+     * Gets the track type.
+     *
+     * @return TrackType which indicates if the track is video, audio, timed
+     *         text.
+     */
+    public int getTrackType() {
+      return mTrackType;
+    }
+
+    /**
+     * Gets the track info
+     *
+     * @return map trackIndex to string (e.g. "English", 3).
+     */
+    public SparseArray<String> getTrackInfoArray() {
+      return mTrackInfoArray;
+    }
+  }
+
+  @SuppressLint("HandlerLeak")
+  private class EventHandler extends Handler {
+    private MediaPlayer mMediaPlayer;
+    private Bundle mData;
+
+    public EventHandler(MediaPlayer mp, Looper looper) {
+      super(looper);
+      mMediaPlayer = mp;
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+      switch (msg.what) {
+        case MEDIA_PREPARED:
+          if (mOnPreparedListener != null)
+            mOnPreparedListener.onPrepared(mMediaPlayer);
+          return;
+        case MEDIA_PLAYBACK_COMPLETE:
+          if (mOnCompletionListener != null)
+            mOnCompletionListener.onCompletion(mMediaPlayer);
+          stayAwake(false);
+          return;
+        case MEDIA_BUFFERING_UPDATE:
+          if (mOnBufferingUpdateListener != null)
+            mOnBufferingUpdateListener.onBufferingUpdate(mMediaPlayer, msg.arg1);
+          return;
+        case MEDIA_SEEK_COMPLETE:
+          if (isPlaying())
+            stayAwake(true);
+          if (mOnSeekCompleteListener != null)
+            mOnSeekCompleteListener.onSeekComplete(mMediaPlayer);
+          return;
+        case MEDIA_SET_VIDEO_SIZE:
+          if (mOnVideoSizeChangedListener != null)
+            mOnVideoSizeChangedListener.onVideoSizeChanged(mMediaPlayer, msg.arg1, msg.arg2);
+          return;
+        case MEDIA_ERROR:
+          Log.e("Error (%d, %d)", msg.arg1, msg.arg2);
+          boolean error_was_handled = false;
+          if (mOnErrorListener != null)
+            error_was_handled = mOnErrorListener.onError(mMediaPlayer, msg.arg1, msg.arg2);
+          if (mOnCompletionListener != null && !error_was_handled)
+            mOnCompletionListener.onCompletion(mMediaPlayer);
+          stayAwake(false);
+          return;
+        case MEDIA_INFO:
+          Log.i("Info (%d, %d)", msg.arg1, msg.arg2);
+          if (mOnInfoListener != null)
+            mOnInfoListener.onInfo(mMediaPlayer, msg.arg1, msg.arg2);
+          return;
+        case MEDIA_CACHE:
+          return;
+        case MEDIA_TIMED_TEXT:
+          mData = msg.getData();
+          if (mData.getInt(MEDIA_SUBTITLE_TYPE) == SUBTITLE_TEXT) {
+            Log.i("Subtitle : %s", mData.getString(MEDIA_SUBTITLE_STRING));
+            if (mOnTimedTextListener != null)
+              mOnTimedTextListener.onTimedText(mData.getString(MEDIA_SUBTITLE_STRING));
+          } else if (mData.getInt(MEDIA_SUBTITLE_TYPE) == SUBTITLE_BITMAP) {
+            Log.i("Subtitle : bitmap");
+            if (mOnTimedTextListener != null)
+              mOnTimedTextListener.onTimedTextUpdate(mData.getByteArray(MEDIA_SUBTITLE_BYTES), msg.arg1, msg.arg2);
+          }
+          return;
+        case MEDIA_CACHING_UPDATE:
+          if (mOnCachingUpdateListener != null) {
+            int cacheType = msg.getData().getInt(MEDIA_CACHING_TYPE);
+            if (cacheType == CACHE_TYPE_NOT_AVAILABLE) {
+              mOnCachingUpdateListener.onCachingNotAvailable(mMediaPlayer, msg.getData().getInt(MEDIA_CACHING_INFO));
+            } else if (cacheType == CACHE_TYPE_UPDATE) {
+              mOnCachingUpdateListener.onCachingUpdate(mMediaPlayer, msg.getData().getLongArray(MEDIA_CACHING_SEGMENTS));
+            } else if (cacheType == CACHE_TYPE_SPEED) {
+              mOnCachingUpdateListener.onCachingSpeed(mMediaPlayer, msg.getData().getInt(MEDIA_CACHING_INFO));
+            }
+          }
+          return;
+        case MEDIA_NOP:
+          return;
+        case MEDIA_HW_ERROR:
+        	if (mOnHWRenderFailedListener != null)
+        		mOnHWRenderFailedListener.onFailed();
+        	return;
+        default:
+          Log.e("Unknown message type " + msg.what);
+          return;
+      }
+    }
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/MediaScanner.java b/showkeyHelper/src/io/vov/vitamio/MediaScanner.java
new file mode 100644
index 0000000..1250af6
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/MediaScanner.java
@@ -0,0 +1,451 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.content.ContentProviderClient;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.text.TextUtils;
+
+import io.vov.vitamio.provider.MediaStore;
+import io.vov.vitamio.provider.MediaStore.Video;
+import io.vov.vitamio.utils.ContextUtils;
+import io.vov.vitamio.utils.FileUtils;
+import io.vov.vitamio.utils.Log;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+
+public class MediaScanner {
+  private static final String[] VIDEO_PROJECTION = new String[]{Video.Media._ID, Video.Media.DATA, Video.Media.DATE_MODIFIED,};
+  private static final int ID_VIDEO_COLUMN_INDEX = 0;
+  private static final int PATH_VIDEO_COLUMN_INDEX = 1;
+  private static final int DATE_MODIFIED_VIDEO_COLUMN_INDEX = 2;
+  private Context mContext;
+  private ContentProviderClient mProvider;
+  private boolean mCaseInsensitivePaths;
+  private HashMap<String, FileCacheEntry> mFileCache;
+  private MyMediaScannerClient mClient = new MyMediaScannerClient();
+
+  public MediaScanner(Context ctx) {
+    mContext = ctx;
+    native_init(mClient);
+  }
+
+  private static native boolean loadFFmpeg_native(String ffmpegPath);
+
+  private void initialize() {
+    mCaseInsensitivePaths = true;
+  }
+
+  private void prescan(String filePath) throws RemoteException {
+    mProvider = mContext.getContentResolver().acquireContentProviderClient(MediaStore.AUTHORITY);
+    Cursor c = null;
+    String where = null;
+    String[] selectionArgs = null;
+
+    if (mFileCache == null)
+      mFileCache = new HashMap<String, FileCacheEntry>();
+    else
+      mFileCache.clear();
+
+    try {
+      if (filePath != null) {
+        where = Video.Media.DATA + "=?";
+        selectionArgs = new String[]{filePath};
+      }
+
+      c = mProvider.query(Video.Media.CONTENT_URI, VIDEO_PROJECTION, where, selectionArgs, null);
+      if (c != null) {
+        try {
+          while (c.moveToNext()) {
+            long rowId = c.getLong(ID_VIDEO_COLUMN_INDEX);
+            String path = c.getString(PATH_VIDEO_COLUMN_INDEX);
+            long lastModified = c.getLong(DATE_MODIFIED_VIDEO_COLUMN_INDEX);
+            if (path.startsWith("/")) {
+              File tempFile = new File(path);
+              if (!TextUtils.isEmpty(filePath) && !tempFile.exists()) {
+                mProvider.delete(Video.Media.CONTENT_URI, where, selectionArgs);
+                return;
+              }
+              path = FileUtils.getCanonical(tempFile);
+              String key = mCaseInsensitivePaths ? path.toLowerCase() : path;
+              mFileCache.put(key, new FileCacheEntry(Video.Media.CONTENT_URI, rowId, path, lastModified));
+            }
+          }
+        } finally {
+          c.close();
+          c = null;
+        }
+      }
+    } finally {
+      if (c != null) {
+        c.close();
+      }
+    }
+  }
+
+  ;
+
+  private void postscan(String[] directories) throws RemoteException {
+    Iterator<FileCacheEntry> iterator = mFileCache.values().iterator();
+
+    while (iterator.hasNext()) {
+      FileCacheEntry entry = iterator.next();
+      String path = entry.mPath;
+
+      if (!entry.mSeenInFileSystem) {
+        if (inScanDirectory(path, directories) && !new File(path).exists()) {
+          mProvider.delete(ContentUris.withAppendedId(entry.mTableUri, entry.mRowId), null, null);
+          iterator.remove();
+        }
+      }
+    }
+
+    mFileCache.clear();
+    mFileCache = null;
+    mProvider.release();
+    mProvider = null;
+  }
+
+  private boolean inScanDirectory(String path, String[] directories) {
+    for (int i = 0; i < directories.length; i++) {
+      if (path.startsWith(directories[i]))
+        return true;
+    }
+    return false;
+  }
+
+  public void scanDirectories(String[] directories) {
+    try {
+      long start = System.currentTimeMillis();
+      prescan(null);
+      long prescan = System.currentTimeMillis();
+
+      for (int i = 0; i < directories.length; i++) {
+        if (!TextUtils.isEmpty(directories[i])) {
+          directories[i] = ContextUtils.fixLastSlash(directories[i]);
+          processDirectory(directories[i], MediaFile.sFileExtensions);
+        }
+      }
+
+      long scan = System.currentTimeMillis();
+      postscan(directories);
+      long end = System.currentTimeMillis();
+
+      Log.d(" prescan time: %dms", prescan - start);
+      Log.d("    scan time: %dms", scan - prescan);
+      Log.d("postscan time: %dms", end - scan);
+      Log.d("   total time: %dms", end - start);
+    } catch (SQLException e) {
+      Log.e("SQLException in MediaScanner.scan()", e);
+    } catch (UnsupportedOperationException e) {
+      Log.e("UnsupportedOperationException in MediaScanner.scan()", e);
+    } catch (RemoteException e) {
+      Log.e("RemoteException in MediaScanner.scan()", e);
+    }
+  }
+
+  public Uri scanSingleFile(String path, String mimeType) {
+    try {
+      prescan(path);
+      File file = new File(path);
+      long lastModifiedSeconds = file.lastModified() / 1000;
+
+      return mClient.doScanFile(path, lastModifiedSeconds, file.length(), true);
+    } catch (RemoteException e) {
+      Log.e("RemoteException in MediaScanner.scanFile()", e);
+      return null;
+    }
+  }
+
+  static {
+    String LIB_ROOT = Vitamio.getLibraryPath();
+    Log.i("LIB ROOT: %s", LIB_ROOT);
+    System.load(LIB_ROOT + "libstlport_shared.so");
+    System.load(LIB_ROOT + "libvscanner.so");
+    loadFFmpeg_native(LIB_ROOT + "libffmpeg.so");
+  }
+
+  private native void processDirectory(String path, String extensions);
+
+  private native boolean processFile(String path, String mimeType);
+
+  private native final void native_init(MediaScannerClient client);
+
+  public native void release();
+
+  private native final void native_finalize();
+
+  @Override
+  protected void finalize() throws Throwable {
+    try {
+      native_finalize();
+    } finally {
+      super.finalize();
+    }
+  }
+
+  private static class FileCacheEntry {
+    Uri mTableUri;
+    long mRowId;
+    String mPath;
+    long mLastModified;
+    boolean mLastModifiedChanged;
+    boolean mSeenInFileSystem;
+
+    FileCacheEntry(Uri tableUri, long rowId, String path, long lastModified) {
+      mTableUri = tableUri;
+      mRowId = rowId;
+      mPath = path;
+      mLastModified = lastModified;
+      mSeenInFileSystem = false;
+      mLastModifiedChanged = false;
+    }
+
+    @Override
+    public String toString() {
+      return mPath;
+    }
+  }
+
+  private class MyMediaScannerClient implements MediaScannerClient {
+    private String mMimeType;
+    private int mFileType;
+    private String mPath;
+    private long mLastModified;
+    private long mFileSize;
+    private String mTitle;
+    private String mArtist;
+    private String mAlbum;
+    private String mLanguage;
+    private long mDuration;
+    private int mWidth;
+    private int mHeight;
+
+    public FileCacheEntry beginFile(String path, long lastModified, long fileSize) {
+      int lastSlash = path.lastIndexOf('/');
+      if (lastSlash >= 0 && lastSlash + 2 < path.length()) {
+        if (path.regionMatches(lastSlash + 1, "._", 0, 2))
+          return null;
+
+        if (path.regionMatches(true, path.length() - 4, ".jpg", 0, 4)) {
+          if (path.regionMatches(true, lastSlash + 1, "AlbumArt_{", 0, 10) || path.regionMatches(true, lastSlash + 1, "AlbumArt.", 0, 9)) {
+            return null;
+          }
+          int length = path.length() - lastSlash - 1;
+          if ((length == 17 && path.regionMatches(true, lastSlash + 1, "AlbumArtSmall", 0, 13)) || (length == 10 && path.regionMatches(true, lastSlash + 1, "Folder", 0, 6))) {
+            return null;
+          }
+        }
+      }
+
+      MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
+      if (mediaFileType != null) {
+        mFileType = mediaFileType.fileType;
+        mMimeType = mediaFileType.mimeType;
+      }
+
+      String key = FileUtils.getCanonical(new File(path));
+      if (mCaseInsensitivePaths)
+        key = path.toLowerCase();
+      FileCacheEntry entry = mFileCache.get(key);
+      if (entry == null) {
+        entry = new FileCacheEntry(null, 0, path, 0);
+        mFileCache.put(key, entry);
+      }
+      entry.mSeenInFileSystem = true;
+
+      long delta = lastModified - entry.mLastModified;
+      if (delta > 1 || delta < -1) {
+        entry.mLastModified = lastModified;
+        entry.mLastModifiedChanged = true;
+      }
+
+      mPath = path;
+      mLastModified = lastModified;
+      mFileSize = fileSize;
+      mTitle = null;
+      mDuration = 0;
+
+      return entry;
+    }
+
+    public void scanFile(String path, long lastModified, long fileSize) {
+      Log.i("scanFile: %s", path);
+      doScanFile(path, lastModified, fileSize, false);
+    }
+
+    public Uri doScanFile(String path, long lastModified, long fileSize, boolean scanAlways) {
+      Uri result = null;
+      try {
+        FileCacheEntry entry = beginFile(path, lastModified, fileSize);
+        if (entry != null && (entry.mLastModifiedChanged || scanAlways)) {
+          if (processFile(path, null)) {
+            result = endFile(entry);
+          } else {
+            if (mCaseInsensitivePaths)
+              mFileCache.remove(path.toLowerCase());
+            else
+              mFileCache.remove(path);
+          }
+        }
+      } catch (RemoteException e) {
+        Log.e("RemoteException in MediaScanner.scanFile()", e);
+      }
+      return result;
+    }
+
+    private int parseSubstring(String s, int start, int defaultValue) {
+      int length = s.length();
+      if (start == length)
+        return defaultValue;
+
+      char ch = s.charAt(start++);
+      if (ch < '0' || ch > '9')
+        return defaultValue;
+
+      int result = ch - '0';
+      while (start < length) {
+        ch = s.charAt(start++);
+        if (ch < '0' || ch > '9')
+          return result;
+        result = result * 10 + (ch - '0');
+      }
+
+      return result;
+    }
+
+    public void handleStringTag(String name, byte[] valueBytes, String valueEncoding) {
+      String value;
+      try {
+        value = new String(valueBytes, valueEncoding);
+      } catch (Exception e) {
+        Log.e("handleStringTag", e);
+        value = new String(valueBytes);
+      }
+      Log.i("%s : %s", name, value);
+
+      if (name.equalsIgnoreCase("title")) {
+        mTitle = value;
+      } else if (name.equalsIgnoreCase("artist")) {
+        mArtist = value.trim();
+      } else if (name.equalsIgnoreCase("albumartist")) {
+        if (TextUtils.isEmpty(mArtist))
+          mArtist = value.trim();
+      } else if (name.equalsIgnoreCase("album")) {
+        mAlbum = value.trim();
+      } else if (name.equalsIgnoreCase("language")) {
+        mLanguage = value.trim();
+      } else if (name.equalsIgnoreCase("duration")) {
+        mDuration = parseSubstring(value, 0, 0);
+      } else if (name.equalsIgnoreCase("width")) {
+        mWidth = parseSubstring(value, 0, 0);
+      } else if (name.equalsIgnoreCase("height")) {
+        mHeight = parseSubstring(value, 0, 0);
+      }
+    }
+
+    public void setMimeType(String mimeType) {
+      Log.i("setMimeType: %s", mimeType);
+      mMimeType = mimeType;
+      mFileType = MediaFile.getFileTypeForMimeType(mimeType);
+    }
+
+    private ContentValues toValues() {
+      ContentValues map = new ContentValues();
+
+      map.put(MediaStore.MediaColumns.DATA, mPath);
+      map.put(MediaStore.MediaColumns.DATE_MODIFIED, mLastModified);
+      map.put(MediaStore.MediaColumns.SIZE, mFileSize);
+      map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType);
+      map.put(MediaStore.MediaColumns.TITLE, mTitle);
+
+      if (MediaFile.isVideoFileType(mFileType)) {
+        map.put(Video.Media.DURATION, mDuration);
+        map.put(Video.Media.LANGUAGE, mLanguage);
+        map.put(Video.Media.ALBUM, mAlbum);
+        map.put(Video.Media.ARTIST, mArtist);
+        map.put(Video.Media.WIDTH, mWidth);
+        map.put(Video.Media.HEIGHT, mHeight);
+      }
+
+      return map;
+    }
+
+    private Uri endFile(FileCacheEntry entry) throws RemoteException {
+      Uri tableUri;
+      boolean isVideo = MediaFile.isVideoFileType(mFileType) && mWidth > 0 && mHeight > 0;
+      if (isVideo) {
+        tableUri = Video.Media.CONTENT_URI;
+      } else {
+        return null;
+      }
+      entry.mTableUri = tableUri;
+
+      ContentValues values = toValues();
+      String title = values.getAsString(MediaStore.MediaColumns.TITLE);
+      if (TextUtils.isEmpty(title)) {
+        title = values.getAsString(MediaStore.MediaColumns.DATA);
+        int lastSlash = title.lastIndexOf('/');
+        if (lastSlash >= 0) {
+          lastSlash++;
+          if (lastSlash < title.length())
+            title = title.substring(lastSlash);
+        }
+        int lastDot = title.lastIndexOf('.');
+        if (lastDot > 0)
+          title = title.substring(0, lastDot);
+        values.put(MediaStore.MediaColumns.TITLE, title);
+      }
+
+      long rowId = entry.mRowId;
+
+      Uri result = null;
+      if (rowId == 0) {
+        result = mProvider.insert(tableUri, values);
+        if (result != null) {
+          rowId = ContentUris.parseId(result);
+          entry.mRowId = rowId;
+        }
+      } else {
+        result = ContentUris.withAppendedId(tableUri, rowId);
+        mProvider.update(result, values, null, null);
+      }
+
+      return result;
+    }
+
+    public void addNoMediaFolder(String path) {
+      ContentValues values = new ContentValues();
+      values.put(MediaStore.MediaColumns.DATA, "");
+      String[] pathSpec = new String[]{path + '%'};
+      try {
+        mProvider.update(Video.Media.CONTENT_URI, values, MediaStore.MediaColumns.DATA + " LIKE ?", pathSpec);
+      } catch (RemoteException e) {
+        throw new RuntimeException();
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/MediaScannerClient.java b/showkeyHelper/src/io/vov/vitamio/MediaScannerClient.java
new file mode 100644
index 0000000..d20ed0b
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/MediaScannerClient.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+/**
+ * DON'T TOUCH THIS FILE IF YOU DON'T KNOW THE MediaScanner PROCEDURE!!!
+ */
+public interface MediaScannerClient {
+  public void scanFile(String path, long lastModified, long fileSize);
+
+  public void addNoMediaFolder(String path);
+
+  public void handleStringTag(String name, byte[] value, String valueEncoding);
+
+  public void setMimeType(String mimeType);
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/Metadata.java b/showkeyHelper/src/io/vov/vitamio/Metadata.java
new file mode 100644
index 0000000..a359016
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/Metadata.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.util.SparseArray;
+
+
+import java.io.UnsupportedEncodingException;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * See {@link io.vov.vitamio.MediaPlayer#getMetadata()}
+ */
+public class Metadata {
+  public static final int ANY = 0;
+  public static final int TITLE = 1; // String
+  public static final int COMMENT = 2; // String
+  public static final int COPYRIGHT = 3; // String
+  public static final int ALBUM = 4; // String
+  public static final int ARTIST = 5; // String
+  public static final int AUTHOR = 6; // String
+  public static final int COMPOSER = 7; // String
+  public static final int GENRE = 8; // String
+  public static final int DATE = 9; // Date
+  public static final int DURATION = 10; // Integer(milliseconds)
+  public static final int CD_TRACK_NUM = 11; // Integer (1-based)
+  public static final int CD_TRACK_MAX = 12; // Integer
+  public static final int RATING = 13; // String
+  public static final int ALBUM_ART = 14; // byte[]
+  public static final int VIDEO_FRAME = 15; // Bitmap
+  public static final int LENGTH = 16; // Integer (bytes)
+  public static final int BIT_RATE = 17; // Integer
+  public static final int AUDIO_BIT_RATE = 18; // Integer
+  public static final int VIDEO_BIT_RATE = 19; // Integer
+  public static final int AUDIO_SAMPLE_RATE = 20; // Integer
+  public static final int VIDEO_FRAME_RATE = 21; // Float
+  // See RFC2046 and RFC4281.
+  public static final int MIME_TYPE = 22; // String
+  public static final int AUDIO_CODEC = 23; // String
+  public static final int VIDEO_CODEC = 24; // String
+  public static final int VIDEO_HEIGHT = 25; // Integer
+  public static final int VIDEO_WIDTH = 26; // Integer
+  public static final int NUM_TRACKS = 27; // Integer
+  public static final int DRM_CRIPPLED = 28; // Boolean
+  public static final int PAUSE_AVAILABLE = 29; // Boolean
+  public static final int SEEK_BACKWARD_AVAILABLE = 30; // Boolean
+  public static final int SEEK_FORWARD_AVAILABLE = 31; // Boolean
+  public static final int SEEK_AVAILABLE = 32; // Boolean
+  private static final int LAST_SYSTEM = 32;
+  private static final int FIRST_CUSTOM = 8192;
+  private SparseArray<byte[]> mMeta = new SparseArray<byte[]>();
+  private String mEncoding = "UTF-8";
+
+  public boolean parse(Map<byte[], byte[]> meta, String encoding) {
+    String key = null;
+    byte[] value = null;
+    mEncoding = encoding;
+    for (byte[] keyBytes : meta.keySet()) {
+      try {
+        key = new String(keyBytes, mEncoding).trim().toLowerCase(Locale.US);
+      } catch (UnsupportedEncodingException e) {
+        key = new String(keyBytes).trim().toLowerCase(Locale.US);
+      }
+      value = meta.get(keyBytes);
+      if (key.equals("title")) {
+        mMeta.put(TITLE, value);
+      } else if (key.equals("comment")) {
+        mMeta.put(COMMENT, value);
+      } else if (key.equals("copyright")) {
+        mMeta.put(COPYRIGHT, value);
+      } else if (key.equals("album")) {
+        mMeta.put(ALBUM, value);
+      } else if (key.equals("artist")) {
+        mMeta.put(ARTIST, value);
+      } else if (key.equals("author")) {
+        mMeta.put(AUTHOR, value);
+      } else if (key.equals("composer")) {
+        mMeta.put(COMPOSER, value);
+      } else if (key.equals("genre")) {
+        mMeta.put(GENRE, value);
+      } else if (key.equals("creation_time") || key.equals("date")) {
+        mMeta.put(DATE, value);
+      } else if (key.equals("duration")) {
+        mMeta.put(DURATION, value);
+      } else if (key.equals("length")) {
+        mMeta.put(LENGTH, value);
+      } else if (key.equals("bit_rate")) {
+        mMeta.put(BIT_RATE, value);
+      } else if (key.equals("audio_bit_rate")) {
+        mMeta.put(AUDIO_BIT_RATE, value);
+      } else if (key.equals("video_bit_rate")) {
+        mMeta.put(VIDEO_BIT_RATE, value);
+      } else if (key.equals("audio_sample_rate")) {
+        mMeta.put(AUDIO_SAMPLE_RATE, value);
+      } else if (key.equals("video_frame_rate")) {
+        mMeta.put(VIDEO_FRAME_RATE, value);
+      } else if (key.equals("format")) {
+        mMeta.put(MIME_TYPE, value);
+      } else if (key.equals("audio_codec")) {
+        mMeta.put(AUDIO_CODEC, value);
+      } else if (key.equals("video_codec")) {
+        mMeta.put(VIDEO_CODEC, value);
+      } else if (key.equals("video_height")) {
+        mMeta.put(VIDEO_HEIGHT, value);
+      } else if (key.equals("video_width")) {
+        mMeta.put(VIDEO_WIDTH, value);
+      } else if (key.equals("num_tracks")) {
+        mMeta.put(NUM_TRACKS, value);
+      } else if (key.equals("cap_pause")) {
+        mMeta.put(PAUSE_AVAILABLE, value);
+      } else if (key.equals("cap_seek")) {
+        mMeta.put(SEEK_AVAILABLE, value);
+      }
+    }
+
+    if (BuildConfig.DEBUG) {
+      android.util.Log.i("Vitamio[Metadata]", "title:\t\t" + getString(TITLE));
+      android.util.Log.i("Vitamio[Metadata]", "comment:\t\t" + getString(COMMENT));
+      android.util.Log.i("Vitamio[Metadata]", "copyright:\t\t" + getString(COPYRIGHT));
+      android.util.Log.i("Vitamio[Metadata]", "album:\t\t" + getString(ALBUM));
+      android.util.Log.i("Vitamio[Metadata]", "artist:\t\t" + getString(ARTIST));
+      android.util.Log.i("Vitamio[Metadata]", "composer:\t\t" + getString(COMPOSER));
+      android.util.Log.i("Vitamio[Metadata]", "genre:\t\t" + getString(GENRE));
+      android.util.Log.i("Vitamio[Metadata]", "date:\t\t" + getString(DATE));
+      android.util.Log.i("Vitamio[Metadata]", "duration:\t\t" + getLong(DURATION));
+      android.util.Log.i("Vitamio[Metadata]", "length:\t\t" + getLong(LENGTH));
+      android.util.Log.i("Vitamio[Metadata]", "bit_rate:\t\t" + getInt(BIT_RATE));
+      android.util.Log.i("Vitamio[Metadata]", "audio_bit_rate:\t" + getInt(AUDIO_BIT_RATE));
+      android.util.Log.i("Vitamio[Metadata]", "video_bit_rate:\t" + getInt(VIDEO_BIT_RATE));
+      android.util.Log.i("Vitamio[Metadata]", "audio_sample_rate:\t" + getInt(AUDIO_SAMPLE_RATE));
+      android.util.Log.i("Vitamio[Metadata]", "video_frame_rate:\t" + getDouble(VIDEO_FRAME_RATE));
+      android.util.Log.i("Vitamio[Metadata]", "format:\t\t" + getString(MIME_TYPE));
+      android.util.Log.i("Vitamio[Metadata]", "audio_codec:\t" + getString(AUDIO_CODEC));
+      android.util.Log.i("Vitamio[Metadata]", "video_codec:\t" + getString(VIDEO_CODEC));
+      android.util.Log.i("Vitamio[Metadata]", "video_height:\t" + getInt(VIDEO_HEIGHT));
+      android.util.Log.i("Vitamio[Metadata]", "video_width:\t" + getInt(VIDEO_WIDTH));
+      android.util.Log.i("Vitamio[Metadata]", "num_tracks:\t\t" + getInt(NUM_TRACKS));
+      android.util.Log.i("Vitamio[Metadata]", "cap_pause:\t\t" + getBoolean(PAUSE_AVAILABLE));
+      android.util.Log.i("Vitamio[Metadata]", "cap_seek:\t\t" + getBoolean(SEEK_AVAILABLE));
+    }
+
+    return true;
+  }
+
+  public boolean has(final int metadataId) {
+    if (!checkMetadataId(metadataId)) {
+      throw new IllegalArgumentException("Invalid key: " + metadataId);
+    }
+    return mMeta.indexOfKey(metadataId) >= 0;
+  }
+
+  public String getString(final int key) {
+    byte[] value = mMeta.get(key);
+    if (value == null) {
+      return null;
+    }
+    try {
+      return new String(value, mEncoding);
+    } catch (UnsupportedEncodingException e) {
+      return new String(value);
+    }
+  }
+
+  public int getInt(final int key) {
+    try {
+      return Integer.parseInt(getString(key));
+    } catch (Exception e) {
+      return -1;
+    }
+  }
+
+  public boolean getBoolean(final int key) {
+    try {
+      return Boolean.parseBoolean(getString(key));
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  public long getLong(final int key) {
+    try {
+      return Long.parseLong(getString(key));
+    } catch (Exception e) {
+      return -1;
+    }
+  }
+
+  public double getDouble(final int key) {
+    try {
+      return Double.parseDouble(getString(key));
+    } catch (Exception e) {
+      return -1;
+    }
+  }
+
+  public byte[] getByteArray(final int key) {
+    return mMeta.get(key);
+  }
+
+  private boolean checkMetadataId(final int val) {
+    if (val <= ANY || (LAST_SYSTEM < val && val < FIRST_CUSTOM)) {
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/ThumbnailUtils.java b/showkeyHelper/src/io/vov/vitamio/ThumbnailUtils.java
new file mode 100644
index 0000000..bbf2a31
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/ThumbnailUtils.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import io.vov.vitamio.provider.MediaStore.Video;
+
+/**
+ * ThumbnailUtils is a wrapper of MediaMetadataRetriever to retrive a thumbnail
+ * of video file.
+ * <p/>
+ * <pre>
+ * Bitmap thumb = ThumbnailUtils.createVideoThumbnail(this, videoPath, MINI_KIND);
+ * </pre>
+ */
+public class ThumbnailUtils {
+  private static final int OPTIONS_NONE = 0x0;
+  private static final int OPTIONS_SCALE_UP = 0x1;
+  public static final int OPTIONS_RECYCLE_INPUT = 0x2;
+  public static final int TARGET_SIZE_MINI_THUMBNAIL_WIDTH = 426;
+  public static final int TARGET_SIZE_MINI_THUMBNAIL_HEIGHT = 320;
+  public static final int TARGET_SIZE_MICRO_THUMBNAIL_WIDTH = 212;
+  public static final int TARGET_SIZE_MICRO_THUMBNAIL_HEIGHT = 160;
+  
+
+  public static Bitmap createVideoThumbnail(Context ctx, String filePath, int kind) {
+    if (!Vitamio.isInitialized(ctx)) {
+      return null;
+    }
+    Bitmap bitmap = null;
+    MediaMetadataRetriever retriever = null;
+    try {
+      retriever = new MediaMetadataRetriever(ctx);
+      retriever.setDataSource(filePath);
+      bitmap = retriever.getFrameAtTime(-1);
+    } catch (Exception ex) {
+    } finally {
+      try {
+        retriever.release();
+      } catch (RuntimeException ex) {
+      }
+    }
+
+    if (bitmap != null) {
+      if (kind == Video.Thumbnails.MICRO_KIND)
+        bitmap = extractThumbnail(bitmap, TARGET_SIZE_MICRO_THUMBNAIL_WIDTH, TARGET_SIZE_MICRO_THUMBNAIL_HEIGHT, OPTIONS_RECYCLE_INPUT);
+      else if (kind == Video.Thumbnails.MINI_KIND)
+        bitmap = extractThumbnail(bitmap, TARGET_SIZE_MINI_THUMBNAIL_WIDTH, TARGET_SIZE_MINI_THUMBNAIL_HEIGHT, OPTIONS_RECYCLE_INPUT);
+    }
+    return bitmap;
+  }
+
+  public static Bitmap extractThumbnail(Bitmap source, int width, int height) {
+    return extractThumbnail(source, width, height, OPTIONS_NONE);
+  }
+
+  public static Bitmap extractThumbnail(Bitmap source, int width, int height, int options) {
+    if (source == null)
+      return null;
+
+    float scale;
+    if (source.getWidth() < source.getHeight())
+      scale = width / (float) source.getWidth();
+    else
+      scale = height / (float) source.getHeight();
+    Matrix matrix = new Matrix();
+    matrix.setScale(scale, scale);
+    Bitmap thumbnail = transform(matrix, source, width, height, OPTIONS_SCALE_UP | options);
+    return thumbnail;
+  }
+
+  private static Bitmap transform(Matrix scaler, Bitmap source, int targetWidth, int targetHeight, int options) {
+    boolean scaleUp = (options & OPTIONS_SCALE_UP) != 0;
+    boolean recycle = (options & OPTIONS_RECYCLE_INPUT) != 0;
+
+    int deltaX = source.getWidth() - targetWidth;
+    int deltaY = source.getHeight() - targetHeight;
+    if (!scaleUp && (deltaX < 0 || deltaY < 0)) {
+      Bitmap b2 = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888);
+      Canvas c = new Canvas(b2);
+
+      int deltaXHalf = Math.max(0, deltaX / 2);
+      int deltaYHalf = Math.max(0, deltaY / 2);
+      Rect src = new Rect(deltaXHalf, deltaYHalf, deltaXHalf + Math.min(targetWidth, source.getWidth()), deltaYHalf + Math.min(targetHeight, source.getHeight()));
+      int dstX = (targetWidth - src.width()) / 2;
+      int dstY = (targetHeight - src.height()) / 2;
+      Rect dst = new Rect(dstX, dstY, targetWidth - dstX, targetHeight - dstY);
+      c.drawBitmap(source, src, dst, null);
+      if (recycle)
+        source.recycle();
+      return b2;
+    }
+
+    float bitmapWidthF = source.getWidth();
+    float bitmapHeightF = source.getHeight();
+    float bitmapAspect = bitmapWidthF / bitmapHeightF;
+    float viewAspect = (float) targetWidth / targetHeight;
+
+    float scale = bitmapAspect > viewAspect ? targetHeight / bitmapHeightF : targetWidth / bitmapWidthF;
+    if (scale < .9F || scale > 1F)
+      scaler.setScale(scale, scale);
+    else
+      scaler = null;
+
+    Bitmap b1;
+    if (scaler != null)
+      b1 = Bitmap.createBitmap(source, 0, 0, source.getWidth(), source.getHeight(), scaler, true);
+    else
+      b1 = source;
+
+    if (recycle && b1 != source)
+      source.recycle();
+
+    int dx1 = Math.max(0, b1.getWidth() - targetWidth);
+    int dy1 = Math.max(0, b1.getHeight() - targetHeight);
+
+    Bitmap b2 = Bitmap.createBitmap(b1, dx1 / 2, dy1 / 2, targetWidth, targetHeight);
+
+    if (b2 != b1 && (recycle || b1 != source))
+      b1.recycle();
+
+    return b2;
+  }
+
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/VIntent.java b/showkeyHelper/src/io/vov/vitamio/VIntent.java
new file mode 100644
index 0000000..1deb02a
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/VIntent.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+/**
+ * Common intent actions used by Vitamio component.
+ */
+public class VIntent {
+  public static final String ACTION_MEDIA_SCANNER_SCAN_DIRECTORY = "com.yixia.vitamio.action.MEDIA_SCANNER_SCAN_DIRECTORY";
+  public static final String ACTION_MEDIA_SCANNER_SCAN_FILE = "com.yixia.vitamio.action.MEDIA_SCANNER_SCAN_FILE";
+  public static final String ACTION_MEDIA_SCANNER_STARTED = "com.yixia.vitamio.action.MEDIA_SCANNER_STARTED";
+  public static final String ACTION_MEDIA_SCANNER_FINISHED = "com.yixia.vitamio.action.MEDIA_SCANNER_FINISHED";
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/Vitamio.java b/showkeyHelper/src/io/vov/vitamio/Vitamio.java
new file mode 100644
index 0000000..10c4166
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/Vitamio.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+import io.vov.vitamio.utils.CPU;
+import io.vov.vitamio.utils.ContextUtils;
+import io.vov.vitamio.utils.IOUtils;
+import io.vov.vitamio.utils.Log;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import android.content.Context;
+
+import com.joyplus.tvhelper.R;
+
+
+
+/**
+ * Inspect this class before using any other Vitamio classes.
+ * <p/>
+ * Don't modify this class, or the full Vitamio library may be broken.
+ */
+public class Vitamio {
+  private static final String[] LIBS_CODECS = {"libffmpeg.so", "libOMX.9.so", "libOMX.11.so", "libOMX.14.so", "libOMX.16.so"};
+  private static final String[] LIBS_PLAYER = {"libvplayer.so"};
+  private static final String[] LIBS_SCANNER = {"libvscanner.so"};
+  private static final String[] LIBS_AV = {"libvao.0.so", "libvvo.0.so", "libvvo.7.so", "libvvo.8.so", "libvvo.9.so", "libvvo.j.so"};
+  private static final String LIBS_LOCK = ".lock";
+  private static final int VITAMIO_NOT_SUPPORTED = -1;
+  private static final int VITAMIO_ARMV6 = 60;
+  private static final int VITAMIO_ARMV6_VFP = 61;
+  private static final int VITAMIO_ARMV7_VFPV3 = 70;
+  private static final int VITAMIO_ARMV7_NEON = 71;
+  private static final int vitamioType;
+
+  static {
+    int cpu = CPU.getFeature();
+    if ((cpu & CPU.FEATURE_ARM_NEON) > 0)
+      vitamioType = VITAMIO_ARMV7_NEON;
+    else if ((cpu & CPU.FEATURE_ARM_VFPV3) > 0 && (cpu & CPU.FEATURE_ARM_V7A) > 0)
+      vitamioType = VITAMIO_ARMV7_VFPV3;
+    else if ((cpu & CPU.FEATURE_ARM_VFP) > 0 && (cpu & CPU.FEATURE_ARM_V6) > 0)
+      vitamioType = VITAMIO_ARMV6_VFP;
+    else if ((cpu & CPU.FEATURE_ARM_V6) > 0)
+      vitamioType = VITAMIO_ARMV6;
+    else
+      vitamioType = VITAMIO_NOT_SUPPORTED;
+  }
+
+  private static String vitamioPackage;
+  private static String vitamioLibraryPath;
+
+  /**
+   * Call this method before using any other Vitamio specific classes.
+   * <p/>
+   * This method will use {@link #isInitialized(Context)} to check if Vitamio is
+   * initialized at this device, and initialize it if not initialized.
+   *
+   * @param ctx Android Context
+   * @return true if the Vitamio initialized successfully.
+   */
+  public static boolean initialize(Context ctx) {
+    return isInitialized(ctx) || extractLibs(ctx, R.raw.libarm);
+  }
+
+  /**
+   * Same as {@link #initialize(Context)}
+   *
+   * @param ctx   Android Context
+   * @param rawId R.raw.libarm
+   * @return true if the Vitamio initialized successfully.
+   */
+  public static boolean initialize(Context ctx, int rawId) {
+    return isInitialized(ctx) || extractLibs(ctx, rawId);
+  }
+
+  /**
+   * Check if Vitamio is initialized at this device
+   *
+   * @param ctx Android Context
+   * @return true if the Vitamio has been initialized.
+   */
+  public static boolean isInitialized(Context ctx) {
+    vitamioPackage = ctx.getPackageName();
+    vitamioLibraryPath = ContextUtils.getDataDir(ctx) + "libs/";
+    File dir = new File(getLibraryPath());
+    if (dir.exists() && dir.isDirectory()) {
+      String[] libs = dir.list();
+      if (libs != null) {
+        Arrays.sort(libs);
+        for (String L : getRequiredLibs()) {
+          if (Arrays.binarySearch(libs, L) < 0) {
+            Log.e("Native libs %s not exists!", L);
+            return false;
+          }
+        }
+        File lock = new File(getLibraryPath() + LIBS_LOCK);
+        FileReader fr = null;
+        try {
+          fr = new FileReader(lock);
+          int appVersion = ContextUtils.getVersionCode(ctx);
+          int libVersion = fr.read();
+          Log.i("isNativeLibsInited, APP VERSION: %d, Vitamio Library version: %d", appVersion, libVersion);
+          if (libVersion == appVersion)
+            return true;
+        } catch (IOException e) {
+          Log.e("isNativeLibsInited", e);
+        } finally {
+          IOUtils.closeSilently(fr);
+        }
+      }
+    }
+    return false;
+  }
+
+  public static String getVitamioPackage() {
+    return vitamioPackage;
+  }
+
+  public static int getVitamioType() {
+    return vitamioType;
+  }
+
+  public static final String getLibraryPath() {
+    return vitamioLibraryPath;
+  }
+
+  private static final List<String> getRequiredLibs() {
+    List<String> libs = new ArrayList<String>();
+    for (String[] libArray : new String[][]{LIBS_CODECS, LIBS_PLAYER, LIBS_SCANNER, LIBS_AV}) {
+      for (String lib : libArray)
+        libs.add(lib);
+    }
+    libs.add(LIBS_LOCK);
+    return libs;
+  }
+
+  private static boolean extractLibs(Context ctx, int rawID) {
+    long begin = System.currentTimeMillis();
+    final int version = ContextUtils.getVersionCode(ctx);
+    Log.d("loadLibs start " + version);
+    File lock = new File(getLibraryPath() + LIBS_LOCK);
+    if (lock.exists())
+      lock.delete();
+    String libPath = copyCompressedLib(ctx, rawID, "libarm.so");
+    Log.d("copyCompressedLib time: " + (System.currentTimeMillis() - begin) / 1000.0);
+    boolean inited = native_initializeLibs(libPath, getLibraryPath(), String.valueOf(Vitamio.getVitamioType()));
+    new File(libPath).delete();
+    FileWriter fw = null;
+    try {
+      lock.createNewFile();
+      fw = new FileWriter(lock);
+      fw.write(version);
+      return true;
+    } catch (IOException e) {
+      Log.e("Error creating lock file", e);
+    } finally {
+      Log.d("initializeNativeLibs: " + inited);
+      Log.d("loadLibs time: " + (System.currentTimeMillis() - begin) / 1000.0);
+      IOUtils.closeSilently(fw);
+    }
+    return false;
+  }
+
+  private static String copyCompressedLib(Context ctx, int rawID, String destName) {
+    byte[] buffer = new byte[1024];
+    InputStream is = null;
+    BufferedInputStream bis = null;
+    FileOutputStream fos = null;
+    String destPath = null;
+
+    try {
+      try {
+        String destDir = getLibraryPath();
+        destPath = destDir + destName;
+        File f = new File(destDir);
+        if (f.exists() && !f.isDirectory())
+          f.delete();
+        if (!f.exists())
+          f.mkdirs();
+        f = new File(destPath);
+        if (f.exists() && !f.isFile())
+          f.delete();
+        if (!f.exists())
+          f.createNewFile();
+      } catch (Exception fe) {
+        Log.e("loadLib", fe);
+      }
+
+      is = ctx.getResources().openRawResource(rawID);
+      bis = new BufferedInputStream(is);
+      fos = new FileOutputStream(destPath);
+      while (bis.read(buffer) != -1) {
+        fos.write(buffer);
+      }
+    } catch (Exception e) {
+      Log.e("loadLib", e);
+      return null;
+    } finally {
+      IOUtils.closeSilently(fos);
+      IOUtils.closeSilently(bis);
+      IOUtils.closeSilently(is);
+    }
+
+    return destPath;
+  }
+
+  static {
+    System.loadLibrary("vinit");
+  }
+
+  private native static boolean native_initializeLibs(String libPath, String destDir, String prefix);
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/VitamioLicense.java b/showkeyHelper/src/io/vov/vitamio/VitamioLicense.java
new file mode 100644
index 0000000..13aeb63
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/VitamioLicense.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio;
+
+/**
+ * DON'T MODIFY THIS FILE IF YOU WANT TO USE VITAMIO
+ */
+public class VitamioLicense {
+  public static final String LICENSE = "Copyright (c) YIXIA (http://yixia.com).\nTHIS SOFTWARE (Vitamio) IS WORK OF YIXIA (http://yixia.com)";
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/provider/MediaStore.java b/showkeyHelper/src/io/vov/vitamio/provider/MediaStore.java
new file mode 100644
index 0000000..94cd38b
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/provider/MediaStore.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.provider;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.provider.BaseColumns;
+
+import io.vov.vitamio.utils.Log;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public final class MediaStore {
+  public static final String AUTHORITY = "me.abitno.vplayer.mediaprovider";
+  public static final String MEDIA_SCANNER_VOLUME = "volume";
+  public static final String CONTENT_AUTHORITY_SLASH = "content://" + AUTHORITY + "/";
+  public static final Uri CONTENT_URI = Uri.parse(CONTENT_AUTHORITY_SLASH);
+  private static final String BASE_SQL_FIELDS = MediaColumns._ID + " INTEGER PRIMARY KEY," + //
+      MediaColumns.DATA + " TEXT NOT NULL," + //
+      MediaColumns.DIRECTORY + " TEXT NOT NULL," + //
+      MediaColumns.DIRECTORY_NAME + " TEXT NOT NULL," + //
+      MediaColumns.SIZE + " INTEGER," + //
+      MediaColumns.DISPLAY_NAME + " TEXT," + //
+      MediaColumns.TITLE + " TEXT," + //
+      MediaColumns.TITLE_KEY + " TEXT," + //
+      MediaColumns.DATE_ADDED + " INTEGER," + //
+      MediaColumns.DATE_MODIFIED + " INTEGER," + //
+      MediaColumns.MIME_TYPE + " TEXT," + //
+      MediaColumns.AVAILABLE_SIZE + " INTEGER default 0," + //
+      MediaColumns.PLAY_STATUS + " INTEGER ,";
+
+  public static Uri getMediaScannerUri() {
+    return Uri.parse(CONTENT_AUTHORITY_SLASH + "media_scanner");
+  }
+
+  public static Uri getVolumeUri() {
+    return Uri.parse(CONTENT_AUTHORITY_SLASH + MEDIA_SCANNER_VOLUME);
+  }
+
+  public interface MediaColumns extends BaseColumns {
+    public static final String DATA = "_data";
+    public static final String DIRECTORY = "_directory";
+    public static final String DIRECTORY_NAME = "_directory_name";
+    public static final String SIZE = "_size";
+    public static final String DISPLAY_NAME = "_display_name";
+    public static final String TITLE = "title";
+    public static final String TITLE_KEY = "title_key";
+    public static final String DATE_ADDED = "date_added";
+    public static final String DATE_MODIFIED = "date_modified";
+    public static final String MIME_TYPE = "mime_type";
+    public static final String AVAILABLE_SIZE = "available_size";
+    public static final String PLAY_STATUS = "play_status";
+
+  }
+
+  public static final class Audio {
+    public interface AudioColumns extends MediaColumns {
+      public static final String DURATION = "duration";
+      public static final String BOOKMARK = "bookmark";
+      public static final String ARTIST = "artist";
+      public static final String COMPOSER = "composer";
+      public static final String ALBUM = "album";
+      public static final String TRACK = "track";
+      public static final String YEAR = "year";
+    }
+
+    public static final class Media implements AudioColumns {
+      public static final Uri CONTENT_URI = Uri.parse(CONTENT_AUTHORITY_SLASH + "audios/media");
+      public static final String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
+    }
+  }
+
+  public static final class Video {
+
+    public interface VideoColumns extends MediaColumns {
+      public static final String DURATION = "duration";
+      public static final String ARTIST = "artist";
+      public static final String ALBUM = "album";
+      public static final String WIDTH = "width";
+      public static final String HEIGHT = "height";
+      public static final String DESCRIPTION = "description";
+      public static final String LANGUAGE = "language";
+      public static final String LATITUDE = "latitude";
+      public static final String LONGITUDE = "longitude";
+      public static final String DATE_TAKEN = "datetaken";
+      public static final String BOOKMARK = "bookmark";
+      public static final String MINI_THUMB_MAGIC = "mini_thumb_magic";
+      public static final String HIDDEN = "hidden";
+      public static final String SUBTRACK = "sub_track";
+      public static final String AUDIO_TRACK = "audio_track";
+    }
+
+    public static final class Media implements VideoColumns {
+      public static final Uri CONTENT_URI = Uri.parse(CONTENT_AUTHORITY_SLASH + "videos/media");
+      public static final String CONTENT_TYPE = "vnd.android.cursor.dir/video";
+      protected static final String TABLE_NAME = "videos";
+      protected static final String SQL_FIELDS = BASE_SQL_FIELDS + //
+          DURATION + " INTEGER," + //
+          ARTIST + " TEXT," + //
+          ALBUM + " TEXT," + //
+          WIDTH + " INTEGER," + //
+          HEIGHT + " INTEGER," + //
+          DESCRIPTION + " TEXT," + //
+          LANGUAGE + " TEXT," + //
+          LATITUDE + " DOUBLE," + //
+          LONGITUDE + " DOUBLE," + //
+          DATE_TAKEN + " INTEGER," + //
+          BOOKMARK + " INTEGER," + //
+          MINI_THUMB_MAGIC + " INTEGER," + //
+          HIDDEN + " INTEGER default 0," + // 1 hidden , 0 visible
+          SUBTRACK + " TEXT," + //
+          AUDIO_TRACK + " INTEGER";
+      protected static final String SQL_TRIGGER_VIDEO_CLEANUP = "CREATE TRIGGER " + //
+          "IF NOT EXISTS video_cleanup AFTER DELETE ON " + TABLE_NAME + " " + //
+          "BEGIN " + //
+          "SELECT _DELETE_FILE(old._data);" + //
+          "SELECT _DELETE_FILE(old._data || '.ssi');" + // The cache index
+          "END";
+      protected static final String SQL_TRIGGER_VIDEO_UPDATE = "CREATE TRIGGER " + //
+          "IF NOT EXISTS video_update AFTER UPDATE ON " + TABLE_NAME + " " + //
+          "WHEN new._data <> old._data " + //
+          "BEGIN " + //
+          "SELECT _DELETE_FILE(old._data || '.ssi');" + //
+          "END";
+    }
+
+    public static class Thumbnails implements BaseColumns {
+      public static final int MINI_KIND = 1;
+      public static final int MICRO_KIND = 3;
+      public static final Uri CONTENT_URI = Uri.parse(CONTENT_AUTHORITY_SLASH + "videos/thumbnails");
+      public static final String THUMBNAILS_DIRECTORY = "Android/data/me.abitno.vplayer.t/thumbnails";
+      public static final String DATA = "_data";
+      public static final String VIDEO_ID = "video_id";
+      public static final String KIND = "kind";
+      public static final String WIDTH = "width";
+      public static final String HEIGHT = "height";
+      protected static final String TABLE_NAME = "videothumbnails";
+      protected static final String SQL_FIELDS = _ID + " INTEGER PRIMARY KEY," + //
+          DATA + " TEXT," + //
+          VIDEO_ID + " INTEGER," + //
+          KIND + " INTEGER," + //
+          WIDTH + " INTEGER," + //
+          HEIGHT + " INTEGER";
+      protected static final String SQL_INDEX_VIDEO_ID = "CREATE INDEX IF NOT EXISTS video_id_index on videothumbnails(video_id);";
+      protected static final String SQL_TRIGGER_VIDEO_THUMBNAILS_CLEANUP = "CREATE TRIGGER " + //
+          "IF NOT EXISTS videothumbnails_cleanup DELETE ON videothumbnails " + //
+          "BEGIN " + //
+          "SELECT _DELETE_FILE(old._data);" + //
+          "END";
+
+      public static void cancelThumbnailRequest(ContentResolver cr, long origId) {
+        InternalThumbnails.cancelThumbnailRequest(cr, origId, CONTENT_URI, InternalThumbnails.DEFAULT_GROUP_ID);
+      }
+
+      public static Bitmap getThumbnail(Context ctx, ContentResolver cr, long origId, int kind, BitmapFactory.Options options) {
+        return InternalThumbnails.getThumbnail(ctx, cr, origId, InternalThumbnails.DEFAULT_GROUP_ID, kind, options, CONTENT_URI);
+      }
+
+      public static Bitmap getThumbnail(Context ctx, ContentResolver cr, long origId, long groupId, int kind, BitmapFactory.Options options) {
+        return InternalThumbnails.getThumbnail(ctx, cr, origId, groupId, kind, options, CONTENT_URI);
+      }
+
+      public static String getThumbnailPath(Context ctx, ContentResolver cr, long origId) {
+        return InternalThumbnails.getThumbnailPath(ctx, cr, origId, CONTENT_URI);
+      }
+
+      public static void cancelThumbnailRequest(ContentResolver cr, long origId, long groupId) {
+        InternalThumbnails.cancelThumbnailRequest(cr, origId, CONTENT_URI, groupId);
+      }
+    }
+  }
+
+  private static class InternalThumbnails implements BaseColumns {
+    static final int DEFAULT_GROUP_ID = 0;
+    private static final int MINI_KIND = 1;
+    private static final int MICRO_KIND = 3;
+    private static final String[] PROJECTION = new String[]{_ID, MediaColumns.DATA};
+    private static final Object sThumbBufLock = new Object();
+    private static byte[] sThumbBuf;
+
+    private static Bitmap getMiniThumbFromFile(Cursor c, Uri baseUri, ContentResolver cr, BitmapFactory.Options options) {
+      Bitmap bitmap = null;
+      Uri thumbUri = null;
+      try {
+        long thumbId = c.getLong(0);
+        thumbUri = ContentUris.withAppendedId(baseUri, thumbId);
+        ParcelFileDescriptor pfdInput = cr.openFileDescriptor(thumbUri, "r");
+        bitmap = BitmapFactory.decodeFileDescriptor(pfdInput.getFileDescriptor(), null, options);
+        pfdInput.close();
+      } catch (FileNotFoundException ex) {
+        Log.e("getMiniThumbFromFile", ex);
+      } catch (IOException ex) {
+        Log.e("getMiniThumbFromFile", ex);
+      } catch (OutOfMemoryError ex) {
+        Log.e("getMiniThumbFromFile", ex);
+      }
+      return bitmap;
+    }
+
+    static void cancelThumbnailRequest(ContentResolver cr, long origId, Uri baseUri, long groupId) {
+      Uri cancelUri = baseUri.buildUpon().appendQueryParameter("cancel", "1").appendQueryParameter("orig_id", String.valueOf(origId)).appendQueryParameter("group_id", String.valueOf(groupId)).build();
+      Cursor c = null;
+      try {
+        c = cr.query(cancelUri, PROJECTION, null, null, null);
+      } finally {
+        if (c != null)
+          c.close();
+      }
+    }
+
+    static String getThumbnailPath(Context ctx, ContentResolver cr, long origId, Uri baseUri) {
+      String column = "video_id=";
+      String path = "";
+      Cursor c = null;
+      try {
+        c = cr.query(baseUri, PROJECTION, column + origId, null, null);
+        if (c != null && c.moveToFirst()) {
+          path = c.getString(c.getColumnIndex(MediaColumns.DATA));
+        }
+      } finally {
+        if (c != null)
+          c.close();
+      }
+      return path;
+    }
+
+    static Bitmap getThumbnail(Context ctx, ContentResolver cr, long origId, long groupId, int kind, BitmapFactory.Options options, Uri baseUri) {
+      Bitmap bitmap = null;
+      MiniThumbFile thumbFile = MiniThumbFile.instance(baseUri);
+      long magic = thumbFile.getMagic(origId);
+      if (magic != 0) {
+        if (kind == MICRO_KIND) {
+          synchronized (sThumbBufLock) {
+            if (sThumbBuf == null)
+              sThumbBuf = new byte[MiniThumbFile.BYTES_PER_MINTHUMB];
+            if (thumbFile.getMiniThumbFromFile(origId, sThumbBuf) != null) {
+              bitmap = BitmapFactory.decodeByteArray(sThumbBuf, 0, sThumbBuf.length);
+              if (bitmap == null)
+                Log.d("couldn't decode byte array.");
+            }
+          }
+          return bitmap;
+        } else if (kind == MINI_KIND) {
+          String column = "video_id=";
+          Cursor c = null;
+          try {
+            c = cr.query(baseUri, PROJECTION, column + origId, null, null);
+            if (c != null && c.moveToFirst()) {
+              bitmap = getMiniThumbFromFile(c, baseUri, cr, options);
+              if (bitmap != null)
+                return bitmap;
+            }
+          } finally {
+            if (c != null)
+              c.close();
+          }
+        }
+      }
+
+      Cursor c = null;
+      try {
+        Uri blockingUri = baseUri.buildUpon().appendQueryParameter("blocking", "1").appendQueryParameter("orig_id", String.valueOf(origId)).appendQueryParameter("group_id", String.valueOf(groupId)).build();
+        c = cr.query(blockingUri, PROJECTION, null, null, null);
+        if (c == null)
+          return null;
+
+        if (kind == MICRO_KIND) {
+          synchronized (sThumbBufLock) {
+            if (sThumbBuf == null)
+              sThumbBuf = new byte[MiniThumbFile.BYTES_PER_MINTHUMB];
+            if (thumbFile.getMiniThumbFromFile(origId, sThumbBuf) != null) {
+              bitmap = BitmapFactory.decodeByteArray(sThumbBuf, 0, sThumbBuf.length);
+              if (bitmap == null)
+                Log.d("couldn't decode byte array.");
+            }
+          }
+        } else if (kind == MINI_KIND) {
+          if (c.moveToFirst())
+            bitmap = getMiniThumbFromFile(c, baseUri, cr, options);
+        } else {
+          throw new IllegalArgumentException("Unsupported kind: " + kind);
+        }
+      } catch (SQLiteException ex) {
+        Log.e("getThumbnail", ex);
+      } finally {
+        if (c != null)
+          c.close();
+      }
+      return bitmap;
+    }
+  }
+
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/provider/MiniThumbFile.java b/showkeyHelper/src/io/vov/vitamio/provider/MiniThumbFile.java
new file mode 100644
index 0000000..03471df
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/provider/MiniThumbFile.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.provider;
+
+import android.net.Uri;
+import android.os.Environment;
+
+import io.vov.vitamio.provider.MediaStore.Video;
+import io.vov.vitamio.utils.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.util.Hashtable;
+
+public class MiniThumbFile {
+  protected static final int BYTES_PER_MINTHUMB = 10000;
+  private static final int MINI_THUMB_DATA_FILE_VERSION = 7;
+  private static final int HEADER_SIZE = 1 + 8 + 4;
+  private static Hashtable<String, MiniThumbFile> sThumbFiles = new Hashtable<String, MiniThumbFile>();
+  private Uri mUri;
+  private RandomAccessFile mMiniThumbFile;
+  private FileChannel mChannel;
+  private ByteBuffer mBuffer;
+
+  public MiniThumbFile(Uri uri) {
+    mUri = uri;
+    mBuffer = ByteBuffer.allocateDirect(BYTES_PER_MINTHUMB);
+  }
+
+  protected static synchronized void reset() {
+    for (MiniThumbFile file : sThumbFiles.values())
+      file.deactivate();
+    sThumbFiles.clear();
+  }
+
+  protected static synchronized MiniThumbFile instance(Uri uri) {
+    String type = uri.getPathSegments().get(0);
+    MiniThumbFile file = sThumbFiles.get(type);
+    if (file == null) {
+      file = new MiniThumbFile(Uri.parse(MediaStore.CONTENT_AUTHORITY_SLASH + type + "/media"));
+      sThumbFiles.put(type, file);
+    }
+
+    return file;
+  }
+
+  private String randomAccessFilePath(int version) {
+    String directoryName = Environment.getExternalStorageDirectory().toString() + "/" + Video.Thumbnails.THUMBNAILS_DIRECTORY;
+    return directoryName + "/.thumbdata" + version + "-" + mUri.hashCode();
+  }
+
+  private void removeOldFile() {
+    String oldPath = randomAccessFilePath(MINI_THUMB_DATA_FILE_VERSION - 1);
+    File oldFile = new File(oldPath);
+    if (oldFile.exists()) {
+      try {
+        oldFile.delete();
+      } catch (SecurityException ex) {
+      }
+    }
+  }
+
+  private RandomAccessFile miniThumbDataFile() {
+    if (mMiniThumbFile == null) {
+      removeOldFile();
+      String path = randomAccessFilePath(MINI_THUMB_DATA_FILE_VERSION);
+      File directory = new File(path).getParentFile();
+      if (!directory.isDirectory()) {
+        if (!directory.mkdirs())
+          Log.e("Unable to create .thumbnails directory %s", directory.toString());
+      }
+      File f = new File(path);
+      try {
+        mMiniThumbFile = new RandomAccessFile(f, "rw");
+      } catch (IOException ex) {
+        try {
+          mMiniThumbFile = new RandomAccessFile(f, "r");
+        } catch (IOException ex2) {
+        }
+      }
+
+      if (mMiniThumbFile != null)
+        mChannel = mMiniThumbFile.getChannel();
+    }
+    return mMiniThumbFile;
+  }
+
+  protected synchronized void deactivate() {
+    if (mMiniThumbFile != null) {
+      try {
+        mMiniThumbFile.close();
+        mMiniThumbFile = null;
+      } catch (IOException ex) {
+      }
+    }
+  }
+
+  protected synchronized long getMagic(long id) {
+    RandomAccessFile r = miniThumbDataFile();
+    if (r != null) {
+      long pos = id * BYTES_PER_MINTHUMB;
+      FileLock lock = null;
+      try {
+        mBuffer.clear();
+        mBuffer.limit(1 + 8);
+
+        lock = mChannel.lock(pos, 1 + 8, true);
+        if (mChannel.read(mBuffer, pos) == 9) {
+          mBuffer.position(0);
+          if (mBuffer.get() == 1)
+            return mBuffer.getLong();
+        }
+      } catch (IOException ex) {
+        Log.e("Got exception checking file magic: ", ex);
+      } catch (RuntimeException ex) {
+        Log.e("Got exception when reading magic, id = %d, disk full or mount read-only? %s", id, ex.getClass().toString());
+      } finally {
+        try {
+          if (lock != null)
+            lock.release();
+        } catch (IOException ex) {
+        }
+      }
+    }
+    return 0;
+  }
+
+  protected synchronized void saveMiniThumbToFile(byte[] data, long id, long magic) throws IOException {
+    RandomAccessFile r = miniThumbDataFile();
+    if (r == null)
+      return;
+
+    long pos = id * BYTES_PER_MINTHUMB;
+    FileLock lock = null;
+    try {
+      if (data != null) {
+        if (data.length > BYTES_PER_MINTHUMB - HEADER_SIZE)
+          return;
+
+        mBuffer.clear();
+        mBuffer.put((byte) 1);
+        mBuffer.putLong(magic);
+        mBuffer.putInt(data.length);
+        mBuffer.put(data);
+        mBuffer.flip();
+
+        lock = mChannel.lock(pos, BYTES_PER_MINTHUMB, false);
+        mChannel.write(mBuffer, pos);
+      }
+    } catch (IOException ex) {
+      Log.e("couldn't save mini thumbnail data for %d; %s", id, ex.getMessage());
+      throw ex;
+    } catch (RuntimeException ex) {
+      Log.e("couldn't save mini thumbnail data for %d, disk full or mount read-only? %s", id, ex.getClass().toString());
+    } finally {
+      try {
+        if (lock != null)
+          lock.release();
+      } catch (IOException ex) {
+      }
+    }
+  }
+
+  protected synchronized byte[] getMiniThumbFromFile(long id, byte[] data) {
+    RandomAccessFile r = miniThumbDataFile();
+    if (r == null)
+      return null;
+
+    long pos = id * BYTES_PER_MINTHUMB;
+    FileLock lock = null;
+    try {
+      mBuffer.clear();
+      lock = mChannel.lock(pos, BYTES_PER_MINTHUMB, true);
+      int size = mChannel.read(mBuffer, pos);
+      if (size > 1 + 8 + 4) {
+        mBuffer.position(9);
+        int length = mBuffer.getInt();
+
+        if (size >= 1 + 8 + 4 + length && data.length >= length) {
+          mBuffer.get(data, 0, length);
+          return data;
+        }
+      }
+    } catch (IOException ex) {
+      Log.e("got exception when reading thumbnail id = %d, exception: %s", id, ex.getMessage());
+    } catch (RuntimeException ex) {
+      Log.e("Got exception when reading thumbnail, id = %d, disk full or mount read-only? %s", id, ex.getClass().toString());
+    } finally {
+      try {
+        if (lock != null)
+          lock.release();
+      } catch (IOException ex) {
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/CPU.java b/showkeyHelper/src/io/vov/vitamio/utils/CPU.java
new file mode 100644
index 0000000..73b6701
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/CPU.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import android.os.Build;
+
+public class CPU {
+	private static final Map<String, String> cpuinfo = new HashMap<String, String>();
+	private static int cachedFeature = -1;
+	private static String cachedFeatureString = null;
+	public static final int FEATURE_ARM_V5TE = 1 << 0;
+	public static final int FEATURE_ARM_V6 = 1 << 1;
+	public static final int FEATURE_ARM_VFP = 1 << 2;
+	public static final int FEATURE_ARM_V7A = 1 << 3;
+	public static final int FEATURE_ARM_VFPV3 = 1 << 4;
+	public static final int FEATURE_ARM_NEON = 1 << 5;
+
+	public static String getFeatureString() {
+		getFeature();
+		return cachedFeatureString;
+	}
+
+	public static int getFeature() {
+		if (cachedFeature > 0)
+			return getCachedFeature();
+
+		cachedFeature = FEATURE_ARM_V5TE;
+
+		if (cpuinfo.isEmpty()) {
+			BufferedReader bis = null;
+			try {
+				bis = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
+				String line;
+				String[] pairs;
+				while ((line = bis.readLine()) != null) {
+					Log.d(line);
+					if (!line.trim().equals("")) {
+						pairs = line.split(":");
+						if (pairs.length > 1)
+							cpuinfo.put(pairs[0].trim(), pairs[1].trim());
+					}
+				}
+			} catch (Exception e) {
+				Log.e("getCPUFeature", e);
+			} finally {
+				try {
+					if (bis != null)
+						bis.close();
+				} catch (IOException e) {
+					Log.e("getCPUFeature", e);
+				}
+			}
+		}
+
+		if (!cpuinfo.isEmpty()) {
+			for (String key : cpuinfo.keySet())
+				Log.d("%s:%s", key, cpuinfo.get(key));
+
+			boolean hasARMv6 = false;
+			boolean hasARMv7 = false;
+
+			String val = cpuinfo.get("CPU architecture");
+			if (val != null) {
+				try {
+					int i = StringUtils.convertToInt(val);
+					Log.d("CPU architecture: %s", i);
+					if (i >= 7) {
+						hasARMv6 = true;
+						hasARMv7 = true;
+					} else if (i >= 6) {
+						hasARMv6 = true;
+						hasARMv7 = false;
+					}
+				} catch (NumberFormatException ex) {
+					Log.e("getCPUFeature", ex);
+				}
+			}
+
+			val = cpuinfo.get("Processor");
+			if (val != null && val.contains("(v7l)") || val.contains("ARMv7")) {
+				hasARMv6 = true;
+				hasARMv7 = true;
+			}
+			if (val != null && val.contains("(v6l)") || val.contains("ARMv6")) {
+				hasARMv6 = true;
+				hasARMv7 = false;
+			}
+
+			if (hasARMv6)
+				cachedFeature |= FEATURE_ARM_V6;
+			if (hasARMv7)
+				cachedFeature |= FEATURE_ARM_V7A;
+
+			val = cpuinfo.get("Features");
+			if (val != null) {
+				if (val.contains("neon"))
+					cachedFeature |= FEATURE_ARM_VFP | FEATURE_ARM_VFPV3 | FEATURE_ARM_NEON;
+				else if (val.contains("vfpv3"))
+					cachedFeature |= FEATURE_ARM_VFP | FEATURE_ARM_VFPV3;
+				else if (val.contains("vfp"))
+					cachedFeature |= FEATURE_ARM_VFP;
+			}
+		}
+
+		return getCachedFeature();
+	}
+
+	private static int getCachedFeature() {
+		if (cachedFeatureString == null) {
+			StringBuffer sb = new StringBuffer();
+			if ((cachedFeature & FEATURE_ARM_V5TE) > 0)
+				sb.append("V5TE ");
+			if ((cachedFeature & FEATURE_ARM_V6) > 0)
+				sb.append("V6 ");
+			if ((cachedFeature & FEATURE_ARM_VFP) > 0)
+				sb.append("VFP ");
+			if ((cachedFeature & FEATURE_ARM_V7A) > 0)
+				sb.append("V7A ");
+			if ((cachedFeature & FEATURE_ARM_VFPV3) > 0)
+				sb.append("VFPV3 ");
+			if ((cachedFeature & FEATURE_ARM_NEON) > 0)
+				sb.append("NEON ");
+			cachedFeatureString = sb.toString();
+		}
+		Log.d("GET CPU FATURE: %s", cachedFeatureString);
+		return cachedFeature;
+	}
+
+	public static boolean isDroidXDroid2() {
+		return (Build.MODEL.trim().equalsIgnoreCase("DROIDX") || Build.MODEL.trim().equalsIgnoreCase("DROID2") || Build.FINGERPRINT.toLowerCase().contains("shadow") || Build.FINGERPRINT.toLowerCase().contains("droid2"));
+	}
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/ContextUtils.java b/showkeyHelper/src/io/vov/vitamio/utils/ContextUtils.java
new file mode 100644
index 0000000..57557a2
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/ContextUtils.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+
+public class ContextUtils {
+	public static int getVersionCode(Context ctx) {
+		int version = 0;
+		try {
+			version = ctx.getPackageManager().getPackageInfo(ctx.getApplicationInfo().packageName, 0).versionCode;
+		} catch (Exception e) {
+			Log.e("getVersionInt", e);
+		}
+		return version;
+	}
+
+	public static String getDataDir(Context ctx) {
+		ApplicationInfo ai = ctx.getApplicationInfo();
+		if (ai.dataDir != null)
+			return fixLastSlash(ai.dataDir);
+		else
+			return "/data/data/" + ai.packageName + "/";
+	}
+
+	public static String fixLastSlash(String str) {
+		String res = str == null ? "/" : str.trim() + "/";
+		if (res.length() > 2 && res.charAt(res.length() - 2) == '/')
+			res = res.substring(0, res.length() - 1);
+		return res;
+	}
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/Crypto.java b/showkeyHelper/src/io/vov/vitamio/utils/Crypto.java
new file mode 100644
index 0000000..b1dde63
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/Crypto.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import android.util.Base64;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.PublicKey;
+import java.security.spec.AlgorithmParameterSpec;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class Crypto {
+	private Cipher ecipher;
+
+	public Crypto(String key) {
+		try {
+			SecretKeySpec skey = new SecretKeySpec(generateKey(key), "AES");
+			setupCrypto(skey);
+		} catch (Exception e) {
+			Log.e("Crypto", e);
+		}
+	}
+
+	private void setupCrypto(SecretKey key) {
+		byte[] iv = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+		AlgorithmParameterSpec paramSpec = new IvParameterSpec(iv);
+		try {
+			ecipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+			ecipher.init(Cipher.ENCRYPT_MODE, key, paramSpec);
+		} catch (Exception e) {
+			ecipher = null;
+			Log.e("setupCrypto", e);
+		}
+	}
+
+	public String encrypt(String plaintext) {
+		if (ecipher == null)
+			return "";
+
+		try {
+			byte[] ciphertext = ecipher.doFinal(plaintext.getBytes("UTF-8"));
+			return Base64.encodeToString(ciphertext, Base64.NO_WRAP);
+		} catch (Exception e) {
+			Log.e("encryp", e);
+			return "";
+		}
+	}
+
+	public static String md5(String plain) {
+		try {
+			MessageDigest m = MessageDigest.getInstance("MD5");
+			m.update(plain.getBytes());
+			byte[] digest = m.digest();
+			BigInteger bigInt = new BigInteger(1, digest);
+			String hashtext = bigInt.toString(16);
+			while (hashtext.length() < 32) {
+				hashtext = "0" + hashtext;
+			}
+			return hashtext;
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	private static byte[] generateKey(String input) {
+		try {
+			byte[] bytesOfMessage = input.getBytes("UTF-8");
+			MessageDigest md = MessageDigest.getInstance("SHA256");
+			return md.digest(bytesOfMessage);
+		} catch (Exception e) {
+			Log.e("generateKey", e);
+			return null;
+		}
+	}
+
+	private PublicKey readKeyFromStream(InputStream keyStream) throws IOException {
+		ObjectInputStream oin = new ObjectInputStream(new BufferedInputStream(keyStream));
+		try {
+			PublicKey pubKey = (PublicKey) oin.readObject();
+			return pubKey;
+		} catch (Exception e) {
+			Log.e("readKeyFromStream", e);
+			return null;
+		} finally {
+			oin.close();
+		}
+	}
+
+	public String rsaEncrypt(InputStream keyStream, String data) {
+		try {
+			return rsaEncrypt(keyStream, data.getBytes("UTF-8"));
+		} catch (UnsupportedEncodingException e) {
+			return "";
+		}
+	}
+
+	public String rsaEncrypt(InputStream keyStream, byte[] data) {
+		try {
+			PublicKey pubKey = readKeyFromStream(keyStream);
+			Cipher cipher = Cipher.getInstance("RSA/ECB/NoPadding");
+			cipher.init(Cipher.ENCRYPT_MODE, pubKey);
+			byte[] cipherData = cipher.doFinal(data);
+			return Base64.encodeToString(cipherData, Base64.NO_WRAP);
+		} catch (Exception e) {
+			Log.e("rsaEncrypt", e);
+			return "";
+		}
+	}
+
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/Device.java b/showkeyHelper/src/io/vov/vitamio/utils/Device.java
new file mode 100644
index 0000000..01e21ff
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/Device.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.util.DisplayMetrics;
+
+import java.util.Locale;
+
+public class Device {
+  public static String getLocale() {
+    Locale locale = Locale.getDefault();
+    if (locale != null) {
+      String lo = locale.getLanguage();
+      Log.i("getLocale " + lo);
+      if (lo != null) {
+        return lo.toLowerCase();
+      }
+    }
+    return "en";
+  }
+
+  public static String getDeviceFeatures(Context ctx) {
+    return getIdentifiers(ctx) + getSystemFeatures() + getScreenFeatures(ctx);
+  }
+  
+  @SuppressLint("NewApi")
+  public static String getIdentifiers(Context ctx) {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getPair("serial", Build.SERIAL));
+    sb.append(getPair("android_id", Settings.Secure.getString(ctx.getContentResolver(), Settings.Secure.ANDROID_ID)));
+    TelephonyManager tel = (TelephonyManager) ctx.getSystemService(Context.TELEPHONY_SERVICE);
+    sb.append(getPair("sim_country_iso", tel.getSimCountryIso()));
+    sb.append(getPair("network_operator_name", tel.getNetworkOperatorName()));
+    sb.append(getPair("unique_id", Crypto.md5(sb.toString())));
+    return sb.toString();
+  }
+
+  public static String getSystemFeatures() {
+    StringBuilder sb = new StringBuilder();
+    sb.append(getPair("android_release", Build.VERSION.RELEASE));
+    sb.append(getPair("android_sdk_int", "" + Build.VERSION.SDK_INT));
+    sb.append(getPair("device_cpu_abi", Build.CPU_ABI));
+    sb.append(getPair("device_model", Build.MODEL));
+    sb.append(getPair("device_manufacturer", Build.MANUFACTURER));
+    sb.append(getPair("device_board", Build.BOARD));
+    sb.append(getPair("device_fingerprint", Build.FINGERPRINT));
+    sb.append(getPair("device_cpu_feature", CPU.getFeatureString()));
+    return sb.toString();
+  }
+
+  public static String getScreenFeatures(Context ctx) {
+    StringBuilder sb = new StringBuilder();
+    DisplayMetrics disp = ctx.getResources().getDisplayMetrics();
+    sb.append(getPair("screen_density", "" + disp.density));
+    sb.append(getPair("screen_density_dpi", "" + disp.densityDpi));
+    sb.append(getPair("screen_height_pixels", "" + disp.heightPixels));
+    sb.append(getPair("screen_width_pixels", "" + disp.widthPixels));
+    sb.append(getPair("screen_scaled_density", "" + disp.scaledDensity));
+    sb.append(getPair("screen_xdpi", "" + disp.xdpi));
+    sb.append(getPair("screen_ydpi", "" + disp.ydpi));
+    return sb.toString();
+  }
+
+  private static String getPair(String key, String value) {
+    key = key == null ? "" : key.trim();
+    value = value == null ? "" : value.trim();
+    return "&" + key + "=" + value;
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/FileUtils.java b/showkeyHelper/src/io/vov/vitamio/utils/FileUtils.java
new file mode 100644
index 0000000..2932052
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/FileUtils.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+public class FileUtils {
+	private static final String FILE_NAME_RESERVED = "|\\?*<\":>+[]/'";
+
+	public static String getUniqueFileName(String name, String id) {
+		StringBuilder sb = new StringBuilder();
+		for (Character c : name.toCharArray()) {
+			if (FILE_NAME_RESERVED.indexOf(c) == -1) {
+				sb.append(c);
+			}
+		}
+		name = sb.toString();
+		if (name.length() > 16) {
+			name = name.substring(0, 16);
+		}
+		id = Crypto.md5(id);
+		name += id;
+		try {
+			File f = File.createTempFile(name, null);
+			if (f.exists()) {
+				f.delete();
+				return name;
+			}
+		} catch (IOException e) {
+		}
+		return id;
+	}
+
+	public static String getCanonical(File f) {
+		if (f == null)
+			return null;
+
+		try {
+			return f.getCanonicalPath();
+		} catch (IOException e) {
+			return f.getAbsolutePath();
+		}
+	}
+
+	/**
+	 * Get the path for the file:/// only
+	 * 
+	 * @param uri
+	 * @return
+	 */
+	public static String getPath(String uri) {
+		Log.i("FileUtils#getPath(%s)", uri);
+		if (TextUtils.isEmpty(uri))
+			return null;
+		if (uri.startsWith("file://") && uri.length() > 7)
+			return Uri.decode(uri.substring(7));
+		return Uri.decode(uri);
+	}
+
+	public static String getName(String uri) {
+		String path = getPath(uri);
+		if (path != null)
+			return new File(path).getName();
+		return null;
+	}
+
+	public static void deleteDir(File f) {
+		if (f.exists() && f.isDirectory()) {
+			for (File file : f.listFiles()) {
+				if (file.isDirectory())
+					deleteDir(file);
+				file.delete();
+			}
+			f.delete();
+		}
+	}
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/IOUtils.java b/showkeyHelper/src/io/vov/vitamio/utils/IOUtils.java
new file mode 100644
index 0000000..11eb8a7
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/IOUtils.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import android.database.Cursor;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import java.io.Closeable;
+
+public class IOUtils {
+	
+	private static final String TAG = "IOUtils";
+	
+	public static void closeSilently(Closeable c) {
+		if (c == null)
+			return;
+		try {
+			c.close();
+		} catch (Throwable t) {
+			Log.w(TAG, "fail to close", t);
+		}
+	}
+
+	public static void closeSilently(ParcelFileDescriptor c) {
+		if (c == null)
+			return;
+		try {
+			c.close();
+		} catch (Throwable t) {
+			Log.w(TAG, "fail to close", t);
+		}
+	}
+	
+	public static void closeSilently(Cursor cursor) {
+    try {
+    	if (cursor != null) cursor.close();
+     } catch (Throwable t) {
+    	 Log.w(TAG, "fail to close", t);
+     }
+	 }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/Log.java b/showkeyHelper/src/io/vov/vitamio/utils/Log.java
new file mode 100644
index 0000000..7140744
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/Log.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+
+
+import io.vov.vitamio.BuildConfig;
+
+import java.util.MissingFormatArgumentException;
+
+public class Log {
+	public static final String TAG = "Vitamio[Player]";
+	public static final String DEBUG_TAG = "debug.vitamio";
+
+	public static void i(String msg, Object... args) {
+		try {
+			if (BuildConfig.DEBUG) 
+				android.util.Log.i(TAG, String.format(msg, args));
+		} catch (MissingFormatArgumentException e) {
+			android.util.Log.e(TAG, "vitamio.Log", e);
+			android.util.Log.i(TAG, msg);
+		}
+	}
+
+	public static void d(String msg, Object... args) {
+		try {
+			if (BuildConfig.DEBUG) 
+				android.util.Log.d(TAG, String.format(msg, args));
+		} catch (MissingFormatArgumentException e) {
+			android.util.Log.e(TAG, "vitamio.Log", e);
+			android.util.Log.d(TAG, msg);
+		}
+	}
+
+	public static void e(String msg, Object... args) {
+		try {
+				android.util.Log.e(TAG, String.format(msg, args));
+		} catch (MissingFormatArgumentException e) {
+			android.util.Log.e(TAG, "vitamio.Log", e);
+			android.util.Log.e(TAG, msg);
+		}
+	}
+
+	public static void e(String msg, Throwable t) {
+		android.util.Log.e(TAG, msg, t);
+	}
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/utils/StringUtils.java b/showkeyHelper/src/io/vov/vitamio/utils/StringUtils.java
new file mode 100644
index 0000000..9313b8e
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/utils/StringUtils.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2012 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vov.vitamio.utils;
+
+import java.util.Arrays;
+import java.util.Iterator;
+
+public class StringUtils {
+	public static String join(Object[] elements, CharSequence separator) {
+		return join(Arrays.asList(elements), separator);
+	}
+
+	public static String join(Iterable<? extends Object> elements, CharSequence separator) {
+		StringBuilder builder = new StringBuilder();
+
+		if (elements != null) {
+			Iterator<? extends Object> iter = elements.iterator();
+			if (iter.hasNext()) {
+				builder.append(String.valueOf(iter.next()));
+				while (iter.hasNext()) {
+					builder.append(separator).append(String.valueOf(iter.next()));
+				}
+			}
+		}
+
+		return builder.toString();
+	}
+
+	public static String fixLastSlash(String str) {
+		String res = str == null ? "/" : str.trim() + "/";
+		if (res.length() > 2 && res.charAt(res.length() - 2) == '/')
+			res = res.substring(0, res.length() - 1);
+		return res;
+	}
+
+	public static int convertToInt(String str) throws NumberFormatException {
+		int s, e;
+		for (s = 0; s < str.length(); s++)
+			if (Character.isDigit(str.charAt(s)))
+				break;
+		for (e = str.length(); e > 0; e--)
+			if (Character.isDigit(str.charAt(e - 1)))
+				break;
+		if (e > s) {
+			try {
+				return Integer.parseInt(str.substring(s, e));
+			} catch (NumberFormatException ex) {
+				Log.e("convertToInt", ex);
+				throw new NumberFormatException();
+			}
+		} else {
+			throw new NumberFormatException();
+		}
+	}
+
+	public static String generateTime(long time) {
+		int totalSeconds = (int) (time / 1000);
+		int seconds = totalSeconds % 60;
+		int minutes = (totalSeconds / 60) % 60;
+		int hours = totalSeconds / 3600;
+
+		return hours > 0 ? String.format("%02d:%02d:%02d", hours, minutes, seconds) : String.format("%02d:%02d", minutes, seconds);
+	}
+
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/widget/CenterLayout.java b/showkeyHelper/src/io/vov/vitamio/widget/CenterLayout.java
new file mode 100644
index 0000000..c01826f
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/widget/CenterLayout.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RemoteViews.RemoteView;
+
+@RemoteView
+public class CenterLayout extends ViewGroup {
+  private int mPaddingLeft = 0;
+  private int mPaddingRight = 0;
+  private int mPaddingTop = 0;
+  private int mPaddingBottom = 0;
+  private int mWidth, mHeight;
+
+  public CenterLayout(Context context) {
+    super(context);
+  }
+
+  public CenterLayout(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public CenterLayout(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int count = getChildCount();
+
+    int maxHeight = 0;
+    int maxWidth = 0;
+
+    measureChildren(widthMeasureSpec, heightMeasureSpec);
+
+    for (int i = 0; i < count; i++) {
+      View child = getChildAt(i);
+      if (child.getVisibility() != GONE) {
+        int childRight;
+        int childBottom;
+
+        CenterLayout.LayoutParams lp = (CenterLayout.LayoutParams) child.getLayoutParams();
+
+        childRight = lp.x + child.getMeasuredWidth();
+        childBottom = lp.y + child.getMeasuredHeight();
+
+        maxWidth = Math.max(maxWidth, childRight);
+        maxHeight = Math.max(maxHeight, childBottom);
+      }
+    }
+
+    maxWidth += mPaddingLeft + mPaddingRight;
+    maxHeight += mPaddingTop + mPaddingBottom;
+
+    maxHeight = Math.max(maxHeight, getSuggestedMinimumHeight());
+    maxWidth = Math.max(maxWidth, getSuggestedMinimumWidth());
+
+    setMeasuredDimension(resolveSize(maxWidth, widthMeasureSpec), resolveSize(maxHeight, heightMeasureSpec));
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    int count = getChildCount();
+    mWidth = getMeasuredWidth();
+    mHeight = getMeasuredHeight();
+    for (int i = 0; i < count; i++) {
+      View child = getChildAt(i);
+      if (child.getVisibility() != GONE) {
+        CenterLayout.LayoutParams lp = (CenterLayout.LayoutParams) child.getLayoutParams();
+        int childLeft = mPaddingLeft + lp.x;
+        if (lp.width > 0)
+          childLeft += (int) ((mWidth - lp.width) / 2.0);
+        else
+          childLeft += (int) ((mWidth - child.getMeasuredWidth()) / 2.0);
+        int childTop = mPaddingTop + lp.y;
+        if (lp.height > 0)
+          childTop += (int) ((mHeight - lp.height) / 2.0);
+        else
+          childTop += (int) ((mHeight - child.getMeasuredHeight()) / 2.0);
+        child.layout(childLeft, childTop, childLeft + child.getMeasuredWidth(), childTop + child.getMeasuredHeight());
+      }
+    }
+  }
+
+  @Override
+  protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+    return p instanceof CenterLayout.LayoutParams;
+  }
+
+  @Override
+  protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+    return new LayoutParams(p);
+  }
+
+  public static class LayoutParams extends ViewGroup.LayoutParams {
+    public int x;
+    public int y;
+
+    public LayoutParams(int width, int height, int x, int y) {
+      super(width, height);
+      this.x = x;
+      this.y = y;
+    }
+
+    public LayoutParams(ViewGroup.LayoutParams source) {
+      super(source);
+    }
+  }
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/widget/MediaController.java b/showkeyHelper/src/io/vov/vitamio/widget/MediaController.java
new file mode 100644
index 0000000..cd18de0
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/widget/MediaController.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.widget;
+
+
+
+import io.vov.vitamio.utils.Log;
+import io.vov.vitamio.utils.StringUtils;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Rect;
+import android.media.AudioManager;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.PopupWindow;
+import android.widget.ProgressBar;
+import android.widget.SeekBar;
+import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.TextView;
+
+import com.joyplus.tvhelper.R;
+
+/**
+ * A view containing controls for a MediaPlayer. Typically contains the buttons
+ * like "Play/Pause" and a progress slider. It takes care of synchronizing the
+ * controls with the state of the MediaPlayer.
+ * <p/>
+ * The way to use this class is to a) instantiate it programatically or b)
+ * create it in your xml layout.
+ * <p/>
+ * a) The MediaController will create a default set of controls and put them in
+ * a window floating above your application. Specifically, the controls will
+ * float above the view specified with setAnchorView(). By default, the window
+ * will disappear if left idle for three seconds and reappear when the user
+ * touches the anchor view. To customize the MediaController's style, layout and
+ * controls you should extend MediaController and override the {#link
+ * {@link #makeControllerView()} method.
+ * <p/>
+ * b) The MediaController is a FrameLayout, you can put it in your layout xml
+ * and get it through {@link #findViewById(int)}.
+ * <p/>
+ * NOTES: In each way, if you want customize the MediaController, the SeekBar's
+ * id must be mediacontroller_progress, the Play/Pause's must be
+ * mediacontroller_pause, current time's must be mediacontroller_time_current,
+ * total time's must be mediacontroller_time_total, file name's must be
+ * mediacontroller_file_name. And your resources must have a pause_button
+ * drawable and a play_button drawable.
+ * <p/>
+ * Functions like show() and hide() have no effect when MediaController is
+ * created in an xml layout.
+ */
+public class MediaController extends FrameLayout {
+  private static final int sDefaultTimeout = 3000;
+  private static final int FADE_OUT = 1;
+  private static final int SHOW_PROGRESS = 2;
+  private MediaPlayerControl mPlayer;
+  private Context mContext;
+  private PopupWindow mWindow;
+  private int mAnimStyle;
+  private View mAnchor;
+  private View mRoot;
+  private ProgressBar mProgress;
+  private TextView mEndTime, mCurrentTime;
+  private TextView mFileName;
+  private OutlineTextView mInfoView;
+  private String mTitle;
+  private long mDuration;
+  private boolean mShowing;
+  private boolean mDragging;
+  private boolean mInstantSeeking = true;
+  private boolean mFromXml = false;
+  private ImageButton mPauseButton;
+  private AudioManager mAM;
+  private OnShownListener mShownListener;
+  private OnHiddenListener mHiddenListener;
+  @SuppressLint("HandlerLeak")
+  private Handler mHandler = new Handler() {
+    @Override
+    public void handleMessage(Message msg) {
+      long pos;
+      switch (msg.what) {
+        case FADE_OUT:
+          hide();
+          break;
+        case SHOW_PROGRESS:
+          pos = setProgress();
+          if (!mDragging && mShowing) {
+            msg = obtainMessage(SHOW_PROGRESS);
+            sendMessageDelayed(msg, 1000 - (pos % 1000));
+            updatePausePlay();
+          }
+          break;
+      }
+    }
+  };
+  private View.OnClickListener mPauseListener = new View.OnClickListener() {
+    public void onClick(View v) {
+      doPauseResume();
+      show(sDefaultTimeout);
+    }
+  };
+  private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
+    public void onStartTrackingTouch(SeekBar bar) {
+      mDragging = true;
+      show(3600000);
+      mHandler.removeMessages(SHOW_PROGRESS);
+      if (mInstantSeeking)
+        mAM.setStreamMute(AudioManager.STREAM_MUSIC, true);
+      if (mInfoView != null) {
+        mInfoView.setText("");
+        mInfoView.setVisibility(View.VISIBLE);
+      }
+    }
+
+    public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
+      if (!fromuser)
+        return;
+
+      long newposition = (mDuration * progress) / 1000;
+      String time = StringUtils.generateTime(newposition);
+      if (mInstantSeeking)
+        mPlayer.seekTo(newposition);
+      if (mInfoView != null)
+        mInfoView.setText(time);
+      if (mCurrentTime != null)
+        mCurrentTime.setText(time);
+    }
+
+    public void onStopTrackingTouch(SeekBar bar) {
+      if (!mInstantSeeking)
+        mPlayer.seekTo((mDuration * bar.getProgress()) / 1000);
+      if (mInfoView != null) {
+        mInfoView.setText("");
+        mInfoView.setVisibility(View.GONE);
+      }
+      show(sDefaultTimeout);
+      mHandler.removeMessages(SHOW_PROGRESS);
+      mAM.setStreamMute(AudioManager.STREAM_MUSIC, false);
+      mDragging = false;
+      mHandler.sendEmptyMessageDelayed(SHOW_PROGRESS, 1000);
+    }
+  };
+
+  public MediaController(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    mRoot = this;
+    mFromXml = true;
+    initController(context);
+  }
+
+  public MediaController(Context context) {
+    super(context);
+    if (!mFromXml && initController(context))
+      initFloatingWindow();
+  }
+
+  private boolean initController(Context context) {
+    mContext = context;
+    mAM = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+    return true;
+  }
+
+  @Override
+  public void onFinishInflate() {
+    if (mRoot != null)
+      initControllerView(mRoot);
+  }
+
+  private void initFloatingWindow() {
+    mWindow = new PopupWindow(mContext);
+    mWindow.setFocusable(false);
+    mWindow.setBackgroundDrawable(null);
+    mWindow.setOutsideTouchable(true);
+    mAnimStyle = android.R.style.Animation;
+  }
+
+  /**
+   * Set the view that acts as the anchor for the control view. This can for
+   * example be a VideoView, or your Activity's main view.
+   *
+   * @param view The view to which to anchor the controller when it is visible.
+   */
+  public void setAnchorView(View view) {
+    mAnchor = view;
+    if (!mFromXml) {
+      removeAllViews();
+      mRoot = makeControllerView();
+      mWindow.setContentView(mRoot);
+      mWindow.setWidth(LayoutParams.MATCH_PARENT);
+      mWindow.setHeight(LayoutParams.WRAP_CONTENT);
+    }
+    initControllerView(mRoot);
+  }
+
+  /**
+   * Create the view that holds the widgets that control playback. Derived
+   * classes can override this to create their own.
+   *
+   * @return The controller view.
+   */
+  protected View makeControllerView() {
+    return ((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.mediacontroller, this);
+  }
+
+  private void initControllerView(View v) {
+    mPauseButton = (ImageButton) v.findViewById(R.id.mediacontroller_play_pause);
+    if (mPauseButton != null) {
+      mPauseButton.requestFocus();
+      mPauseButton.setOnClickListener(mPauseListener);
+    }
+
+    mProgress = (ProgressBar) v.findViewById(R.id.mediacontroller_seekbar);
+    if (mProgress != null) {
+      if (mProgress instanceof SeekBar) {
+        SeekBar seeker = (SeekBar) mProgress;
+        seeker.setOnSeekBarChangeListener(mSeekListener);
+        seeker.setThumbOffset(1);
+      }
+      mProgress.setMax(1000);
+    }
+
+    mEndTime = (TextView) v.findViewById(R.id.mediacontroller_time_total);
+    mCurrentTime = (TextView) v.findViewById(R.id.mediacontroller_time_current);
+    mFileName = (TextView) v.findViewById(R.id.mediacontroller_file_name);
+    if (mFileName != null)
+      mFileName.setText(mTitle);
+  }
+
+  public void setMediaPlayer(MediaPlayerControl player) {
+    mPlayer = player;
+    updatePausePlay();
+  }
+
+  /**
+   * Control the action when the seekbar dragged by user
+   *
+   * @param seekWhenDragging True the media will seek periodically
+   */
+  public void setInstantSeeking(boolean seekWhenDragging) {
+    mInstantSeeking = seekWhenDragging;
+  }
+
+  public void show() {
+    show(sDefaultTimeout);
+  }
+
+  /**
+   * Set the content of the file_name TextView
+   *
+   * @param name
+   */
+  public void setFileName(String name) {
+    mTitle = name;
+    if (mFileName != null)
+      mFileName.setText(mTitle);
+  }
+
+  /**
+   * Set the View to hold some information when interact with the
+   * MediaController
+   *
+   * @param v
+   */
+  public void setInfoView(OutlineTextView v) {
+    mInfoView = v;
+  }
+
+  private void disableUnsupportedButtons() {
+    try {
+      if (mPauseButton != null && !mPlayer.canPause())
+        mPauseButton.setEnabled(false);
+    } catch (IncompatibleClassChangeError ex) {
+    }
+  }
+
+  /**
+   * <p>
+   * Change the animation style resource for this controller.
+   * </p>
+   * <p/>
+   * <p>
+   * If the controller is showing, calling this method will take effect only the
+   * next time the controller is shown.
+   * </p>
+   *
+   * @param animationStyle animation style to use when the controller appears
+   *                       and disappears. Set to -1 for the default animation, 0 for no animation, or
+   *                       a resource identifier for an explicit animation.
+   */
+  public void setAnimationStyle(int animationStyle) {
+    mAnimStyle = animationStyle;
+  }
+
+  /**
+   * Show the controller on screen. It will go away automatically after
+   * 'timeout' milliseconds of inactivity.
+   *
+   * @param timeout The timeout in milliseconds. Use 0 to show the controller
+   *                until hide() is called.
+   */
+  public void show(int timeout) {
+    if (!mShowing && mAnchor != null && mAnchor.getWindowToken() != null) {
+      if (mPauseButton != null)
+        mPauseButton.requestFocus();
+      disableUnsupportedButtons();
+
+      if (mFromXml) {
+        setVisibility(View.VISIBLE);
+      } else {
+        int[] location = new int[2];
+
+        mAnchor.getLocationOnScreen(location);
+        Rect anchorRect = new Rect(location[0], location[1], location[0] + mAnchor.getWidth(), location[1] + mAnchor.getHeight());
+
+        mWindow.setAnimationStyle(mAnimStyle);
+        mWindow.showAtLocation(mAnchor, Gravity.NO_GRAVITY, anchorRect.left, anchorRect.bottom);
+      }
+      mShowing = true;
+      if (mShownListener != null)
+        mShownListener.onShown();
+    }
+    updatePausePlay();
+    mHandler.sendEmptyMessage(SHOW_PROGRESS);
+
+    if (timeout != 0) {
+      mHandler.removeMessages(FADE_OUT);
+      mHandler.sendMessageDelayed(mHandler.obtainMessage(FADE_OUT), timeout);
+    }
+  }
+
+  public boolean isShowing() {
+    return mShowing;
+  }
+
+  public void hide() {
+    if (mAnchor == null)
+      return;
+
+    if (mShowing) {
+      try {
+        mHandler.removeMessages(SHOW_PROGRESS);
+        if (mFromXml)
+          setVisibility(View.GONE);
+        else
+          mWindow.dismiss();
+      } catch (IllegalArgumentException ex) {
+        Log.d("MediaController already removed");
+      }
+      mShowing = false;
+      if (mHiddenListener != null)
+        mHiddenListener.onHidden();
+    }
+  }
+
+  public void setOnShownListener(OnShownListener l) {
+    mShownListener = l;
+  }
+
+  public void setOnHiddenListener(OnHiddenListener l) {
+    mHiddenListener = l;
+  }
+
+  private long setProgress() {
+    if (mPlayer == null || mDragging)
+      return 0;
+
+    long position = mPlayer.getCurrentPosition();
+    long duration = mPlayer.getDuration();
+    if (mProgress != null) {
+      if (duration > 0) {
+        long pos = 1000L * position / duration;
+        mProgress.setProgress((int) pos);
+      }
+      int percent = mPlayer.getBufferPercentage();
+      mProgress.setSecondaryProgress(percent * 10);
+    }
+
+    mDuration = duration;
+
+    if (mEndTime != null)
+      mEndTime.setText(StringUtils.generateTime(mDuration));
+    if (mCurrentTime != null)
+      mCurrentTime.setText(StringUtils.generateTime(position));
+
+    return position;
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    show(sDefaultTimeout);
+    return true;
+  }
+
+  @Override
+  public boolean onTrackballEvent(MotionEvent ev) {
+    show(sDefaultTimeout);
+    return false;
+  }
+
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    int keyCode = event.getKeyCode();
+    if (event.getRepeatCount() == 0 && (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE)) {
+      doPauseResume();
+      show(sDefaultTimeout);
+      if (mPauseButton != null)
+        mPauseButton.requestFocus();
+      return true;
+    } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP) {
+      if (mPlayer.isPlaying()) {
+        mPlayer.pause();
+        updatePausePlay();
+      }
+      return true;
+    } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) {
+      hide();
+      return true;
+    } else {
+      show(sDefaultTimeout);
+    }
+    return super.dispatchKeyEvent(event);
+  }
+
+  private void updatePausePlay() {
+    if (mRoot == null || mPauseButton == null)
+      return;
+
+    if (mPlayer.isPlaying())
+      mPauseButton.setImageResource(R.drawable.mediacontroller_pause_button);
+    else
+      mPauseButton.setImageResource(R.drawable.mediacontroller_play_button);
+  }
+
+  private void doPauseResume() {
+    if (mPlayer.isPlaying())
+      mPlayer.pause();
+    else
+      mPlayer.start();
+    updatePausePlay();
+  }
+
+  @Override
+  public void setEnabled(boolean enabled) {
+    if (mPauseButton != null)
+      mPauseButton.setEnabled(enabled);
+    if (mProgress != null)
+      mProgress.setEnabled(enabled);
+    disableUnsupportedButtons();
+    super.setEnabled(enabled);
+  }
+
+  public interface OnShownListener {
+    public void onShown();
+  }
+
+  public interface OnHiddenListener {
+    public void onHidden();
+  }
+
+  public interface MediaPlayerControl {
+    void start();
+
+    void pause();
+
+    long getDuration();
+
+    long getCurrentPosition();
+
+    void seekTo(long pos);
+
+    boolean isPlaying();
+
+    int getBufferPercentage();
+
+    boolean canPause();
+
+    boolean canSeekBackward();
+
+    boolean canSeekForward();
+  }
+
+}
diff --git a/showkeyHelper/src/io/vov/vitamio/widget/OutlineTextView.java b/showkeyHelper/src/io/vov/vitamio/widget/OutlineTextView.java
new file mode 100644
index 0000000..807ae80
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/widget/OutlineTextView.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * Display text with border, use the same XML attrs as
+ * {@link android.widget.TextView}, except that {@link OutlineTextView} will
+ * transform the shadow to border
+ */
+public class OutlineTextView extends TextView {
+  private TextPaint mTextPaint;
+  private TextPaint mTextPaintOutline;
+  private String mText = "";
+  private int mAscent = 0;
+  private float mBorderSize;
+  private int mBorderColor;
+  private int mColor;
+  private float mSpacingMult = 1.0f;
+  private float mSpacingAdd = 0;
+  private boolean mIncludePad = true;
+
+  public OutlineTextView(Context context) {
+    super(context);
+    initPaint();
+  }
+
+  public OutlineTextView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initPaint();
+  }
+
+  public OutlineTextView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initPaint();
+  }
+
+  private void initPaint() {
+    mTextPaint = new TextPaint();
+    mTextPaint.setAntiAlias(true);
+    mTextPaint.setTextSize(getTextSize());
+    mTextPaint.setColor(mColor);
+    mTextPaint.setStyle(Paint.Style.FILL);
+    mTextPaint.setTypeface(getTypeface());
+
+    mTextPaintOutline = new TextPaint();
+    mTextPaintOutline.setAntiAlias(true);
+    mTextPaintOutline.setTextSize(getTextSize());
+    mTextPaintOutline.setColor(mBorderColor);
+    mTextPaintOutline.setStyle(Paint.Style.STROKE);
+    mTextPaintOutline.setTypeface(getTypeface());
+    mTextPaintOutline.setStrokeWidth(mBorderSize);
+  }
+
+  public void setText(String text) {
+    super.setText(text);
+    mText = text.toString();
+    requestLayout();
+    invalidate();
+  }
+
+  public void setTextSize(float size) {
+    super.setTextSize(size);
+    requestLayout();
+    invalidate();
+    initPaint();
+  }
+
+  public void setTextColor(int color) {
+    super.setTextColor(color);
+    mColor = color;
+    invalidate();
+    initPaint();
+  }
+
+  public void setShadowLayer(float radius, float dx, float dy, int color) {
+    super.setShadowLayer(radius, dx, dy, color);
+    mBorderSize = radius;
+    mBorderColor = color;
+    requestLayout();
+    invalidate();
+    initPaint();
+  }
+
+  public void setTypeface(Typeface tf, int style) {
+    super.setTypeface(tf, style);
+    requestLayout();
+    invalidate();
+    initPaint();
+  }
+
+  public void setTypeface(Typeface tf) {
+    super.setTypeface(tf);
+    requestLayout();
+    invalidate();
+    initPaint();
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    Layout layout = new StaticLayout(getText(), mTextPaintOutline, getWidth(), Layout.Alignment.ALIGN_CENTER, mSpacingMult, mSpacingAdd, mIncludePad);
+    layout.draw(canvas);
+    layout = new StaticLayout(getText(), mTextPaint, getWidth(), Layout.Alignment.ALIGN_CENTER, mSpacingMult, mSpacingAdd, mIncludePad);
+    layout.draw(canvas);
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    Layout layout = new StaticLayout(getText(), mTextPaintOutline, measureWidth(widthMeasureSpec), Layout.Alignment.ALIGN_CENTER, mSpacingMult, mSpacingAdd, mIncludePad);
+    int ex = (int) (mBorderSize * 2 + 1);
+    setMeasuredDimension(measureWidth(widthMeasureSpec) + ex, measureHeight(heightMeasureSpec) * layout.getLineCount() + ex);
+  }
+
+  private int measureWidth(int measureSpec) {
+    int result = 0;
+    int specMode = MeasureSpec.getMode(measureSpec);
+    int specSize = MeasureSpec.getSize(measureSpec);
+
+    if (specMode == MeasureSpec.EXACTLY) {
+      result = specSize;
+    } else {
+      result = (int) mTextPaintOutline.measureText(mText) + getPaddingLeft() + getPaddingRight();
+      if (specMode == MeasureSpec.AT_MOST) {
+        result = Math.min(result, specSize);
+      }
+    }
+
+    return result;
+  }
+
+  private int measureHeight(int measureSpec) {
+    int result = 0;
+    int specMode = MeasureSpec.getMode(measureSpec);
+    int specSize = MeasureSpec.getSize(measureSpec);
+
+    mAscent = (int) mTextPaintOutline.ascent();
+    if (specMode == MeasureSpec.EXACTLY) {
+      result = specSize;
+    } else {
+      result = (int) (-mAscent + mTextPaintOutline.descent()) + getPaddingTop() + getPaddingBottom();
+      if (specMode == MeasureSpec.AT_MOST) {
+        result = Math.min(result, specSize);
+      }
+    }
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/showkeyHelper/src/io/vov/vitamio/widget/VideoView.java b/showkeyHelper/src/io/vov/vitamio/widget/VideoView.java
new file mode 100644
index 0000000..e58ed47
--- /dev/null
+++ b/showkeyHelper/src/io/vov/vitamio/widget/VideoView.java
@@ -0,0 +1,776 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2013 YIXIA.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.vov.vitamio.widget;
+
+import io.vov.vitamio.MediaPlayer;
+import io.vov.vitamio.MediaPlayer.OnBufferingUpdateListener;
+import io.vov.vitamio.MediaPlayer.OnCompletionListener;
+import io.vov.vitamio.MediaPlayer.OnErrorListener;
+import io.vov.vitamio.MediaPlayer.OnInfoListener;
+import io.vov.vitamio.MediaPlayer.OnPreparedListener;
+import io.vov.vitamio.MediaPlayer.OnSeekCompleteListener;
+import io.vov.vitamio.MediaPlayer.OnTimedTextListener;
+import io.vov.vitamio.MediaPlayer.OnVideoSizeChangedListener;
+import io.vov.vitamio.MediaPlayer.TrackInfo;
+import io.vov.vitamio.Metadata;
+import io.vov.vitamio.Vitamio;
+import io.vov.vitamio.utils.Log;
+
+import java.io.IOException;
+import java.util.List;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.SparseArray;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+
+import com.joyplus.mediaplayer.JoyplusMediaPlayerScreenManager;
+import com.joyplus.tvhelper.R;
+
+
+
+/**
+ * Displays a video file. The VideoView class can load images from various
+ * sources (such as resources or content providers), takes care of computing its
+ * measurement from the video so that it can be used in any layout manager, and
+ * provides various display options such as scaling and tinting.
+ * <p/>
+ * VideoView also provide many wrapper methods for
+ * {@link io.vov.vitamio.MediaPlayer}, such as {@link #getVideoWidth()},
+ * {@link #setTimedTextShown(boolean)}
+ */
+public class VideoView extends SurfaceView implements MediaController.MediaPlayerControl {
+    //add for zoom by Jas@20130925
+    public static final int VIDEO_LAYOUT_16X9     = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_16x9;
+    public static final int VIDEO_LAYOUT_4X3      = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_4x3;
+    public static final int VIDEO_LAYOUT_FILL     = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_FULL;
+    public static final int VIDEO_LAYOUT_ORIGINAL = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_ORIGINAL;
+    public static final int VIDEO_LAYOUT_DEFAULT  = JoyplusMediaPlayerScreenManager.LINEARLAYOUT_PARAMS_DEFAULT;
+    private int             mVideoLayout = VIDEO_LAYOUT_DEFAULT;
+    //end add for zoom
+  private static final int STATE_ERROR = -1;
+  private static final int STATE_IDLE = 0;
+  private static final int STATE_PREPARING = 1;
+  private static final int STATE_PREPARED = 2;
+  private static final int STATE_PLAYING = 3;
+  private static final int STATE_PAUSED = 4;
+  private static final int STATE_PLAYBACK_COMPLETED = 5;
+  private static final int STATE_SUSPEND = 6;
+  private static final int STATE_RESUME = 7;
+  private static final int STATE_SUSPEND_UNSUPPORTED = 8;
+  OnVideoSizeChangedListener mSizeChangedListener = new OnVideoSizeChangedListener() {
+    public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+      Log.d("onVideoSizeChanged: (%dx%d)", width, height);
+      mVideoWidth = mp.getVideoWidth();
+      mVideoHeight = mp.getVideoHeight();
+      mVideoAspectRatio = mp.getVideoAspectRatio();
+      if (mVideoWidth != 0 && mVideoHeight != 0)
+//        setVideoLayout(mVideoLayout, mAspectRatio);
+    	  setVideoLayout(mVideoLayout);
+    }
+  };
+  OnPreparedListener mPreparedListener = new OnPreparedListener() {
+    public void onPrepared(MediaPlayer mp) {
+      Log.d("onPrepared");
+      mCurrentState = STATE_PREPARED;
+      mTargetState = STATE_PLAYING;
+      
+      // Get the capabilities of the player for this stream
+      Metadata data = mp.getMetadata();
+
+      if (data != null) {
+          mCanPause = !data.has(Metadata.PAUSE_AVAILABLE)
+                  || data.getBoolean(Metadata.PAUSE_AVAILABLE);
+          mCanSeekBack = !data.has(Metadata.SEEK_BACKWARD_AVAILABLE)
+                  || data.getBoolean(Metadata.SEEK_BACKWARD_AVAILABLE);
+          mCanSeekForward = !data.has(Metadata.SEEK_FORWARD_AVAILABLE)
+                  || data.getBoolean(Metadata.SEEK_FORWARD_AVAILABLE);
+      } else {
+          mCanPause = mCanSeekBack = mCanSeekForward = true;
+      }
+
+      if (mOnPreparedListener != null)
+        mOnPreparedListener.onPrepared(mMediaPlayer);
+      if (mMediaController != null)
+        mMediaController.setEnabled(true);
+      mVideoWidth = mp.getVideoWidth();
+      mVideoHeight = mp.getVideoHeight();
+      mVideoAspectRatio = mp.getVideoAspectRatio();
+
+      long seekToPosition = mSeekWhenPrepared;
+
+      if (seekToPosition != 0)
+        seekTo(seekToPosition);
+      if (mVideoWidth != 0 && mVideoHeight != 0) {
+//        setVideoLayout(mVideoLayout, mAspectRatio);
+    	  setVideoLayout(mVideoLayout);
+        if (mSurfaceWidth == mVideoWidth && mSurfaceHeight == mVideoHeight) {
+          if (mTargetState == STATE_PLAYING) {
+            start();
+            if (mMediaController != null)
+              mMediaController.show();
+          } else if (!isPlaying() && (seekToPosition != 0 || getCurrentPosition() > 0)) {
+            if (mMediaController != null)
+              mMediaController.show(0);
+          }
+        }
+      } else if (mTargetState == STATE_PLAYING) {
+        start();
+      }
+    }
+  };
+  SurfaceHolder.Callback mSHCallback = new SurfaceHolder.Callback() {
+    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
+      mSurfaceWidth = w;
+      mSurfaceHeight = h;
+      boolean isValidState = (mTargetState == STATE_PLAYING);
+      boolean hasValidSize = (mVideoWidth == w && mVideoHeight == h);
+      if (mMediaPlayer != null && isValidState && hasValidSize) {
+        if (mSeekWhenPrepared != 0)
+          seekTo(mSeekWhenPrepared);
+        start();
+        if (mMediaController != null) {
+          if (mMediaController.isShowing())
+            mMediaController.hide();
+          mMediaController.show();
+        }
+      }
+    }
+
+    public void surfaceCreated(SurfaceHolder holder) {
+      mSurfaceHolder = holder;
+      if (mMediaPlayer != null && mCurrentState == STATE_SUSPEND && mTargetState == STATE_RESUME) {
+        mMediaPlayer.setDisplay(mSurfaceHolder);
+        resume();
+      } else {
+        openVideo();
+      }
+    }
+
+    public void surfaceDestroyed(SurfaceHolder holder) {
+      mSurfaceHolder = null;
+      if (mMediaController != null)
+        mMediaController.hide();
+      if (mCurrentState != STATE_SUSPEND)
+        release(true);
+    }
+  };
+  private Uri mUri;
+  private long mDuration;
+  private int mCurrentState = STATE_IDLE;
+  private int mTargetState = STATE_IDLE;
+  private float mAspectRatio = 0;
+  private SurfaceHolder mSurfaceHolder = null;
+  private MediaPlayer mMediaPlayer = null;
+  private int mVideoWidth;
+  private int mVideoHeight;
+  private float mVideoAspectRatio;
+  private int mSurfaceWidth;
+  private int mSurfaceHeight;
+  private MediaController mMediaController;
+  private OnCompletionListener mOnCompletionListener;
+  private OnPreparedListener mOnPreparedListener;
+  private OnErrorListener mOnErrorListener;
+  private OnSeekCompleteListener mOnSeekCompleteListener;
+  private OnTimedTextListener mOnTimedTextListener;
+  private OnInfoListener mOnInfoListener;
+  private OnBufferingUpdateListener mOnBufferingUpdateListener;
+  private int mCurrentBufferPercentage;
+  private long mSeekWhenPrepared; // recording the seek position while preparing
+  private boolean mCanPause;
+  private boolean mCanSeekBack;
+  private boolean mCanSeekForward;
+  private Context mContext;
+  private OnCompletionListener mCompletionListener = new OnCompletionListener() {
+    public void onCompletion(MediaPlayer mp) {
+      Log.d("onCompletion");
+      mCurrentState = STATE_PLAYBACK_COMPLETED;
+      mTargetState = STATE_PLAYBACK_COMPLETED;
+      if (mMediaController != null)
+        mMediaController.hide();
+      if (mOnCompletionListener != null)
+        mOnCompletionListener.onCompletion(mMediaPlayer);
+    }
+  };
+  private OnErrorListener mErrorListener = new OnErrorListener() {
+    public boolean onError(MediaPlayer mp, int framework_err, int impl_err) {
+      Log.d("Error: %d, %d", framework_err, impl_err);
+      mCurrentState = STATE_ERROR;
+      mTargetState = STATE_ERROR;
+      if (mMediaController != null)
+        mMediaController.hide();
+
+      if (mOnErrorListener != null) {
+        if (mOnErrorListener.onError(mMediaPlayer, framework_err, impl_err))
+          return true;
+      }
+
+      if (getWindowToken() != null) {
+        int message = framework_err == MediaPlayer.MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK ? R.string.VideoView_error_text_invalid_progressive_playback : R.string.VideoView_error_text_unknown;
+
+        new AlertDialog.Builder(mContext).setTitle(R.string.VideoView_error_title).setMessage(message).setPositiveButton(R.string.VideoView_error_button, new DialogInterface.OnClickListener() {
+          public void onClick(DialogInterface dialog, int whichButton) {
+            if (mOnCompletionListener != null)
+              mOnCompletionListener.onCompletion(mMediaPlayer);
+          }
+        }).setCancelable(false).show();
+      }
+      return true;
+    }
+  };
+  private OnBufferingUpdateListener mBufferingUpdateListener = new OnBufferingUpdateListener() {
+    public void onBufferingUpdate(MediaPlayer mp, int percent) {
+      mCurrentBufferPercentage = percent;
+      if (mOnBufferingUpdateListener != null)
+        mOnBufferingUpdateListener.onBufferingUpdate(mp, percent);
+    }
+  };
+  private OnInfoListener mInfoListener = new OnInfoListener() {
+    @Override
+    public boolean onInfo(MediaPlayer mp, int what, int extra) {
+      Log.d("onInfo: (%d, %d)", what, extra);
+      if (mOnInfoListener != null) {
+        mOnInfoListener.onInfo(mp, what, extra);
+      } else if (mMediaPlayer != null) {
+        if (what == MediaPlayer.MEDIA_INFO_BUFFERING_START)
+          mMediaPlayer.pause();
+        else if (what == MediaPlayer.MEDIA_INFO_BUFFERING_END)
+          mMediaPlayer.start();
+      }
+
+      return true;
+    }
+  };
+  private OnSeekCompleteListener mSeekCompleteListener = new OnSeekCompleteListener() {
+    @Override
+    public void onSeekComplete(MediaPlayer mp) {
+      Log.d("onSeekComplete");
+      if (mOnSeekCompleteListener != null)
+        mOnSeekCompleteListener.onSeekComplete(mp);
+    }
+  };
+  private OnTimedTextListener mTimedTextListener = new OnTimedTextListener() {
+    @Override
+    public void onTimedTextUpdate(byte[] pixels, int width, int height) {
+      Log.i("onSubtitleUpdate: bitmap subtitle, %dx%d", width, height);
+      if (mOnTimedTextListener != null)
+        mOnTimedTextListener.onTimedTextUpdate(pixels, width, height);
+    }
+
+    @Override
+    public void onTimedText(String text) {
+      Log.i("onSubtitleUpdate: %s", text);
+      if (mOnTimedTextListener != null)
+        mOnTimedTextListener.onTimedText(text);
+    }
+  };
+
+  public VideoView(Context context) {
+    super(context);
+    initVideoView(context);
+  }
+
+  public VideoView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+    initVideoView(context);
+  }
+
+  public VideoView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initVideoView(context);
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
+    int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
+    setMeasuredDimension(width, height);
+  }
+  public int getVideoLayout(){
+	  return mVideoLayout;
+  }
+  public void setVideoLayout(int layout) {
+      LayoutParams lp     = getLayoutParams();
+      View base = (View) this.getParent();
+      int windowWidth = base.getWidth();
+      int windowHeight = base.getHeight();
+      if(mVideoWidth<0 || mVideoHeight<0)return;
+      mSurfaceHeight      = mVideoHeight;
+      mSurfaceWidth       = mVideoWidth;
+      if (VIDEO_LAYOUT_16X9 == layout) {
+      	lp.width  = windowWidth;
+      	lp.height = windowWidth*9/16;
+      } else if (layout == VIDEO_LAYOUT_4X3) {
+      	lp.width  = windowHeight*4/3;
+      	lp.height = windowHeight;
+      } else if(layout == VIDEO_LAYOUT_ORIGINAL){
+      	lp.width  = mSurfaceWidth;
+      	lp.height = mSurfaceHeight;
+      } else if(layout == VIDEO_LAYOUT_FILL){
+      	lp.width       = windowWidth;
+      	lp.height      = windowHeight;        	
+      }
+      setLayoutParams(lp);
+      getHolder().setFixedSize(mSurfaceWidth, mSurfaceHeight);
+      mVideoLayout = layout;
+  }
+  /**
+   * Set the display options
+   *
+   * @param layout      <ul>
+   *                    <li>{@link #VIDEO_LAYOUT_ORIGIN}
+   *                    <li>{@link #VIDEO_LAYOUT_SCALE}
+   *                    <li>{@link #VIDEO_LAYOUT_STRETCH}
+   *                    <li>{@link #VIDEO_LAYOUT_ZOOM}
+   *                    </ul>
+   * @param aspectRatio video aspect ratio, will audo detect if 0.
+   */
+//  public void setVideoLayout(int layout, float aspectRatio) {
+//    LayoutParams lp = getLayoutParams();
+//    DisplayMetrics disp = mContext.getResources().getDisplayMetrics();
+//    int windowWidth = disp.widthPixels, windowHeight = disp.heightPixels;
+//    float windowRatio = windowWidth / (float) windowHeight;
+//    float videoRatio = aspectRatio <= 0.01f ? mVideoAspectRatio : aspectRatio;
+//    mSurfaceHeight = mVideoHeight;
+//    mSurfaceWidth = mVideoWidth;
+//    if (VIDEO_LAYOUT_ORIGIN == layout && mSurfaceWidth < windowWidth && mSurfaceHeight < windowHeight) {
+//      lp.width = (int) (mSurfaceHeight * videoRatio);
+//      lp.height = mSurfaceHeight;
+//    } else if (layout == VIDEO_LAYOUT_ZOOM) {
+//      lp.width = windowRatio > videoRatio ? windowWidth : (int) (videoRatio * windowHeight);
+//      lp.height = windowRatio < videoRatio ? windowHeight : (int) (windowWidth / videoRatio);
+//    } else {
+//      boolean full = layout == VIDEO_LAYOUT_STRETCH;
+//      lp.width = (full || windowRatio < videoRatio) ? windowWidth : (int) (videoRatio * windowHeight);
+//      lp.height = (full || windowRatio > videoRatio) ? windowHeight : (int) (windowWidth / videoRatio);
+//    }
+//    setLayoutParams(lp);
+//    getHolder().setFixedSize(mSurfaceWidth, mSurfaceHeight);
+//    Log.d("VIDEO: %dx%dx%f, Surface: %dx%d, LP: %dx%d, Window: %dx%dx%f", mVideoWidth, mVideoHeight, mVideoAspectRatio, mSurfaceWidth, mSurfaceHeight, lp.width, lp.height, windowWidth, windowHeight, windowRatio);
+//    mVideoLayout = layout;
+//    mAspectRatio = aspectRatio;
+//  }
+
+  private void initVideoView(Context ctx) {
+    mContext = ctx;
+    mVideoWidth = 0;
+    mVideoHeight = 0;
+    getHolder().setFormat(PixelFormat.RGBA_8888); // PixelFormat.RGB_565
+    getHolder().addCallback(mSHCallback);
+    setFocusable(true);
+    setFocusableInTouchMode(true);
+    requestFocus();
+    mCurrentState = STATE_IDLE;
+    mTargetState = STATE_IDLE;
+    if (ctx instanceof Activity)
+      ((Activity) ctx).setVolumeControlStream(AudioManager.STREAM_MUSIC);
+  }
+
+  public boolean isValid() {
+    return (mSurfaceHolder != null && mSurfaceHolder.getSurface().isValid());
+  }
+
+  public void setVideoPath(String path) {
+    setVideoURI(Uri.parse(path));
+  }
+
+  public void setVideoURI(Uri uri) {
+    mUri = uri;
+    mSeekWhenPrepared = 0;
+    openVideo();
+    requestLayout();
+    invalidate();
+  }
+
+  public void stopPlayback() {
+    if (mMediaPlayer != null) {
+      mMediaPlayer.stop();
+      mMediaPlayer.release();
+      mMediaPlayer = null;
+      mCurrentState = STATE_IDLE;
+      mTargetState = STATE_IDLE;
+    }
+  }
+
+  private void openVideo() {
+    if (mUri == null || mSurfaceHolder == null || !Vitamio.isInitialized(mContext))
+      return;
+
+    Intent i = new Intent("com.android.music.musicservicecommand");
+    i.putExtra("command", "pause");
+    mContext.sendBroadcast(i);
+
+    release(false);
+    try {
+      mDuration = -1;
+      mCurrentBufferPercentage = 0;
+      mMediaPlayer = new MediaPlayer(mContext);
+      mMediaPlayer.setOnPreparedListener(mPreparedListener);
+      mMediaPlayer.setOnVideoSizeChangedListener(mSizeChangedListener);
+      mMediaPlayer.setOnCompletionListener(mCompletionListener);
+      mMediaPlayer.setOnErrorListener(mErrorListener);
+      mMediaPlayer.setOnBufferingUpdateListener(mBufferingUpdateListener);
+      mMediaPlayer.setOnInfoListener(mInfoListener);
+      mMediaPlayer.setOnSeekCompleteListener(mSeekCompleteListener);
+      mMediaPlayer.setOnTimedTextListener(mTimedTextListener);
+      mMediaPlayer.setDataSource(mContext, mUri);
+      mMediaPlayer.setDisplay(mSurfaceHolder);
+      mMediaPlayer.setScreenOnWhilePlaying(true);
+      mMediaPlayer.prepareAsync();
+      mCurrentState = STATE_PREPARING;
+      attachMediaController();
+    } catch (IOException ex) {
+      Log.e("Unable to open content: " + mUri, ex);
+      mCurrentState = STATE_ERROR;
+      mTargetState = STATE_ERROR;
+      mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
+      return;
+    } catch (IllegalArgumentException ex) {
+      Log.e("Unable to open content: " + mUri, ex);
+      mCurrentState = STATE_ERROR;
+      mTargetState = STATE_ERROR;
+      mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
+      return;
+    }
+  }
+
+  public void setMediaController(MediaController controller) {
+    if (mMediaController != null)
+      mMediaController.hide();
+    mMediaController = controller;
+    attachMediaController();
+  }
+
+  private void attachMediaController() {
+    if (mMediaPlayer != null && mMediaController != null) {
+      mMediaController.setMediaPlayer(this);
+      View anchorView = this.getParent() instanceof View ? (View) this.getParent() : this;
+      mMediaController.setAnchorView(anchorView);
+      mMediaController.setEnabled(isInPlaybackState());
+
+      if (mUri != null) {
+        List<String> paths = mUri.getPathSegments();
+        String name = paths == null || paths.isEmpty() ? "null" : paths.get(paths.size() - 1);
+        mMediaController.setFileName(name);
+      }
+    }
+  }
+
+  public void setOnPreparedListener(OnPreparedListener l) {
+    mOnPreparedListener = l;
+  }
+
+  public void setOnCompletionListener(OnCompletionListener l) {
+    mOnCompletionListener = l;
+  }
+
+  public void setOnErrorListener(OnErrorListener l) {
+    mOnErrorListener = l;
+  }
+
+  public void setOnBufferingUpdateListener(OnBufferingUpdateListener l) {
+    mOnBufferingUpdateListener = l;
+  }
+
+  public void setOnSeekCompleteListener(OnSeekCompleteListener l) {
+    mOnSeekCompleteListener = l;
+  }
+
+  public void setOnTimedTextListener(OnTimedTextListener l) {
+    mOnTimedTextListener = l;
+  }
+
+  public void setOnInfoListener(OnInfoListener l) {
+    mOnInfoListener = l;
+  }
+
+  private void release(boolean cleartargetstate) {
+    if (mMediaPlayer != null) {
+      mMediaPlayer.reset();
+      mMediaPlayer.release();
+      mMediaPlayer = null;
+      mCurrentState = STATE_IDLE;
+      if (cleartargetstate)
+        mTargetState = STATE_IDLE;
+    }
+  }
+
+  @Override
+  public boolean onTouchEvent(MotionEvent ev) {
+    if (isInPlaybackState() && mMediaController != null)
+      toggleMediaControlsVisiblity();
+    return false;
+  }
+
+  @Override
+  public boolean onTrackballEvent(MotionEvent ev) {
+    if (isInPlaybackState() && mMediaController != null)
+      toggleMediaControlsVisiblity();
+    return false;
+  }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    boolean isKeyCodeSupported = keyCode != KeyEvent.KEYCODE_BACK && keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN && keyCode != KeyEvent.KEYCODE_MENU && keyCode != KeyEvent.KEYCODE_CALL && keyCode != KeyEvent.KEYCODE_ENDCALL;
+    if (isInPlaybackState() && isKeyCodeSupported && mMediaController != null) {
+      if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE) {
+        if (mMediaPlayer.isPlaying()) {
+          pause();
+          mMediaController.show();
+        } else {
+          start();
+          mMediaController.hide();
+        }
+        return true;
+      } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
+        if (!mMediaPlayer.isPlaying()) {
+            start();
+            mMediaController.hide();
+        }
+        return true;
+      } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP || keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
+      	if (mMediaPlayer.isPlaying()) {
+          pause();
+          mMediaController.show();
+      	}
+      	return true;
+      } else {
+        toggleMediaControlsVisiblity();
+      }
+    }
+
+    return super.onKeyDown(keyCode, event);
+  }
+
+  private void toggleMediaControlsVisiblity() {
+    if (mMediaController.isShowing()) {
+      mMediaController.hide();
+    } else {
+      mMediaController.show();
+    }
+  }
+
+  public void start() {
+    if (isInPlaybackState()) {
+      mMediaPlayer.start();
+      mCurrentState = STATE_PLAYING;
+    }
+    mTargetState = STATE_PLAYING;
+  }
+
+  public void pause() {
+    if (isInPlaybackState()) {
+      if (mMediaPlayer.isPlaying()) {
+        mMediaPlayer.pause();
+        mCurrentState = STATE_PAUSED;
+      }
+    }
+    mTargetState = STATE_PAUSED;
+  }
+
+  public void suspend() {
+    if (isInPlaybackState()) {
+      release(false);
+      mCurrentState = STATE_SUSPEND_UNSUPPORTED;
+      Log.d("Unable to suspend video. Release MediaPlayer.");
+    }
+  }
+
+  public void resume() {
+    if (mSurfaceHolder == null && mCurrentState == STATE_SUSPEND) {
+      mTargetState = STATE_RESUME;
+    } else if (mCurrentState == STATE_SUSPEND_UNSUPPORTED) {
+      openVideo();
+    }
+  }
+
+  public long getDuration() {
+    if (isInPlaybackState()) {
+      if (mDuration > 0)
+        return mDuration;
+      mDuration = mMediaPlayer.getDuration();
+      return mDuration;
+    }
+    mDuration = -1;
+    return mDuration;
+  }
+
+  public long getCurrentPosition() {
+    if (isInPlaybackState())
+      return mMediaPlayer.getCurrentPosition();
+    return 0;
+  }
+
+  public void seekTo(long msec) {
+    if (isInPlaybackState()) {
+      mMediaPlayer.seekTo(msec);
+      mSeekWhenPrepared = 0;
+    } else {
+      mSeekWhenPrepared = msec;
+    }
+  }
+
+  public boolean isPlaying() {
+    return isInPlaybackState() && mMediaPlayer.isPlaying();
+  }
+
+  public int getBufferPercentage() {
+    if (mMediaPlayer != null)
+      return mCurrentBufferPercentage;
+    return 0;
+  }
+
+  public void setVolume(float leftVolume, float rightVolume) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setVolume(leftVolume, rightVolume);
+  }
+
+  public int getVideoWidth() {
+    return mVideoWidth;
+  }
+
+  public int getVideoHeight() {
+    return mVideoHeight;
+  }
+
+  public float getVideoAspectRatio() {
+    return mVideoAspectRatio;
+  }
+
+  public void setVideoQuality(int quality) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setVideoQuality(quality);
+  }
+  
+  public void setVideoChroma(int chroma) {
+  	if (mMediaPlayer != null)
+  		mMediaPlayer.setVideoChroma(chroma);
+  }
+
+  public void setBufferSize(int bufSize) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setBufferSize(bufSize);
+  }
+
+  public boolean isBuffering() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.isBuffering();
+    return false;
+  }
+
+  public String getMetaEncoding() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.getMetaEncoding();
+    return null;
+  }
+
+  public void setMetaEncoding(String encoding) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setMetaEncoding(encoding);
+  }
+
+  public SparseArray<String> getAudioTrackMap(String encoding) {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.findTrackFromTrackInfo(TrackInfo.MEDIA_TRACK_TYPE_AUDIO, mMediaPlayer.getTrackInfo(encoding));
+    return null;
+  }
+
+  public int getAudioTrack() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.getAudioTrack();
+    return -1;
+  }
+
+  public void setAudioTrack(int audioIndex) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.selectTrack(audioIndex);
+  }
+
+  public void setTimedTextShown(boolean shown) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setTimedTextShown(shown);
+  }
+
+  public void setTimedTextEncoding(String encoding) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.setTimedTextEncoding(encoding);
+  }
+
+  public int getTimedTextLocation() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.getTimedTextLocation();
+    return -1;
+  }
+
+  public void addTimedTextSource(String subPath) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.addTimedTextSource(subPath);
+  }
+
+  public String getTimedTextPath() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.getTimedTextPath();
+    return null;
+  }
+
+  public void setSubTrack(int trackId) {
+    if (mMediaPlayer != null)
+      mMediaPlayer.selectTrack(trackId);
+  }
+
+  public int getTimedTextTrack() {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.getTimedTextTrack();
+    return -1;
+  }
+
+  public SparseArray<String> getSubTrackMap(String encoding) {
+    if (mMediaPlayer != null)
+      return mMediaPlayer.findTrackFromTrackInfo(TrackInfo.MEDIA_TRACK_TYPE_TIMEDTEXT, mMediaPlayer.getTrackInfo(encoding));
+    return null;
+  }
+
+  protected boolean isInPlaybackState() {
+    return (mMediaPlayer != null && mCurrentState != STATE_ERROR && mCurrentState != STATE_IDLE && mCurrentState != STATE_PREPARING);
+  }
+
+  public boolean canPause() {
+    return mCanPause;
+  }
+
+  public boolean canSeekBackward() {
+    return mCanSeekBack;
+  }
+
+  public boolean canSeekForward() {
+    return mCanSeekForward;
+  }
+}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/Collection.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/Collection.java
deleted file mode 100644
index 721aa2c..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/Collection.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Collection {
-	private File file;
-	private String charset;
-	
-	private List<Element> elements = new ArrayList<Element>();
-
-	public List<Element> getElements() {
-		return elements;
-	}
-	
-	public int getElementSize(){
-		
-		return elements.size();
-	}
-
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		for (Element el : elements) {
-			builder.append(el + "\n");
-		}
-		return builder.toString();
-	}
-
-	public void synchronize(final int startRank, final Time newStartTime,
-			final int endRank, final Time newEndTime) {
-		final Time oldStartTime = elements.get(startRank).getStartTime();
-		final Time oldEndTime = elements.get(endRank).getEndTime();
-		final long init = newStartTime.getTime() - oldStartTime.getTime();
-		final double coef = (newStartTime.getTime() - oldStartTime.getTime())
-				/ (newEndTime.getTime() - oldEndTime.getTime());
-		for (int i = startRank; i <= endRank; ++i) {
-			final Element e = elements.get(i);
-			e.setStartTime(new Time(
-					(long) (e.getStartTime().getTime() * coef + init)));
-			e.setEndTime(new Time(
-					(long) (e.getEndTime().getTime() * coef + init)));
-		}
-	}
-
-	/**
-	 * @return the file
-	 */
-	public File getFile() {
-		return file;
-	}
-
-	/**
-	 * @param file the file to set
-	 */
-	public void setFile(File file) {
-		this.file = file;
-	}
-
-	/**
-	 * @return the charset
-	 */
-	public String getCharset() {
-		return charset;
-	}
-
-	/**
-	 * @param charset the charset to set
-	 */
-	public void setCharset(String charset) {
-		this.charset = charset;
-	}
-	
-	
-}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/Element.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/Element.java
deleted file mode 100644
index c734bc2..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/Element.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-
-
-public class Element {
-	public static final String TIME_SEP = " --> ";
-	private int rank;
-	private Time startTime;
-	private Time endTime;
-	private String text;
-	
-	public Element() {}
-	
-	public Element(Element e){
-		
-		this.rank = e.rank;
-		this.startTime = e.startTime;
-		this.endTime = e.endTime;
-		this.text = e.text;
-	}
-	
-	
-	/**
-	 * @return the rank
-	 */
-	public int getRank() {
-		return rank;
-	}
-
-
-	/**
-	 * @param rank the rank to set
-	 */
-	public void setRank(int rank) {
-		this.rank = rank;
-	}
-
-
-	/**
-	 * @return the startTime
-	 */
-	public Time getStartTime() {
-		return startTime;
-	}
-
-	/**
-	 * @param time the startTime to set
-	 */
-	public void setStartTime(Time time) {
-		this.startTime = time;
-	}
-
-	/**
-	 * @return the endTime
-	 */
-	public Time getEndTime() {
-		return endTime;
-	}
-
-	/**
-	 * @param time the endTime to set
-	 */
-	public void setEndTime(Time time) {
-		this.endTime = time;
-	}
-
-	/**
-	 * @return the text
-	 */
-	public String getText() {
-		return text;
-	}
-
-
-	/**
-	 * @param text the text to set
-	 */
-	public void setText(String text) {
-		this.text = text;
-	}
-
-
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append(String.valueOf(rank)+"\n");
-		builder.append(startTime + TIME_SEP + endTime +"\n");
-		builder.append(text);
-		return builder.toString();
-	}
-}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/Parser.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/Parser.java
deleted file mode 100644
index 5460bd2..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/Parser.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.mozilla.intl.chardet.nsDetector;
-import org.mozilla.intl.chardet.nsICharsetDetectionObserver;
-
-public class Parser {
-	private static final String SEP = "\r?\n";
-	private static final String RANK_REGEX = "(\\d+)";
-	private static final String TIME_REGEX = "(\\d{1,2}):(\\d{1,2}):(\\d{1,2})[,.](\\d{1,3})";
-	private static final String TEXT_REGEX = "(.*?)^" + SEP;
-	private static final String SRT_REGEX = RANK_REGEX + SEP + TIME_REGEX
-			+ " --> " + TIME_REGEX + SEP + TEXT_REGEX;
-
-	private String charset = "GBK";
-
-	private final Collection collection = new Collection();
-	private final Pattern pattern = Pattern.compile(SRT_REGEX,
-			Pattern.MULTILINE | Pattern.DOTALL);
-
-	public Parser() {
-//		parse(f);
-	}
-
-//	public Parser(InputStream is) {
-//		parse(is);
-//	}
-//
-//	public Parser(String input) {
-//		parse(input);
-//	}
-
-	public void parse(File f) {
-		try {
-			InputStream is;
-			nsICharsetDetectionObserver observer = new nsICharsetDetectionObserver() {
-				@Override
-				public void Notify(String charset) {
-					setCharset(charset);
-				}
-			};
-			collection.setFile(f);
-			nsDetector detector = new nsDetector();
-			detector.Init(observer);
-			is = new FileInputStream(f);
-			int len = 0;
-			byte[] buf = new byte[512];
-			while ((len = is.read(buf, 0, buf.length)) > 0) {
-				detector.DoIt(buf, len, false);
-			}
-			detector.DataEnd();
-			is.close();
-			is = new FileInputStream(f);
-			parse(is);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public void parse(InputStream is) {
-		int len = 0;
-		final char[] buffer = new char[512];
-		final Writer writer = new StringWriter();
-		try {
-			InputStreamReader isr = new InputStreamReader(is, getCharset());
-			final BufferedReader br = new BufferedReader(isr);
-			while ((len = br.read(buffer)) > 0) {
-				writer.write(buffer, 0, len);
-			}
-		} catch (Exception e) {
-		} finally {
-			try {
-				is.close();
-			} catch (Exception e) {
-			}
-		}
-		parse(writer.toString());
-
-	}
-
-	public void parse(String input) {
-		Matcher m = pattern.matcher(input);
-		int match = 0;
-		while (m.find()) {
-			++match;
-			Element e = getElement(m);
-			if(collection.getElementSize() >= 1 ){
-				if(e.getStartTime().getTime() !=
-					collection.getElements().get(collection.getElementSize()-1)
-					.getStartTime().getTime()){
-					collection.getElements().add(e);
-				}
-			}else {
-				collection.getElements().add(e);
-			}
-		}
-		collection.setCharset(getCharset());
-		java.util.Collections.sort(collection.getElements(), new SubTitleElementComparator());
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public Element getElement(Matcher matcher) {
-		final Element e = new Element();
-		e.setRank(Integer.parseInt(matcher.group(1)));
-		{
-			final long h = Long.parseLong(matcher.group(2));
-			final long m = Long.parseLong(matcher.group(3));
-			final long s = Long.parseLong(matcher.group(4));
-			final long ms = Long.parseLong(matcher.group(5));
-			e.setStartTime(new Time(h, m, s, ms));
-		}
-		{
-			final long h = Long.parseLong(matcher.group(6));
-			final long m = Long.parseLong(matcher.group(7));
-			final long s = Long.parseLong(matcher.group(8));
-			final long ms = Long.parseLong(matcher.group(9));
-			e.setEndTime(new Time(h, m, s, ms));
-		}
-		e.setText(matcher.group(10).replaceAll("<.*>", "").trim().replaceAll("\\\\N", "\n"));
-		return e;
-	}
-
-	public void updateCollection(Collection subtitles) {
-		synchronized (subtitles) {
-			// subtitles.getElements().clear();
-			subtitles.getElements().addAll(getCollection().getElements());
-		}
-	}
-
-	/**
-	 * @return the charset
-	 */
-	public String getCharset() {
-		return charset;
-	}
-
-	/**
-	 * @param charset
-	 *            the charset to set
-	 */
-	public void setCharset(String charset) {
-		System.out.println(charset);
-		this.charset = charset;
-	}
-}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/SubTitleElementComparator.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/SubTitleElementComparator.java
deleted file mode 100644
index 6dec12b..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/SubTitleElementComparator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-import java.util.Comparator;
-
-public class SubTitleElementComparator implements Comparator<Element> {
-
-	@Override
-	public int compare(Element lhs, Element rhs) {
-		// TODO Auto-generated method stub
-		long lhsStartTime = lhs.getStartTime().getTime();
-		long rhsStartTime = rhs.getStartTime().getTime();
-		
-		if(lhsStartTime - rhsStartTime > 0 ){
-			return 1;
-		}else if(lhsStartTime - rhsStartTime < 0 ){
-			return -1;
-		}
-		
-		return 0;
-	}
-
-}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/SubWriter.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/SubWriter.java
deleted file mode 100644
index bb2939e..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/SubWriter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-public class SubWriter {
-	private Collection collection;
-	
-	public SubWriter(Collection collection) {
-		setCollection(collection);
-		
-	}
-	public void write(Collection collection) {
-		setCollection(collection);
-		write();
-	}
-	
-	public void write() {
-		Collection collection = getCollection();
-		String fileContent = collection.toString();
-		Writer writer;
-		try {
-			writer = new OutputStreamWriter(
-					new FileOutputStream(collection.getFile()), 
-					collection.getCharset());
-			writer.write(fileContent);
-			writer.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * @return the collection
-	 */
-	public Collection getCollection() {
-		return collection;
-	}
-	/**
-	 * @param collection the collection to set
-	 */
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-}
diff --git a/showkeyHelper/src/org/blaznyoght/subtitles/model/Time.java b/showkeyHelper/src/org/blaznyoght/subtitles/model/Time.java
deleted file mode 100644
index 5197df7..0000000
--- a/showkeyHelper/src/org/blaznyoght/subtitles/model/Time.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.blaznyoght.subtitles.model;
-
-import java.util.Date;
-import java.util.Scanner;
-import java.util.regex.MatchResult;
-
-public class Time {
-	private long time;
-	
-	public Time(long time) {
-		this.time = time;
-	}
-	
-	public Time(long h, long m, long s, long ms) {
-		setTime(getTimeAsLong(h, m, s, ms));
-	}
-	
-	public Time(String time) {
-		setTime(stringTimeToLong(time));
-	}
-
-	public Time(Date value) {
-		this.time = value.getTime();
-	}
-
-	/**
-	 * @return the time
-	 */
-	public long getTime() {
-		return time;
-	}
-
-	/**
-	 * @param time the time to set
-	 */
-	public void setTime(long time) {
-		this.time = time;
-	}
-
-	private String longToTime(long time) {
-		return String.format(
-				"%02d:%02d:%02d,%03d", 
-				(time / 3600000),
-				(time / 60000) % 60,
-				(time / 1000) % 60,
-				time % 1000);
-	}
-	
-	private long stringTimeToLong(String time) {
-		Scanner scanner = new Scanner(time);
-		scanner.findInLine("(\\d+):(\\d+):(\\d+)[,.](\\d+)");
-		MatchResult result = scanner.match();
-		int h = Integer.parseInt(result.group(0));
-		int m = Integer.parseInt(result.group(1));
-		int s = Integer.parseInt(result.group(2));
-		int ms = Integer.parseInt(result.group(3));
-		scanner.close();
-		return getTimeAsLong(h, m, s, ms);
-	}
-
-	public long getTimeAsLong(long h, long m, long s, long ms) {
-		return (h*3600000)+(m*60000)+(s*1000)+ms;
-	}
-	
-	public String toString() {
-		return longToTime(getTime());
-	}
-}