GFTranslator to DGTranslator in a few more places

7 files changed, 8 insertions, 8 deletions

diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml
index 459ea601c..25c85c52b 100644
--- a/src/ui/android/AndroidManifest.xml
+++ b/src/ui/android/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:allowBackup="true"
         android:icon="@drawable/dg_short"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" android:name="GFTranslator">
+        android:theme="@style/AppTheme" android:name="DGTranslator">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java b/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java
index ee4cbc092..7141041d5 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java
@@ -2,7 +2,7 @@ package org.grammaticalframework.ui.android;
 
 import android.app.Application;
 
-public class GFTranslator extends Application {
+public class DGTranslator extends Application {
 	private Translator mTranslator;
 
 	@Override
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
index b7a8e9859..ac1957cca 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -38,7 +38,7 @@ public class LexicalEntryActivity extends ListActivity {
 	    super.onCreate(savedInstanceState);
 	    setContentView(R.layout.activity_lexical_entry);
 
-        mTranslator = ((GFTranslator) getApplicationContext()).getTranslator();
+        mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
 
 	    mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language);
 	    mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages());
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
index 2653b77ec..ce8d16190 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
@@ -104,7 +104,7 @@ public class MainActivity extends Activity {
 
         mTts = new TTS(this);
 
-        mTranslator = ((GFTranslator) getApplicationContext()).getTranslator();
+        mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
 
         mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages());
         mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() {
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
index 2efc9eb42..81b0eff05 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
@@ -41,7 +41,7 @@ public class TranslatorInputMethodService extends InputMethodService
     public void onCreate() {
         super.onCreate();
         
-        mTranslator = ((GFTranslator) getApplicationContext()).getTranslator();
+        mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
         
         mSymbolsPage1Keyboard = null;
         mSymbolsPage2Keyboard = null;
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java
index 876f660da..f3c41a52f 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java
@@ -24,7 +24,7 @@ public class TranslatorKeyboard extends Keyboard {
     public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) {
     	super(context, xmlLayoutResId, modeId);
 
-    	mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator();
+    	mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
     	updateLanguageKeyLabels();
     }
 
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
index 943c48d35..0c98f0827 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
@@ -20,12 +20,12 @@ public class TranslatorKeyboardView extends KeyboardView {
 
     public TranslatorKeyboardView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator();
+        mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
     }
 
     public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator();
+        mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
     }
 
     private PopupWindow mLanguagesPopup = null;