Put common functionality in a superclass

pilhuhn · Jun 20, 2012 · aae640c · aae640c
1 parent acbe057
commit aae640c
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 63 deletions.
diff --git a/src/org/rhq/pocket/operation/AbstractOperationActivity.java b/src/org/rhq/pocket/operation/AbstractOperationActivity.java
@@ -0,0 +1,60 @@
+package org.rhq.pocket.operation;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.codehaus.jackson.JsonNode;
+
+import org.rhq.pocket.FinishCallback;
+import org.rhq.pocket.R;
+import org.rhq.pocket.RHQActivity;
+import org.rhq.pocket.TalkToServerTask;
+
+/**
+ * Base class for the operation activities
+ * @author Heiko W. Rupp
+ */
+public abstract class AbstractOperationActivity extends RHQActivity {
+
+    public void deleteCurrent(String historyId) {
+        new TalkToServerTask(this,new FinishCallback() {
+            @Override
+            public void onSuccess(JsonNode result) {
+                Toast.makeText(getApplicationContext(), getString(R.string.SuccessfullyDeleted), Toast.LENGTH_SHORT).show();
+                refresh(null);
+
+                enableMenuItem(R.id.trash_this, false);
+
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                Toast.makeText(getApplicationContext(),getString(R.string.DeleteFailed) + e.getLocalizedMessage(),Toast.LENGTH_LONG).show();
+            }
+        },"/operation/history/" + historyId,"DELETE").execute();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId()==R.id.trash_this) {
+
+            FragmentManager fm = getFragmentManager();
+            Fragment fragment = fm.findFragmentById(R.id.detail_container);
+            if (fragment!=null && fragment instanceof OperationHistoryDetailFragment) {
+                String historyId = ((OperationHistoryDetailFragment)fragment).getHistoryId();
+                deleteCurrent(historyId);
+                // remove the details fragment
+                FragmentTransaction ft = fm.beginTransaction();
+                ft.setTransitionStyle(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+                ft.remove(fragment);
+                ft.commit();
+
+            }
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/org/rhq/pocket/operation/OperationActivity.java b/src/org/rhq/pocket/operation/OperationActivity.java
@@ -16,7 +16,7 @@
  * Activity to deal with operation scheduling
  * @author Heiko W. Rupp
  */
-public class OperationActivity extends RHQActivity {
+public class OperationActivity extends AbstractOperationActivity {
     private int resourceId=-1;
 
     public void onCreate(Bundle savedInstanceState) {
@@ -56,21 +56,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId()==R.id.trash_this) {
-
-            FragmentManager fm = getFragmentManager();
-            Fragment fragment = fm.findFragmentById(R.id.detail_container);
-            if (fragment!=null && fragment instanceof OperationHistoryDetailFragment) {
-                ((OperationHistoryDetailFragment)fragment).deleteCurrent();
-            }
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-
     @Override
     public void refresh(View v) {
         FragmentManager fm = getFragmentManager();

diff --git a/src/org/rhq/pocket/operation/OperationHistoryActivity.java b/src/org/rhq/pocket/operation/OperationHistoryActivity.java
@@ -5,18 +5,16 @@
 import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
 
 import org.rhq.pocket.R;
-import org.rhq.pocket.RHQActivity;
 
 /**
  * Activity to display operation histories and to handle them
  * @author Heiko W. Rupp
  */
-public class OperationHistoryActivity extends RHQActivity {
+public class OperationHistoryActivity extends AbstractOperationActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -51,20 +49,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId()==R.id.trash_this) {
-
-            FragmentManager fm = getFragmentManager();
-            Fragment fragment = fm.findFragmentById(R.id.detail_container);
-            if (fragment!=null && fragment instanceof OperationHistoryDetailFragment) {
-                ((OperationHistoryDetailFragment)fragment).deleteCurrent();
-            }
-
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
 
     @Override
     public void refresh(View v) {

diff --git a/src/org/rhq/pocket/operation/OperationHistoryDetailFragment.java b/src/org/rhq/pocket/operation/OperationHistoryDetailFragment.java
@@ -3,8 +3,6 @@
 import java.util.Map;
 
 import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.text.Html;
 import android.view.LayoutInflater;
@@ -45,6 +43,10 @@ public void setHistoryId(String id) {
         this.historyId = id;
     }
 
+    public String getHistoryId() {
+        return historyId;
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -109,32 +111,4 @@ public void setHistory(OperationHistoryRest history) {
         historyId = history.getJobId();
     }
 
-    public void deleteCurrent() {
-        new TalkToServerTask(getActivity(),new FinishCallback() {
-            @Override
-            public void onSuccess(JsonNode result) {
-                RHQActivity activity = (RHQActivity) getActivity();
-                Toast.makeText(activity,getString(R.string.SuccessfullyDeleted),Toast.LENGTH_SHORT).show();
-                if (activity instanceof OperationHistoryActivity) {
-                    activity.refresh(null);
-                }
-                activity.enableMenuItem(R.id.trash_this,false);
-
-                // remove the details fragment
-                FragmentManager fm = getFragmentManager();
-                Fragment fragment = fm.findFragmentById(R.id.detail_container);
-                if (fragment!=null) {
-                    FragmentTransaction ft = fm.beginTransaction();
-                    ft.setTransitionStyle(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-                    ft.remove(fragment);
-                    ft.commit();
-                }
-            }
-
-            @Override
-            public void onFailure(Exception e) {
-                Toast.makeText(getActivity(),getString(R.string.DeleteFailed) + e.getLocalizedMessage(),Toast.LENGTH_LONG).show();
-            }
-        },"/operation/history/" + historyId,"DELETE").execute();
-    }
 }