Bug 929865 - Part 4: Move WebApps to webapp.Webapps; rename WebApp<n> to Webapp<n>. r=myk

--HG--
extra : rebase_source : c16aae95aae1145907a4b40d48256f5e9bbaa516

mobile/android/base/WebappManifestFragment.xml.frag.in

@@ -1,4 +1,4 @@
-        <activity android:name="org.mozilla.gecko.WebApps$WebApp@APPNUM@"
+        <activity android:name="org.mozilla.gecko.webapp.Webapps$Webapp@APPNUM@"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"

mobile/android/base/moz.build

@@ -412,7 +412,7 @@ gbjar.sources += [
     'webapp/TaskKiller.java',
     'webapp/UninstallListener.java',
     'webapp/WebappImpl.java',
-    'WebApps.java',
+    'webapp/Webapps.java',
     'widget/ActivityChooserModel.java',
     'widget/AllCapsTextView.java',
     'widget/AnimatedHeightLayout.java',

mobile/android/base/webapp/Dispatcher.java

@@ -45,7 +45,7 @@ public class Dispatcher extends Activity {
         Intent intent = new Intent(getIntent());
 
         // Only change its destination.
-        intent.setClassName(getApplicationContext(), "org.mozilla.gecko.WebApps$WebApp" + index);
+        intent.setClassName(getApplicationContext(), "org.mozilla.gecko.webapp.Webapps$Webapp" + index);
 
         // If and only if we haven't seen this before.
         intent.putExtra("isInstalled", isInstalled);

mobile/android/base/webapp/Webapps.java

@@ -3,510 +3,510 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.webapp;
 
 /**
  * Declare a predefined number of Webapp<num> classes to the Webapps class.
  * These are used so that each web app can launch in its own process. Keep this
- * number in sync with the number of web apps handled in WebappAllocator.
+ * number in sync with the number of web apps defined in the Android manifest.
  */
-public final class WebApps {
-    public static class WebApp0 extends Webapp {
+public final class Webapps {
+    public static class Webapp0 extends WebappImpl {
         @Override
         protected int getIndex() { return 0; }
     }
 
-    public static class WebApp1 extends Webapp {
+    public static class Webapp1 extends WebappImpl {
         @Override
         protected int getIndex() { return 1; }
     }
 
-    public static class WebApp2 extends Webapp {
+    public static class Webapp2 extends WebappImpl {
         @Override
         protected int getIndex() { return 2; }
     }
 
-    public static class WebApp3 extends Webapp {
+    public static class Webapp3 extends WebappImpl {
         @Override
         protected int getIndex() { return 3; }
     }
 
-    public static class WebApp4 extends Webapp {
+    public static class Webapp4 extends WebappImpl {
         @Override
         protected int getIndex() { return 4; }
     }
 
-    public static class WebApp5 extends Webapp {
+    public static class Webapp5 extends WebappImpl {
         @Override
         protected int getIndex() { return 5; }
     }
 
-    public static class WebApp6 extends Webapp {
+    public static class Webapp6 extends WebappImpl {
         @Override
         protected int getIndex() { return 6; }
     }
 
-    public static class WebApp7 extends Webapp {
+    public static class Webapp7 extends WebappImpl {
         @Override
         protected int getIndex() { return 7; }
     }
 
-    public static class WebApp8 extends Webapp {
+    public static class Webapp8 extends WebappImpl {
         @Override
         protected int getIndex() { return 8; }
     }
 
-    public static class WebApp9 extends Webapp {
+    public static class Webapp9 extends WebappImpl {
         @Override
         protected int getIndex() { return 9; }
     }
 
-    public static class WebApp10 extends Webapp {
+    public static class Webapp10 extends WebappImpl {
         @Override
         protected int getIndex() { return 10; }
     }
 
-    public static class WebApp11 extends Webapp {
+    public static class Webapp11 extends WebappImpl {
         @Override
         protected int getIndex() { return 11; }
     }
 
-    public static class WebApp12 extends Webapp {
+    public static class Webapp12 extends WebappImpl {
         @Override
         protected int getIndex() { return 12; }
     }
 
-    public static class WebApp13 extends Webapp {
+    public static class Webapp13 extends WebappImpl {
         @Override
         protected int getIndex() { return 13; }
     }
 
-    public static class WebApp14 extends Webapp {
+    public static class Webapp14 extends WebappImpl {
         @Override
         protected int getIndex() { return 14; }
     }
 
-    public static class WebApp15 extends Webapp {
+    public static class Webapp15 extends WebappImpl {
         @Override
         protected int getIndex() { return 15; }
     }
 
-    public static class WebApp16 extends Webapp {
+    public static class Webapp16 extends WebappImpl {
         @Override
         protected int getIndex() { return 16; }
     }
 
-    public static class WebApp17 extends Webapp {
+    public static class Webapp17 extends WebappImpl {
         @Override
         protected int getIndex() { return 17; }
     }
 
-    public static class WebApp18 extends Webapp {
+    public static class Webapp18 extends WebappImpl {
         @Override
         protected int getIndex() { return 18; }
     }
 
-    public static class WebApp19 extends Webapp {
+    public static class Webapp19 extends WebappImpl {
         @Override
         protected int getIndex() { return 19; }
     }
 
-    public static class WebApp20 extends Webapp {
+    public static class Webapp20 extends WebappImpl {
         @Override
         protected int getIndex() { return 20; }
     }
 
-    public static class WebApp21 extends Webapp {
+    public static class Webapp21 extends WebappImpl {
         @Override
         protected int getIndex() { return 21; }
     }
 
-    public static class WebApp22 extends Webapp {
+    public static class Webapp22 extends WebappImpl {
         @Override
         protected int getIndex() { return 22; }
     }
 
-    public static class WebApp23 extends Webapp {
+    public static class Webapp23 extends WebappImpl {
         @Override
         protected int getIndex() { return 23; }
     }
 
-    public static class WebApp24 extends Webapp {
+    public static class Webapp24 extends WebappImpl {
         @Override
         protected int getIndex() { return 24; }
     }
 
-    public static class WebApp25 extends Webapp {
+    public static class Webapp25 extends WebappImpl {
         @Override
         protected int getIndex() { return 25; }
     }
 
-    public static class WebApp26 extends Webapp {
+    public static class Webapp26 extends WebappImpl {
         @Override
         protected int getIndex() { return 26; }
     }
 
-    public static class WebApp27 extends Webapp {
+    public static class Webapp27 extends WebappImpl {
         @Override
         protected int getIndex() { return 27; }
     }
 
-    public static class WebApp28 extends Webapp {
+    public static class Webapp28 extends WebappImpl {
         @Override
         protected int getIndex() { return 28; }
     }
 
-    public static class WebApp29 extends Webapp {
+    public static class Webapp29 extends WebappImpl {
         @Override
         protected int getIndex() { return 29; }
     }
 
-    public static class WebApp30 extends Webapp {
+    public static class Webapp30 extends WebappImpl {
         @Override
         protected int getIndex() { return 30; }
     }
 
-    public static class WebApp31 extends Webapp {
+    public static class Webapp31 extends WebappImpl {
         @Override
         protected int getIndex() { return 31; }
     }
 
-    public static class WebApp32 extends Webapp {
+    public static class Webapp32 extends WebappImpl {
         @Override
         protected int getIndex() { return 32; }
     }
 
-    public static class WebApp33 extends Webapp {
+    public static class Webapp33 extends WebappImpl {
         @Override
         protected int getIndex() { return 33; }
     }
 
-    public static class WebApp34 extends Webapp {
+    public static class Webapp34 extends WebappImpl {
         @Override
         protected int getIndex() { return 34; }
     }
 
-    public static class WebApp35 extends Webapp {
+    public static class Webapp35 extends WebappImpl {
         @Override
         protected int getIndex() { return 35; }
     }
 
-    public static class WebApp36 extends Webapp {
+    public static class Webapp36 extends WebappImpl {
         @Override
         protected int getIndex() { return 36; }
     }
 
-    public static class WebApp37 extends Webapp {
+    public static class Webapp37 extends WebappImpl {
         @Override
         protected int getIndex() { return 37; }
     }
 
-    public static class WebApp38 extends Webapp {
+    public static class Webapp38 extends WebappImpl {
         @Override
         protected int getIndex() { return 38; }
     }
 
-    public static class WebApp39 extends Webapp {
+    public static class Webapp39 extends WebappImpl {
         @Override
         protected int getIndex() { return 39; }
     }
 
-    public static class WebApp40 extends Webapp {
+    public static class Webapp40 extends WebappImpl {
         @Override
         protected int getIndex() { return 40; }
     }
 
-    public static class WebApp41 extends Webapp {
+    public static class Webapp41 extends WebappImpl {
         @Override
         protected int getIndex() { return 41; }
     }
 
-    public static class WebApp42 extends Webapp {
+    public static class Webapp42 extends WebappImpl {
         @Override
         protected int getIndex() { return 42; }
     }
 
-    public static class WebApp43 extends Webapp {
+    public static class Webapp43 extends WebappImpl {
         @Override
         protected int getIndex() { return 43; }
     }
 
-    public static class WebApp44 extends Webapp {
+    public static class Webapp44 extends WebappImpl {
         @Override
         protected int getIndex() { return 44; }
     }
 
-    public static class WebApp45 extends Webapp {
+    public static class Webapp45 extends WebappImpl {
         @Override
         protected int getIndex() { return 45; }
     }
 
-    public static class WebApp46 extends Webapp {
+    public static class Webapp46 extends WebappImpl {
         @Override
         protected int getIndex() { return 46; }
     }
 
-    public static class WebApp47 extends Webapp {
+    public static class Webapp47 extends WebappImpl {
         @Override
         protected int getIndex() { return 47; }
     }
 
-    public static class WebApp48 extends Webapp {
+    public static class Webapp48 extends WebappImpl {
         @Override
         protected int getIndex() { return 48; }
     }
 
-    public static class WebApp49 extends Webapp {
+    public static class Webapp49 extends WebappImpl {
         @Override
         protected int getIndex() { return 49; }
     }
 
-    public static class WebApp50 extends Webapp {
+    public static class Webapp50 extends WebappImpl {
         @Override
         protected int getIndex() { return 50; }
     }
 
-    public static class WebApp51 extends Webapp {
+    public static class Webapp51 extends WebappImpl {
         @Override
         protected int getIndex() { return 51; }
     }
 
-    public static class WebApp52 extends Webapp {
+    public static class Webapp52 extends WebappImpl {
         @Override
         protected int getIndex() { return 52; }
     }
 
-    public static class WebApp53 extends Webapp {
+    public static class Webapp53 extends WebappImpl {
         @Override
         protected int getIndex() { return 53; }
     }
 
-    public static class WebApp54 extends Webapp {
+    public static class Webapp54 extends WebappImpl {
         @Override
         protected int getIndex() { return 54; }
     }
 
-    public static class WebApp55 extends Webapp {
+    public static class Webapp55 extends WebappImpl {
         @Override
         protected int getIndex() { return 55; }
     }
 
-    public static class WebApp56 extends Webapp {
+    public static class Webapp56 extends WebappImpl {
         @Override
         protected int getIndex() { return 56; }
     }
 
-    public static class WebApp57 extends Webapp {
+    public static class Webapp57 extends WebappImpl {
         @Override
         protected int getIndex() { return 57; }
     }
 
-    public static class WebApp58 extends Webapp {
+    public static class Webapp58 extends WebappImpl {
         @Override
         protected int getIndex() { return 58; }
     }
 
-    public static class WebApp59 extends Webapp {
+    public static class Webapp59 extends WebappImpl {
         @Override
         protected int getIndex() { return 59; }
     }
 
-    public static class WebApp60 extends Webapp {
+    public static class Webapp60 extends WebappImpl {
         @Override
         protected int getIndex() { return 60; }
     }
 
-    public static class WebApp61 extends Webapp {
+    public static class Webapp61 extends WebappImpl {
         @Override
         protected int getIndex() { return 61; }
     }
 
-    public static class WebApp62 extends Webapp {
+    public static class Webapp62 extends WebappImpl {
         @Override
         protected int getIndex() { return 62; }
     }
 
-    public static class WebApp63 extends Webapp {
+    public static class Webapp63 extends WebappImpl {
         @Override
         protected int getIndex() { return 63; }
     }
 
-    public static class WebApp64 extends Webapp {
+    public static class Webapp64 extends WebappImpl {
         @Override
         protected int getIndex() { return 64; }
     }
 
-    public static class WebApp65 extends Webapp {
+    public static class Webapp65 extends WebappImpl {
         @Override
         protected int getIndex() { return 65; }
     }
 
-    public static class WebApp66 extends Webapp {
+    public static class Webapp66 extends WebappImpl {
         @Override
         protected int getIndex() { return 66; }
     }
 
-    public static class WebApp67 extends Webapp {
+    public static class Webapp67 extends WebappImpl {
         @Override
         protected int getIndex() { return 67; }
     }
 
-    public static class WebApp68 extends Webapp {
+    public static class Webapp68 extends WebappImpl {
         @Override
         protected int getIndex() { return 68; }
     }
 
-    public static class WebApp69 extends Webapp {
+    public static class Webapp69 extends WebappImpl {
         @Override
         protected int getIndex() { return 69; }
     }
 
-    public static class WebApp70 extends Webapp {
+    public static class Webapp70 extends WebappImpl {
         @Override
         protected int getIndex() { return 70; }
     }
 
-    public static class WebApp71 extends Webapp {
+    public static class Webapp71 extends WebappImpl {
         @Override
         protected int getIndex() { return 71; }
     }
 
-    public static class WebApp72 extends Webapp {
+    public static class Webapp72 extends WebappImpl {
         @Override
         protected int getIndex() { return 72; }
     }
 
-    public static class WebApp73 extends Webapp {
+    public static class Webapp73 extends WebappImpl {
         @Override
         protected int getIndex() { return 73; }
     }
 
-    public static class WebApp74 extends Webapp {
+    public static class Webapp74 extends WebappImpl {
         @Override
         protected int getIndex() { return 74; }
     }
 
-    public static class WebApp75 extends Webapp {
+    public static class Webapp75 extends WebappImpl {
         @Override
         protected int getIndex() { return 75; }
     }
 
-    public static class WebApp76 extends Webapp {
+    public static class Webapp76 extends WebappImpl {
         @Override
         protected int getIndex() { return 76; }
     }
 
-    public static class WebApp77 extends Webapp {
+    public static class Webapp77 extends WebappImpl {
         @Override
         protected int getIndex() { return 77; }
     }
 
-    public static class WebApp78 extends Webapp {
+    public static class Webapp78 extends WebappImpl {
         @Override
         protected int getIndex() { return 78; }
     }
 
-    public static class WebApp79 extends Webapp {
+    public static class Webapp79 extends WebappImpl {
         @Override
         protected int getIndex() { return 79; }
     }
 
-    public static class WebApp80 extends Webapp {
+    public static class Webapp80 extends WebappImpl {
         @Override
         protected int getIndex() { return 80; }
     }
 
-    public static class WebApp81 extends Webapp {
+    public static class Webapp81 extends WebappImpl {
         @Override
         protected int getIndex() { return 81; }
     }
 
-    public static class WebApp82 extends Webapp {
+    public static class Webapp82 extends WebappImpl {
         @Override
         protected int getIndex() { return 82; }
     }
 
-    public static class WebApp83 extends Webapp {
+    public static class Webapp83 extends WebappImpl {
         @Override
         protected int getIndex() { return 83; }
     }
 
-    public static class WebApp84 extends Webapp {
+    public static class Webapp84 extends WebappImpl {
         @Override
         protected int getIndex() { return 84; }
     }
 
-    public static class WebApp85 extends Webapp {
+    public static class Webapp85 extends WebappImpl {
         @Override
         protected int getIndex() { return 85; }
     }
 
-    public static class WebApp86 extends Webapp {
+    public static class Webapp86 extends WebappImpl {
         @Override
         protected int getIndex() { return 86; }
     }
 
-    public static class WebApp87 extends Webapp {
+    public static class Webapp87 extends WebappImpl {
         @Override
         protected int getIndex() { return 87; }
     }
 
-    public static class WebApp88 extends Webapp {
+    public static class Webapp88 extends WebappImpl {
         @Override
         protected int getIndex() { return 88; }
     }
 
-    public static class WebApp89 extends Webapp {
+    public static class Webapp89 extends WebappImpl {
         @Override
         protected int getIndex() { return 89; }
     }
 
-    public static class WebApp90 extends Webapp {
+    public static class Webapp90 extends WebappImpl {
         @Override
         protected int getIndex() { return 90; }
     }
 
-    public static class WebApp91 extends Webapp {
+    public static class Webapp91 extends WebappImpl {
         @Override
         protected int getIndex() { return 91; }
     }
 
-    public static class WebApp92 extends Webapp {
+    public static class Webapp92 extends WebappImpl {
         @Override
         protected int getIndex() { return 92; }
     }
 
-    public static class WebApp93 extends Webapp {
+    public static class Webapp93 extends WebappImpl {
         @Override
         protected int getIndex() { return 93; }
     }
 
-    public static class WebApp94 extends Webapp {
+    public static class Webapp94 extends WebappImpl {
         @Override
         protected int getIndex() { return 94; }
     }
 
-    public static class WebApp95 extends Webapp {
+    public static class Webapp95 extends WebappImpl {
         @Override
         protected int getIndex() { return 95; }
     }
 
-    public static class WebApp96 extends Webapp {
+    public static class Webapp96 extends WebappImpl {
         @Override
         protected int getIndex() { return 96; }
     }
 
-    public static class WebApp97 extends Webapp {
+    public static class Webapp97 extends WebappImpl {
         @Override
         protected int getIndex() { return 97; }
     }
 
-    public static class WebApp98 extends Webapp {
+    public static class Webapp98 extends WebappImpl {
         @Override
         protected int getIndex() { return 98; }
     }
 
-    public static class WebApp99 extends Webapp {
+    public static class Webapp99 extends WebappImpl {
         @Override
         protected int getIndex() { return 99; }
     }