Bug 1081389: Stop overriding abstract methods with more abstract methods. r=rnewman
authorChris Kitching <chriskitching@linux.com>
Sat, 11 Oct 2014 00:04:25 +0100
changeset 221095 ec980805fd40cf0d753d7e4fe24e771cd8cd53d7
parent 221094 413a320a2bbb0383d3ba9a54efd85c363fa3c413
child 221096 16fbd77efbdf8cc661714a4abb99459e96ce4a0d
push id28010
push userkwierso@gmail.com
push dateWed, 24 Dec 2014 00:29:29 +0000
treeherdermozilla-central@8b881bea204a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs1081389
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1081389: Stop overriding abstract methods with more abstract methods. r=rnewman
mobile/android/base/GeckoApp.java
mobile/android/base/db/BaseTable.java
mobile/android/base/sync/net/WBOCollectionRequestDelegate.java
mobile/android/base/sync/net/WBORequestDelegate.java
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -195,18 +195,17 @@ public abstract class GeckoApp
     private String mPrivateBrowsingSession;
 
     private volatile HealthRecorder mHealthRecorder;
     private volatile Locale mLastLocale;
 
     private EventListener mWebappEventListener;
 
     abstract public int getLayout();
-    @Override
-    abstract public boolean hasTabsSideBar();
+
     abstract protected String getDefaultProfileName() throws NoMozillaDirectoryException;
 
     private static final String RESTARTER_ACTION = "org.mozilla.gecko.restart";
     private static final String RESTARTER_CLASS = "org.mozilla.gecko.Restarter";
 
     @SuppressWarnings("serial")
     class SessionRestoreException extends Exception {
         public SessionRestoreException(Exception e) {
--- a/mobile/android/base/db/BaseTable.java
+++ b/mobile/android/base/db/BaseTable.java
@@ -25,24 +25,16 @@ public abstract class BaseTable implemen
     }
 
     // Table implementation
     @Override
     public Table.ContentProviderInfo[] getContentProviderInfo() {
         return new Table.ContentProviderInfo[0];
     }
 
-    // Table implementation
-    @Override
-    public abstract void onCreate(SQLiteDatabase db);
-
-    // Table implementation
-    @Override
-    public abstract void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion);
-
     // Returns the name of the table to modify/query
     protected abstract String getTable();
 
     // Table implementation
     @Override
     public Cursor query(SQLiteDatabase db, Uri uri, int dbId, String[] columns, String selection, String[] selectionArgs, String sortOrder, String groupBy, String limit) {
         Cursor c = db.query(getTable(), columns, selection, selectionArgs, groupBy, null, sortOrder, limit);
         log("query " + columns + " in " + selection + " = " + c);
--- a/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java
+++ b/mobile/android/base/sync/net/WBOCollectionRequestDelegate.java
@@ -12,19 +12,17 @@ import org.mozilla.gecko.sync.KeyBundleP
  * Subclass this to handle collection fetches.
  * @author rnewman
  *
  */
 public abstract class WBOCollectionRequestDelegate
 extends SyncStorageCollectionRequestDelegate
 implements KeyBundleProvider {
 
-  @Override
-  public abstract KeyBundle keyBundle();
-  public abstract void handleWBO(CryptoRecord record);
+    public abstract void handleWBO(CryptoRecord record);
 
   @Override
   public void handleRequestProgress(String progress) {
     try {
       CryptoRecord record = CryptoRecord.fromJSONRecord(progress);
       record.keyBundle = this.keyBundle();
       this.handleWBO(record);
     } catch (Exception e) {
--- a/mobile/android/base/sync/net/WBORequestDelegate.java
+++ b/mobile/android/base/sync/net/WBORequestDelegate.java
@@ -4,11 +4,9 @@
 
 package org.mozilla.gecko.sync.net;
 
 import org.mozilla.gecko.sync.KeyBundleProvider;
 import org.mozilla.gecko.sync.crypto.KeyBundle;
 
 public abstract class WBORequestDelegate
 implements SyncStorageRequestDelegate, KeyBundleProvider {
-  @Override
-  public abstract KeyBundle keyBundle();
 }