aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2012-02-14 11:00:02 -0600
committerAndy Doan <andy.doan@linaro.org>2012-02-14 11:02:18 -0600
commit2a66027d4f5d76b11e7f544af6df2879ae0c284b (patch)
treed7894451ea20cd2a3711e53fbae56575719b230c
parent54820061d46e61d8e3c893a1c3d0b862cb2b171b (diff)
downloadLinaroConnect-2a66027d4f5d76b11e7f544af6df2879ae0c284b.tar.gz
updates for new compiler compliance level
under 1.7 java compiling rules, the @overide is not valid for methods implementing function from an interface. Signed-off-by: Andy Doan <andy.doan@linaro.org>
-rw-r--r--.classpath1
-rw-r--r--.settings/org.eclipse.jdt.core.prefs5
-rw-r--r--src/org/linaro/connect/FlingListener.java10
-rw-r--r--src/org/linaro/connect/ImageViewActivity.java4
-rw-r--r--src/org/linaro/connect/ImagesListActivity.java1
-rw-r--r--src/org/linaro/connect/JSONImageListAdapter.java2
-rw-r--r--src/org/linaro/connect/LinaroConnectActivity.java1
-rw-r--r--src/org/linaro/connect/MyScheduleActivity.java1
-rw-r--r--src/org/linaro/connect/PostingsActivity.java1
-rw-r--r--src/org/linaro/connect/ScheduleActivity.java1
-rw-r--r--src/org/linaro/connect/ScheduleItemActivity.java1
11 files changed, 6 insertions, 22 deletions
diff --git a/.classpath b/.classpath
index 6c635c0..a4763d1 100644
--- a/.classpath
+++ b/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1832c6a
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Tue Feb 14 11:01:45 CST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/src/org/linaro/connect/FlingListener.java b/src/org/linaro/connect/FlingListener.java
index 515060f..2b2027f 100644
--- a/src/org/linaro/connect/FlingListener.java
+++ b/src/org/linaro/connect/FlingListener.java
@@ -18,7 +18,6 @@ public class FlingListener implements OnGestureListener, OnDoubleTapListener {
final GestureDetector gd = new GestureDetector(this);
v.setOnTouchListener(new OnTouchListener() {
- @Override
public boolean onTouch(View v, MotionEvent me) {
return gd.onTouchEvent(me);
}
@@ -33,12 +32,10 @@ public class FlingListener implements OnGestureListener, OnDoubleTapListener {
mEnableBack = enabled;
}
- @Override
public boolean onDown(MotionEvent e) {
return true;
}
- @Override
public boolean onFling(MotionEvent e1, MotionEvent e2,
final float velocityX, final float velocityY) {
if(mEnableForward && velocityX < 0)
@@ -48,36 +45,29 @@ public class FlingListener implements OnGestureListener, OnDoubleTapListener {
return true;
}
- @Override
public boolean onDoubleTap(MotionEvent e) {
return true;
}
- @Override
public void onLongPress(MotionEvent e) {
}
- @Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
float distanceY) {
return true;
}
- @Override
public void onShowPress(MotionEvent e) {
}
- @Override
public boolean onSingleTapUp(MotionEvent e) {
return false;
}
- @Override
public boolean onDoubleTapEvent(MotionEvent e) {
return false;
}
- @Override
public boolean onSingleTapConfirmed(MotionEvent e) {
return false;
}
diff --git a/src/org/linaro/connect/ImageViewActivity.java b/src/org/linaro/connect/ImageViewActivity.java
index 94411eb..6bb4180 100644
--- a/src/org/linaro/connect/ImageViewActivity.java
+++ b/src/org/linaro/connect/ImageViewActivity.java
@@ -41,14 +41,12 @@ public class ImageViewActivity extends Activity {
mForward = (ImageButton)findViewById(R.id.image_view_forward);
mBack.setOnClickListener(new View.OnClickListener() {
- @Override
public void onClick(View v) {
setSelected(mSelected-1);
}
});
mForward.setOnClickListener(new View.OnClickListener() {
- @Override
public void onClick(View v) {
setSelected(mSelected+1);
}
@@ -71,12 +69,10 @@ public class ImageViewActivity extends Activity {
private void setFlingListener(View v) {
mFlingListener = new FlingListener(v, new FlingEvent() {
- @Override
public void onFlingForward() {
setSelected(mSelected+1);
}
- @Override
public void onFlingBack() {
setSelected(mSelected-1);
}
diff --git a/src/org/linaro/connect/ImagesListActivity.java b/src/org/linaro/connect/ImagesListActivity.java
index faf8879..e50ba14 100644
--- a/src/org/linaro/connect/ImagesListActivity.java
+++ b/src/org/linaro/connect/ImagesListActivity.java
@@ -61,7 +61,6 @@ public class ImagesListActivity extends Activity {
}
private final OnItemClickListener mClickListener = new OnItemClickListener() {
- @Override
public void onItemClick(AdapterView<?> parent, View v, int pos, long id)
{
Intent i = new Intent(getApplicationContext(), ImageViewActivity.class);
diff --git a/src/org/linaro/connect/JSONImageListAdapter.java b/src/org/linaro/connect/JSONImageListAdapter.java
index 8c2715d..2f6f1f9 100644
--- a/src/org/linaro/connect/JSONImageListAdapter.java
+++ b/src/org/linaro/connect/JSONImageListAdapter.java
@@ -76,7 +76,6 @@ public class JSONImageListAdapter extends ArrayAdapter<JSONImageItem> {
if ( d != null ) {
mCache.put(jsi, new SoftReference<Drawable>(d));
mHandler.post(new Runnable() {
- @Override
public void run() {
notifyDataSetChanged();
}
@@ -89,7 +88,6 @@ public class JSONImageListAdapter extends ArrayAdapter<JSONImageItem> {
}
private final Runnable mDownloader = new Runnable() {
- @Override
public void run() {
while ( mWorking || !mItemQueue.isEmpty()) {
try {
diff --git a/src/org/linaro/connect/LinaroConnectActivity.java b/src/org/linaro/connect/LinaroConnectActivity.java
index 2c57202..7ec3846 100644
--- a/src/org/linaro/connect/LinaroConnectActivity.java
+++ b/src/org/linaro/connect/LinaroConnectActivity.java
@@ -129,7 +129,6 @@ public class LinaroConnectActivity extends Activity {
}
private final OnItemClickListener mClickListener = new OnItemClickListener() {
- @Override
public void onItemClick(AdapterView<?> parent, View v, int pos, long id)
{
JSONLayoutItem jsi = (JSONLayoutItem)mAdapter.getItem(pos);
diff --git a/src/org/linaro/connect/MyScheduleActivity.java b/src/org/linaro/connect/MyScheduleActivity.java
index 6e14f9e..e01147c 100644
--- a/src/org/linaro/connect/MyScheduleActivity.java
+++ b/src/org/linaro/connect/MyScheduleActivity.java
@@ -59,7 +59,6 @@ public class MyScheduleActivity extends Activity{
mLoginBtn = (Button)findViewById(R.id.my_schedule_login);
mLoginBtn.setOnClickListener(new View.OnClickListener() {
- @Override
public void onClick(View v) {
String user = getInput(R.id.my_schedule_user);
String pass = getInput(R.id.my_schedule_pass);
diff --git a/src/org/linaro/connect/PostingsActivity.java b/src/org/linaro/connect/PostingsActivity.java
index 63d941a..057956f 100644
--- a/src/org/linaro/connect/PostingsActivity.java
+++ b/src/org/linaro/connect/PostingsActivity.java
@@ -127,7 +127,6 @@ public class PostingsActivity extends Activity {
}
private final OnItemClickListener mClickListener = new OnItemClickListener() {
- @Override
public void onItemClick(AdapterView<?> parent, View v, int pos, long id)
{
JSONPostingItem jsi = (JSONPostingItem)mAdapter.getItem(pos);
diff --git a/src/org/linaro/connect/ScheduleActivity.java b/src/org/linaro/connect/ScheduleActivity.java
index 7a229e3..5fe4222 100644
--- a/src/org/linaro/connect/ScheduleActivity.java
+++ b/src/org/linaro/connect/ScheduleActivity.java
@@ -134,7 +134,6 @@ public class ScheduleActivity extends Activity {
}
private final OnItemClickListener mClickListener = new OnItemClickListener() {
- @Override
public void onItemClick(AdapterView<?> parent, View v, int pos, long id)
{
ScheduleItem si = mAdapter.getItem(pos);
diff --git a/src/org/linaro/connect/ScheduleItemActivity.java b/src/org/linaro/connect/ScheduleItemActivity.java
index a555061..0feb9ca 100644
--- a/src/org/linaro/connect/ScheduleItemActivity.java
+++ b/src/org/linaro/connect/ScheduleItemActivity.java
@@ -37,7 +37,6 @@ public class ScheduleItemActivity extends Activity {
Button b = (Button)findViewById(R.id.schedule_item_add);
b.setOnClickListener(new View.OnClickListener() {
- @Override
public void onClick(View v) {
addToCalendar();
}