[jsword-svn] r1581 - in trunk: common/src/main/java/org/crosswire/common/config common/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/book
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Mon Jul 30 07:57:02 MST 2007
Author: dmsmith
Date: 2007-07-30 07:57:01 -0700 (Mon, 30 Jul 2007)
New Revision: 1581
Added:
trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties
trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties
Modified:
trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java
Log:
Fixed a compatibility bug.
Checked in iso639 languages for German and Farsi.
Modified: trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-29 11:27:03 UTC (rev 1580)
+++ trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-30 14:57:01 UTC (rev 1581)
@@ -283,7 +283,10 @@
try
{
Object object = convertToObject(value);
- setter.invoke(null, new Object[] { object.toString() });
+ if (object != null)
+ {
+ setter.invoke(null, new Object[] { object });
+ }
}
catch (InvocationTargetException e)
{
@@ -297,6 +300,10 @@
{
ex = e;
}
+ catch (NullPointerException e)
+ {
+ ex = e;
+ }
if (ex != null)
{
Modified: trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-29 11:27:03 UTC (rev 1580)
+++ trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-30 14:57:01 UTC (rev 1581)
@@ -26,7 +26,6 @@
import java.util.ResourceBundle;
import java.util.TreeMap;
-import org.crosswire.common.util.Reporter;
import org.jdom.Element;
/**
@@ -109,8 +108,7 @@
return mapEntry.getKey();
}
}
- Reporter.informUser(this, Msg.IGNORE, new Object[] { orig });
- return null;
+ return new Integer(0);
}
}
Modified: trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java 2007-07-29 11:27:03 UTC (rev 1580)
+++ trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java 2007-07-30 14:57:01 UTC (rev 1581)
@@ -104,7 +104,7 @@
mapEntry = (Map.Entry) iter.next();
if (mapEntry.getValue().toString().equals(orig) || mapEntry.getKey().toString().equals(orig))
{
- return mapEntry.getKey();
+ return mapEntry.getKey().toString();
}
}
Reporter.informUser(this, Msg.IGNORE, new Object[] { orig });
Added: trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties (rev 0)
+++ trunk/common/src/main/java/org/crosswire/common/util/iso639_de.properties 2007-07-30 14:57:01 UTC (rev 1581)
@@ -0,0 +1,84 @@
+# These are all the languages of the Sword modules currently maintained at Crosswire
+# and for which we have Bible name translations
+# as of July 30, 2007
+af=Afrikaans
+sq=Albanian
+ar=Arabic
+hy=Armenian
+eu=Basque
+bar=Bavarian
+bs=Bosnian
+br=Breton
+bg=Bulgarian
+my=Burmese
+ca=Catalan
+ceb=Cebuano
+ch=Chamorro
+zh=Chinese
+hr=Croatian
+cs=Czech
+da=Danish
+nl=Dutch
+en=English
+enm=English, Middle (1100-1500)
+ang=English, Old (ca.450-1100)
+eo=Esperanto
+et=Estonian
+fi=Finnish
+fr=French
+fy=Frisian
+gd=Gaelic (Scots)
+de=German
+got=Gothic
+grc=Greek, Ancient (to 1453)
+el=Greek, Modern (1453-)
+ht=Haitian; Haitian Creole
+haw=Hawaiian
+he=Hebrew
+hu=Hungarian
+is=Icelandic
+id=Indonesian
+ga=Irish
+it=Italian
+itz=Itz\u00e1
+ja=Japanese
+kek=Kekch\u00ed
+tlh=Klingon; tlhIngan-Hol
+ko=Korean
+ku=Kurdish
+la=Latin
+lv=Latvian
+lt=Lithuanian
+lmo=Lombard
+ms=Malay (generic)
+mt=Maltese
+gv=Manx
+mi=Maori
+no=Norwegian
+pap=Papiamento
+fa=Persian
+pl=Polish
+pt=Portuguese
+pot=Potawatomi
+ro=Romanian
+ru=Russian
+sco=Scots
+sk=Slovak
+sl=Slovenian
+es=Spanish
+srn=Sranan
+sw=Swahili (generic)
+sv=Swedish
+syr=Syriac
+tl=Tagalog
+ty=Tahitian
+th=Thai
+tn=Tswana
+tr=Turkish
+uk=Ukrainian
+ppk=Uma
+vi=Vietnamese
+cy=Welsh
+xh=Xhosa
+yo=Yoruba
+zu=Zulu
Added: trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties (rev 0)
+++ trunk/common/src/main/java/org/crosswire/common/util/iso639_fa.properties 2007-07-30 14:57:01 UTC (rev 1581)
@@ -0,0 +1,84 @@
+# These are all the languages of the Sword modules currently maintained at Crosswire
+# and for which we have Bible name translations
+# as of July 30, 2007
+af=Afrikaans
+sq=Albanian
+ar=Arabic
+hy=Armenian
+eu=Basque
+bar=Bavarian
+bs=Bosnian
+br=Breton
+bg=Bulgarian
+my=Burmese
+ca=Catalan
+ceb=Cebuano
+ch=Chamorro
+zh=Chinese
+hr=Croatian
+cs=Czech
+da=Danish
+nl=Dutch
+en=English
+enm=English, Middle (1100-1500)
+ang=English, Old (ca.450-1100)
+eo=Esperanto
+et=Estonian
+fi=Finnish
+fr=French
+fy=Frisian
+gd=Gaelic (Scots)
+de=German
+got=Gothic
+grc=Greek, Ancient (to 1453)
+el=Greek, Modern (1453-)
+ht=Haitian; Haitian Creole
+haw=Hawaiian
+he=Hebrew
+hu=Hungarian
+is=Icelandic
+id=Indonesian
+ga=Irish
+it=Italian
+itz=Itz\u00e1
+ja=Japanese
+kek=Kekch\u00ed
+tlh=Klingon; tlhIngan-Hol
+ko=Korean
+ku=Kurdish
+la=Latin
+lv=Latvian
+lt=Lithuanian
+lmo=Lombard
+ms=Malay (generic)
+mt=Maltese
+gv=Manx
+mi=Maori
+no=Norwegian
+pap=Papiamento
+fa=Persian
+pl=Polish
+pt=Portuguese
+pot=Potawatomi
+ro=Romanian
+ru=Russian
+sco=Scots
+sk=Slovak
+sl=Slovenian
+es=Spanish
+srn=Sranan
+sw=Swahili (generic)
+sv=Swedish
+syr=Syriac
+tl=Tagalog
+ty=Tahitian
+th=Thai
+tn=Tswana
+tr=Turkish
+uk=Ukrainian
+ppk=Uma
+vi=Vietnamese
+cy=Welsh
+xh=Xhosa
+yo=Yoruba
+zu=Zulu
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java 2007-07-29 11:27:03 UTC (rev 1580)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java 2007-07-30 14:57:01 UTC (rev 1581)
@@ -21,9 +21,7 @@
*/
package org.crosswire.jsword.book;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.TreeMap;
More information about the jsword-svn
mailing list