[jsword-svn] r1086 - in trunk: bibledesktop/etc/jnlp
bibledesktop/src/main/java/org/crosswire/bibledesktop/book
bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install
bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop
bibledesktop/src/main/java/org/crosswire/bibledesktop/util
bibledesktop-web/src/web/stable
common/src/main/java/org/crosswire/common/progress
common/src/main/java/org/crosswire/common/util
common/src/main/java/org/crosswire/common/xml
common-swing/src/main/java/org/crosswire/common/config/swing
common-swing/src/main/java/org/crosswire/common/swing
common-swing/src/main/java/org/crosswire/common/swing/desktop
jsword/src/main/java/org/crosswire/jsword/book
jsword/src/main/java/org/crosswire/jsword/book/filter/gbf
jsword/src/main/java/org/crosswire/jsword/book/install
jsword/src/main/java/org/crosswire/jsword/book/install/sword
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-limbo/src/main/java/org/crosswire/bibledesktop/desktop
jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage
jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference
jsword-limbo/src/main/java/org/crosswire/common/swing
jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword
jsword-sword/src/main/java/org/crosswire/sword/mgr
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Apr 30 16:53:38 MST 2006
Author: dmsmith
Date: 2006-04-30 16:51:48 -0700 (Sun, 30 Apr 2006)
New Revision: 1086
Modified:
trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.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/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.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/desktop/MDIViewLayout.java
trunk/common/src/main/java/org/crosswire/common/progress/Job.java
trunk/common/src/main/java/org/crosswire/common/util/ClassUtil.java
trunk/common/src/main/java/org/crosswire/common/util/ThreadUtil.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferenceRootTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DocumentWriter.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookFilters.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTagBuilders.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BookType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/DictToOsis.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
Log:
Fixed a jnlp bug on the mac. Updated jnlp to offer shortcuts on mac, using jdk 5 features.
Also cleaned up warnings provided by Eclipse 3.2.
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2006-04-30 23:51:48 UTC (rev 1086)
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 1.0//EN" "jnlp.dtd">
-
<jnlp spec="1.0+" codebase="@jnlp.codebase@" href="bibledesktop- at release.version@.jnlp">
<information>
@@ -13,6 +11,10 @@
<icon href="icon32.gif"/>
<icon kind="splash" href="icon64.gif"/>
<offline-allowed/>
+ <shortcut online="false">
+ <desktop/>
+ <menu submenu="Bible Desktop"/>
+ </shortcut>
</information>
<security>
@@ -25,7 +27,7 @@
</security>
<resources>
- <j2se version="1.4+" max-heap-size="512m"/>
+ <j2se version="1.4+"/>
<jar href="bibledesktop- at release.version@.jar"/>
<jar href="jsword- at release.version@.jar"/>
<jar href="jsword-common- at release.version@.jar"/>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -199,7 +199,7 @@
/**
* For when a selection is made
*/
- private final class CustomItemListener implements ItemListener
+ final class CustomItemListener implements ItemListener
{
public void itemStateChanged(ItemEvent ev)
{
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -388,7 +388,7 @@
/**
* Filter out verse lists
*/
- private static final class CustomFileFilter extends FileFilter
+ static final class CustomFileFilter extends FileFilter
{
/* (non-Javadoc)
* @see javax.swing.filechooser.FileFilter#accept(java.io.File)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -176,7 +176,7 @@
*/
public void setBookData(Book book, Key key)
{
- throw new UnsupportedOperationException(); //$NON-NLS-1$
+ throw new UnsupportedOperationException();
}
/* (non-Javadoc)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -725,7 +725,7 @@
/**
*
*/
- private static final class SelectedActionListener implements ActionListener
+ static final class SelectedActionListener implements ActionListener
{
/* (non-Javadoc)
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -439,7 +439,7 @@
/**
* Update the list whenever the textbox changes
*/
- private class CustomDocumentEvent implements DocumentListener
+ class CustomDocumentEvent implements DocumentListener
{
/* (non-Javadoc)
* @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
@@ -469,7 +469,7 @@
/**
* To update the textbox when the passage changes
*/
- private class CustomPassageListener implements PassageListener
+ class CustomPassageListener implements PassageListener
{
/* (non-Javadoc)
* @see org.crosswire.jsword.passage.PassageListener#versesAdded(org.crosswire.jsword.passage.PassageEvent)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -90,7 +90,7 @@
/**
* Listens to the InstallManager for Installer changes
*/
- private class CustomInstallerListener implements InstallerListener
+ class CustomInstallerListener implements InstallerListener
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.install.InstallerListener#installerAdded(org.crosswire.jsword.book.install.InstallerEvent)
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -471,7 +471,7 @@
/**
* When new books are added we need to relfect the change in this tree.
*/
- private final class CustomBooksListener implements BooksListener
+ final class CustomBooksListener implements BooksListener
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.BooksListener#bookAdded(org.crosswire.jsword.book.BooksEvent)
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -44,16 +44,16 @@
public void initialize()
{
host = new JTextField();
- JLabel hostLabel = getLabelForText(Msg.HOST, host); //$NON-NLS-1$
+ JLabel hostLabel = getLabelForText(Msg.HOST, host);
directory = new JTextField();
- JLabel directoryLabel = getLabelForText(Msg.DIRECTORY, directory); //$NON-NLS-1$
+ JLabel directoryLabel = getLabelForText(Msg.DIRECTORY, directory);
proxyHost = new JTextField();
- JLabel proxyHostLabel = getLabelForText(Msg.PROXY_HOST, proxyHost); //$NON-NLS-1$
+ JLabel proxyHostLabel = getLabelForText(Msg.PROXY_HOST, proxyHost);
proxyPort = new JTextField();
- JLabel proxyPortLabel = getLabelForText(Msg.PROXY_PORT, proxyPort); //$NON-NLS-1$
+ JLabel proxyPortLabel = getLabelForText(Msg.PROXY_PORT, proxyPort);
setLayout(new GridBagLayout());
add(hostLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 10, 2, 2), 0, 0));
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -170,7 +170,7 @@
/**
* Pack the frame if we get new jobs that could shunt things around
*/
- private final class CustomWorkListener implements WorkListener
+ final class CustomWorkListener implements WorkListener
{
/* (non-Javadoc)
* @see org.crosswire.common.progress.WorkListener#workProgressed(org.crosswire.common.progress.WorkEvent)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -112,7 +112,7 @@
String url = ev.getURL();
if (protocol.length() == 0)
{
- lbl_message.setText(url); //$NON-NLS-1$
+ lbl_message.setText(url);
}
else
{
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -106,7 +106,7 @@
public boolean getDefault()
{
- return defaultState; //$NON-NLS-1$
+ return defaultState;
}
public boolean getState()
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -145,7 +145,7 @@
/**
*
*/
- private static final class XSLTFilter implements URLFilter
+ static final class XSLTFilter implements URLFilter
{
/* (non-Javadoc)
* @see org.crosswire.common.util.URLFilter#accept(java.lang.String)
Modified: trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp
===================================================================
--- trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/bibledesktop-web/src/web/stable/bibledesktop-1.0.2.jnlp 2006-04-30 23:51:48 UTC (rev 1086)
@@ -13,6 +13,10 @@
<icon href="icon32.gif"/>
<icon kind="splash" href="icon64.gif"/>
<offline-allowed/>
+ <shortcut online="false">
+ <desktop/>
+ <menu submenu="Bible Desktop"/>
+ </shortcut>
</information>
<security>
@@ -25,7 +29,7 @@
</security>
<resources>
- <j2se version="1.4+" max-heap-size="512m"/>
+ <j2se version="1.4+"/>
<jar href="bibledesktop-1.0.2.jar"/>
<jar href="jsword-1.0.2.jar"/>
<jar href="jsword-common-1.0.2.jar"/>
Modified: trunk/common/src/main/java/org/crosswire/common/progress/Job.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/Job.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common/src/main/java/org/crosswire/common/progress/Job.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -583,7 +583,7 @@
/**
* So we can fake progress for Jobs that don't tell us how they are doing
*/
- private final class PredictTask extends TimerTask
+ final class PredictTask extends TimerTask
{
/* (non-Javadoc)
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
Modified: trunk/common/src/main/java/org/crosswire/common/util/ClassUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/ClassUtil.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common/src/main/java/org/crosswire/common/util/ClassUtil.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -65,7 +65,7 @@
{
try
{
- String file_name = classname.replace(',', '/') + EXTENSION_CLASS; //$NON-NLS-1$ //$NON-NLS-2$
+ String file_name = classname.replace(',', '/') + EXTENSION_CLASS;
ZipFile zip = new ZipFile(paths[i]);
ZipEntry entry = zip.getEntry(file_name);
@@ -89,7 +89,7 @@
else
{
// Search for the file
- String extra = classname.replace('.', File.separatorChar); //$NON-NLS-1$
+ String extra = classname.replace('.', File.separatorChar);
if (!paths[i].endsWith(File.separator))
{
Modified: trunk/common/src/main/java/org/crosswire/common/util/ThreadUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/ThreadUtil.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common/src/main/java/org/crosswire/common/util/ThreadUtil.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -184,7 +184,7 @@
*/
private static void addItem(List list, int depth, String item)
{
- list.add(PADDING.substring(0, depth * 2) + item); //$NON-NLS-1$
+ list.add(PADDING.substring(0, depth * 2) + item);
}
private static final String PADDING = " "; //$NON-NLS-1$
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -106,7 +106,7 @@
for (int i = 0; i < len; i++)
{
- char ch = s.charAt(i); //$NON-NLS-1$
+ char ch = s.charAt(i);
switch (ch)
{
case '<':
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -211,7 +211,7 @@
* A custom data model for the TreeConfig Tree
* @author Joe Walker
*/
- private class AdvancedConfigureTreeModel extends ConfigureTreeModel
+ class AdvancedConfigureTreeModel extends ConfigureTreeModel
{
/* (non-Javadoc)
* @see org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel#getChildren(java.lang.String)
@@ -306,7 +306,7 @@
/**
* Simple Tree Node
*/
- private static class CompNode
+ static class CompNode
{
/**
* Create a node with a name and path
@@ -341,7 +341,7 @@
/**
* The renderer for our tree
*/
- private class CustomTreeCellRenderer extends DefaultTreeCellRenderer
+ class CustomTreeCellRenderer extends DefaultTreeCellRenderer
{
/* (non-Javadoc)
* @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean)
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -204,7 +204,7 @@
{
super(new FieldLayout(10, 10));
- add(new JLabel(Msg.NAME.toString() + ':')); //$NON-NLS-1$
+ add(new JLabel(Msg.NAME.toString() + ':'));
add(name_field);
setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -99,7 +99,7 @@
wcards++;
// The name for the title bar
- names.add(path.replace('.', ' ')); //$NON-NLS-1$ //$NON-NLS-2$
+ names.add(path.replace('.', ' '));
}
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -69,7 +69,7 @@
{
AntiAliasedTextPane.antiAliasing = antiAliasing;
// Set it system wide for the next run
- System.setProperty("swing.aatext", Boolean.toString(antiAliasing)); //$NON-NLS-1$ //$NON-NLS-2$
+ System.setProperty("swing.aatext", Boolean.toString(antiAliasing)); //$NON-NLS-1$
}
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -444,7 +444,7 @@
mylabel.setText(Msg.NO_FILE.toString());
// Find a file
- name = File.separator + orig.replace('.', File.separatorChar) + FileUtil.EXTENSION_JAVA; //$NON-NLS-1$ //$NON-NLS-2$
+ name = File.separator + orig.replace('.', File.separatorChar) + FileUtil.EXTENSION_JAVA;
for (int i = 0; i < sources.length; i++)
{
File file = new File(sources[i], name);
@@ -542,7 +542,7 @@
/**
* The ExceptionPane instance that we add to the Log
*/
- private static final class ExceptionPaneReporterListener implements ReporterListener
+ static final class ExceptionPaneReporterListener implements ReporterListener
{
/**
* Called whenever Reporter.informUser() is passed an Exception
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -312,13 +312,13 @@
* An extension of JLabel that resets it's font so that
* it can be used to render the items in a JComboBox
*/
- private static class CustomListCellRenderer extends DefaultListCellRenderer
+ static class CustomListCellRenderer extends DefaultListCellRenderer
{
/* (non-Javadoc)
* @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
/* @Override */
- public Component getListCellRendererComponent(JList listbox, Object value, int index, boolean selected, boolean focus)
+ public Component getListCellRendererComponent(JList listbox, Object value, int index, boolean selected, boolean focus)
{
if (value == null)
{
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -222,7 +222,7 @@
/**
* So we can tidy things up when a window is closed
*/
- private class CustomInternalFrameAdapter extends InternalFrameAdapter
+ class CustomInternalFrameAdapter extends InternalFrameAdapter
{
/* (non-Javadoc)
* @see javax.swing.event.InternalFrameListener#internalFrameClosed(javax.swing.event.InternalFrameEvent)
@@ -237,7 +237,7 @@
/**
* We need to veto the closing of the last window.
*/
- private class CloseListener implements VetoableChangeListener
+ class CloseListener implements VetoableChangeListener
{
/* (non-Javadoc)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookFilters.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookFilters.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookFilters.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -54,12 +54,12 @@
/**
* Filter for all books
*/
- private static BookFilter allBookFilter = new AllBookFilter();
+ static BookFilter allBookFilter = new AllBookFilter();
/**
* Filter for all books
*/
- private static class AllBookFilter implements BookFilter
+ static class AllBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -83,7 +83,7 @@
/**
* Filter for all Bibles
*/
- private static class BiblesBookFilter implements BookFilter
+ static class BiblesBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -107,7 +107,7 @@
/**
* Filter for all dictionaries
*/
- private static class DictionariesBookFilter implements BookFilter
+ static class DictionariesBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -128,12 +128,12 @@
/**
* Filter for all dictionaries
*/
- private static BookFilter dailyDevotionalsBookFilter = new DailyDevotionalsBookFilter();
+ static BookFilter dailyDevotionalsBookFilter = new DailyDevotionalsBookFilter();
/**
* Filter for all dictionaries
*/
- private static class DailyDevotionalsBookFilter implements BookFilter
+ static class DailyDevotionalsBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -158,7 +158,7 @@
/**
* Filter for all commentaries
*/
- private static class CommentariesBookFilter implements BookFilter
+ static class CommentariesBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -183,7 +183,7 @@
/**
* Filter for all Greek Definition Dictionaries
*/
- private static class GreekDefinitionsBookFilter implements BookFilter
+ static class GreekDefinitionsBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -208,7 +208,7 @@
/**
* Filter for all Greek Parse/Morphology Dictionaries
*/
- private static class GreekParseBookFilter implements BookFilter
+ static class GreekParseBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -233,7 +233,7 @@
/**
* Filter for all Hebrew Definition Dictionaries
*/
- private static class HebrewDefinitionsBookFilter implements BookFilter
+ static class HebrewDefinitionsBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -258,7 +258,7 @@
/**
* Filter for all Hebrew Parse/Morphology Dictionaries
*/
- private static class HebrewParseBookFilter implements BookFilter
+ static class HebrewParseBookFilter implements BookFilter
{
public boolean test(Book book)
{
@@ -326,7 +326,7 @@
/**
* Custom Filter
*/
- private static class CustomBookFilter implements BookFilter
+ static class CustomBookFilter implements BookFilter
{
/**
* Ctor
@@ -395,7 +395,7 @@
/**
*
*/
- private class Test
+ class Test
{
protected String result;
protected Method property;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/Defaults.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -525,7 +525,7 @@
/**
* To keep us up to date with changes in the available Books
*/
- private static class DefaultsBookListener implements BooksListener
+ static class DefaultsBookListener implements BooksListener
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.BooksListener#bookAdded(org.crosswire.jsword.book.BooksEvent)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTagBuilders.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTagBuilders.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTagBuilders.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -118,7 +118,7 @@
/**
*
*/
- private static final class BoldStartTagBuilder implements TagBuilder
+ static final class BoldStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -132,7 +132,7 @@
/**
*
*/
- private static final class CrossRefStartTagBuilder implements TagBuilder
+ static final class CrossRefStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -146,7 +146,7 @@
/**
*
*/
- private static final class DefaultEndTagBuilder implements TagBuilder
+ static final class DefaultEndTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -160,7 +160,7 @@
/**
*
*/
- private static final class EndOfLineTagBuilder implements TagBuilder
+ static final class EndOfLineTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -175,7 +175,7 @@
/**
*
*/
- private static final class FootnoteStartTagBuilder implements TagBuilder
+ static final class FootnoteStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -189,7 +189,7 @@
/**
*
*/
- private static final class FootnoteEndTagBuilder implements TagBuilder
+ static final class FootnoteEndTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -203,7 +203,7 @@
/**
*
*/
- private static final class HeaderStartTagBuilder implements TagBuilder
+ static final class HeaderStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -217,7 +217,7 @@
/**
*
*/
- private static final class IgnoredTagBuilder implements TagBuilder
+ static final class IgnoredTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -231,7 +231,7 @@
/**
*
*/
- private static final class ItalicStartTagBuilder implements TagBuilder
+ static final class ItalicStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -245,7 +245,7 @@
/**
*
*/
- private static final class JustifyRightTagBuilder implements TagBuilder
+ static final class JustifyRightTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -259,7 +259,7 @@
/**
*
*/
- private static final class OTQuoteStartTagBuilder implements TagBuilder
+ static final class OTQuoteStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -273,7 +273,7 @@
/**
*
*/
- private static final class ParagraphTagBuilder implements TagBuilder
+ static final class ParagraphTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -287,7 +287,7 @@
/**
*
*/
- private static final class PoetryStartTagBuilder implements TagBuilder
+ static final class PoetryStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -302,7 +302,7 @@
/**
*
*/
- private static final class PsalmTitleStartTagBuilder implements TagBuilder
+ static final class PsalmTitleStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -317,7 +317,7 @@
/**
*
*/
- private static final class RedLetterStartTagBuilder implements TagBuilder
+ static final class RedLetterStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -331,7 +331,7 @@
/**
*
*/
- private static final class StrongsMorphTagBuilder implements TagBuilder
+ static final class StrongsMorphTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -345,7 +345,7 @@
/**
*
*/
- private static final class StrongsWordTagBuilder implements TagBuilder
+ static final class StrongsWordTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -359,7 +359,7 @@
/**
*
*/
- private static final class TextFootnoteTagBuilder implements TagBuilder
+ static final class TextFootnoteTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -373,7 +373,7 @@
/**
*
*/
- private static final class TitleStartTagBuilder implements TagBuilder
+ static final class TitleStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
@@ -387,7 +387,7 @@
/**
*
*/
- private static final class UnderlineStartTagBuilder implements TagBuilder
+ static final class UnderlineStartTagBuilder implements TagBuilder
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.filter.gbf.TagBuilder#createTag(java.lang.String)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -603,7 +603,7 @@
newLemma.append(existingLemma).append('|');
}
- newLemma.append(OSISUtil.LEMMA_STRONGS).append(name.substring(2)); //$NON-NLS-1$
+ newLemma.append(OSISUtil.LEMMA_STRONGS).append(name.substring(2));
word.setAttribute(OSISUtil.ATTRIBUTE_W_LEMMA, newLemma.toString());
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -120,7 +120,7 @@
buf.append(installer.getInstallerDefinition());
props.setProperty("Installer." + i++, buf.toString()); //$NON-NLS-1$
}
- URL outputURL = Project.instance().getWritablePropertiesURL(getClass().getName()); //$NON-NLS-1$
+ URL outputURL = Project.instance().getWritablePropertiesURL(getClass().getName());
try
{
OutputStream out = NetUtil.getOutputStream(outputURL);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -456,7 +456,7 @@
*/
private static String getTempFileExtension(String host, String directory)
{
- return DOWNLOAD_PREFIX + host + directory.replace('/', '_'); //$NON-NLS-1$
+ return DOWNLOAD_PREFIX + host + directory.replace('/', '_');
}
/* (non-Javadoc)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -81,7 +81,7 @@
{
try
{
- URL url = new URL(NetUtil.PROTOCOL_HTTP, host, dir + '/' + file); //$NON-NLS-1$
+ URL url = new URL(NetUtil.PROTOCOL_HTTP, host, dir + '/' + file);
copy(job, url, dest);
}
catch (LucidException ex)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BookType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BookType.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BookType.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -41,7 +41,7 @@
/**
* Uncompressed Bibles
*/
- public static final BookType RAW_TEXT = new BookType("RawText", BookCategory.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_TEXT = new BookType("RawText", BookCategory.BIBLE) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -62,7 +62,7 @@
/**
* Compressed Bibles
*/
- public static final BookType Z_TEXT = new BookType("zText", BookCategory.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType Z_TEXT = new BookType("zText", BookCategory.BIBLE) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -88,7 +88,7 @@
/**
* Uncompressed Commentaries
*/
- public static final BookType RAW_COM = new BookType("RawCom", BookCategory.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_COM = new BookType("RawCom", BookCategory.COMMENTARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -109,7 +109,7 @@
/**
* Compressed Commentaries
*/
- public static final BookType Z_COM = new BookType("zCom", BookCategory.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType Z_COM = new BookType("zCom", BookCategory.COMMENTARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -135,7 +135,7 @@
/**
* Uncompresses HREF Commentaries
*/
- public static final BookType HREF_COM = new BookType("HREFCom", BookCategory.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType HREF_COM = new BookType("HREFCom", BookCategory.COMMENTARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -156,7 +156,7 @@
/**
* Uncompressed Commentaries
*/
- public static final BookType RAW_FILES = new BookType("RawFiles", BookCategory.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_FILES = new BookType("RawFiles", BookCategory.COMMENTARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -177,7 +177,7 @@
/**
* 2-Byte Index Uncompressed Dictionaries
*/
- public static final BookType RAW_LD = new BookType("RawLD", BookCategory.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_LD = new BookType("RawLD", BookCategory.DICTIONARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -202,7 +202,7 @@
/**
* 4-Byte Index Uncompressed Dictionaries
*/
- public static final BookType RAW_LD4 = new BookType("RawLD4", BookCategory.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_LD4 = new BookType("RawLD4", BookCategory.DICTIONARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -227,7 +227,7 @@
/**
* Compressed Dictionaries
*/
- public static final BookType Z_LD = new BookType("zLD", BookCategory.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType Z_LD = new BookType("zLD", BookCategory.DICTIONARY) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
@@ -257,7 +257,7 @@
/**
* Generic Books
*/
- public static final BookType RAW_GEN_BOOK = new BookType("RawGenBook", BookCategory.OTHER) //$NON-NLS-1$ //$NON-NLS-2$
+ public static final BookType RAW_GEN_BOOK = new BookType("RawGenBook", BookCategory.OTHER) //$NON-NLS-1$
{
protected Book getBook(SwordBookMetaData sbmd, AbstractBackend backend)
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -511,7 +511,7 @@
bookType = BookType.fromString(modTypeName);
if (getBookType() == null)
{
- log.error("Book not supported: malformed conf file for " + internal + " no book type found"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ log.error("Book not supported: malformed conf file for " + internal + " no book type found"); //$NON-NLS-1$ //$NON-NLS-2$
supported = false;
return;
}
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -1132,7 +1132,7 @@
*/
public Object getDefault()
{
- return Boolean.TRUE; //$NON-NLS-1$
+ return Boolean.TRUE;
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -412,7 +412,7 @@
* Check that the directories in the version directory really
* represent versions.
*/
- private static class CustomFilenameFilter implements FilenameFilter
+ static class CustomFilenameFilter implements FilenameFilter
{
/* (non-Javadoc)
* @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -207,7 +207,7 @@
if (foundPsalmTitle)
{
- buildPsalmTitle(buf, cleanup(osisID, psalmTitleText, false)); //$NON-NLS-1$
+ buildPsalmTitle(buf, cleanup(osisID, psalmTitleText, false));
}
if (foundPreVerse && !preVerseText.equals(psalmTitleText))
@@ -216,7 +216,7 @@
{
buildPreVerseClose(buf);
}
- buildPreVerseOpen(buf, cleanup(osisID, preVerseText, false)); //$NON-NLS-1$
+ buildPreVerseOpen(buf, cleanup(osisID, preVerseText, false));
inPreVerse = true;
}
@@ -402,7 +402,7 @@
docBuffer.append("\n </work>"); //$NON-NLS-1$
docBuffer.append("\n</header>"); //$NON-NLS-1$
docBuffer.append('\n');
- MessageFormat msgFormat = new MessageFormat(docBuffer.toString()); //$NON-NLS-1$
+ MessageFormat msgFormat = new MessageFormat(docBuffer.toString());
msgFormat.format(new Object[] { bmd.getInitials(), bmd.getName(), range }, buf, pos);
}
@@ -539,7 +539,7 @@
if (acrostic != null)
{
MessageFormat msgFormat = new MessageFormat("<title type=\"acrostic\" canonical=\"true\">{0}</title>"); //$NON-NLS-1$
- input = input.replaceFirst((String) hebLetters.get(osisID), ""); //$NON-NLS-1$ //$NON-NLS-2$
+ input = input.replaceFirst((String) hebLetters.get(osisID), ""); //$NON-NLS-1$
input = msgFormat.format(new Object[] { acrostic }) + input;
}
@@ -608,7 +608,7 @@
fixed = fixed.replaceAll("split(ID|id)=\"", "type=\"x-split\" subType=\"x-"); //$NON-NLS-1$ //$NON-NLS-2$
if (!whole.equals(fixed))
{
- input = replace(input, whole, fixed); //$NON-NLS-1$
+ input = replace(input, whole, fixed);
}
Matcher srcMatcher = srcPattern.matcher(fixed);
@@ -1798,7 +1798,7 @@
input = replace(input, "Caesar", "C\u00E6sar"); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (osisID.equals("Acts.7.4")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Acts.7.4")) //$NON-NLS-1$
{
input = replace(input, "Chaldaeans", "Chald\u00E6ans"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -1811,22 +1811,22 @@
input = replace(input, "Judaea", "Jud\u00E6a"); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (!osisID.equals("Mark.14.70")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (!osisID.equals("Mark.14.70")) //$NON-NLS-1$
{
input = replace(input, "Galilaean", "Galil\u00E6an"); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (osisID.equals("Mark.15.16")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Mark.15.16")) //$NON-NLS-1$
{
input = replace(input, "Praetorium", "Pr\u00E6torium"); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (osisID.equals("Mark.10.46")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Mark.10.46")) //$NON-NLS-1$
{
input = replace(input, "Timaeus", "Tim\u00E6us"); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (osisID.startsWith("Luke.19")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.startsWith("Luke.19")) //$NON-NLS-1$
{
input = replace(input, "Zacchaeus", "Zacch\u00E6us"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -2815,25 +2815,25 @@
"<inscription><w lemma=\"strong:H06944\">HOLINESS</w> <w lemma=\"strong:H03068\">TO THE <seg><divineName type=\"x-yhwh\">Lord</divineName></seg></w></inscription>"); //$NON-NLS-1$
}
- if (osisID.equals("Dan.5.25")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Dan.5.25")) //$NON-NLS-1$
{
input = replace(input, "<w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w>, <w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w>, <w morph=\"strongMorph:TH8752\" lemma=\"strong:H08625\">TEKEL</w>, <w morph=\"strongMorph:TH8751\" lemma=\"strong:H06537\">UPHARSIN</w>", //$NON-NLS-1$
"<inscription><w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w>, <w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w>, <w morph=\"strongMorph:TH8752\" lemma=\"strong:H08625\">TEKEL</w>, <w morph=\"strongMorph:TH8751\" lemma=\"strong:H06537\">UPHARSIN</w></inscription>"); //$NON-NLS-1$
}
- if (osisID.equals("Dan.5.26")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Dan.5.26")) //$NON-NLS-1$
{
input = replace(input, "<w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w>", //$NON-NLS-1$
"<inscription><w morph=\"strongMorph:TH8752\" lemma=\"strong:H04484\">MENE</w></inscription>"); //$NON-NLS-1$
}
- if (osisID.equals("Dan.5.27")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Dan.5.27")) //$NON-NLS-1$
{
input = replace(input, "<w morph=\"strongMorph:TH8752\" lemma=\"strong:H08625\">TEKEL</w>", //$NON-NLS-1$
"<inscription><w morph=\"strongMorph:TH8752\" lemma=\"strong:H08625\">TEKEL</w></inscription>"); //$NON-NLS-1$
}
- if (osisID.equals("Dan.5.28")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Dan.5.28")) //$NON-NLS-1$
{
input = replace(input, "<w morph=\"strongMorph:TH8752\" lemma=\"strong:H06537\">PERES</w>", //$NON-NLS-1$
"<inscription><w morph=\"strongMorph:TH8752\" lemma=\"strong:H06537\">PERES</w></inscription>"); //$NON-NLS-1$
@@ -2864,7 +2864,7 @@
}
// The next undoes an incorrect application of divineName
- if (osisID.equals("Acts.17.23")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Acts.17.23")) //$NON-NLS-1$
{
input = replace(input, "<w src=\"14\" lemma=\"strong:G57\" morph=\"robinson:A-DSM\">TO THE UNKNOWN</w> <w src=\"15\" lemma=\"strong:G2316\" morph=\"robinson:N-DSM\"><divineName>God</divineName></w>", //$NON-NLS-1$
"<inscription><w src=\"14\" lemma=\"strong:G57\" morph=\"robinson:A-DSM\">TO THE UNKNOWN</w> <w src=\"15\" lemma=\"strong:G2316\" morph=\"robinson:N-DSM\">GOD</w></inscription>"); //$NON-NLS-1$
@@ -2882,7 +2882,7 @@
"<inscription><w src=\"9 10\" lemma=\"strong:G3588 strong:G935\" morph=\"robinson:T-NSM robinson:N-NSM\">THE KING</w> <w src=\"12\" lemma=\"strong:G2453\" morph=\"robinson:A-GPM\">OF THE JEWS</w></inscription>"); //$NON-NLS-1$
}
- if (osisID.equals("Rev.17.5")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (osisID.equals("Rev.17.5")) //$NON-NLS-1$
{
input = replace(input, "<w src=\"8\" lemma=\"strong:G3466\" morph=\"robinson:N-NSN\">MYSTERY</w>, <w src=\"9\" lemma=\"strong:G897\" morph=\"robinson:N-NSF\">BABYLON</w> <w src=\"11\" lemma=\"strong:G3173\" morph=\"robinson:A-NSF\">THE GREAT</w>, <w src=\"12 13\" lemma=\"strong:G3588 strong:G3384\" morph=\"robinson:T-NSF robinson:N-NSF\">THE MOTHER</w> <w src=\"14 15\" lemma=\"strong:G3588 strong:G4204\" morph=\"robinson:T-GPF robinson:N-GPF\">OF HARLOTS</w> <w src=\"16\" lemma=\"strong:G2532\" morph=\"robinson:CONJ\">AND</w> <w src=\"17 18\" lemma=\"strong:G3588 strong:G946\" morph=\"robinson:T-GPN robinson:N-GPN\">ABOMINATIONS</w> <w src=\"19 20\" lemma=\"strong:G3588 strong:G1093\" morph=\"robinson:T-GSF robinson:N-GSF\">OF THE EARTH</w>", //$NON-NLS-1$
"<inscription><w src=\"8\" lemma=\"strong:G3466\" morph=\"robinson:N-NSN\">MYSTERY</w>, <w src=\"9\" lemma=\"strong:G897\" morph=\"robinson:N-NSF\">BABYLON</w> <w src=\"11\" lemma=\"strong:G3173\" morph=\"robinson:A-NSF\">THE GREAT</w>, <w src=\"12 13\" lemma=\"strong:G3588 strong:G3384\" morph=\"robinson:T-NSF robinson:N-NSF\">THE MOTHER</w> <w src=\"14 15\" lemma=\"strong:G3588 strong:G4204\" morph=\"robinson:T-GPF robinson:N-GPF\">OF HARLOTS</w> <w src=\"16\" lemma=\"strong:G2532\" morph=\"robinson:CONJ\">AND</w> <w src=\"17 18\" lemma=\"strong:G3588 strong:G946\" morph=\"robinson:T-GPN robinson:N-GPN\">ABOMINATIONS</w> <w src=\"19 20\" lemma=\"strong:G3588 strong:G1093\" morph=\"robinson:T-GSF robinson:N-GSF\">OF THE EARTH</w></inscription>"); //$NON-NLS-1$
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/DictToOsis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/DictToOsis.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/DictToOsis.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -142,7 +142,7 @@
docBuffer.append("\n </header>"); //$NON-NLS-1$
docBuffer.append("\n<div>"); //$NON-NLS-1$
docBuffer.append('\n');
- MessageFormat msgFormat = new MessageFormat(docBuffer.toString()); //$NON-NLS-1$
+ MessageFormat msgFormat = new MessageFormat(docBuffer.toString());
msgFormat.format(new Object[] { bmd.getInitials(), bmd.getName() }, buf, pos);
}
@@ -153,7 +153,7 @@
private void buildEntryOpen(StringBuffer buf, String entryName, String entryDef)
{
- if (entryName.indexOf(' ') != -1) //$NON-NLS-1$
+ if (entryName.indexOf(' ') != -1)
{
entryName = "x"; //$NON-NLS-1$
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -207,7 +207,7 @@
* The <code>NameVisitor</code> constructs a readable representation
* of the Passage.
*/
- private static class NameVisitor extends DefaultKeyVisitor
+ static class NameVisitor extends DefaultKeyVisitor
{
/**
* Create a <code>NameVisitor</code>.
@@ -248,7 +248,7 @@
* The <code>OsisRefVisitor</code> constructs a readable representation
* of the Passage, using OSIS names.
*/
- private static class OsisRefVisitor extends NameVisitor
+ static class OsisRefVisitor extends NameVisitor
{
/* (non-Javadoc)
* @see org.crosswire.jsword.passage.KeyVisitor#visitLeaf(org.crosswire.jsword.passage.Key)
@@ -264,7 +264,7 @@
* The <code>OsisRefVisitor</code> constructs a readable representation
* of the Passage, using OSIS names.
*/
- private static class OsisIDVisitor extends NameVisitor
+ static class OsisIDVisitor extends NameVisitor
{
/* (non-Javadoc)
* @see org.crosswire.jsword.passage.KeyVisitor#visitLeaf(org.crosswire.jsword.passage.Key)
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -479,7 +479,7 @@
*/
public static AccuracyType fromText(String original, String[] parts, AccuracyType verseAccuracy, VerseRange basis) throws NoSuchVerseException
{
- String msg = original; //$NON-NLS-1$
+ String msg = original;
switch (parts.length)
{
case 1:
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -844,7 +844,7 @@
/**
* Iterator over 1 verse - For being a VerseBase.
*/
- private class VerseIterator implements Iterator
+ class VerseIterator implements Iterator
{
/* (non-Javadoc)
* @see java.util.Iterator#hasNext()
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -271,7 +271,7 @@
/**
* Simpler method name display
*/
- private static final class CustomListCellRenderer extends DefaultListCellRenderer
+ static final class CustomListCellRenderer extends DefaultListCellRenderer
{
/* (non-Javadoc)
* @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -157,7 +157,7 @@
return bookName;
}
- return bookName + " (" + chapters + ')'; //$NON-NLS-1$ //$NON-NLS-2$
+ return bookName + " (" + chapters + ')'; //$NON-NLS-1$
}
catch (NoSuchVerseException ex)
{
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferenceRootTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferenceRootTreeNode.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferenceRootTreeNode.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -169,7 +169,7 @@
/**
* So we can keep track of how many books there are
*/
- private final class CustomBooksListener implements BooksListener
+ final class CustomBooksListener implements BooksListener
{
/* (non-Javadoc)
* @see org.crosswire.jsword.book.BooksListener#bookAdded(org.crosswire.jsword.book.BooksEvent)
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -135,7 +135,7 @@
*/
public void setBookData(Book book, Key key)
{
- throw new UnsupportedOperationException(); //$NON-NLS-1$
+ throw new UnsupportedOperationException();
}
/* (non-Javadoc)
@@ -143,7 +143,7 @@
*/
public void refresh()
{
- throw new UnsupportedOperationException(); //$NON-NLS-1$
+ throw new UnsupportedOperationException();
}
/* (non-Javadoc)
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DocumentWriter.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DocumentWriter.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DocumentWriter.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -231,7 +231,7 @@
/**
* For Thread/Swing correctness we should only update in the GUI thread
*/
- private class Updater implements Runnable
+ class Updater implements Runnable
{
public void run()
{
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 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -88,7 +88,7 @@
try
{
- return new URL(NetUtil.PROTOCOL_FTP, host, directory + "/" + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$ //$NON-NLS-2$
+ return new URL(NetUtil.PROTOCOL_FTP, host, directory + "/" + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$
}
catch (MalformedURLException ex)
{
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java 2006-04-18 19:33:42 UTC (rev 1085)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java 2006-04-30 23:51:48 UTC (rev 1086)
@@ -147,7 +147,7 @@
}
- private class Properties extends java.util.Properties {
+ class Properties extends java.util.Properties {
private static final long serialVersionUID = 3258126977117533238L;
private String name = null;
More information about the jsword-svn
mailing list