From 653190c6a1c850d1b58a9f4c5200da1cafb0dfd7 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@shapley.(none)>
Date: Fri, 4 Jun 2010 13:32:00 -0700
Subject: [PATCH] Switching around attributes so they are similar

---
 framework/src/com/phonegap/CompassListener.java | 2 +-
 framework/src/com/phonegap/ContactManager.java  | 4 ++--
 framework/src/com/phonegap/DroidGap.java        | 8 ++++----
 framework/src/com/phonegap/NetworkManager.java  | 2 +-
 framework/src/com/phonegap/PhoneGap.java        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/framework/src/com/phonegap/CompassListener.java b/framework/src/com/phonegap/CompassListener.java
index b504528c..ea1a73b2 100644
--- a/framework/src/com/phonegap/CompassListener.java
+++ b/framework/src/com/phonegap/CompassListener.java
@@ -16,7 +16,7 @@ public class CompassListener implements SensorEventListener{
 	
 	private SensorManager sensorManager;
 	
-	CompassListener(Context ctx, WebView appView)
+	CompassListener(WebView appView, Context ctx)
 	{
 		mCtx = ctx;
 		mAppView = appView;		
diff --git a/framework/src/com/phonegap/ContactManager.java b/framework/src/com/phonegap/ContactManager.java
index 07569db4..de1ed9bc 100644
--- a/framework/src/com/phonegap/ContactManager.java
+++ b/framework/src/com/phonegap/ContactManager.java
@@ -27,12 +27,12 @@ public class ContactManager {
 	Uri mPhone = android.provider.Contacts.Phones.CONTENT_URI;	
 	Uri mEmail = android.provider.Contacts.ContactMethods.CONTENT_URI;
 	
-	ContactManager(Activity app, WebView view)
+	ContactManager(WebView view, Activity app)
 	{
 		mApp = app;
 		mView = view;
 	}
-			
+	
 	// This is to add backwards compatibility to the OLD Contacts API\
 	public void getContactsAndSendBack()
 	{
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 8a65e5ab..b0ac1cd2 100644
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -133,14 +133,14 @@ public class DroidGap extends Activity {
     
     private void bindBrowser(WebView appView)
     {
-    	gap = new PhoneGap(this, appView);
+    	gap = new PhoneGap(appView, this);
     	geo = new GeoBroker(appView, this);
     	accel = new AccelBroker(appView, this);
     	launcher = new CameraLauncher(appView, this);
-    	mContacts = new ContactManager(this, appView);
+    	mContacts = new ContactManager(appView, this);
     	fs = new FileUtils(appView);
-    	netMan = new NetworkManager(this, appView);
-    	mCompass = new CompassListener(this, appView);  
+    	netMan = new NetworkManager(appView, this);
+    	mCompass = new CompassListener(appView, this);  
     	crypto = new CryptoHandler(appView);
     	
     	// This creates the new javascript interfaces for PhoneGap
diff --git a/framework/src/com/phonegap/NetworkManager.java b/framework/src/com/phonegap/NetworkManager.java
index 9fafcb61..5d4c0196 100644
--- a/framework/src/com/phonegap/NetworkManager.java
+++ b/framework/src/com/phonegap/NetworkManager.java
@@ -13,7 +13,7 @@ public class NetworkManager {
 	WebView mView;
 	ConnectivityManager sockMan;
 	
-	NetworkManager(Context ctx, WebView view)
+	NetworkManager(WebView view, Context ctx)
 	{
 		mCtx = ctx;
 		mView = view;
diff --git a/framework/src/com/phonegap/PhoneGap.java b/framework/src/com/phonegap/PhoneGap.java
index 6dc00a8d..1141e708 100644
--- a/framework/src/com/phonegap/PhoneGap.java
+++ b/framework/src/com/phonegap/PhoneGap.java
@@ -49,7 +49,7 @@ public class PhoneGap{
     private WebView mAppView;
     AudioHandler audio; 
     
-	public PhoneGap(Context ctx, WebView appView) {
+	public PhoneGap(WebView appView, Context ctx) {
         this.mCtx = ctx;
         this.mAppView = appView;
         audio = new AudioHandler("/sdcard/tmprecording.mp3", ctx);