diff options
Diffstat (limited to 'src/org/madore/android/unicodeMap/UnicodeMapActivity.java')
-rw-r--r-- | src/org/madore/android/unicodeMap/UnicodeMapActivity.java | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/org/madore/android/unicodeMap/UnicodeMapActivity.java b/src/org/madore/android/unicodeMap/UnicodeMapActivity.java index 6caad15..f4c7dc6 100644 --- a/src/org/madore/android/unicodeMap/UnicodeMapActivity.java +++ b/src/org/madore/android/unicodeMap/UnicodeMapActivity.java @@ -2,10 +2,6 @@ package org.madore.android.unicodeMap; import java.util.List; import java.util.ArrayList; -import java.io.InputStreamReader; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; import android.content.Context; import android.content.res.AssetManager; import android.os.Bundle; @@ -14,36 +10,19 @@ import android.widget.*; import android.text.ClipboardManager; import android.app.ListActivity; -public class UnicodeMapActivity extends ListActivity { +public final class UnicodeMapActivity extends ListActivity { - static final List<UnicodeCharacter> list = new ArrayList<UnicodeCharacter>(12); - - protected void parseUnicodeData() { - AssetManager amgr = getAssets(); - try { - BufferedReader rd - = new BufferedReader(new InputStreamReader(amgr.open("UnicodeData.txt"), - "US-ASCII")); - String line; - while ( ( line = rd.readLine() ) != null ) { - String[] bits = line.split(";"); - int codePoint = Integer.parseInt(bits[0], 16); - String name = bits[1]; - if ( name.charAt(0) != '<' ) - list.add(new UnicodeCharacter(codePoint, name)); - } - } catch (UnsupportedEncodingException e) { - throw new AssertionError("US-ASCII encoding unsupported"); - } catch (IOException e) { - throw new RuntimeException(e); - } - } + protected UnicodeDatabase db; + protected List<UnicodeCharacter> list; /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - parseUnicodeData(); + this.db = new UnicodeDatabase(getApplicationContext()); + this.list = new ArrayList<UnicodeCharacter>(db.countRange(0,1024)); + for ( UnicodeCharacter ch : db.getRange(0,1024) ) + list.add(ch); final ClipboardManager cmgr = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE); setListAdapter(new ArrayAdapter<UnicodeCharacter>(this, R.layout.list_item, list)); |