Skip to content

Commit ccf268d

Browse files
committed
Merge branch 'master' of github.com:bmeike/ProgrammingAndroid2Examples
2 parents 5c0040f + c9e0d4d commit ccf268d

File tree

47 files changed

+71
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+71
-238
lines changed

.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
/.metadata
1+
.DS_*
2+
.checkstyle
3+
.classpath
4+
.project
5+
.settings
6+
assets
7+
bin
8+
gen
9+
lint.xml
10+

AIDLDemo/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

AndroidUIDemo/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

AndroidViewDemo/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

AndroidViewDemo/src/com/oreilly/demo/android/pa/viewdemo/widget/EffectsWidget.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
public class EffectsWidget extends View {
1919

2020
/** The effect to apply to the drawing */
21-
public interface PaintEffect { void setEffect(Paint paint); }
21+
public interface PaintEffect {
22+
/** @param paint the paint effect */
23+
void setEffect(Paint paint);
24+
}
2225

2326
private final PaintEffect effect;
2427
private final int id;

AsyncTaskDemo/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

AsyncTaskDemo/src/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemo.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.widget.Button;
1010
import android.widget.TextView;
1111

12-
import com.oreilly.demo.android.pa.asynctask.R;
1312
import com.oreilly.demo.android.pa.asynctask.game.Game;
1413

1514

@@ -96,6 +95,12 @@ public void onCreate(Bundle state) {
9695
/**
9796
* Synchronous request to remote service
9897
* DO NOT USE!!
98+
99+
* @param dots
100+
* @param bg
101+
* @param game
102+
* @param resp
103+
* @param level
99104
*/
100105
void initGame(
101106
View dots,

AsyncTaskDemo/src/com/oreilly/demo/android/pa/asynctask/AsyncTaskSample.java

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,49 @@
2121
*/
2222
public class AsyncTaskSample {
2323

24+
/**
25+
* AsyncDBReq
26+
*/
2427
public class AsyncDBReq
2528
extends AsyncTask<PreparedStatement, Void, ResultSet>
2629
{
30+
/**
31+
* @see android.os.AsyncTask#doInBackground(PreparedStatement[])
32+
*/
2733
@Override
2834
protected ResultSet doInBackground(PreparedStatement... q) {
2935
// implementation...
3036
return null;
3137
}
3238

39+
/**
40+
* @see android.os.AsyncTask#onPostExecute(java.lang.Object)
41+
*/
3342
@Override
3443
protected void onPostExecute(ResultSet result) {
3544
// implementation...
3645
}
3746
}
3847

48+
/**
49+
* AsyncContentReq
50+
*/
3951
public class AsyncContentReq
4052
extends AsyncTask<URI, Void, HttpResponse>
4153
{
54+
/**
55+
* @see android.os.AsyncTask#doInBackground(PreparedStatement[])
56+
*/
4257
@Override
4358
protected HttpResponse doInBackground(URI... req) {
4459
// implementation...
4560
return null;
4661
}
4762

4863

64+
/**
65+
* @see android.os.AsyncTask#onPostExecute(java.lang.Object)
66+
*/
4967
@Override
5068
protected void onPostExecute(HttpResponse result) {
5169
// implementation...
@@ -54,9 +72,12 @@ protected void onPostExecute(HttpResponse result) {
5472

5573
int mCount;
5674

75+
/**
76+
* @param button
77+
*/
5778
public void initButton1( Button button) {
5879
mCount = 0;
59-
button.setOnClickListener(
80+
button.setOnClickListener(
6081
new View.OnClickListener() {
6182
@Override public void onClick(View v) {
6283
new AsyncTask<Void, Void, Void>() {
@@ -69,11 +90,15 @@ protected Void doInBackground(Void... args) {
6990
} });
7091
}
7192

93+
/**
94+
* @param button
95+
* @param vals
96+
*/
7297
public void initButton2(
7398
Button button,
7499
final Map<String, String> vals)
75100
{
76-
button.setOnClickListener(
101+
button.setOnClickListener(
77102
new View.OnClickListener() {
78103
@SuppressWarnings("unchecked")
79104
@Override public void onClick(View v) {

AsyncTaskDemo/src/com/oreilly/demo/android/pa/asynctask/game/PersistentModel.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void run() {
2626
Looper.loop();
2727
}
2828

29-
public Handler getHandler() {
30-
// TODO Auto-generated method stub
31-
return null;
32-
}
29+
/**
30+
* @return the handler
31+
*/
32+
public Handler getHandler() { return null; }
3333
}

AudioPlayer/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)