From: thadh <thadh@THADH-LAPTOP.ad.corp.google.com>
Date: Sun, 25 Oct 2009 21:56:20 +0000 (-0700)
Subject: go
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=f42ffbb78f720a0088e83859bdcce20ed43f0a89

go
---

diff --git a/.classpath b/.classpath
index 8a2ab5a..aa18ab6 100755
--- a/.classpath
+++ b/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Util"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="jars/icu4j-4_2_1-src.jar/icu4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="jars/icu4j-4_2_1-src/icu4j.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jars/buildICU4J.sh b/jars/buildICU4J.sh
new file mode 100755
index 0000000..a294d86
--- /dev/null
+++ b/jars/buildICU4J.sh
@@ -0,0 +1,27 @@
+#!/bin/bash -e
+
+DIR=`dirname $0`/icu4j-4_2_1-src
+
+cd $DIR
+ant clean
+ant collator
+ant collIndices
+
+rm  classes/com/ibm/icu/impl/data/icudt42b/ubidi.icu
+rm  classes/com/ibm/icu/impl/data/icudt42b/cnvalias.icu
+rm -rf classes/com/ibm/icu/impl/data/icudt42b/brkitr
+
+rm -rf ./safe
+mkdir ./safe
+# Need this res_index.txt file because the process to auto-generate it from the context of the jar doesn't work on Android.
+mv classes/com/ibm/icu/impl/data/icudt42b/coll/res_index.txt ./safe
+mv classes/com/ibm/icu/impl/data/icudt42b/coll/en* ./safe
+mv classes/com/ibm/icu/impl/data/icudt42b/coll/de* ./safe
+mv classes/com/ibm/icu/impl/data/icudt42b/coll/ucadata.icu ./safe
+rm classes/com/ibm/icu/impl/data/icudt42b/coll/*
+mv ./safe/* classes/com/ibm/icu/impl/data/icudt42b/coll/
+rm -rf ./safe
+
+ant moduleJar
+
+ls -l $DIR/icu4j.jar
diff --git a/jars/icu4j-4_2_1-src/build.xml b/jars/icu4j-4_2_1-src/build.xml
index 82b5bc5..b1bef22 100755
--- a/jars/icu4j-4_2_1-src/build.xml
+++ b/jars/icu4j-4_2_1-src/build.xml
@@ -376,6 +376,12 @@
     </java>
   </target>
 
+  <target name="collIndices" depends="build_indexgenerator">
+    <java classname="com.ibm.icu.dev.tool.index.IndexGenerator" classpath="${build.dir}" logError="true">
+      <arg value="${build.dir}/${icu4j.data.path}/coll" />
+    </java>
+  </target>
+
   <target name="tools"
           depends="core"
           unless="before.java14"
@@ -913,7 +919,14 @@
   </target>
 
   <target name="moduleJar" depends="initBase" description="modular build of 'icu4j.jar' jar file">
-    <jar jarfile="${jar.file}" compress="true" includes="com/ibm/icu/util/**/*,com/ibm/icu/text/**/*,com/ibm/icu/math/**/*,com/ibm/icu/impl/**/*,com/ibm/icu/lang/**/*" basedir="${build.dir}">
+    <jar jarfile="${jar.file}" compress="true">
+
+    	<!-- com/ibm/icu/util/**/*,com/ibm/icu/text/**/*,com/ibm/icu/math/**/*,com/ibm/icu/impl/**/*,com/ibm/icu/lang/**/* -->
+      <fileset dir="${build.dir}" includes="com/ibm/icu/util/**/*,com/ibm/icu/text/**/*,com/ibm/icu/math/**/*,com/ibm/icu/impl/**/*,com/ibm/icu/lang/**/*" excludes="META-INF/services/**/*,com/ibm/icu/charset/**/*,${icu4j.data.path}/*.cnv,${icu4j.data.path}/cnvalias.icu" />
+
+    	<fileset dir="${basedir}" includes="license.html,unicode-license.txt" />
+      <fileset dir="${src.dir}" includes="com/ibm/icu/ICUConfig.properties" />
+    	
       <manifest>
         <attribute name="Built-By" value="${corp}" />
         <section name="common">
