Remove @Override statements which cause compile errors on Win7 64bit with Eclipse Galileo 3.5 and Java 1.6.0_21-b07

src/com/keepassdroid/EntryActivity.java

@@ -106,7 +106,6 @@ public class EntryActivity extends LockCloseActivity {
 		Button edit = (Button) findViewById(R.id.entry_edit);
 		edit.setOnClickListener(new View.OnClickListener() {
 
-			@Override
 			public void onClick(View v) {
 				EntryEditActivity.Launch(EntryActivity.this, mEntry);
 			}

src/com/keepassdroid/EntryEditActivity.java

@@ -137,7 +137,6 @@ public class EntryEditActivity extends LockCloseActivity {
 		Button save = (Button) findViewById(R.id.entry_save);
 		save.setOnClickListener(new View.OnClickListener() {
 
-			@Override
 			public void onClick(View v) {
 				EntryEditActivity act = EntryEditActivity.this;
 				
@@ -212,7 +211,6 @@ public class EntryEditActivity extends LockCloseActivity {
 		Button cancel = (Button) findViewById(R.id.entry_cancel);
 		cancel.setOnClickListener(new View.OnClickListener() {
 
-			@Override
 			public void onClick(View v) {
 				finish();
 				

src/com/keepassdroid/GroupActivity.java

@@ -149,7 +149,6 @@ public abstract class GroupActivity extends GroupBaseActivity {
 			Button addEntry = (Button) findViewById(R.id.add_entry);
 			addEntry.setOnClickListener(new View.OnClickListener() {
 	
-				@Override
 				public void onClick(View v) {
 					EntryEditActivity.Launch(GroupActivity.this, mGroup);
 				}

src/com/keepassdroid/PasswordActivity.java

@@ -166,7 +166,6 @@ public class PasswordActivity extends LockingActivity {
 		// Show or hide password
 		checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 
-			@Override
 			public void onCheckedChanged(CompoundButton buttonView,
 					boolean isChecked) {
 				TextView password = (TextView) findViewById(R.id.password);
@@ -183,7 +182,6 @@ public class PasswordActivity extends LockingActivity {
 		ImageButton browse = (ImageButton) findViewById(R.id.browse_button);
 		browse.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				if (Interaction.isIntentAvailable(PasswordActivity.this, Intents.FILE_BROWSE)) {
 					Intent i = new Intent(Intents.FILE_BROWSE);

src/com/keepassdroid/ProgressTask.java

@@ -86,7 +86,6 @@ public class ProgressTask implements Runnable {
 	
 	private class CloseProcessDialog implements Runnable {
 
-		@Override
 		public void run() {
 			mPd.dismiss();
 		}

src/com/keepassdroid/PwListAdapter.java

@@ -90,23 +90,19 @@ public class PwListAdapter extends BaseAdapter {
 		}
 	}
 	
-	@Override
 	public int getCount() {
 		
 		return groupsForViewing.size() + entriesForViewing.size();
 	}
 
-	@Override
 	public Object getItem(int position) {
 		return position;
 	}
 
-	@Override
 	public long getItemId(int position) {
 		return position;
 	}
 
-	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		int size = groupsForViewing.size();
 		

src/com/keepassdroid/SetPasswordDialog.java

@@ -68,7 +68,6 @@ public class SetPasswordDialog extends CancelDialog {
 		Button okButton = (Button) findViewById(R.id.ok);
 		okButton.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				TextView passView = (TextView) findViewById(R.id.pass_password);
 				String pass = passView.getText().toString();
@@ -104,7 +103,6 @@ public class SetPasswordDialog extends CancelDialog {
 		Button cancel = (Button) findViewById(R.id.cancel);
 		cancel.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				cancel();
 				if ( mFinish != null ) {

src/com/keepassdroid/UpdateStatus.java

@@ -51,7 +51,6 @@ public class UpdateStatus {
 			mResId = resId;
 		}
 		
-		@Override
 		public void run() {
 			mPD.setMessage(mCtx.getString(mResId));
 		}

src/com/keepassdroid/crypto/NativeAESCipherSpi.java

@@ -77,7 +77,6 @@ public class NativeAESCipherSpi extends CipherSpi {
 	 */
 	private static class Cleanup implements Runnable {
 
-		@Override
 		public void run() {
 			while (true) {
 				try {

src/com/keepassdroid/database/PwEntry.java

@@ -27,7 +27,6 @@ public abstract class PwEntry implements Cloneable {
 
 	public static class EntryNameComparator implements Comparator<PwEntry> {
 
-		@Override
 		public int compare(PwEntry object1, PwEntry object2) {
 			return object1.getTitle().compareToIgnoreCase(object2.getTitle());
 		}

src/com/keepassdroid/database/PwEntryV4.java

@@ -185,63 +185,51 @@ public class PwEntryV4 extends PwEntry implements ITimeLogger {
 		return value;
 	}
 
-	@Override
 	public Date getCreationTime() {
 		return creation;
 	}
 
-	@Override
 	public Date getExpiryTime() {
 		return expireDate;
 	}
 
-	@Override
 	public Date getLastAccessTime() {
 		return lastAccess;
 	}
 
-	@Override
 	public Date getLastModificationTime() {
 		return lastMod;
 	}
 
-	@Override
 	public Date getLocationChanged() {
 		return parentGroupLastMod;
 	}
 
-	@Override
 	public long getUsageCount() {
 		return usageCount;
 	}
 
-	@Override
 	public void setCreationTime(Date date) {
 		creation = date;
 		
 	}
 
-	@Override
 	public void setExpiryTime(Date date) {
 		expireDate = date;
 	}
 
-	@Override
 	public void setLastAccessTime(Date date) {
 		lastAccess = date;
 	}
 
-	@Override
 	public void setLastModificationTime(Date date) {
 		lastMod = date;
 	}
 
-	@Override
 	public void setLocationChanged(Date date) {
 		parentGroupLastMod = date;
 	}
 
-	@Override
 	public void setUsageCount(long count) {
 		usageCount = count;
 	}
@@ -251,7 +239,6 @@ public class PwEntryV4 extends PwEntry implements ITimeLogger {
 		return expires;
 	}
 
-	@Override
 	public void setExpires(boolean exp) {
 		expires = exp;
 	}

src/com/keepassdroid/database/PwGroup.java

@@ -49,7 +49,6 @@ public abstract class PwGroup {
 
 	public static class GroupNameComparator implements Comparator<PwGroup> {
 
-		@Override
 		public int compare(PwGroup object1, PwGroup object2) {
 			return object1.getName().compareToIgnoreCase(object2.getName());
 		}

src/com/keepassdroid/database/PwGroupV4.java

@@ -136,73 +136,59 @@ public class PwGroupV4 extends PwGroup implements ITimeLogger {
 		return parentGroupLastMod;
 	}
 
-	@Override
 	public Date getCreationTime() {
 		return creation;
 	}
 
-	@Override
 	public Date getExpiryTime() {
 		return expireDate;
 	}
 
-	@Override
 	public Date getLastAccessTime() {
 		return lastAccess;
 	}
 
-	@Override
 	public Date getLastModificationTime() {
 		return lastMod;
 	}
 
-	@Override
 	public Date getLocationChanged() {
 		return parentGroupLastMod;
 	}
 
-	@Override
 	public long getUsageCount() {
 		return usageCount;
 	}
 
-	@Override
 	public void setCreationTime(Date date) {
 		creation = date;
 		
 	}
 
-	@Override
 	public void setExpiryTime(Date date) {
 		expireDate = date;
 	}
 
-	@Override
 	public void setLastAccessTime(Date date) {
 		lastAccess = date;
 	}
 
-	@Override
 	public void setLastModificationTime(Date date) {
 		lastMod = date;
 	}
 
-	@Override
 	public void setLocationChanged(Date date) {
 		parentGroupLastMod = date;
 	}
 
-	@Override
 	public void setUsageCount(long count) {
 		usageCount = count;
 	}
 
-	@Override
 	public boolean expires() {
 		return expires;
 	}
 
-	@Override
 	public void setExpires(boolean exp) {
 		expires = exp;
 	}

src/com/keepassdroid/database/edit/RunnableOnFinish.java

@@ -49,6 +49,5 @@ public abstract class RunnableOnFinish implements Runnable {
 		mStatus = status;
 	}
 	
-	@Override
 	abstract public void run();
 }

src/com/keepassdroid/fileselect/BrowserDialog.java

@@ -24,7 +24,6 @@ public class BrowserDialog extends Dialog {
 		Button cancel = (Button) findViewById(R.id.cancel);
 		cancel.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				BrowserDialog.this.cancel();
 			}
@@ -33,7 +32,6 @@ public class BrowserDialog extends Dialog {
 		Button market = (Button) findViewById(R.id.install_market);
 		market.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				Util.gotoUrl(getContext(), R.string.oi_filemanager_market);
 				BrowserDialog.this.cancel();
@@ -43,7 +41,6 @@ public class BrowserDialog extends Dialog {
 		Button web = (Button) findViewById(R.id.install_web);
 		web.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				Util.gotoUrl(getContext(), R.string.oi_filemanager_web);
 				BrowserDialog.this.cancel();

src/com/keepassdroid/fileselect/FileSelectActivity.java

@@ -91,7 +91,6 @@ public class FileSelectActivity extends ListActivity {
 		Button openButton = (Button) findViewById(R.id.open);
 		openButton.setOnClickListener(new View.OnClickListener() {
 
-			@Override
 			public void onClick(View v) {
 				String fileName = Util.getEditText(FileSelectActivity.this,
 						R.id.file_filename);
@@ -110,7 +109,6 @@ public class FileSelectActivity extends ListActivity {
 		Button createButton = (Button) findViewById(R.id.create);
 		createButton.setOnClickListener(new View.OnClickListener() {
 
-			@Override
 			public void onClick(View v) {
 				String filename = Util.getEditText(FileSelectActivity.this,
 						R.id.file_filename);
@@ -182,7 +180,6 @@ public class FileSelectActivity extends ListActivity {
 		ImageButton browseButton = (ImageButton) findViewById(R.id.browse_button);
 		browseButton.setOnClickListener(new View.OnClickListener() {
 			
-			@Override
 			public void onClick(View v) {
 				if (Interaction.isIntentAvailable(FileSelectActivity.this, Intents.FILE_BROWSE)) {
 					Intent i = new Intent(Intents.FILE_BROWSE);

src/com/keepassdroid/settings/AppSettingsActivity.java

@@ -50,7 +50,6 @@ public class AppSettingsActivity extends LockingClosePreferenceActivity {
 		Preference keyFile = findPreference(getString(R.string.keyfile_key));
 		keyFile.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			
-			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {
 				Boolean value = (Boolean) newValue;
 				
@@ -69,7 +68,6 @@ public class AppSettingsActivity extends LockingClosePreferenceActivity {
 			Preference rounds = findPreference(getString(R.string.rounds_key));
 			rounds.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 				
-				@Override
 				public boolean onPreferenceChange(Preference preference, Object newValue) {
 					setRounds(App.getDB(), preference);
 					return true;