Merge branch 'master' of github.com:Determinant/piztor

46 files changed, 0 insertions, 545 deletions

diff --git a/client/Piztor/.classpath b/client/Piztor/.classpath
deleted file mode 100644
index 7bc01d9..0000000
--- a/client/Piztor/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/client/Piztor/.project b/client/Piztor/.project
deleted file mode 100644
index 97100ec..0000000
--- a/client/Piztor/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Piztor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/client/Piztor/.settings/org.eclipse.jdt.core.prefs b/client/Piztor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2d..0000000
--- a/client/Piztor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
deleted file mode 100644
index 63cb8ff..0000000
--- a/client/Piztor/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.macaroon.piztor"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.macaroon.piztor.Main"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="com.macaroon.piztor.InitAct"
-            android:label="@string/title_activity_init" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/client/Piztor/bin/AndroidManifest.xml b/client/Piztor/bin/AndroidManifest.xml
deleted file mode 100644
index 63cb8ff..0000000
--- a/client/Piztor/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.macaroon.piztor"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.macaroon.piztor.Main"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="com.macaroon.piztor.InitAct"
-            android:label="@string/title_activity_init" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
deleted file mode 100644
index 1b1c693..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class
deleted file mode 100644
index 1f3df48..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
deleted file mode 100644
index 496344b..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
deleted file mode 100644
index 107bcad..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class b/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class
deleted file mode 100644
index 566eb01..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class
deleted file mode 100644
index c656689..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class b/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class
deleted file mode 100644
index 6a8e04d..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class b/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class
deleted file mode 100644
index 4a3fc81..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class
deleted file mode 100644
index a95e1ab..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class
deleted file mode 100644
index 4bc657f..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
deleted file mode 100644
index 5444d98..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
deleted file mode 100644
index 8577179..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
deleted file mode 100644
index fab7556..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
deleted file mode 100644
index cec6e5a..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
deleted file mode 100644
index a78c834..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class
deleted file mode 100644
index 42ddcce..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class
+++ /dev/null
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R.class b/client/Piztor/bin/classes/com/macaroon/piztor/R.class
deleted file mode 100644
index d173856..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R.class
+++ /dev/null
diff --git a/client/Piztor/gen/com/macaroon/piztor/BuildConfig.java b/client/Piztor/gen/com/macaroon/piztor/BuildConfig.java
deleted file mode 100644
index 833e650..0000000
--- a/client/Piztor/gen/com/macaroon/piztor/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.macaroon.piztor;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/client/Piztor/gen/com/macaroon/piztor/R.java b/client/Piztor/gen/com/macaroon/piztor/R.java
deleted file mode 100644
index 9821c7f..0000000
--- a/client/Piztor/gen/com/macaroon/piztor/R.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.macaroon.piztor;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class dimen {
-        /**  Default screen margins, per the Android Design guidelines. 
-
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    
-         */
-        public static final int activity_horizontal_margin=0x7f040000;
-        public static final int activity_vertical_margin=0x7f040001;
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-    }
-    public static final class id {
-        public static final int action_settings=0x7f080000;
-    }
-    public static final class layout {
-        public static final int activity_init=0x7f030000;
-    }
-    public static final class menu {
-        public static final int init=0x7f070000;
-        public static final int main=0x7f070001;
-    }
-    public static final class string {
-        public static final int action_settings=0x7f050001;
-        public static final int app_name=0x7f050000;
-        public static final int hello_world=0x7f050002;
-        public static final int title_activity_init=0x7f050003;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    
- API 11 theme customizations can go here. 
-
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    
- API 14 theme customizations can go here. 
-         */
-        public static final int AppBaseTheme=0x7f060000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f060001;
-    }
-}
diff --git a/client/Piztor/ic_launcher-web.png b/client/Piztor/ic_launcher-web.png
deleted file mode 100644
index a18cbb4..0000000
--- a/client/Piztor/ic_launcher-web.png
+++ /dev/null
diff --git a/client/Piztor/libs/android-support-v4.jar b/client/Piztor/libs/android-support-v4.jar
deleted file mode 100644
index cf12d28..0000000
--- a/client/Piztor/libs/android-support-v4.jar
+++ /dev/null
diff --git a/client/Piztor/proguard-project.txt b/client/Piztor/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/client/Piztor/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/client/Piztor/project.properties b/client/Piztor/project.properties
deleted file mode 100644
index ce39f2d..0000000
--- a/client/Piztor/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18
diff --git a/client/Piztor/res/drawable-hdpi/ic_launcher.png b/client/Piztor/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 288b665..0000000
--- a/client/Piztor/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/client/Piztor/res/drawable-mdpi/ic_launcher.png b/client/Piztor/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 6ae570b..0000000
--- a/client/Piztor/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/client/Piztor/res/drawable-xhdpi/ic_launcher.png b/client/Piztor/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index d4fb7cd..0000000
--- a/client/Piztor/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/client/Piztor/res/drawable-xxhdpi/ic_launcher.png b/client/Piztor/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 85a6081..0000000
--- a/client/Piztor/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
diff --git a/client/Piztor/res/layout/activity_init.xml b/client/Piztor/res/layout/activity_init.xml
deleted file mode 100644
index 43e6253..0000000
--- a/client/Piztor/res/layout/activity_init.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".InitAct" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
-
-</RelativeLayout>
diff --git a/client/Piztor/res/menu/init.xml b/client/Piztor/res/menu/init.xml
deleted file mode 100644
index c002028..0000000
--- a/client/Piztor/res/menu/init.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>
diff --git a/client/Piztor/res/menu/main.xml b/client/Piztor/res/menu/main.xml
deleted file mode 100644
index c002028..0000000
--- a/client/Piztor/res/menu/main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>
diff --git a/client/Piztor/res/values-sw600dp/dimens.xml b/client/Piztor/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 44f01db..0000000
--- a/client/Piztor/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>
diff --git a/client/Piztor/res/values-sw720dp-land/dimens.xml b/client/Piztor/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 61e3fa8..0000000
--- a/client/Piztor/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-
-</resources>
diff --git a/client/Piztor/res/values-v11/styles.xml b/client/Piztor/res/values-v11/styles.xml
deleted file mode 100644
index 3c02242..0000000
--- a/client/Piztor/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>
diff --git a/client/Piztor/res/values-v14/styles.xml b/client/Piztor/res/values-v14/styles.xml
deleted file mode 100644
index a91fd03..0000000
--- a/client/Piztor/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-        <!-- API 14 theme customizations can go here. -->
-    </style>
-
-</resources>
diff --git a/client/Piztor/res/values/dimens.xml b/client/Piztor/res/values/dimens.xml
deleted file mode 100644
index 55c1e59..0000000
--- a/client/Piztor/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
deleted file mode 100644
index 8e76dc0..0000000
--- a/client/Piztor/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Piztor</string>
-    <string name="action_settings">Settings</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="title_activity_init">InitAct</string>
-
-</resources>
diff --git a/client/Piztor/res/values/styles.xml b/client/Piztor/res/values/styles.xml
deleted file mode 100644
index 6ce89c7..0000000
--- a/client/Piztor/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<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>
-
-</resources>
diff --git a/client/Piztor/src/com/macaroon/piztor/ActMgr.java b/client/Piztor/src/com/macaroon/piztor/ActMgr.java
deleted file mode 100644
index 81fa6f2..0000000
--- a/client/Piztor/src/com/macaroon/piztor/ActMgr.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.*;
-
-import android.annotation.SuppressLint;
-
-@SuppressLint("UseSparseArrays")
-public class ActMgr {
-	// event
-	PiztorAct act;
-	ActStatus nowStatus;
-	HashMap<ActStatus, HashMap<Integer, ActStatus>> mp;
-
-	ActMgr(PiztorAct act, ActStatus nowStatus, ActStatus[] r) {
-		this.act = act;
-		this.nowStatus = nowStatus;
-		mp = new HashMap<ActStatus, HashMap<Integer, ActStatus>>();
-		for (int i = 0; i < r.length; i++) {
-			mp.put(r[i], new HashMap<Integer, ActStatus>());
-		}
-	}
-
-	void trigger(int event) {
-		for (Integer i : mp.get(nowStatus).keySet())
-			System.out.println(i);
-		if (mp.get(nowStatus).containsKey(event)) {
-			nowStatus.leave(event);
-			nowStatus = mp.get(nowStatus).get(event);
-			nowStatus.enter(event);
-		} else if (AppMgr.mp.get(act.getClass()).containsKey(event)) {
-			AppMgr.trigger(event);
-		}
-	}
-
-	void add(ActStatus a, int event, ActStatus b) {
-		if (mp.containsKey(a)) {
-			HashMap<Integer, ActStatus> h = mp.get(a);
-			h.put(event, b);
-			mp.put(a, h);
-		} else {
-			HashMap<Integer, ActStatus> h = new HashMap<Integer, ActStatus>();
-			h.put(event, b);
-			mp.put(a, h);
-		}
-	}
-}
-
-abstract class ActStatus {
-	abstract void enter(int e);
-
-	abstract void leave(int e);
-}
-
-class EmptyStatus extends ActStatus {
-	@Override
-	void enter(int e) {
-	}
-
-	@Override
-	void leave(int e) {
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/AppMgr.java b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
deleted file mode 100644
index 9259786..0000000
--- a/client/Piztor/src/com/macaroon/piztor/AppMgr.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.HashMap;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-
-@SuppressLint("UseSparseArrays")
-public class AppMgr {
-	// Status
-	public enum  ActivityStatus{
-		create, start, resume, restart, stop, pause, destroy
-	} 
-	static ActivityStatus status;
-	static PiztorAct nowAct;
-
-	static HashMap<Class<?>, HashMap<Integer, Class<?>>> mp;
-
-	static void setStatus(ActivityStatus st) {
-		status = st;
-	}
-
-	static void trigger(int event) {
-		
-		Intent i = new Intent();
-		i.setClass(nowAct, mp.get(nowAct.getClass()).get(event));
-		nowAct.startActivity(i);
-	}
-
-	static void add(Class<?> a, Integer event, Class<?> b) {
-		if (mp.containsKey(a))
-			mp.get(a).put(event, b);
-		else {
-			HashMap<Integer, Class<?>> h = new HashMap<Integer, Class<?>>();
-			h.put(event, b);
-			mp.put(a, h);
-		}
-	}
-
-	static void addTransition(Class<?> a, int i, Class<?> b) {
-		if (mp.containsKey(a)) {
-			HashMap<Integer, Class<?>> h = mp.get(a);
-			h.put(i, b);
-			mp.put(a, h);
-		} else {
-			HashMap<Integer, Class<?>> h = new HashMap<Integer, Class<?>>();
-			h.put(i, b);
-			mp.put(a, h);
-		}
-	}
-
-	static void addStatus(Class<?> a) {
-		mp.put(a, new HashMap<Integer, Class<?>>());
-	}
-
-	static void init() {
-		mp = new HashMap<Class<?>, HashMap<Integer, Class<?>>>();
-		addStatus(InitAct.class);
-		
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/InitAct.java b/client/Piztor/src/com/macaroon/piztor/InitAct.java
deleted file mode 100644
index 1ce492c..0000000
--- a/client/Piztor/src/com/macaroon/piztor/InitAct.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.macaroon.piztor;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-
-public class InitAct extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_init);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.init, menu);
-		return true;
-	}
-
-}
diff --git a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java b/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
deleted file mode 100644
index ad12b17..0000000
--- a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.macaroon.piztor;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PiztorAct extends Activity {
-	String id;
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		System.out.println(id + " on create");
-		AppMgr.setStatus(AppMgr.ActivityStatus.create);
-		AppMgr.nowAct = this;
-	}
-	
-	@Override
-	protected void onStart() {
-		super.onStart();
-		System.out.println(id + " on start");
-		AppMgr.setStatus(AppMgr.ActivityStatus.start);
-		AppMgr.nowAct = this;
-	}
-	
-	@Override
-	protected void onStop() {
-		super.onStop();
-		System.out.println(id + " on stop");
-		AppMgr.setStatus(AppMgr.ActivityStatus.stop);
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		System.out.println(id + " on resume");
-		AppMgr.setStatus(AppMgr.ActivityStatus.resume);
-		AppMgr.nowAct = this;
-	}
-	
-	@Override
-	protected void onPause() {
-		super.onPause();
-		System.out.println(id + " on pause");
-		AppMgr.setStatus(AppMgr.ActivityStatus.pause);
-	}
-	
-	@Override
-	protected void onRestart() {
-		super.onRestart();
-		System.out.println(id + " on restart");
-		AppMgr.setStatus(AppMgr.ActivityStatus.restart);
-	}
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		System.out.println(id + " on destroy");
-		AppMgr.setStatus(AppMgr.ActivityStatus.destroy);
-	}
-	
-}