diff --git a/jars/icu4j-4_2_1-src/eclipseProjectMisc/initSrc.launch b/jars/icu4j-4_2_1-src/eclipseProjectMisc/initSrc.launch
deleted file mode 100755
index 9a1b84e..0000000
--- a/jars/icu4j-4_2_1-src/eclipseProjectMisc/initSrc.launch
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_BUILD_SCOPE" value="${none}"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/icu4j/src&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/icu4j/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="icu4j"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jre1.6.0"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="initSrc,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/icu4j/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/icu4j}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/jars/icu4j-4_2_1-src/eclipseProjectMisc/normSrc.launch b/jars/icu4j-4_2_1-src/eclipseProjectMisc/normSrc.launch
deleted file mode 100755
index 179d952..0000000
--- a/jars/icu4j-4_2_1-src/eclipseProjectMisc/normSrc.launch
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_BUILD_SCOPE" value="${none}"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/icu4j/src&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/icu4j/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="icu4j"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jre1.6.0"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="normSrc,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/icu4j/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/icu4j}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 155a15c..0bfd39a 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -205,7 +205,10 @@ public class DictionaryActivity extends ListActivity {
 
   private void closeCurrentDictionary() {
     Log.i(LOG, "closeCurrentDictionary");
-    searchOperation.stopAndWait();
+    if (searchOperation != null) {
+      searchOperation.stopAndWait();
+      searchOperation = null;
+    }
     languageList = null;
     setListAdapter(null);
     dictionary = null;
@@ -313,6 +316,7 @@ public class DictionaryActivity extends ListActivity {
     languageList = new LanguageListAdapter(
         dictionary.languageDatas[(languageList.languageData == dictionary.languageDatas[0]) ? 1
             : 0]);
+    Log.d(LOG, "onLanguageButton, newLang=" + languageList.languageData.language.symbol);
     setListAdapter(languageList);
     updateLangButton();
     onSearchTextChange(searchText.getText().toString());
@@ -327,8 +331,10 @@ public class DictionaryActivity extends ListActivity {
     if (selectedRowIndex == selectedTokenRowIndex && selectedRowIndex > 0) {
       destRowIndex = languageList.languageData.sortedIndex
           .get(prevTokenIndex).startRow;
+      Log.d(LOG, "onUpButton, jumping back a word, destRowIndex=" + destRowIndex);
     } else {
       destRowIndex = selectedTokenRowIndex;
+      Log.d(LOG, "onUpButton, jumping to top of word, destRowIndex=" + destRowIndex);
     }
     jumpToRow(languageList, destRowIndex);
   }
@@ -342,8 +348,10 @@ public class DictionaryActivity extends ListActivity {
     if (nextTokenIndex < languageList.languageData.sortedIndex.size()) {
       destRowIndex = languageList.languageData.sortedIndex
           .get(nextTokenIndex).startRow;
+      Log.d(LOG, "onDownButton, jumping down a word, destRowIndex=" + destRowIndex);
     } else {
       destRowIndex = languageList.languageData.rows.size() - 1;
+      Log.d(LOG, "onDownButton, jumping to end of dict, destRowIndex=" + destRowIndex);
     }
     jumpToRow(languageList, destRowIndex);
   }
diff --git a/src/com/hughes/android/dictionary/DictionaryActivityTest.java b/src/com/hughes/android/dictionary/DictionaryActivityTest.java
index 5631b9d..5afcb22 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivityTest.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivityTest.java
@@ -34,7 +34,7 @@ public class DictionaryActivityTest extends ActivityInstrumentationTestCase2<Dic
     assertEquals(Language.EN, dict.languageList.languageData.language);
 
     dict.uiHandler.post(switchLang);
-    Thread.sleep(100);
+    Thread.sleep(200);
     assertEquals(Language.DE, dict.languageList.languageData.language);
     
     dict.finish();