[jsword-svn] r2045 - in trunk: bibledesktop bibledesktop/etc/eclipse bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop-web/etc/eclipse biblemapper/src/main/java/org/crosswire/biblemapper/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop common-swing/src/main/java/org/crosswire/common/swing/plaf jsword/etc/eclipse jsword/src/main/java/org/crosswire/common/activate jsword/src/main/java/org/crosswire/common/config jsword/src/main/java/org/crosswire/common/diff jsword/src/main/java/org/crosswire/common/history jsword/src/main/java/org/crosswire/common/icu jsword/src/main/java/org/crosswire/common/options jsword/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/book/readings jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/examples jsword/src/main/java/org/crosswire/jsword/passage jsword/src/main/java/org/crosswire/jsword/versification jsword/src/test/java/org/crosswire/common/diff jsword/src/test/java/org/crosswire/jsword/passage jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal jsword-limbo/src/main/java/org/crosswire/common/config/swing jsword-limbo/src/main/java/org/crosswire/common/swing jsword-limbo/src/main/java/org/crosswire/common/util jsword-limbo/src/main/java/org/crosswire/jsword/book jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword jsword-limbo/src/main/java/org/crosswire/jsword/book/raw jsword-sword/src/main/java/org/crosswire/sword/frontend/im jsword-web/etc/eclipse
dmsmith at crosswire.org
dmsmith at crosswire.org
Mon Dec 6 14:19:49 MST 2010
Author: dmsmith
Date: 2010-12-06 14:19:49 -0700 (Mon, 06 Dec 2010)
New Revision: 2045
Modified:
trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
trunk/bibledesktop/.classpath
trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogEntriesPanel.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordItemsMem.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewDurusauIM.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java
trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
trunk/jsword/etc/eclipse/jsword-ant-all.launch
trunk/jsword/etc/eclipse/jsword-ant-build.launch
trunk/jsword/etc/eclipse/jsword-ant-clean.launch
trunk/jsword/src/main/java/org/crosswire/common/activate/Activator.java
trunk/jsword/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
trunk/jsword/src/main/java/org/crosswire/common/config/NumberChoice.java
trunk/jsword/src/main/java/org/crosswire/common/diff/Bitap.java
trunk/jsword/src/main/java/org/crosswire/common/diff/DifferenceEngine.java
trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java
trunk/jsword/src/main/java/org/crosswire/common/history/History.java
trunk/jsword/src/main/java/org/crosswire/common/icu/DateFormatter.java
trunk/jsword/src/main/java/org/crosswire/common/options/DataType.java
trunk/jsword/src/main/java/org/crosswire/common/options/OptionList.java
trunk/jsword/src/main/java/org/crosswire/common/util/PatternFormatter.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsKey.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/OSISNames.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
trunk/jsword/src/test/java/org/crosswire/common/diff/BitapTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java
Log:
JS-136: Require Java 5
Converted from new Integer to Integer.valueOf. Also for Character, Float, and Long.
Modified: trunk/bibledesktop/.classpath
===================================================================
--- trunk/bibledesktop/.classpath 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/.classpath 2010-12-06 21:19:49 UTC (rev 2045)
@@ -7,7 +7,6 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="src/main/i18n"/>
<classpathentry kind="lib" path="jar/jsword-common-aqua-1.0.6/jsword-common-aqua-1.0.6.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-all.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-all.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -9,10 +9,9 @@
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/bibledesktop/build.xml}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-incremental.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
Modified: trunk/bibledesktop/etc/eclipse/BD-ant-install.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/etc/eclipse/BD-ant-install.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="install,"/>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -389,7 +389,7 @@
} else {
// TRANSLATOR: Dynamic label for prioritization slider on Advanced Search.
// The user has chosen a number other than 0 or 1.
- lblRank.setText(shaper.shape(Msg.gettext("Show {0} verses:", new Integer(val))));
+ lblRank.setText(shaper.shape(Msg.gettext("Show {0} verses:", Integer.valueOf(val))));
}
}
@@ -654,7 +654,7 @@
Dictionary labels = new Hashtable();
int max = DisplaySelectPane.getMaxNumRankedVerses();
for (int i = 0; i <= max; i += 20) {
- Integer label = new Integer(i);
+ Integer label = Integer.valueOf(i);
labels.put(label, new JLabel(shaper.shape(label.toString()), SwingConstants.CENTER));
}
return labels;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -58,11 +58,11 @@
break;
case LEVEL_CHAPTER:
- selected = new Integer(set.getVerse().getChapter());
+ selected = Integer.valueOf(set.getVerse().getChapter());
break;
case LEVEL_VERSE:
- selected = new Integer(set.getVerse().getVerse());
+ selected = Integer.valueOf(set.getVerse().getVerse());
break;
default:
@@ -151,7 +151,7 @@
return BibleInfo.getBookName(index + 1);
default:
- return new Integer(index + 1);
+ return Integer.valueOf(index + 1);
}
} catch (NoSuchVerseException ex) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -88,7 +88,7 @@
cboChapter.setModel(mdlChapter);
// There are over 100 chapters in some books
- cboChapter.setPrototypeDisplayValue(new Integer(999));
+ cboChapter.setPrototypeDisplayValue(Integer.valueOf(999));
cboChapter.addItemListener(cil);
cboChapter.setRenderer(new NumberCellRenderer());
}
@@ -101,7 +101,7 @@
cboVerse.setModel(mdlVerse);
// There are over 100 verses in some chapters
- cboVerse.setPrototypeDisplayValue(new Integer(999));
+ cboVerse.setPrototypeDisplayValue(Integer.valueOf(999));
cboVerse.addItemListener(cil);
cboVerse.setRenderer(new NumberCellRenderer());
}
@@ -132,14 +132,14 @@
}
int chapterval = newverse.getChapter();
- Integer chapternum = new Integer(chapterval);
+ Integer chapternum = Integer.valueOf(chapterval);
if (oldverse.getChapter() != chapterval || !cboChapter.getSelectedItem().equals(chapternum)) {
cboChapter.setSelectedItem(chapternum);
}
if (cboVerse != null) {
int verseval = newverse.getVerse();
- Integer versenum = new Integer(verseval);
+ Integer versenum = Integer.valueOf(verseval);
if (oldverse.getVerse() != verseval || !cboVerse.getSelectedItem().equals(versenum)) {
cboVerse.setSelectedItem(versenum);
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -97,7 +97,7 @@
advanced = new AdvancedSearchPane();
// TRANSLATOR: This is the initial title of a Bible View. {0} is a placeholder for a number that uniquely identifies the Bible View.
- title = Msg.gettext("Untitled {0}", new Integer(base++));
+ title = Msg.gettext("Untitled {0}", Integer.valueOf(base++));
actions = new ActionFactory(Msg.class, this);
@@ -347,7 +347,7 @@
// {1} is a placeholder for the number of verses that satisfied the search request.
// I18N(DMS): This needs support for singular/plural and to show internationalized numbers.
Reporter.informUser(this, Msg.gettext("There are {1} verses with: {0}", new Object[] {
- param, new Integer(total)
+ param, Integer.valueOf(total)
}));
} else {
// TRANSLATOR: The user has done a prioritized search and there are more hits that the user has requested.
@@ -520,7 +520,7 @@
switch (mode) {
case CLEAR:
// TRANSLATOR: This is the initial title of a Bible View. {0} is a placeholder for a number that uniquely identifies the Bible View.
- title = Msg.gettext("Untitled {0}", new Integer(base++));
+ title = Msg.gettext("Untitled {0}", Integer.valueOf(base++));
break;
case PASSAGE:
title = key.getName();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -136,7 +136,7 @@
int bookCount = Books.installed().getBooks().size();
// TRANSLATOR: This label give the number of books that are installed. {0} is a placeholder for the number.
desc = Msg.gettext("{0} books installed.", new Object[] {
- new Integer(bookCount)
+ Integer.valueOf(bookCount)
});
} else {
int bookCount = installer.getBooks().size();
@@ -147,7 +147,7 @@
} else {
// TRANSLATOR: This label gives the number of books available at a download site. {0} is a placeholder for the number.
desc = Msg.gettext("{0} books available for download.", new Object[] {
- new Integer(bookCount)
+ Integer.valueOf(bookCount)
});
}
}
@@ -441,7 +441,7 @@
// The pattern ###,###,###.# says to separate the number at every third digit and
// to show one digit of fractional part.
// The , and . will automatically be converted into the user's proper separators.
- formattedMsg = Msg.gettext("{0} is {1,number,###,###,###.#}MB. Continue?", new Object[] {name.getName(), new Float(size)});
+ formattedMsg = Msg.gettext("{0} is {1,number,###,###,###.#}MB. Continue?", new Object[] {name.getName(), Float.valueOf(size)});
} else {
// TRANSLATOR: The size of the book is provided so that the user can decide whether to continue a download.
// {0} is a placeholder for the name of the book.
@@ -449,7 +449,7 @@
// The pattern ###,###,###.# says to separate the number at every third digit and
// to show one digit of fractional part.
// The , and . will automatically be converted into the user's proper separators.
- formattedMsg = Msg.gettext("{0} is {1,number,###,###,###.#}KB. Continue?", new Object[] {name.getName(), new Float(size)});
+ formattedMsg = Msg.gettext("{0} is {1,number,###,###,###.#}KB. Continue?", new Object[] {name.getName(), Float.valueOf(size)});
}
// TRANSLATOR: Title to a dialog asking whether the user should download the book based on it's size.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -97,7 +97,7 @@
installer.setProxyHost(proxyHost.getText());
Integer pport = null;
try {
- pport = new Integer(proxyPort.getText());
+ pport = Integer.valueOf(proxyPort.getText());
} catch (NumberFormatException e) {
pport = null; // or -1
}
Modified: trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch
===================================================================
--- trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/bibledesktop-web/etc/eclipse/bibledesktopweb-ant-incremental.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/bibledesktop-web/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -203,12 +203,12 @@
VerseRange vr = new VerseRange(new Verse(b, c, 1), new Verse(b, c, BibleInfo.versesInChapter(b, c)));
return vr;
case 1:
- return new Integer(b);
+ return Integer.valueOf(b);
case 2:
- return new Integer(c);
+ return Integer.valueOf(c);
default:
float f = map.getPositionDimension(b, c, col - 3);
- return new Float(f);
+ return Float.valueOf(f);
}
} catch (NoSuchVerseException ex) {
Reporter.informUser(this, ex);
@@ -217,11 +217,11 @@
case 0:
return new VerseRange();
case 1:
- return new Integer(0);
+ return Integer.valueOf(0);
case 2:
- return new Integer(0);
+ return Integer.valueOf(0);
default:
- return new Float(0.0f);
+ return Float.valueOf(0.0f);
}
}
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -398,7 +398,7 @@
// Mac's don't have mnemonics.
// Otherwise, dig out the mnemonic.
if (!OSType.MAC.equals(OSType.getOSType())) {
- cwAction.putValue(Action.MNEMONIC_KEY, new Integer(cwLabel.getDisplayedMnemonic()));
+ cwAction.putValue(Action.MNEMONIC_KEY, Integer.valueOf(cwLabel.getDisplayedMnemonic()));
}
cwAction.putValue(Action.SHORT_DESCRIPTION, tooltip);
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -448,7 +448,7 @@
int line_num = st.getLineNumber(level);
String orig = name;
- Integer errorLine = new Integer(line_num);
+ Integer errorLine = Integer.valueOf(line_num);
// TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source is unavailable.
mylabel.setText(UserMsg.gettext("No File"));
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -75,10 +75,10 @@
size = new JComboBox();
size.setRenderer(new NumberCellRenderer());
for (int i = MIN_FONT_SIZE; i <= MAX_FONT_SIZE; i++) {
- size.addItem(new Integer(i));
+ size.addItem(Integer.valueOf(i));
}
- size.setSelectedItem(new Integer(RENDERED_FONT_SIZE));
+ size.setSelectedItem(Integer.valueOf(RENDERED_FONT_SIZE));
size.addItemListener(changer);
// TRANSLATOR: This is an option for a bold font.
@@ -114,7 +114,7 @@
fontc.name.setSelectedItem(font);
fontc.bold.setSelected(font.isBold());
fontc.italic.setSelected(font.isItalic());
- fontc.size.setSelectedItem(new Integer(font.getSize()));
+ fontc.size.setSelectedItem(Integer.valueOf(font.getSize()));
final ActionFactory actions = new ActionFactory(FontChooser.class, fontc);
@@ -174,7 +174,7 @@
bold.setSelected(newFont.isBold());
italic.setSelected(newFont.isItalic());
- size.setSelectedItem(new Integer(newFont.getSize()));
+ size.setSelectedItem(Integer.valueOf(newFont.getSize()));
suppressEvents = false;
fireStateChange();
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -296,8 +296,8 @@
Toolkit tk = win.getToolkit();
Dimension screenSize = tk.getScreenSize();
- int width = new Float(screenSize.width * percentOfScreen).intValue();
- int height = new Float(screenSize.height * percentOfScreen).intValue();
+ int width = Float.valueOf(screenSize.width * percentOfScreen).intValue();
+ int height = Float.valueOf(screenSize.height * percentOfScreen).intValue();
Dimension winSize = new Dimension(width, height);
win.setSize(winSize);
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -236,7 +236,7 @@
private String generateTitle() {
// TRANSLATOR: This is the label on a Bible View tab when it is cleared.
// {0} is a number to make the label unique.
- return UserMsg.gettext("Untitled {0}", new Integer(base++));
+ return UserMsg.gettext("Untitled {0}", Integer.valueOf(base++));
}
/**
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -52,7 +52,7 @@
Object[] metalUIDefaults = new Object[] {
"BibleViewPane.TabbedPaneUI", MetalBorderlessTabbedPaneUI.createUI(null),
- "SplitPane.dividerSize", new Integer(5),
+ "SplitPane.dividerSize", Integer.valueOf(5),
"SelectPanel.border", panelSelectBorder
};
Modified: trunk/jsword/etc/eclipse/jsword-ant-all.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-all.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/etc/eclipse/jsword-ant-all.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/jsword}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword/build.xml}"/>
Modified: trunk/jsword/etc/eclipse/jsword-ant-build.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-build.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/etc/eclipse/jsword-ant-build.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/jsword}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="build,"/>
Modified: trunk/jsword/etc/eclipse/jsword-ant-clean.launch
===================================================================
--- trunk/jsword/etc/eclipse/jsword-ant-clean.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/etc/eclipse/jsword-ant-clean.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword/build.xml"/>
</listAttribute>
@@ -10,7 +10,7 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/jsword}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,"/>
Modified: trunk/jsword/src/main/java/org/crosswire/common/activate/Activator.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/activate/Activator.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/activate/Activator.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -81,7 +81,7 @@
}
public static void deactivateAll() {
- Iterator iter = activated.iterator();
+ Iterator<Activatable> iter = activated.iterator();
while (iter.hasNext()) {
deactivate((Activatable) iter.next());
}
@@ -90,7 +90,7 @@
/**
* The list of things that we have activated
*/
- private static Set activated = new HashSet();
+ private static Set<Activatable> activated = new HashSet<Activatable>();
/**
* The object we use to prevent others from
Modified: trunk/jsword/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -56,7 +56,7 @@
Element alternative = (Element) iter.next();
int number = Integer.parseInt(alternative.getAttributeValue("number"));
String name = configResources.getString(prefix + number);
- options.put(new Integer(number), name);
+ options.put(Integer.valueOf(number), name);
}
}
@@ -101,7 +101,7 @@
public Object convertToObject(String orig) {
// First check to see if this is a number
try {
- return new Integer(orig);
+ return Integer.valueOf(orig);
} catch (NumberFormatException ex) {
Iterator iter = options.entrySet().iterator();
while (iter.hasNext()) {
@@ -110,7 +110,7 @@
return mapEntry.getKey();
}
}
- return new Integer(0);
+ return Integer.valueOf(0);
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/config/NumberChoice.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/config/NumberChoice.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/config/NumberChoice.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -61,6 +61,6 @@
*/
/* @Override */
public Object convertToObject(String orig) {
- return new Integer(Convert.string2Int(orig));
+ return Integer.valueOf(Convert.string2Int(orig));
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/Bitap.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/Bitap.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/Bitap.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -131,7 +131,7 @@
}
for (int j = finish - 1; j >= start; j--) {
- Character curChar = new Character(text.charAt(j));
+ Character curChar = Character.valueOf(text.charAt(j));
int mask = alphabet.containsKey(curChar) ? ((Integer) alphabet.get(curChar)).intValue() : 0;
if (d == 0) { // First pass: exact match.
rd[j] = ((rd[j + 1] << 1) | 1) & mask;
@@ -201,11 +201,11 @@
assert len <= Bitap.MAXBITS : "Pattern too long for this application.";
for (int i = 0; i < len; i++) {
- Character c = new Character(pattern.charAt(i));
+ Character c = Character.valueOf(pattern.charAt(i));
Integer value = (Integer) alphabet.get(c);
int mask = value == null ? 0 : value.intValue();
mask |= (int) Math.pow(2, len - i - 1);
- alphabet.put(c, new Integer(mask));
+ alphabet.put(c, Integer.valueOf(mask));
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/DifferenceEngine.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/DifferenceEngine.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/DifferenceEngine.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -91,8 +91,8 @@
List vMap2 = new ArrayList();
Map v1 = new HashMap();
Map v2 = new HashMap();
- v1.put(new Integer(1), new Integer(0));
- v2.put(new Integer(1), new Integer(0));
+ v1.put(Integer.valueOf(1), Integer.valueOf(0));
+ v2.put(Integer.valueOf(1), Integer.valueOf(0));
int x;
int y;
String footstep; // Used to track overlapping paths.
@@ -110,9 +110,9 @@
// Walk the front path one step.
vMap1.add(new HashSet()); // Adds at index 'd'.
for (int k = -d; k <= d; k += 2) {
- Integer kPlus1Key = new Integer(k + 1);
+ Integer kPlus1Key = Integer.valueOf(k + 1);
Integer kPlus1Value = (Integer) v1.get(kPlus1Key);
- Integer kMinus1Key = new Integer(k - 1);
+ Integer kMinus1Key = Integer.valueOf(k - 1);
Integer kMinus1Value = (Integer) v1.get(kMinus1Key);
if (k == -d || k != d && kMinus1Value.intValue() < kPlus1Value.intValue()) {
x = kPlus1Value.intValue();
@@ -125,7 +125,7 @@
done = true;
}
if (!front) {
- footsteps.put(footstep, new Integer(d));
+ footsteps.put(footstep, Integer.valueOf(d));
}
while (!done && x < source.length() && y < target.length() && source.charAt(x) == target.charAt(y)) {
x++;
@@ -135,10 +135,10 @@
done = true;
}
if (!front) {
- footsteps.put(footstep, new Integer(d));
+ footsteps.put(footstep, Integer.valueOf(d));
}
}
- v1.put(new Integer(k), new Integer(x));
+ v1.put(Integer.valueOf(k), Integer.valueOf(x));
Set s = (Set) vMap1.get(d);
s.add(x + "," + y);
if (done) {
@@ -154,9 +154,9 @@
// Walk the reverse path one step.
vMap2.add(new HashSet()); // Adds at index 'd'.
for (int k = -d; k <= d; k += 2) {
- Integer kPlus1Key = new Integer(k + 1);
+ Integer kPlus1Key = Integer.valueOf(k + 1);
Integer kPlus1Value = (Integer) v2.get(kPlus1Key);
- Integer kMinus1Key = new Integer(k - 1);
+ Integer kMinus1Key = Integer.valueOf(k - 1);
Integer kMinus1Value = (Integer) v2.get(kMinus1Key);
if (k == -d || k != d && kMinus1Value.intValue() < kPlus1Value.intValue()) {
x = kPlus1Value.intValue();
@@ -169,7 +169,7 @@
done = true;
}
if (front) {
- footsteps.put(footstep, new Integer(d));
+ footsteps.put(footstep, Integer.valueOf(d));
}
while (!done && x < source.length() && y < target.length() && source.charAt(source.length() - x - 1) == target.charAt(target.length() - y - 1)) {
x++;
@@ -179,11 +179,11 @@
done = true;
}
if (front) {
- footsteps.put(footstep, new Integer(d));
+ footsteps.put(footstep, Integer.valueOf(d));
}
}
- v2.put(new Integer(k), new Integer(x));
+ v2.put(Integer.valueOf(k), Integer.valueOf(x));
Set s = (Set) vMap2.get(d);
s.add(x + "," + y);
if (done) {
Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -132,7 +132,7 @@
buf.append(String.valueOf((char) charInt.intValue()));
} else {
linearray.add(line);
- linehash.put(line, new Integer(linearray.size() - 1));
+ linehash.put(line, Integer.valueOf(linearray.size() - 1));
buf.append(String.valueOf((char) (linearray.size() - 1)));
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/history/History.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/history/History.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/history/History.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -218,7 +218,7 @@
* @param obj
*/
private void visit(Object obj) {
- history.put(obj, new Long(System.currentTimeMillis()));
+ history.put(obj, Long.valueOf(System.currentTimeMillis()));
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/common/icu/DateFormatter.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/icu/DateFormatter.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/icu/DateFormatter.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -63,7 +63,7 @@
int.class
};
Object[] instanceParams = {
- new Integer(format)
+ Integer.valueOf(format)
};
fmt.formatter = ReflectionUtil.invoke(fmt.formatterClass, fmt.formatterClass, "getDateInstance", instanceParams, instanceTypes);
} catch (NoSuchMethodException e) {
Modified: trunk/jsword/src/main/java/org/crosswire/common/options/DataType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/options/DataType.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/options/DataType.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -69,7 +69,7 @@
* .String)
*/
public Object convertFromString(String value) {
- return new Integer(Convert.string2Int(value));
+ return Integer.valueOf(Convert.string2Int(value));
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/common/options/OptionList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/options/OptionList.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/options/OptionList.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -101,7 +101,7 @@
* @return the matching Option, null otherwise.
*/
public Option getShortOption(char key) {
- Character keyChar = new Character(key);
+ Character keyChar = Character.valueOf(key);
Option match = null;
if (shortOptions.containsKey(keyChar)) {
match = (Option) shortOptions.get(keyChar);
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/PatternFormatter.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/PatternFormatter.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/PatternFormatter.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -101,7 +101,7 @@
throwable, // 4
record.getSourceClassName(), // 5
record.getSourceMethodName(), // 6
- new Long(record.getSequenceNumber()), // 7
+ Long.valueOf(record.getSequenceNumber()), // 7
lineSeparator, // 8
};
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsKey.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsKey.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsKey.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -139,7 +139,7 @@
*/
public static String external2internal(Calendar externalKey) {
Object[] objs = {
- new Integer(1 + externalKey.get(Calendar.MONTH)), new Integer(externalKey.get(Calendar.DATE))
+ Integer.valueOf(1 + externalKey.get(Calendar.MONTH)), Integer.valueOf(externalKey.get(Calendar.DATE))
};
return KEY_FORMAT.format(objs);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -348,7 +348,7 @@
* single value integer, unknown use, some indications that we ought to be
* using it
*/
- public static final ConfigEntryType BLOCK_COUNT = new ConfigEntryType("BlockCount", new Integer(200))
+ public static final ConfigEntryType BLOCK_COUNT = new ConfigEntryType("BlockCount", Integer.valueOf(200))
{
/*
* (non-Javadoc)
@@ -375,7 +375,7 @@
*/
public Object convert(String input) {
try {
- return new Integer(input);
+ return Integer.valueOf(input);
} catch (NumberFormatException e) {
return getDefault();
}
@@ -472,7 +472,7 @@
*/
public Object convert(String input) {
try {
- return new Integer(input);
+ return Integer.valueOf(input);
} catch (NumberFormatException e) {
return null;
}
@@ -754,7 +754,7 @@
*/
public Object convert(String input) {
try {
- return new Integer(input);
+ return Integer.valueOf(input);
} catch (NumberFormatException e) {
return null;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -394,7 +394,7 @@
Date date = nameDF.parse(keytitle);
greg.setTime(date);
Object[] objs = {
- new Integer(1 + greg.get(Calendar.MONTH)), new Integer(greg.get(Calendar.DATE))
+ Integer.valueOf(1 + greg.get(Calendar.MONTH)), Integer.valueOf(greg.get(Calendar.DATE))
};
return DATE_KEY_FORMAT.format(objs);
} catch (ParseException e) {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -242,7 +242,7 @@
}
msgFormat.format(new Object[] {
- bookName, new Integer(chapter), chapterName
+ bookName, Integer.valueOf(chapter), chapterName
}, buf, pos);
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -290,7 +290,7 @@
// {1,number,integer} is a placeholder for the count of Bible books. It works the same way as the count of verses.
// {1,choice,0#books|1#book|1<books} is the placeholder for the singular or plural of "book"
return UserMsg.gettext("{0,number,integer} {0,choice,0#verses|1#verse|1<verses} in {1,number,integer} {1,choice,0#books|1#book|1<books}", new Object[] {
- new Integer(countVerses()), new Integer(booksInPassage())
+ Integer.valueOf(countVerses()), Integer.valueOf(booksInPassage())
});
}
@@ -437,7 +437,7 @@
for (int i = 0; i <= offset; i++) {
if (!it.hasNext()) {
Object[] params = new Object[] {
- new Integer(offset), new Integer(countVerses())
+ Integer.valueOf(offset), Integer.valueOf(countVerses())
};
throw new ArrayIndexOutOfBoundsException(Msg.ABSTRACT_INDEX.toString(params));
}
@@ -460,7 +460,7 @@
for (int i = 0; i <= offset; i++) {
if (!it.hasNext()) {
Object[] params = new Object[] {
- new Integer(offset), new Integer(countVerses())
+ Integer.valueOf(offset), Integer.valueOf(countVerses())
};
throw new ArrayIndexOutOfBoundsException(Msg.ABSTRACT_INDEX.toString(params));
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -270,7 +270,7 @@
// The exception is actually thrown, then it is a lot slower
// I'd like to think that the norm is to get it right
throw new NoSuchVerseException(Msg.BOOKS_BOOK, new Object[] {
- new Integer(book)
+ Integer.valueOf(book)
});
}
}
@@ -295,7 +295,7 @@
// I'd like to think that the norm is to get it right
Object[] params = new Object[] {
- new Integer(book), new Integer(chapter)
+ Integer.valueOf(book), Integer.valueOf(chapter)
};
throw new NoSuchVerseException(Msg.BOOKS_BOOKCHAP, params);
}
@@ -318,7 +318,7 @@
// The exception is actually thrown, then it is a lot slower
// I'd like to think that the norm is to get it right
throw new NoSuchVerseException(Msg.BOOKS_BOOK, new Object[] {
- new Integer(book)
+ Integer.valueOf(book)
});
}
}
@@ -373,7 +373,7 @@
public static int[] decodeOrdinal(int ordinal) throws NoSuchVerseException {
if (ordinal < 1 || ordinal > BibleInfo.versesInBible()) {
Object[] params = new Object[] {
- new Integer(BibleInfo.versesInBible()), new Integer(ordinal)
+ Integer.valueOf(BibleInfo.versesInBible()), Integer.valueOf(ordinal)
};
throw new NoSuchVerseException(Msg.BOOKS_DECODE, params);
}
@@ -416,14 +416,14 @@
// Check the book
if (book < 1 || book > BOOKS_IN_BIBLE) {
throw new NoSuchVerseException(Msg.BOOKS_BOOK, new Object[] {
- new Integer(book)
+ Integer.valueOf(book)
});
}
// Check the chapter
if (chapter < 1 || chapter > chaptersInBook(book)) {
Object[] params = new Object[] {
- new Integer(1), new Integer(chaptersInBook(book)), getPreferredBookName(book), new Integer(chapter),
+ Integer.valueOf(1), Integer.valueOf(chaptersInBook(book)), getPreferredBookName(book), Integer.valueOf(chapter),
};
// TRANSLATOR: The user supplied a chapter that was out of bounds. This tells them what is allowed.
// {0} is the lowest value that is allowed. Currently this is 1, later it will be 0.
@@ -436,7 +436,7 @@
// Check the verse
if (verse < 1 || verse > versesInChapter(book, chapter)) {
Object[] params = new Object[] {
- new Integer(1), new Integer(versesInChapter(book, chapter)), getPreferredBookName(book), new Integer(chapter), new Integer(verse),
+ Integer.valueOf(1), Integer.valueOf(versesInChapter(book, chapter)), getPreferredBookName(book), Integer.valueOf(chapter), Integer.valueOf(verse),
};
// TRANSLATOR: The user supplied a verse number that was out of bounds. This tells them what is allowed.
// {0} is the lowest value that is allowed. Currently this is 1, later it will be 0.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -58,7 +58,7 @@
// The exception is actually thrown, then it is a lot slower
// I'd like to think that the norm is to get it right
throw new NoSuchVerseException(Msg.BOOKS_BOOK, new Object[] {
- new Integer(book)
+ Integer.valueOf(book)
});
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/OSISNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/OSISNames.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/OSISNames.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -65,7 +65,7 @@
// The exception is actually thrown, then it is a lot slower
// I'd like to think that the norm is to get it right
throw new NoSuchVerseException(Msg.BOOKS_BOOK, new Object[] {
- new Integer(book)
+ Integer.valueOf(book)
});
}
}
@@ -114,7 +114,7 @@
for (int i = 0; i < osisBooks.length; i++) {
osisBooks[i] = getString(resources, OSIS_KEY + (i + 1));
- osisMap.put(BookName.normalize(osisBooks[i], OSIS_LOCALE), new Integer(i + 1));
+ osisMap.put(BookName.normalize(osisBooks[i], OSIS_LOCALE), Integer.valueOf(i + 1));
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -184,7 +184,7 @@
public String getSectionName(int section) throws NoSuchVerseException {
if (section == 0) {
throw new NoSuchVerseException(Msg.BOOKS_SECTION, new Object[] {
- new Integer(section)
+ Integer.valueOf(section)
});
}
@@ -205,7 +205,7 @@
// The exception is actually thrown, then it is a lot slower
// I'd like to think that the norm is to get it right
throw new NoSuchVerseException(Msg.BOOKS_SECTION, new Object[] {
- new Integer(section)
+ Integer.valueOf(section)
});
}
}
Modified: trunk/jsword/src/test/java/org/crosswire/common/diff/BitapTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/common/diff/BitapTest.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/test/java/org/crosswire/common/diff/BitapTest.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -21,16 +21,16 @@
// Initialise the bitmasks for Bitap
Map bitmask;
bitmask = new HashMap();
- bitmask.put(new Character('a'), new Integer(4));
- bitmask.put(new Character('b'), new Integer(2));
- bitmask.put(new Character('c'), new Integer(1));
+ bitmask.put(Character.valueOf('a'), Integer.valueOf(4));
+ bitmask.put(Character.valueOf('b'), Integer.valueOf(2));
+ bitmask.put(Character.valueOf('c'), Integer.valueOf(1));
Bitap bitap = new Bitap("", "abc", 0);
bitap.alphabet();
assertEquals("match_alphabet: Unique.", bitmask, bitap.getAlphabet());
bitmask = new HashMap();
- bitmask.put(new Character('a'), new Integer(37));
- bitmask.put(new Character('b'), new Integer(18));
- bitmask.put(new Character('c'), new Integer(8));
+ bitmask.put(Character.valueOf('a'), Integer.valueOf(37));
+ bitmask.put(Character.valueOf('b'), Integer.valueOf(18));
+ bitmask.put(Character.valueOf('c'), Integer.valueOf(8));
bitap = new Bitap("", "abcaba", 0);
bitap.alphabet();
assertEquals("match_alphabet: Duplicates.", bitmask, bitap.getAlphabet());
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -303,7 +303,7 @@
public void testEquals() {
assertTrue(!gen11.equals(null));
- assertTrue(!gen11.equals(new Integer(0)));
+ assertTrue(!gen11.equals(Integer.valueOf(0)));
assertTrue(!gen11.equals("org.crosswire.jsword.passage.Verse"));
assertTrue(gen11.equals(gen11a));
assertTrue(!gen11.equals(gen12));
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -175,7 +175,7 @@
job.beginJob(predictbase, predicturl);
job.setSectionName(LimboMsg.DEBUG_STEPS.toString(new Object[] {
- new Integer(0), new Integer(steps)
+ Integer.valueOf(0), Integer.valueOf(steps)
}));
log.debug("starting test job:");
@@ -188,7 +188,7 @@
job.setWork((i * 100) / steps);
job.setSectionName(LimboMsg.DEBUG_STEPS.toString(new Object[] {
- new Integer(i), new Integer(steps)
+ Integer.valueOf(i), Integer.valueOf(steps)
}));
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogEntriesPanel.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogEntriesPanel.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/journal/BlogEntriesPanel.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -81,8 +81,8 @@
null, null, null, null
}
}, new String[] {
- Msg.ENTRY_TITLE.toString(new Integer(1)), Msg.ENTRY_TITLE.toString(new Integer(2)), Msg.ENTRY_TITLE.toString(new Integer(3)),
- Msg.ENTRY_TITLE.toString(new Integer(4)),
+ Msg.ENTRY_TITLE.toString(Integer.valueOf(1)), Msg.ENTRY_TITLE.toString(Integer.valueOf(2)), Msg.ENTRY_TITLE.toString(Integer.valueOf(3)),
+ Msg.ENTRY_TITLE.toString(Integer.valueOf(4)),
}));
mScrollPane.setViewportView(mBlogEntries);
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -147,7 +147,7 @@
}
title.setText(names.get(1) + LimboMsg.PROPERTIES_POSN.toString(new Object[] {
- new Integer(1), new Integer(wcards)
+ Integer.valueOf(1), Integer.valueOf(wcards)
}));
SwingUtilities.updateComponentTreeUI(this);
@@ -227,7 +227,7 @@
}
title.setText(names.get(posn) + LimboMsg.PROPERTIES_POSN.toString(new Object[] {
- new Integer(posn + 1), new Integer(wcards)
+ Integer.valueOf(posn + 1), Integer.valueOf(wcards)
}));
actions.getAction(BACK).setEnabled(posn != 0);
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/BeanPanel.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -186,7 +186,7 @@
Integer i = null;
if (data != null && data.length() > 0) {
try {
- i = new Integer(data);
+ i = Integer.valueOf(data);
} catch (NumberFormatException e) {
i = null;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -25,7 +25,7 @@
if (local.get() != null)
throw new IllegalStateException("Already started");
- Long start = new Long(System.currentTimeMillis());
+ Long start = Long.valueOf(System.currentTimeMillis());
origin.set(start);
Map times = new HashMap();
@@ -42,7 +42,7 @@
if (times == null)
throw new IllegalStateException("Not started");
- times.put(name, new Long(System.currentTimeMillis() - start));
+ times.put(name, Long.valueOf(System.currentTimeMillis() - start));
}
/**
@@ -55,7 +55,7 @@
if (times == null)
throw new IllegalStateException("Not started");
- times.put("STOP", new Long(System.currentTimeMillis() - start));
+ times.put("STOP", Long.valueOf(System.currentTimeMillis() - start));
local.set(null);
origin.set(null);
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/Strongs.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -242,7 +242,7 @@
case HEBREW:
if (number > HEBREW_MAX || number < 1) {
throw new BookException(LimboMsg.STRONGS_ERROR_HEBREW, new Object[] {
- new Integer(HEBREW_MAX), new Integer(number)
+ Integer.valueOf(HEBREW_MAX), Integer.valueOf(number)
});
}
break;
@@ -250,7 +250,7 @@
case GREEK:
if (number > GREEK_MAX || number < 1) {
throw new BookException(LimboMsg.STRONGS_ERROR_GREEK, new Object[] {
- new Integer(GREEK_MAX), new Integer(number)
+ Integer.valueOf(GREEK_MAX), Integer.valueOf(number)
});
}
// We have not checked for 1418, 2717, 3203-3302, 4452 which do not
@@ -261,7 +261,7 @@
case PARSING:
if (number < 1) {
throw new BookException(LimboMsg.STRONGS_ERROR_PARSING, new Object[] {
- new Integer(number)
+ Integer.valueOf(number)
});
}
// The correct range seems to be: 0, 5625-5773, 8675-8809, but not
@@ -272,7 +272,7 @@
default:
throw new BookException(LimboMsg.STRONGS_ERROR_TYPE, new Object[] {
- new Integer(number)
+ Integer.valueOf(number)
});
}
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -122,7 +122,7 @@
if (!FTPReply.isPositiveCompletion(reply1)) {
String text1 = ftp.getReplyString();
throw new InstallException(FTPMsg.CONNECT_REFUSED, new Object[] {
- host, new Integer(reply1), text1
+ host, Integer.valueOf(reply1), text1
});
}
@@ -135,7 +135,7 @@
if (!FTPReply.isPositiveCompletion(reply1)) {
String text2 = ftp.getReplyString();
throw new InstallException(FTPMsg.AUTH_REFUSED, new Object[] {
- username, new Integer(reply1), text2
+ username, Integer.valueOf(reply1), text2
});
}
@@ -148,7 +148,7 @@
if (!FTPReply.isPositiveCompletion(reply1)) {
String text3 = ftp.getReplyString();
throw new InstallException(FTPMsg.CWD_REFUSED, new Object[] {
- dir, new Integer(reply1), text3
+ dir, Integer.valueOf(reply1), text3
});
}
@@ -167,7 +167,7 @@
if (!FTPReply.isPositiveCompletion(reply)) {
String text = ftp.getReplyString();
throw new InstallException(FTPMsg.DOWNLOAD_REFUSED, new Object[] {
- FILE_LIST_GZ, new Integer(reply), text
+ FILE_LIST_GZ, Integer.valueOf(reply), text
});
}
out.close();
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -156,7 +156,7 @@
if (create) {
// So we have to add the word in
array[count] = data;
- hash.put(data, new Integer(count));
+ hash.put(data, Integer.valueOf(count));
return count++;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -99,7 +99,7 @@
din.readFully(aword);
String word = new String(aword);
- hash.put(word, new Integer(i));
+ hash.put(word, Integer.valueOf(i));
array[i] = word;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordItemsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordItemsMem.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordItemsMem.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -188,7 +188,7 @@
din.readFully(aword);
String word = new String(aword);
- hash.put(word, new Integer(i));
+ hash.put(word, Integer.valueOf(i));
array[i] = word;
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewDurusauIM.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewDurusauIM.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewDurusauIM.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -22,7 +22,7 @@
/* @Override */
public String translate(char in) {
- String retVal = (String) charMap.get(new Integer(in));
+ String retVal = (String) charMap.get(Integer.valueOf(in));
if (retVal == null)
retVal = new String() + in;
@@ -31,391 +31,391 @@
private void init() {
// '1' 0591 HEBREW ACCENT ETNAHTA
- charMap.put(new Integer('1'), new String(new char[] {
+ charMap.put(Integer.valueOf('1'), new String(new char[] {
0x0591
}));
// '2' 0592 HEBREW ACCENT SEGOL
- charMap.put(new Integer('2'), new String(new char[] {
+ charMap.put(Integer.valueOf('2'), new String(new char[] {
0x0592
}));
// '3' 0593 HEBREW ACCENT SHALSHELET
- charMap.put(new Integer('3'), new String(new char[] {
+ charMap.put(Integer.valueOf('3'), new String(new char[] {
0x0593
}));
// '4' 0594 HEBREW ACCENT ZAQEF QATAN
- charMap.put(new Integer('4'), new String(new char[] {
+ charMap.put(Integer.valueOf('4'), new String(new char[] {
0x0594
}));
// '5' 0595 HEBREW ACCENT ZAQEF GADOL
- charMap.put(new Integer('5'), new String(new char[] {
+ charMap.put(Integer.valueOf('5'), new String(new char[] {
0x0595
}));
// '6' 0596 HEBREW ACCENT TIPEHA
- charMap.put(new Integer('6'), new String(new char[] {
+ charMap.put(Integer.valueOf('6'), new String(new char[] {
0x0596
}));
// '7' 0597 HEBREW ACCENT REVIA
- charMap.put(new Integer('7'), new String(new char[] {
+ charMap.put(Integer.valueOf('7'), new String(new char[] {
0x0597
}));
// '8' 0598 HEBREW ACCENT ZARQA
- charMap.put(new Integer('8'), new String(new char[] {
+ charMap.put(Integer.valueOf('8'), new String(new char[] {
0x0598
}));
// '9' 0599 HEBREW ACCENT PASHTA
- charMap.put(new Integer('9'), new String(new char[] {
+ charMap.put(Integer.valueOf('9'), new String(new char[] {
0x0599
}));
// '10' 059A HEBREW ACCENT YETIV //assuming 0
- charMap.put(new Integer('0'), new String(new char[] {
+ charMap.put(Integer.valueOf('0'), new String(new char[] {
0x059A
}));
// '-' 059B HEBREW ACCENT TEVIR
- charMap.put(new Integer('-'), new String(new char[] {
+ charMap.put(Integer.valueOf('-'), new String(new char[] {
0x059B
}));
// '=' 059C HEBREW ACCENT GERESH
- charMap.put(new Integer('='), new String(new char[] {
+ charMap.put(Integer.valueOf('='), new String(new char[] {
0x059C
}));
// (shifted keyboard)
// '!' 059D HEBREW ACCENT GERESH MUQDAM
- charMap.put(new Integer('!'), new String(new char[] {
+ charMap.put(Integer.valueOf('!'), new String(new char[] {
0x059D
}));
// '@' 059E HEBREW ACCENT GERSHAYIM
- charMap.put(new Integer('@'), new String(new char[] {
+ charMap.put(Integer.valueOf('@'), new String(new char[] {
0x059E
}));
// '#' 059F HEBREW ACCENT QARNEY PARA
- charMap.put(new Integer('#'), new String(new char[] {
+ charMap.put(Integer.valueOf('#'), new String(new char[] {
0x059F
}));
// '$' 05A0 HEBREW ACCENT TELISHA GEDOLA
- charMap.put(new Integer('$'), new String(new char[] {
+ charMap.put(Integer.valueOf('$'), new String(new char[] {
0x05A0
}));
// '%' 05A1 HEBREW ACCENT PAZER
- charMap.put(new Integer('%'), new String(new char[] {
+ charMap.put(Integer.valueOf('%'), new String(new char[] {
0x05A1
}));
// '^' 05A3 HEBREW ACCENT MUNAH
- charMap.put(new Integer('^'), new String(new char[] {
+ charMap.put(Integer.valueOf('^'), new String(new char[] {
0x05A3
}));
// '&' 05A4 HEBREW ACCENT MAHAPAKH
- charMap.put(new Integer('&'), new String(new char[] {
+ charMap.put(Integer.valueOf('&'), new String(new char[] {
0x05A4
}));
// '*' 05A5 HEBREW ACCENT MERKHA
- charMap.put(new Integer('*'), new String(new char[] {
+ charMap.put(Integer.valueOf('*'), new String(new char[] {
0x05A5
}));
// '(' 05A6 HEBREW ACCENT MERKHA KEFULA
- charMap.put(new Integer('('), new String(new char[] {
+ charMap.put(Integer.valueOf('('), new String(new char[] {
0x05A6
}));
// ')' 05A7 HEBREW ACCENT DARGA
- charMap.put(new Integer(')'), new String(new char[] {
+ charMap.put(Integer.valueOf(')'), new String(new char[] {
0x05A7
}));
// '_' 05A8 HEBREW ACCENT QADMA
- charMap.put(new Integer('_'), new String(new char[] {
+ charMap.put(Integer.valueOf('_'), new String(new char[] {
0x05A8
}));
// '+' 05A9 HEBREW ACCENT TELISHA QETANA
- charMap.put(new Integer('+'), new String(new char[] {
+ charMap.put(Integer.valueOf('+'), new String(new char[] {
0x05A9
}));
// 'Z' 05AA HEBREW ACCENT YERAH BEN YOMO
- charMap.put(new Integer('Z'), new String(new char[] {
+ charMap.put(Integer.valueOf('Z'), new String(new char[] {
0x05AA
}));
// 'X' 05AB HEBREW ACCENT OLE
- charMap.put(new Integer('X'), new String(new char[] {
+ charMap.put(Integer.valueOf('X'), new String(new char[] {
0x05AB
}));
// 'C' 05AC HEBREW ACCENT ILUY
- charMap.put(new Integer('C'), new String(new char[] {
+ charMap.put(Integer.valueOf('C'), new String(new char[] {
0x05AC
}));
// 'V' 05AD HEBREW ACCENT DEHI
- charMap.put(new Integer('V'), new String(new char[] {
+ charMap.put(Integer.valueOf('V'), new String(new char[] {
0x05AD
}));
// 'B' 05AE HEBREW ACCENT ZINOR
- charMap.put(new Integer('B'), new String(new char[] {
+ charMap.put(Integer.valueOf('B'), new String(new char[] {
0x05AE
}));
// "N' 05AF HEBREW MARK MASORA CIRCLE
- charMap.put(new Integer('N'), new String(new char[] {
+ charMap.put(Integer.valueOf('N'), new String(new char[] {
0x05AF
}));
// 'Q' 05B0 HEBREW POINT SHEVA
- charMap.put(new Integer('Q'), new String(new char[] {
+ charMap.put(Integer.valueOf('Q'), new String(new char[] {
0x05B0
}));
// 'W' 05B1 HEBREW POINT HATAF SEGOL
- charMap.put(new Integer('W'), new String(new char[] {
+ charMap.put(Integer.valueOf('W'), new String(new char[] {
0x05B1
}));
// 'E' 05B2 HEBREW POINT HATAF PATAH
- charMap.put(new Integer('E'), new String(new char[] {
+ charMap.put(Integer.valueOf('E'), new String(new char[] {
0x05B2
}));
// 'R' 05B3 HEBREW POINT HATAF QAMATS
- charMap.put(new Integer('R'), new String(new char[] {
+ charMap.put(Integer.valueOf('R'), new String(new char[] {
0x05B3
}));
// 'T' 05B4 HEBREW POINT HIRIQ
- charMap.put(new Integer('T'), new String(new char[] {
+ charMap.put(Integer.valueOf('T'), new String(new char[] {
0x05B4
}));
// 'Y' 05B5 HEBREW POINT TSERE
- charMap.put(new Integer('Y'), new String(new char[] {
+ charMap.put(Integer.valueOf('Y'), new String(new char[] {
0x05B5
}));
// 'U' 05B6 HEBREW POINT SEGOL
- charMap.put(new Integer('U'), new String(new char[] {
+ charMap.put(Integer.valueOf('U'), new String(new char[] {
0x05B6
}));
// 'I' 05B7 HEBREW POINT PATAH
- charMap.put(new Integer('I'), new String(new char[] {
+ charMap.put(Integer.valueOf('I'), new String(new char[] {
0x05B7
}));
// 'O' 05B8 HEBREW POINT QAMATS
- charMap.put(new Integer('O'), new String(new char[] {
+ charMap.put(Integer.valueOf('O'), new String(new char[] {
0x05B8
}));
// 'P' 05B9 HEBREW POINT HOLAM
- charMap.put(new Integer('P'), new String(new char[] {
+ charMap.put(Integer.valueOf('P'), new String(new char[] {
0x05B9
}));
// 'A' 05BB HEBREW POINT QUBUTS
- charMap.put(new Integer('A'), new String(new char[] {
+ charMap.put(Integer.valueOf('A'), new String(new char[] {
0x05BB
}));
// 'S' 05BC HEBREW POINT DAGESH OR MAPIQ
- charMap.put(new Integer('S'), new String(new char[] {
+ charMap.put(Integer.valueOf('S'), new String(new char[] {
0x05BC
}));
// 'D' 05BD HEBREW POINT METEG
- charMap.put(new Integer('D'), new String(new char[] {
+ charMap.put(Integer.valueOf('D'), new String(new char[] {
0x05BD
}));
// 'F' 05BE HEBREW PUNCTUATION MAQAF
- charMap.put(new Integer('F'), new String(new char[] {
+ charMap.put(Integer.valueOf('F'), new String(new char[] {
0x05BE
}));
// 'G' 05BF HEBREW POINT RAFE
- charMap.put(new Integer('G'), new String(new char[] {
+ charMap.put(Integer.valueOf('G'), new String(new char[] {
0x05BF
}));
// 'H' 05C0 HEBREW PUNCTUATION PASEQ
- charMap.put(new Integer('H'), new String(new char[] {
+ charMap.put(Integer.valueOf('H'), new String(new char[] {
0x05C0
}));
// 'J' 05C1 HEBREW POINT SHIN DOT
- charMap.put(new Integer('J'), new String(new char[] {
+ charMap.put(Integer.valueOf('J'), new String(new char[] {
0x05C1
}));
// 'K' 05C2 HEBREW POINT SIN DOT
- charMap.put(new Integer('K'), new String(new char[] {
+ charMap.put(Integer.valueOf('K'), new String(new char[] {
0x05C2
}));
// 'L' 05C3 HEBREW PUNCTUATION SOF PASUQ
- charMap.put(new Integer('L'), new String(new char[] {
+ charMap.put(Integer.valueOf('L'), new String(new char[] {
0x05C3
}));
// 'M' 05C4 HEBREW MARK UPPER DOT
- charMap.put(new Integer('M'), new String(new char[] {
+ charMap.put(Integer.valueOf('M'), new String(new char[] {
0x05C4
}));
// (unshifted keyboard)
// 't' 05D0 HEBREW LETTER ALEF
- charMap.put(new Integer('t'), new String(new char[] {
+ charMap.put(Integer.valueOf('t'), new String(new char[] {
0x05D0
}));
// 'c' 05D1 HEBREW LETTER BET
- charMap.put(new Integer('c'), new String(new char[] {
+ charMap.put(Integer.valueOf('c'), new String(new char[] {
0x05D1
}));
// 'd' 05D2 HEBREW LETTER GIMEL
- charMap.put(new Integer('d'), new String(new char[] {
+ charMap.put(Integer.valueOf('d'), new String(new char[] {
0x05D2
}));
// 's' 005D3 HEBREW LETTER DALET
- charMap.put(new Integer('s'), new String(new char[] {
+ charMap.put(Integer.valueOf('s'), new String(new char[] {
0x05D3
}));
// 'v' 05D4 HEBREW LETTER HE
- charMap.put(new Integer('v'), new String(new char[] {
+ charMap.put(Integer.valueOf('v'), new String(new char[] {
0x05D4
}));
// 'u' 05D5 HEBREW LETTER VAV
- charMap.put(new Integer('u'), new String(new char[] {
+ charMap.put(Integer.valueOf('u'), new String(new char[] {
0x05D5
}));
// 'z'' 05D6 HEBREW LETTER ZAYIN
- charMap.put(new Integer('z'), new String(new char[] {
+ charMap.put(Integer.valueOf('z'), new String(new char[] {
0x05D6
}));
// 'j' 05D7 HEBREW LETTER HET
- charMap.put(new Integer('j'), new String(new char[] {
+ charMap.put(Integer.valueOf('j'), new String(new char[] {
0x05D7
}));
// 'y' 005D8 HEBREW LETTER TET
- charMap.put(new Integer('y'), new String(new char[] {
+ charMap.put(Integer.valueOf('y'), new String(new char[] {
0x05D8
}));
// 'h' 005D9 HEBREW LETTER YOD
- charMap.put(new Integer('h'), new String(new char[] {
+ charMap.put(Integer.valueOf('h'), new String(new char[] {
0x05D9
}));
// '/' 05DA HEBREW LETTER FINAL KAF
- charMap.put(new Integer('/'), new String(new char[] {
+ charMap.put(Integer.valueOf('/'), new String(new char[] {
0x05DA
}));
// 'l' 05DB HEBREW LETTER KAF
- charMap.put(new Integer('l'), new String(new char[] {
+ charMap.put(Integer.valueOf('l'), new String(new char[] {
0x05DB
}));
// 'k' 05DC HEBREW LETTER LAMED
- charMap.put(new Integer('k'), new String(new char[] {
+ charMap.put(Integer.valueOf('k'), new String(new char[] {
0x05DC
}));
// 't' 05DD HEBREW LETTER FINAL MEM
- charMap.put(new Integer('t'), new String(new char[] {
+ charMap.put(Integer.valueOf('t'), new String(new char[] {
0x05DD
}));
// 'n' 05DE HEBREW LETTER MEM
- charMap.put(new Integer('n'), new String(new char[] {
+ charMap.put(Integer.valueOf('n'), new String(new char[] {
0x05DE
}));
// 'i' 05DF HEBREW LETTER FINAL NUN
- charMap.put(new Integer('i'), new String(new char[] {
+ charMap.put(Integer.valueOf('i'), new String(new char[] {
0x05DF
}));
// 'b' 05E0 HEBREW LETTER NUN
- charMap.put(new Integer('b'), new String(new char[] {
+ charMap.put(Integer.valueOf('b'), new String(new char[] {
0x05E0
}));
// 'x' 05E1 HEBREW LETTER SAMEKH
- charMap.put(new Integer('x'), new String(new char[] {
+ charMap.put(Integer.valueOf('x'), new String(new char[] {
0x05E1
}));
// 'g' 05E2 HEBREW LETTER AYIN
- charMap.put(new Integer('g'), new String(new char[] {
+ charMap.put(Integer.valueOf('g'), new String(new char[] {
0x05E2
}));
// ';' 05E3 HEBREW LETTER FINAL PE
- charMap.put(new Integer(';'), new String(new char[] {
+ charMap.put(Integer.valueOf(';'), new String(new char[] {
0x05E3
}));
// 'p' 05E4 HEBREW LETTER PE
- charMap.put(new Integer('p'), new String(new char[] {
+ charMap.put(Integer.valueOf('p'), new String(new char[] {
0x05E4
}));
// '.' 05E5 HEBREW LETTER FINAL TSADI
- charMap.put(new Integer('.'), new String(new char[] {
+ charMap.put(Integer.valueOf('.'), new String(new char[] {
0x05E5
}));
// 'm' 05E6 HEBREW LETTER TSADI
- charMap.put(new Integer('m'), new String(new char[] {
+ charMap.put(Integer.valueOf('m'), new String(new char[] {
0x05E6
}));
// 'e' 05E7 HEBREW LETTER QOF
- charMap.put(new Integer('e'), new String(new char[] {
+ charMap.put(Integer.valueOf('e'), new String(new char[] {
0x05E7
}));
// 'r' 05E8 HEBREW LETTER RESH
- charMap.put(new Integer('r'), new String(new char[] {
+ charMap.put(Integer.valueOf('r'), new String(new char[] {
0x05E8
}));
// 'a' 05E9 HEBREW LETTER SHIN
- charMap.put(new Integer('a'), new String(new char[] {
+ charMap.put(Integer.valueOf('a'), new String(new char[] {
0x05E9
}));
// ',' 05EA HEBREW LETTER TAV
- charMap.put(new Integer(','), new String(new char[] {
+ charMap.put(Integer.valueOf(','), new String(new char[] {
0x05EA
}));
@@ -423,27 +423,27 @@
// (shifted keyboard)
// 'M' 05F0 HEBREW LIGATURE YIDDISH DOUBLE VAV
- charMap.put(new Integer('M'), new String(new char[] {
+ charMap.put(Integer.valueOf('M'), new String(new char[] {
0x05F0
}));
// '<' 05F1 HEBREW LIGATURE YIDDISH VAV YOD
- charMap.put(new Integer('<'), new String(new char[] {
+ charMap.put(Integer.valueOf('<'), new String(new char[] {
0x05F1
}));
// '>' 05F2 HEBREW LIGATURE YIDDISH DOUBLE YOD
- charMap.put(new Integer('>'), new String(new char[] {
+ charMap.put(Integer.valueOf('>'), new String(new char[] {
0x05F2
}));
// '?' 05F3 HEBREW PUNCTUATION GERESH
- charMap.put(new Integer('?'), new String(new char[] {
+ charMap.put(Integer.valueOf('?'), new String(new char[] {
0x05F3
}));
// '"' 05F4 HEBREW PUNCTUATION GERSHAYIM
- charMap.put(new Integer('"'), new String(new char[] {
+ charMap.put(Integer.valueOf('"'), new String(new char[] {
0x05F4
}));
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java 2010-12-06 21:19:49 UTC (rev 2045)
@@ -34,7 +34,7 @@
retString.append(in);
return retString.toString();
}
- Integer find = (Integer) subst2[getState()].get(new Integer(in));
+ Integer find = (Integer) subst2[getState()].get(Integer.valueOf(in));
if (find != null)
retVal = (char) find.intValue();
else
@@ -64,7 +64,7 @@
}
if (retVal == 50) { // multiChar
setState(1);
- Integer[] chars = (Integer[]) multiChars.get(new Integer(in));
+ Integer[] chars = (Integer[]) multiChars.get(Integer.valueOf(in));
if (chars != null) {
for (int i = 0; i < chars.length; i++)
retString.append((char) chars[i].intValue());
@@ -112,11 +112,11 @@
subst['&'] = 50;
subst['$'] = 50;
- multiChars.put(new Integer('&'), new Integer[] {
- new Integer(1513), new Integer(1474)
+ multiChars.put(Integer.valueOf('&'), new Integer[] {
+ Integer.valueOf(1513), Integer.valueOf(1474)
});
- multiChars.put(new Integer('$'), new Integer[] {
- new Integer(1513), new Integer(1473)
+ multiChars.put(Integer.valueOf('$'), new Integer[] {
+ Integer.valueOf(1513), Integer.valueOf(1473)
});
subst['T'] = 1514;
@@ -142,9 +142,9 @@
// CANTILLATION
subst[':'] = 2;
- subst2[2].put(new Integer('A'), new Integer(1458));
- subst2[2].put(new Integer('E'), new Integer(1457));
- subst2[2].put(new Integer('F'), new Integer(1459));
+ subst2[2].put(Integer.valueOf('A'), Integer.valueOf(1458));
+ subst2[2].put(Integer.valueOf('E'), Integer.valueOf(1457));
+ subst2[2].put(Integer.valueOf('F'), Integer.valueOf(1459));
/*
* Telisha qetana is postpositive as in '04' above. However, Michigan #
@@ -152,7 +152,7 @@
* difference.
*/
subst['2'] = 5;
- subst2[5].put(new Integer('4'), new Integer(1449));
+ subst2[5].put(Integer.valueOf('4'), Integer.valueOf(1449));
/*
* Note Michigan encoding distinguishes between medial metheg '35'
@@ -160,22 +160,22 @@
* (occuring on the # right of the vowel). It is also used for silluq.
*/
subst['3'] = 6;
- subst2[6].put(new Integer('3'), new Integer(1433));
- subst2[6].put(new Integer('5'), new Integer(1469));
+ subst2[6].put(Integer.valueOf('3'), Integer.valueOf(1433));
+ subst2[6].put(Integer.valueOf('5'), Integer.valueOf(1469));
/*
* The Michigan code of telisha gedola in medial position. Graphically,
* # there is no difference.
*/
subst['4'] = 7;
- subst2[7].put(new Integer('4'), new Integer(1440));
+ subst2[7].put(Integer.valueOf('4'), Integer.valueOf(1440));
subst['6'] = 8;
- subst2[8].put(new Integer('0'), new Integer(1451));
- subst2[8].put(new Integer('1'), new Integer(1436));
+ subst2[8].put(Integer.valueOf('0'), Integer.valueOf(1451));
+ subst2[8].put(Integer.valueOf('1'), Integer.valueOf(1436));
subst['1'] = 4;
- subst2[4].put(new Integer('0'), new Integer(1434));
+ subst2[4].put(Integer.valueOf('0'), Integer.valueOf(1434));
/*
* In the poetic books, prepositive dehi occurs; it's unclear whether #
@@ -184,18 +184,18 @@
* code for each.
*/
- subst2[4].put(new Integer('3'), new Integer(1430));
+ subst2[4].put(Integer.valueOf('3'), Integer.valueOf(1430));
/*
* This is the poetic accent mugrash, which also includes rebia, but is
* # encoded separately as '81' in the Michigan text.
*/
- subst2[4].put(new Integer('1'), new Integer(1437));
- subst2[4].put(new Integer('4'), new Integer(1440));
+ subst2[4].put(Integer.valueOf('1'), Integer.valueOf(1437));
+ subst2[4].put(Integer.valueOf('4'), Integer.valueOf(1440));
subst['0'] = 3;
- subst2[3].put(new Integer('0'), new Integer(1475));
- subst2[3].put(new Integer('1'), new Integer(1426));
+ subst2[3].put(Integer.valueOf('0'), Integer.valueOf(1475));
+ subst2[3].put(Integer.valueOf('1'), Integer.valueOf(1426));
/*
* According to BHS, zarqa and sinnor are both postpositive. However, #
@@ -206,7 +206,7 @@
* and use the postpositive Unicode zinor or both accents.
*/
- subst2[3].put(new Integer('2'), new Integer(1454));
+ subst2[3].put(Integer.valueOf('2'), Integer.valueOf(1454));
/*
* Pashta is postpositive, and the Unicode equivalent reflects # this.
@@ -216,9 +216,9 @@
* although it could be algorithmically determined.
*/
- subst2[3].put(new Integer('3'), new Integer(1433));
- subst2[3].put(new Integer('4'), new Integer(1449));
- subst2[3].put(new Integer('5'), new Integer(1472));
+ subst2[3].put(Integer.valueOf('3'), Integer.valueOf(1433));
+ subst2[3].put(Integer.valueOf('4'), Integer.valueOf(1449));
+ subst2[3].put(Integer.valueOf('5'), Integer.valueOf(1472));
/*
* This is the Unicode Hebrew *accent*; there is also another Hebrew #
@@ -227,16 +227,16 @@
* marks.
*/
- subst2[8].put(new Integer('2'), new Integer(1438));
+ subst2[8].put(Integer.valueOf('2'), Integer.valueOf(1438));
// Also known as azla
- subst2[8].put(new Integer('3'), new Integer(1448));
- subst2[8].put(new Integer('4'), new Integer(1452));
- subst2[8].put(new Integer('5'), new Integer(1427));
+ subst2[8].put(Integer.valueOf('3'), Integer.valueOf(1448));
+ subst2[8].put(Integer.valueOf('4'), Integer.valueOf(1452));
+ subst2[8].put(Integer.valueOf('5'), Integer.valueOf(1427));
subst['8'] = 9;
- subst2[9].put(new Integer('0'), new Integer(1428));
- subst2[9].put(new Integer('1'), new Integer(1431));
+ subst2[9].put(Integer.valueOf('0'), Integer.valueOf(1428));
+ subst2[9].put(Integer.valueOf('1'), Integer.valueOf(1431));
/*
* Note, this accent is actually sinnorit, but it does not exist as a #
@@ -244,35 +244,35 @@
* is postpositive, while sinnorit is not. ZARQA is as close as I can #
* get to this.
*/
- subst2[9].put(new Integer('2'), new Integer(1432));
+ subst2[9].put(Integer.valueOf('2'), Integer.valueOf(1432));
/*
* The Unicode form does not match the form used by BHS, but the names #
* are the same.
*/
- subst2[9].put(new Integer('3'), new Integer(1441));
- subst2[9].put(new Integer('4'), new Integer(1439));
- subst2[9].put(new Integer('5'), new Integer(1429));
+ subst2[9].put(Integer.valueOf('3'), Integer.valueOf(1441));
+ subst2[9].put(Integer.valueOf('4'), Integer.valueOf(1439));
+ subst2[9].put(Integer.valueOf('5'), Integer.valueOf(1429));
subst['7'] = 10;
- subst2[10].put(new Integer('0'), new Integer(1444));
- subst2[10].put(new Integer('1'), new Integer(1445));
- subst2[10].put(new Integer('2'), new Integer(1446));
- subst2[10].put(new Integer('3'), new Integer(1430)); // also '13', '73'
+ subst2[10].put(Integer.valueOf('0'), Integer.valueOf(1444));
+ subst2[10].put(Integer.valueOf('1'), Integer.valueOf(1445));
+ subst2[10].put(Integer.valueOf('2'), Integer.valueOf(1446));
+ subst2[10].put(Integer.valueOf('3'), Integer.valueOf(1430)); // also '13', '73'
// also is used for
// majela
- subst2[10].put(new Integer('4'), new Integer(1443));
- subst2[10].put(new Integer('5'), new Integer(1469)); // this is silluq;
+ subst2[10].put(Integer.valueOf('4'), Integer.valueOf(1443));
+ subst2[10].put(Integer.valueOf('5'), Integer.valueOf(1469)); // this is silluq;
// should appear to
// the left of the
// vowel
subst['9'] = 11;
- subst2[11].put(new Integer('1'), new Integer(1435));
- subst2[11].put(new Integer('2'), new Integer(1425));
- subst2[11].put(new Integer('3'), new Integer(1450));
- subst2[11].put(new Integer('4'), new Integer(1447));
- subst2[11].put(new Integer('5'), new Integer(1469)); // should appear to
+ subst2[11].put(Integer.valueOf('1'), Integer.valueOf(1435));
+ subst2[11].put(Integer.valueOf('2'), Integer.valueOf(1425));
+ subst2[11].put(Integer.valueOf('3'), Integer.valueOf(1450));
+ subst2[11].put(Integer.valueOf('4'), Integer.valueOf(1447));
+ subst2[11].put(Integer.valueOf('5'), Integer.valueOf(1469)); // should appear to
// the right of the
// vowel
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-all.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,8 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,6 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="checkstyle,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<intAttribute key="org.eclipse.ui.externaltoolsATTR_SORT_TARGETS" value="1"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-clean.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -12,8 +12,8 @@
<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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0/"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/bibledesktop}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,"/>
Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2010-12-06 14:09:25 UTC (rev 2044)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-incremental.launch 2010-12-06 21:19:49 UTC (rev 2045)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jsword-web/build.xml"/>
</listAttribute>
@@ -15,6 +15,8 @@
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="incremental,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
More information about the jsword-svn
mailing list