add @OverRide where necessary

bmeike · bmeike · commit c0e3ee9369d7 · 2011-07-16T17:16:12.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/.metadata
diff --git a/02/FillListTask/.gitignore b/02/FillListTask/.gitignore
@@ -1,5 +1,6 @@
 /gen
 /assets
+/eclipse
 /.project
 /.classpath
 /bin
diff --git a/02/SharedListTask/.gitignore b/02/SharedListTask/.gitignore
@@ -1,5 +1,6 @@
 /gen
 /assets
+/eclipse
 /.project
 /.classpath
 /bin
diff --git a/06/AIDLDemo/tools/ide/eclipse/project b/06/AIDLDemo/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.oreilly.android.demo.aidl.AIDLDemo</name>
+	<name>AIDLDemo</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/06/AsyncTaskDemo/tools/ide/eclipse/project b/06/AsyncTaskDemo/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.oreilly.demo.android.ch06.AsyncTaskDemo</name>
+	<name>AsyncTaskDemo</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/06/JSerializable/tools/ide/eclipse/project b/06/JSerializable/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.oreilly.demo.android.ch06.JSerializable</name>
+	<name>JSerializable</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/07/AndroidViewDemo/tools/ide/eclipse/project b/07/AndroidViewDemo/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>/com.oreilly.demo.android.ch07.AndroidViewDemo</name>
+	<name>AndroidViewDemo</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/09/AndroidUIDemo/tools/ide/eclipse/project b/09/AndroidUIDemo/tools/ide/eclipse/project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.oreilly.demo.android.ch08.AndroidUIDemo</name>
+	<name>AndroidUIDemo</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/12/FinchVideo/README.txt b/12/FinchVideo/README.txt
@@ -0,0 +1,3 @@
+In order to get this project to build, you must import
+the project FinchWelcome, in the directory
+../framework/FinchFramework into your eclipse workspace
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayer.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayer.java
@@ -57,7 +57,8 @@ private void setUpView() {
 		ImageButton playpauseButton = (ImageButton) findViewById(R.id.playpause);
 		playpauseButton.setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				switch(state) {
 					case 1: setState(2); break;  // is playing, set to pause
 					case 0:						 // is stopped, set to play
@@ -71,7 +72,8 @@ public void onClick(View v) {
 		ImageButton stopButton = (ImageButton) findViewById(R.id.stop);
 		stopButton.setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				setState(0);
 			}
 			
@@ -110,18 +112,21 @@ private void setState(int state) {
 	//////////////////////////////
 	private int seekbarprogress = 0;
 	
-	public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+	@Override
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 		if(fromUser) {
 			seekbarprogress = progress;
 		}
 	}
 
-	public void onStartTrackingTouch(SeekBar seekBar) {
+	@Override
+    public void onStartTrackingTouch(SeekBar seekBar) {
 		seekbarprogress = 0;
 		if(state == 1) pausePlayer();
 	}
 
-	public void onStopTrackingTouch(SeekBar seekBar) {
+	@Override
+    public void onStopTrackingTouch(SeekBar seekBar) {
 		mediaplayer.seekTo(seekbarprogress * 100);
 		if(state == 1) playPlayer(2);
 		seekbarprogress = 0;
@@ -135,13 +140,15 @@ private void resetSeekBar() {
 	}
 	
 	private final Handler seekbarHandler = new Handler() {
-		public void handleMessage(Message msg) {
+		@Override
+        public void handleMessage(Message msg) {
 			SeekBar seek = (SeekBar) findViewById(R.id.seek);
 			seek.setProgress(msg.what);
 		}
 	};
 	
-	public void run() {
+	@Override
+    public void run() {
 		try {
 			while(state > 0) {
 				Thread.sleep(100);  // 10th of a second 
@@ -175,7 +182,8 @@ private void initializeMediaPlayer() {
 		}
 	}
 	
-	public void onCompletion(MediaPlayer mp) {
+	@Override
+    public void onCompletion(MediaPlayer mp) {
 		setState(0);
 	}
 	
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayerWAudioTrack.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayerWAudioTrack.java
@@ -61,7 +61,8 @@ private void setUpView() {
 		ImageButton playpauseButton = (ImageButton) findViewById(R.id.playpause);
 		playpauseButton.setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				switch(state) {
 					case 1: setState(2); break;  // is playing, set to pause
 					case 0:						 // is stopped, set to play
@@ -75,7 +76,8 @@ public void onClick(View v) {
 		ImageButton stopButton = (ImageButton) findViewById(R.id.stop);
 		stopButton.setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				setState(0);
 			}
 			
@@ -150,7 +152,8 @@ public void onCompletion() {
 	
 	private void playPlayer(int previousState) {
 		(new Thread() {
-			public void run() {
+			@Override
+            public void run() {
 				audiotrack.play();
 				audiotrack.write(audio, 0, audio.length);
 			}
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayerWMediaController.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayerWMediaController.java
@@ -87,43 +87,53 @@ public AudioController(MediaPlayer md) {
 			media = md;
 		}
 		
-		public boolean canPause() {
+		@Override
+        public boolean canPause() {
 			return true;
 		}
 
-		public boolean canSeekBackward() {
+		@Override
+        public boolean canSeekBackward() {
 			return true;
 		}
 
-		public boolean canSeekForward() {
+		@Override
+        public boolean canSeekForward() {
 			return true;
 		}
 
-		public int getBufferPercentage() {
+		@Override
+        public int getBufferPercentage() {
 			return 0;
 		}
 
-		public int getCurrentPosition() {
+		@Override
+        public int getCurrentPosition() {
 			return media.getCurrentPosition();
 		}
 
-		public int getDuration() {
+		@Override
+        public int getDuration() {
 			return media.getDuration();
 		}
 
-		public boolean isPlaying() {
+		@Override
+        public boolean isPlaying() {
 			return media.isPlaying();
 		}
 
-		public void pause() {
+		@Override
+        public void pause() {
 			media.pause();
 		}
 
-		public void seekTo(int pos) {
+		@Override
+        public void seekTo(int pos) {
 			media.seekTo(pos);
 		}
 
-		public void start() {
+		@Override
+        public void start() {
 			media.start();
 		}
 		
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioRecorder.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioRecorder.java
@@ -12,6 +12,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
+import android.provider.MediaStore.Audio.AudioColumns;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
@@ -44,23 +45,26 @@ private void setupView() {
 		
 		findViewById(R.id.recordstop).setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				recordOrStop();
 			}
 			
 		});
 		
 		findViewById(R.id.play).setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				playAudio();
 			}
 			
 		});
 		
 		findViewById(R.id.register).setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				registerAudioFile();
 			}
 			
@@ -107,13 +111,15 @@ private void recordOrStop() {
 	}
 	
 	private final Handler timeupdater = new Handler() {
-		public void handleMessage(Message msg) {
+		@Override
+        public void handleMessage(Message msg) {
 			time++;
 			((TextView) findViewById(R.id.time)).setText(""+time+" secs");
 		}
 	};
 	
-	public void run() {
+	@Override
+    public void run() {
 		try {
 			time = 0;
 			timeupdater.sendEmptyMessage(0);
@@ -137,8 +143,8 @@ private void registerAudioFile() {
 		content.put(MediaStore.MediaColumns.DATA, MEDIAFILE);
 		content.put(MediaStore.MediaColumns.TITLE, "AudioRecordExample");
 		content.put(MediaStore.MediaColumns.MIME_TYPE, "audio/amr");
-		content.put(MediaStore.Audio.Media.ARTIST, "Me");
-		content.put(MediaStore.Audio.Media.IS_MUSIC, true);
+		content.put(AudioColumns.ARTIST, "Me");
+		content.put(AudioColumns.IS_MUSIC, true);
 		ContentResolver resolve = getContentResolver();
 		Uri uri = resolve.insert(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, content);
 		sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri));
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioRecorderWAudioRecord.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioRecorderWAudioRecord.java
@@ -45,15 +45,17 @@ private void setupView() {
 		
 		findViewById(R.id.recordstop).setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				recordOrStop();
 			}
 			
 		});
 		
 		findViewById(R.id.play).setOnClickListener(new OnClickListener() {
 
-			public void onClick(View v) {
+			@Override
+            public void onClick(View v) {
 				playAudio();
 			}
 			
@@ -91,7 +93,8 @@ private void recordOrStop() {
 				
 				// start recording in a separate thread
 				(new Thread() {
-					public void run() {
+					@Override
+                    public void run() {
 						if(recorder != null) {
 							recorder.startRecording();
 							while(recordablestate) {
@@ -137,13 +140,15 @@ private void stopRecord() {
 	}
 	
 	private final Handler timeupdater = new Handler() {
-		public void handleMessage(Message msg) {
+		@Override
+        public void handleMessage(Message msg) {
 			time++;
 			((TextView) findViewById(R.id.time)).setText(""+time+" secs");
 		}
 	};
 	
-	public void run() {
+	@Override
+    public void run() {
 		try {
 			time = 0;
 			timeupdater.sendEmptyMessage(0);
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/MultiMedia.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/MultiMedia.java
diff --git a/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/VideoRecorder.java b/14/AudioPlayer/src/com/oreilly/demo/pa/ch14/VideoRecorder.java
diff --git a/14/AudioPlayer/tools/ide/eclipse/project b/14/AudioPlayer/tools/ide/eclipse/project
diff --git a/16/SensorDemos/tools/ide/eclipse/project b/16/SensorDemos/tools/ide/eclipse/project
diff --git a/17/ClientDemo/tools/ide/eclipse/project b/17/ClientDemo/tools/ide/eclipse/project
diff --git a/17/DemoServer/tools/ide/eclipse/project b/17/DemoServer/tools/ide/eclipse/project
diff --git a/18/NDKDemo/tools/ide/eclipse/project b/18/NDKDemo/tools/ide/eclipse/project

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+In order to get this project to build, you must import`
	`2`	`+the project FinchWelcome, in the directory`
	`3`	`+../framework/FinchFramework into your eclipse workspace`