From 6a8f271ba58988bed87607ecc625ca7a571bfc5c Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 3 Apr 2014 14:06:26 +0000 Subject: GFTranslator to DGTranslator in a few more places --- src/ui/android/AndroidManifest.xml | 2 +- .../grammaticalframework/ui/android/DGTranslator.java | 16 ++++++++++++++++ .../grammaticalframework/ui/android/GFTranslator.java | 16 ---------------- .../ui/android/LexicalEntryActivity.java | 2 +- .../grammaticalframework/ui/android/MainActivity.java | 2 +- .../ui/android/TranslatorInputMethodService.java | 2 +- .../ui/android/TranslatorKeyboard.java | 2 +- .../ui/android/TranslatorKeyboardView.java | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java delete mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java (limited to 'src/ui/android') 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"> diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java b/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java new file mode 100644 index 000000000..7141041d5 --- /dev/null +++ b/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java @@ -0,0 +1,16 @@ +package org.grammaticalframework.ui.android; + +import android.app.Application; + +public class DGTranslator extends Application { + private Translator mTranslator; + + @Override + public void onCreate() { + mTranslator = new Translator(this); + } + + public Translator getTranslator() { + return mTranslator; + } +} diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java deleted file mode 100644 index ee4cbc092..000000000 --- a/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.grammaticalframework.ui.android; - -import android.app.Application; - -public class GFTranslator extends Application { - private Translator mTranslator; - - @Override - public void onCreate() { - mTranslator = new Translator(this); - } - - public Translator getTranslator() { - return mTranslator; - } -} 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; -- cgit v1.2.3