the dictionary view in the Android app now shows both the source and the target linearizations

4 files changed, 4 insertions, 15 deletions

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 8d9a41955..5267cfde0 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -1,17 +1,13 @@
 package org.grammaticalframework.ui.android;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 
 import android.app.Activity;
 import android.app.ListActivity;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -22,8 +18,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.webkit.WebView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -76,8 +70,6 @@ public class LexicalEntryActivity extends ListActivity {
 
 		List<String> data = new ArrayList<String>();
 	    for (MorphoAnalysis a : list) {
-	    	Expr e = Expr.readExpr(a.getLemma());
-	    	
 	    	if (!data.contains(a.getLemma())) {
 		    	data.add(a.getLemma());
 	    	}
@@ -220,7 +212,7 @@ public class LexicalEntryActivity extends ListActivity {
 	        		(TextView) convertView.findViewById(R.id.lexical_desc);
 
 	    	Expr e = Expr.readExpr(lemma);
-	    	String phrase = mTranslator.linearize(e);		    	
+	    	String phrase = mTranslator.generateTranslationEntry(e);
 	        descView.setText(phrase);
 
 	        convertView.setOnClickListener(new OnClickListener() {
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 9cbeb6930..a5ad1cff2 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
@@ -5,7 +5,6 @@ import java.io.Serializable;
 import java.util.List;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
@@ -17,7 +16,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 
 import org.grammaticalframework.ui.android.ASR.State;
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index e8ef4738e..df042d1f1 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -131,9 +131,10 @@ public class Translator {
         }
     }
 
-    public String linearize(Expr e) {
+    public String generateTranslationEntry(Expr e) {
+        Concr sourceLang = getConcr(getSourceLanguage().getConcrete());
         Concr targetLang = getConcr(getTargetLanguage().getConcrete());
-        return targetLang.linearize(e);
+        return sourceLang.linearize(e) + " - " + targetLang.linearize(e);
     }
 
     public Map<String,String> tabularLinearize(Expr e) {
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 6bca2ad59..922e1774d 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
@@ -1,7 +1,5 @@
 package org.grammaticalframework.ui.android;
 
-import java.util.Locale;
-
 import org.grammaticalframework.ui.android.TranslatorKeyboard;
 
 import android.content.Context;