cleaning up a little bit - no diss to Ben, but I rewrote that class

Miserlou · May 27, 2011 · fe7e9e1 · fe7e9e1
1 parent 7efaca2
commit fe7e9e1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 22 deletions.
diff --git a/src/org/ale/openwatch/DescribeActivity.java b/src/org/ale/openwatch/DescribeActivity.java
@@ -115,7 +115,6 @@ public void run() {
 					    try {
                             u_service.start();
                         } catch (RemoteException e) {
-                            // TODO Auto-generated catch block
                             e.printStackTrace();
                         }
 
@@ -151,7 +150,6 @@ public boolean onTouch(View v, MotionEvent event) {
               @Override
               public void gotLocation(final Location location){
                   //Got the location!
-                  System.out.println("Got location!");
 
                   loc = location;
                   if (location != null) {

diff --git a/src/org/ale/openwatch/MainActivity.java b/src/org/ale/openwatch/MainActivity.java
@@ -61,8 +61,6 @@ public class MainActivity extends Activity {
 
     Context c;
 
-
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -196,7 +194,6 @@ public void onClick(DialogInterface dialog, int whichButton) {
                                            public void run() {
                                                Intent mainIntent = new Intent(c, DescribeActivity.class); 
                                                startActivity(mainIntent);
-//                                                   u_service.start();
                                            }});
 
                                        finish();
@@ -209,7 +206,6 @@ public void onClick(DialogInterface dialog, int whichButton) {
                                alert2.show();
                            }
                        } catch (RemoteException e) {
-                           // TODO Auto-generated catch block
                            e.printStackTrace();
                        }
                    }
@@ -234,7 +230,6 @@ public void run() {
                            try {
                             mag.r_service.start();
                         } catch (RemoteException e) {
-                            // TODO Auto-generated catch block
                             e.printStackTrace();
                         }
                        }
@@ -285,10 +280,8 @@ public void run() {
        case 9:
            tag.setImageResource(R.drawable.tag10);
            return;
-
 
        }
-
    }
 
 
@@ -298,7 +291,6 @@ public void setRecorderActivity(RecorderActivity raa) {
 
     public void setParentGroup(MainActivityGroup magg) {
         mag = magg;
-        System.out.println("Parent group set!");
     }
 
     public FrameLayout getFL() {

diff --git a/src/org/ale/openwatch/VideoRecorder.java b/src/org/ale/openwatch/VideoRecorder.java
@@ -51,8 +51,6 @@ public void setPath(String patha) {
           osw.write(path);
           osw.flush();
           osw.close();
-          System.out.println("Video path is..");
-          System.out.println(path);
       }catch(IOException e) {
           e.printStackTrace();
       }
@@ -116,7 +114,6 @@ public void stop() throws IOException {
         recorder.release();
     }
     catch(Exception e) {
-        System.out.println("A bad.");
     }
   }
 

diff --git a/src/org/ale/openwatch/audioRecorder.java b/src/org/ale/openwatch/audioRecorder.java
@@ -8,9 +8,6 @@
 import android.media.MediaRecorder;
 import android.os.Environment;
 
-/**
- * @author <a href="http://www.benmccann.com">Ben McCann</a>
- */
 public class audioRecorder {
 
   final MediaRecorder recorder = new MediaRecorder();
@@ -56,7 +53,6 @@ public void start() throws IOException {
       throw new IOException("Path to file could not be created.");
     }
 
-
     setPath(path);
     recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
     recorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
@@ -76,8 +72,6 @@ public void setPath(String s) {
           osw.write(s);
           osw.flush();
           osw.close();
-          System.out.println("Path to file is is..");
-          System.out.println(s);
       }catch(IOException e) {
           e.printStackTrace();
       }

diff --git a/src/org/ale/openwatch/uService.java b/src/org/ale/openwatch/uService.java
@@ -101,9 +101,7 @@ public boolean uploading() throws RemoteException {
 
     };
 
-    //This method was shamelessly stolen from here:
-    // http://reecon.wordpress.com/2010/04/25/uploading-files-to-http-server-using-post-android-sdk/
-    // Thanks, reecon!
+
     public void upload() {
         setDataFromPrefs();
         setDataFromPath();
@@ -130,6 +128,10 @@ public void upload() {
 //        XXX: This is the old way of doing this, simplified by ClientHttpRequest
 //              but kept here for now, just for reference.
 
+            //This method was shamelessly stolen from here:
+            // http://reecon.wordpress.com/2010/04/25/uploading-files-to-http-server-using-post-android-sdk/
+            // Thanks, reecon!
+
 //        try
 //        {
 //            FileInputStream fileInputStream = new FileInputStream(new File(pathToOurFile) );