[jsword-svn] r2311 - in trunk/bibledesktop/src/main: java/org/crosswire/bibledesktop/book java/org/crosswire/bibledesktop/book/install java/org/crosswire/bibledesktop/display java/org/crosswire/common/config/swing java/org/crosswire/common/progress/swing java/org/crosswire/common/swing java/org/crosswire/common/swing/desktop java/org/crosswire/common/swing/plaf resources/xsl/cswing
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Feb 12 09:27:54 MST 2015
Author: dmsmith
Date: 2015-02-12 09:27:53 -0700 (Thu, 12 Feb 2015)
New Revision: 2311
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookIcon.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobCancelListener.java
trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TDIViewLayout.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabPopupListener.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java
trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
simple.xsl improvements
Javadoc improvements
av11n improvements
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -51,7 +51,6 @@
import org.crosswire.common.util.Reporter;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
-import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.PassageKeyFactory;
import org.slf4j.Logger;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -278,8 +278,7 @@
Verse start = quickSet.getVerse();
BibleBook book = start.getBook();
int chapter = start.getChapter();
- // AV11N(DMS): Is this right?
- Versification v11n = Versifications.instance().getDefaultVersification();
+ Versification v11n = start.getVersification();
VerseRange range = new VerseRange(v11n, start, new Verse(v11n, book, chapter, v11n.getLastVerse(book, chapter)));
txtSearch.setText("");
txtKey.setText(range.getName());
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -38,7 +38,7 @@
* The copyright to this program is held by it's authors.
* @author DM Smith
*/
-public class BookFont extends FontStore {
+public final class BookFont extends FontStore {
/**
* Create a persistent Book Font Store.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookIcon.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookIcon.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookIcon.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -36,7 +36,7 @@
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class BookIcon {
+public final class BookIcon {
/**
* Static class
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -3,7 +3,7 @@
allow GUI components to choose between the methods they use to display BookData
objects.
-<br/>
+<br>
There are several implementation of this interface in sub-packages.
<ul>
<li>textpane - A simple unscrolled implementation that uses a JDK HTML widget.</li>
@@ -18,7 +18,7 @@
</ul>
-<br/>
+<br>
We have spent some time investigating alternatives to the JDK HTML widget.
The requirements were:
<ul>
@@ -30,21 +30,21 @@
</ul>
<p>
-<b>JRex (Embed Mozilla)</b><br/>
+<b>JRex (Embed Mozilla)</b><br>
Very good html displayer, but probably very complex to get working and
installed, especially over WebStart. JNI+webstart anyone?
See <a href="http://jrex.mozdev.org/index.html">mozdev</a>.
</p>
<p>
-<b>Jazilla (Mozilla re-write in Java)</b><br/>
+<b>Jazilla (Mozilla re-write in Java)</b><br>
Interesting project, but one that seems more interested in XUL than the Java
renderer, proceeding slowly.
See <a href="http://jazilla.mcbridematt.sniperhq.net/">their home page</a>.
</p>
<p>
-<b>JXWB (OSS Java Browser)</b><br/>
+<b>JXWB (OSS Java Browser)</b><br>
Commercial software made free. Works well with Swing (includes customized
implementations of javax.swing.text.Document and javax.swing.text.EditorKit)
Things have moved on quite a bit recently.
@@ -52,7 +52,7 @@
</p>
<p>
-<b>SWT Browser Component</b><br/>
+<b>SWT Browser Component</b><br>
Don't think we could easily embed an SWT component in swing (since SWT is
heavyweight in AWT speak) and I don't particularly want to re-write the whole
app in SWT. However there are 2 projects to allow use of SWT from a swing API.
@@ -66,7 +66,7 @@
</p>
<p>
-<b>FOP -> PNG</b><br/>
+<b>FOP -> PNG</b><br>
FOP is XSL:FO renderer that can create PDFs and various graphics files.
Could give very slick output, but not at all dynamic, quite slow and FO is not
easy to use. Probably not one of the best ideas for normal rendering.
@@ -74,7 +74,7 @@
</p>
<p>
-<b>Dynamic Swing GUI</b><br/>
+<b>Dynamic Swing GUI</b><br>
There are plenty of XML->Swing converters. JDK 1.4 even includes one.
Maybe we could write a OSIS->SwingXML converter in XSL and then render OSIS
text in swing components. Could be very fancy. XSL could be complex.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -54,12 +54,8 @@
* @author Joe Walker [joe at eireneh dot com]
*/
public abstract class AbstractConfigEditor extends JPanel implements ConfigEditor, ButtonPaneListener {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.ConfigEditor#init(org.crosswire.common
- * .config.Config)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.ConfigEditor#construct(org.crosswire.common.config.Config)
*/
public void construct(Config aConfig) {
this.config = aConfig;
@@ -89,12 +85,8 @@
SwingUtilities.updateComponentTreeUI(this);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.ConfigEditor#showDialog(java.awt.Component
- * , java.awt.event.ActionListener)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.ConfigEditor#showDialog(java.awt.Component, java.awt.event.ActionListener)
*/
public void showDialog(Component parent, ActionListener newal) {
this.al = newal;
@@ -149,12 +141,8 @@
*/
protected abstract void updateTree();
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.ButtonPaneListener#ok(java.awt.event
- * .ActionEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.ButtonPaneListener#okPressed(java.awt.event.ActionEvent)
*/
public void okPressed(ActionEvent ev) {
screenToLocal();
@@ -162,23 +150,15 @@
hideDialog();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.ButtonPaneListener#cancel(java.awt.
- * event.ActionEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.ButtonPaneListener#cancelPressed(java.awt.event.ActionEvent)
*/
public void cancelPressed(ActionEvent ev) {
hideDialog();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.ButtonPaneListener#apply(java.awt.event
- * .ActionEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.ButtonPaneListener#applyPressed(java.awt.event.ActionEvent)
*/
public void applyPressed(ActionEvent ev) {
screenToLocal();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -178,12 +178,8 @@
* @author Joe Walker
*/
class AdvancedConfigureTreeModel extends ConfigureTreeModel {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel
- * #getChildren(java.lang.String)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel#getChildren(java.lang.String)
*/
@Override
protected List<String> getChildren(String path) {
@@ -219,10 +215,8 @@
return retcode;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel#getChild(java.lang.Object, int)
*/
@Override
public Object getChild(Object parent, int index) {
@@ -241,10 +235,8 @@
return new Node(path, name);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel#getChildCount(java.lang.Object)
*/
@Override
public int getChildCount(Object parent) {
@@ -261,10 +253,8 @@
return children;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.TreeConfigEditor.ConfigureTreeModel#isLeaf(java.lang.Object)
*/
@Override
public boolean isLeaf(Object node) {
@@ -283,9 +273,7 @@
this.path = path;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
@@ -310,13 +298,8 @@
* The renderer for our tree
*/
class CustomTreeCellRenderer extends DefaultTreeCellRenderer {
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax
- * .swing.JTree, java.lang.Object, boolean, boolean, boolean, int,
- * boolean)
+ /* (non-Javadoc)
+ * @see javax.swing.tree.DefaultTreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean)
*/
@Override
public Component getTreeCellRendererComponent(JTree jtree, Object value, boolean isselected, boolean expanded, boolean leaf, int row, boolean focus) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -36,9 +36,7 @@
* @author Joe Walker [joe at eireneh dot com]
*/
public class DirectoryField extends FileField {
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.FileField#doBrowse()
*/
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -70,37 +70,27 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common
- * .config.Choice)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common.config.Choice)
*/
public void setChoice(Choice param) {
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getValue()
*/
public String getValue() {
return text.getText();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#setValue(java.lang.String)
*/
public void setValue(String value) {
text.setText(value);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getComponent()
*/
public JComponent getComponent() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -42,7 +42,7 @@
import org.crosswire.common.config.Choice;
import org.crosswire.common.swing.ActionFactory;
import org.crosswire.common.swing.CWScrollPane;
-import org.crosswire.common.util.Convert;
+import org.crosswire.common.util.StringUtil;
/**
* A StringArrayField allows editing of an array of Strings in a JList. It
@@ -87,23 +87,17 @@
add(buttons, BorderLayout.PAGE_END);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common
- * .config.Choice)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common.config.Choice)
*/
public void setChoice(Choice param) {
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getValue()
*/
public String getValue() {
- return Convert.stringArray2String(getArray(), File.pathSeparator);
+ return StringUtil.join(getArray(), File.pathSeparator);
}
/**
@@ -120,13 +114,11 @@
return retcode;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#setValue(java.lang.String)
*/
public void setValue(String value) {
- setArray(Convert.string2StringArray(value, File.pathSeparator));
+ setArray(StringUtil.split(value, File.pathSeparator));
}
/**
@@ -140,9 +132,7 @@
list.setModel(model);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getComponent()
*/
public JComponent getComponent() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -50,7 +50,7 @@
import org.crosswire.common.swing.CWOtherMsg;
import org.crosswire.common.swing.CWScrollPane;
import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.util.Convert;
+import org.crosswire.common.util.StringUtil;
/**
* A StringArrayField allows editing of an array of Strings in a JList. It
@@ -95,23 +95,17 @@
GuiUtil.applyDefaultOrientation(this);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common
- * .config.Choice)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.config.swing.Field#setChoice(org.crosswire.common.config.Choice)
*/
public void setChoice(Choice param) {
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getValue()
*/
public String getValue() {
- return Convert.stringArray2String(getArray(), SEPARATOR);
+ return StringUtil.join(getArray(), SEPARATOR);
}
/**
@@ -128,13 +122,11 @@
return retcode;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#setValue(java.lang.String)
*/
public void setValue(String value) {
- setArray(Convert.string2StringArray(value, SEPARATOR));
+ setArray(StringUtil.split(value, SEPARATOR));
}
/**
@@ -148,9 +140,7 @@
list.setModel(list_model);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.config.swing.Field#getComponent()
*/
public JComponent getComponent() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -63,7 +63,7 @@
*/
public class TreeConfigEditor extends AbstractConfigEditor {
/**
- * <br />
+ * <br>
* Danger - this method is not called by the TreeConfigEditor constructor,
* it is called by the AbstractConfigEditor constructor so any field
* initializers will be called AFTER THIS METHOD EXECUTES so don't use field
@@ -227,9 +227,7 @@
* @author Joe Walker
*/
protected class ConfigureTreeModel implements TreeModel {
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.tree.TreeModel#getRoot()
*/
public Object getRoot() {
@@ -275,9 +273,7 @@
return retcode;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int)
*/
public Object getChild(Object parent, int index) {
@@ -286,9 +282,7 @@
return new Node(path, name);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object)
*/
public int getChildCount(Object parent) {
@@ -296,9 +290,7 @@
return getChildren(path).size();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object)
*/
public boolean isLeaf(Object node) {
@@ -306,21 +298,14 @@
return getChildren(path).size() == 0;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath
- * , java.lang.Object)
+ /* (non-Javadoc)
+ * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object)
*/
public void valueForPathChanged(TreePath path, Object value) {
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object,
- * java.lang.Object)
+ /* (non-Javadoc)
+ * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object)
*/
public int getIndexOfChild(Object parent, Object child) {
String path = ((Node) parent).getFullName();
@@ -328,23 +313,15 @@
return children.indexOf(child);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event
- * .TreeModelListener)
+ /* (non-Javadoc)
+ * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener)
*/
public void addTreeModelListener(TreeModelListener li) {
listeners.add(TreeModelListener.class, li);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event
- * .TreeModelListener)
+ /* (non-Javadoc)
+ * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener)
*/
public void removeTreeModelListener(TreeModelListener li) {
listeners.remove(TreeModelListener.class, li);
@@ -410,9 +387,7 @@
this.name = name;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobCancelListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobCancelListener.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobCancelListener.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -41,11 +41,8 @@
job = theJob;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent ev) {
job.cancel();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -100,12 +100,8 @@
return GuiUtil.flatten(new JButton(action));
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.progress.WorkListener#workProgressed(org.crosswire
- * .common.progress.WorkEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workProgressed(org.crosswire.common.progress.WorkEvent)
*/
public synchronized void workProgressed(final WorkEvent ev) {
SwingUtilities.invokeLater(new Runnable() {
@@ -125,12 +121,8 @@
});
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire
- * .common.progress.WorkEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire.common.progress.WorkEvent)
*/
public void workStateChanged(WorkEvent ev) {
Progress job = (Job) ev.getSource();
@@ -299,12 +291,8 @@
return index;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire
- * .common.progress.WorkEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire.common.progress.WorkEvent)
*/
public void workStateChanged(WorkEvent evt) {
if (cancelButton != null) {
@@ -312,12 +300,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.progress.WorkListener#workProgressed(org.crosswire
- * .common.progress.WorkEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workProgressed(org.crosswire.common.progress.WorkEvent)
*/
public void workProgressed(WorkEvent ev) {
// Don't care about progress
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -44,17 +44,17 @@
* The ActionFactory is responsible for creating CWActions and making them
* available to the program. Each Action is constructed from resources of the
* form: ActionName.field=value where ActionName is the ACTION_COMMAND_KEY value
- * and field is one of the CWAction constants, e.g. LargeIcon. <br/>
+ * and field is one of the CWAction constants, e.g. LargeIcon. <br>
* Field is one of:
* <ul>
- * <li>Name - This is required. The value is used for the text of the Action.<br/>
+ * <li>Name - This is required. The value is used for the text of the Action.<br>
* A mnemonic can be specified by preceding the letter with _. Using this letter in
* a case insensitive search, the earliest position of that letter will
* cause the it to be underlined. In a platform dependent
* way it provides a keyboard mechanism to fire the action. For example, on
* Windows, alt + mnemonic will cause a visible, active element with that
* mnemonic to fire. For this reason, it is important to ensure that two
- * visible, active elements do not have the same mnemonic.<br/>
+ * visible, active elements do not have the same mnemonic.<br>
* Note: Mnemonics are suppressed on MacOSX.</li>
*
* <li>ToolTip - A tip to show when the mouse is over an element. If not
@@ -62,7 +62,7 @@
* tooltip that is identical to the shown text.</li>
*
* <li>SmallIcon - A 16x16 pixel image to be shown for the item. The value for
- * this is a path which can be found as a resource.<br/>
+ * this is a path which can be found as a resource.<br>
* Note: the small icon will be used when actions are tied to menu items and
* buttons.</li>
*
@@ -71,8 +71,8 @@
* toolbar is requested. The value is a resource path to the image.</li>
*
* <li>AcceleratorKey - A key on the keyboard, which may be specified with 0x25
- * kind of notation.<br/>
- * <br/>
+ * kind of notation.<br>
+ * <br>
* Accelerators are global key combinations that work within an application to
* fire the action. When the action is shown as a menu item the accelerator will
* be listed with the name. Note: The accelerator key and it's modifiers are
@@ -80,7 +80,7 @@
* <code>KeyStroke.getKeyStroke(key, modifierMask);</code></li>
*
* <li>AcceleratorKey.Modifier - A comma separated list of ctrl, alt, and shift,
- * indicating what modifiers are necessary for the accelerator.<br/>
+ * indicating what modifiers are necessary for the accelerator.<br>
* Note: ctrl will use a platform's command key. On MacOSX this is the
* Apple/Command key. Other platforms use Ctrl.</li>
* <li>Enabled - Defaults to true when not present. It is disabled when the
@@ -222,19 +222,6 @@
}
/**
- * Get the Action for the given actionName.
- *
- * @param key
- * the internal name of the CWAction
- * @return CWAction null if it does not exist
- * @deprecated use {@link #findAction(String)} instead
- */
- @Deprecated
- public Action getAction(String key) {
- return findAction(key);
- }
-
- /**
* Build a button from an action.
*
* @param action
@@ -255,7 +242,7 @@
* lookup the action for reuse.
* @param name
* This is required. The value is used for the text of the
- * Action.<br/>
+ * Action.<br>
* A mnemonic can be specified by preceding the letter with _.
* Using this letter in a case insensitive search, the earliest
* position of that letter will cause the it to be underlined. In
@@ -263,7 +250,7 @@
* fire the action. For example, on Windows, alt + mnemonic will
* cause a visible, active element with that mnemonic to fire.
* For this reason, it is important to ensure that two visible,
- * active elements do not have the same mnemonic.<br/>
+ * active elements do not have the same mnemonic.<br>
* Note: Mnemonics are suppressed on MacOSX.
* @return the stored or newly constructed action
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -116,11 +116,8 @@
super(arg0, arg1, arg2, arg3);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * java.awt.Component#setComponentOrientation(java.awt.ComponentOrientation)
+ /* (non-Javadoc)
+ * @see java.awt.Component#setComponentOrientation(java.awt.ComponentOrientation)
*/
@Override
public void setComponentOrientation(ComponentOrientation o) {
@@ -153,11 +150,8 @@
super.setComponentOrientation(o);
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.Container#addImpl(java.awt.Component, java.lang.Object,
- * int)
+ /* (non-Javadoc)
+ * @see javax.swing.JSplitPane#addImpl(java.awt.Component, java.lang.Object, int)
*/
@Override
protected void addImpl(Component comp, Object constraints, int index) {
@@ -174,9 +168,7 @@
super.addImpl(comp, realConstraints, index);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setBottomComponent(java.awt.Component)
*/
@Override
@@ -187,9 +179,7 @@
super.setBottomComponent(comp);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setLeftComponent(java.awt.Component)
*/
@Override
@@ -205,9 +195,7 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setRightComponent(java.awt.Component)
*/
@Override
@@ -223,9 +211,7 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setTopComponent(java.awt.Component)
*/
@Override
@@ -310,10 +296,8 @@
firePropertyChange(PROPERTYNAME_VISIBLE_DIVIDER_BORDER, oldVisibility, newVisibility);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.JComponent#updateUI()
+ /* (non-Javadoc)
+ * @see javax.swing.JSplitPane#updateUI()
*/
@Override
public void updateUI() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -36,9 +36,7 @@
* @author Joe Walker [joe at eireneh dot com]
*/
public class AntiAliasedTextPane extends JTextPane {
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JComponent#paintComponent(java.awt.Graphics)
*/
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -33,7 +33,7 @@
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class CWLabel {
+public final class CWLabel {
/**
* Utility class. Prevent instantiation.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -62,9 +62,7 @@
return ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JScrollPane#createHorizontalScrollBar()
*/
@Override
@@ -74,9 +72,7 @@
return scroller;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JScrollPane#createVerticalScrollBar()
*/
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -51,11 +51,8 @@
super(group, name);
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.ThreadGroup#uncaughtException(java.lang.Thread,
- * java.lang.Throwable)
+ /* (non-Javadoc)
+ * @see java.lang.ThreadGroup#uncaughtException(java.lang.Thread, java.lang.Throwable)
*/
@Override
public void uncaughtException(Thread t, Throwable ex) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -97,9 +97,7 @@
this.verticalOrientation = verticalOrientation;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.Icon#getIconHeight()
*/
public int getIconHeight() {
@@ -110,9 +108,7 @@
return Math.max(icon1.getIconHeight(), icon2.getIconHeight());
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.Icon#getIconWidth()
*/
public int getIconWidth() {
@@ -123,11 +119,8 @@
return Math.max(icon1.getIconWidth(), icon2.getIconWidth());
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.Icon#paintIcon(java.awt.Component, java.awt.Graphics,
- * int, int)
+ /* (non-Javadoc)
+ * @see javax.swing.Icon#paintIcon(java.awt.Component, java.awt.Graphics, int, int)
*/
public void paintIcon(Component c, Graphics g, int x, int y) {
int width = getIconWidth();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -553,9 +553,7 @@
event = ev;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see java.lang.Runnable#run()
*/
public void run() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -112,11 +112,8 @@
super(arg0, arg1, arg2, arg3);
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.Container#addImpl(java.awt.Component, java.lang.Object,
- * int)
+ /* (non-Javadoc)
+ * @see javax.swing.JSplitPane#addImpl(java.awt.Component, java.lang.Object, int)
*/
@Override
protected void addImpl(Component comp, Object constraints, int index) {
@@ -126,9 +123,7 @@
super.addImpl(comp, constraints, index);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setBottomComponent(java.awt.Component)
*/
@Override
@@ -139,9 +134,7 @@
super.setBottomComponent(comp);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setLeftComponent(java.awt.Component)
*/
@Override
@@ -152,9 +145,7 @@
super.setLeftComponent(comp);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setRightComponent(java.awt.Component)
*/
@Override
@@ -165,9 +156,7 @@
super.setRightComponent(comp);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JSplitPane#setTopComponent(java.awt.Component)
*/
@Override
@@ -230,10 +219,8 @@
firePropertyChange(PROPERTYNAME_VISIBLE_DIVIDER_BORDER, oldVisibility, newVisibility);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.JComponent#updateUI()
+ /* (non-Javadoc)
+ * @see javax.swing.JSplitPane#updateUI()
*/
@Override
public void updateUI() {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -236,9 +236,7 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object)
*/
public void setSelectedItem(Object selection) {
@@ -246,27 +244,21 @@
fireContentsChanged(this, -1, -1);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ComboBoxModel#getSelectedItem()
*/
public Object getSelectedItem() {
return selection;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ListModel#getSize()
*/
public int getSize() {
return fontCount;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ListModel#getElementAt(int)
*/
public Object getElementAt(int index) {
@@ -305,12 +297,8 @@
GuiUtil.applyDefaultOrientation(this);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing
- * .JList, java.lang.Object, int, boolean, boolean)
+ /* (non-Javadoc)
+ * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
@Override
public Component getListCellRendererComponent(JList listbox, Object value, int index, boolean selected, boolean focus) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -45,8 +45,8 @@
/**
* Convert a String to a Font. Accepts one of two inputs:
* FamilyName-STYLE-size, where STYLE is either PLAIN, BOLD, ITALIC or
- * BOLDITALIC<br/>
- * or<br/>
+ * BOLDITALIC<br>
+ * or<br>
* FamilyName,style,size, where STYLE is 0 for PLAIN, 1 for BOLD, 2 for
* ITALIC or 3 for BOLDITALIC.
*
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -110,7 +110,7 @@
/**
* Set the default font for all Swing components. E.g.
- * <code>setUIFont(new FontUIResource("Serif", Font.ITALIC, 12));</code> <br/>
+ * <code>setUIFont(new FontUIResource("Serif", Font.ITALIC, 12));</code> <br>
* Note: a single resources can be changed with:
* <code>UIManager.put("Label.font", new Font("Serif", Font.ITALIC, 12));</code>
*
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -43,9 +43,7 @@
list = new ArrayList<Object>(map.entrySet());
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object)
*/
public void setSelectedItem(Object newSelection) {
@@ -53,27 +51,21 @@
fireContentsChanged(this, -1, -1);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ComboBoxModel#getSelectedItem()
*/
public Object getSelectedItem() {
return selected;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ListModel#getSize()
*/
public int getSize() {
return list.size();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.ListModel#getElementAt(int)
*/
public Object getElementAt(int index) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -36,12 +36,8 @@
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
public class MapEntryRenderer extends DefaultListCellRenderer {
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax
- * .swing.JList, java.lang.Object, int, boolean, boolean)
+ /* (non-Javadoc)
+ * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean focus) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -44,12 +44,8 @@
GuiUtil.applyDefaultOrientation(this);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax
- * .swing.JList, java.lang.Object, int, boolean, boolean)
+ /* (non-Javadoc)
+ * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean focus) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -35,11 +35,8 @@
* @see java.lang.Character#isDigit(char)
*/
public class NumericDocument extends PlainDocument {
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.text.Document#insertString(int, java.lang.String,
- * javax.swing.text.AttributeSet)
+ /* (non-Javadoc)
+ * @see javax.swing.text.PlainDocument#insertString(int, java.lang.String, javax.swing.text.AttributeSet)
*/
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -71,10 +71,8 @@
txtHelp.setEditorKit(new HTMLEditorKit());
txtHelp.setMargin(new Insets(5, 5, 0, 5));
txtHelp.addKeyListener(new KeyAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.KeyAdapter#keyTyped(java.awt.event.KeyEvent)
*/
@Override
public void keyTyped(KeyEvent ev) {
@@ -104,11 +102,8 @@
this.setContentPane(pnlHelp);
this.getRootPane().setDefaultButton(btnOK);
this.addWindowListener(new WindowAdapter() {
- /*
- * (non-Javadoc)
- *
- * @seejava.awt.event.WindowListener#windowClosing(java.awt.event.
- * WindowEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.WindowAdapter#windowClosing(java.awt.event.WindowEvent)
*/
@Override
public void windowClosing(WindowEvent ev) {
@@ -117,10 +112,8 @@
});
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.Component#setVisible(boolean)
+ /* (non-Javadoc)
+ * @see java.awt.Dialog#setVisible(boolean)
*/
@Override
public void setVisible(boolean visible) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -46,7 +46,7 @@
* @author Adam Thomas [adam-thomas at cox dot net]
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class LayoutPersistence {
+public final class LayoutPersistence {
/**
* Creates the singleton persistence object capable of storing and
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -56,12 +56,8 @@
getPanel().add(desk, getConstraint());
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#addView(java.awt
- * .Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#addView(java.awt.Component)
*/
@Override
public void addView(Component view) {
@@ -83,12 +79,8 @@
iframe.pack();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#removeView(java
- * .awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#removeView(java.awt.Component)
*/
@Override
public void removeView(Component view) {
@@ -115,12 +107,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#forceRemoveView
- * (java.awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#forceRemoveView(java.awt.Component)
*/
@Override
protected void forceRemoveView(Component component) {
@@ -137,12 +125,8 @@
super.forceRemoveView(component);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#updateTitle(java
- * .awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#updateTitle(java.awt.Component)
*/
@Override
public void updateTitle(Component view) {
@@ -153,9 +137,7 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.AbstractViewLayout#getSelected()
*/
@Override
@@ -186,12 +168,8 @@
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#select(java.awt
- * .Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#select(java.awt.Component)
*/
@Override
public void select(Component component) {
@@ -234,12 +212,8 @@
* So we can tidy things up when a window is closed
*/
class CustomInternalFrameAdapter extends InternalFrameAdapter {
- /*
- * (non-Javadoc)
- *
- * @see
- * javax.swing.event.InternalFrameListener#internalFrameClosed(javax
- * .swing.event.InternalFrameEvent)
+ /* (non-Javadoc)
+ * @see javax.swing.event.InternalFrameAdapter#internalFrameClosed(javax.swing.event.InternalFrameEvent)
*/
@Override
public void internalFrameClosed(InternalFrameEvent ev) {
@@ -254,11 +228,8 @@
*/
class CloseListener implements VetoableChangeListener {
- /*
- * (non-Javadoc)
- *
- * @seejava.beans.VetoableChangeListener#vetoableChange(java.beans.
- * PropertyChangeEvent)
+ /* (non-Javadoc)
+ * @see java.beans.VetoableChangeListener#vetoableChange(java.beans.PropertyChangeEvent)
*/
public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException {
// Don't allow the last one to be closed.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TDIViewLayout.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TDIViewLayout.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TDIViewLayout.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -54,12 +54,8 @@
GuiUtil.applyDefaultOrientation(tabs);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#addView(java.awt
- * .Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#addView(java.awt.Component)
*/
@Override
public void addView(Component component) {
@@ -82,12 +78,8 @@
super.addView(component);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#removeView(java
- * .awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#removeView(java.awt.Component)
*/
@Override
public void removeView(Component component) {
@@ -115,12 +107,8 @@
super.removeView(component);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#forceRemoveView
- * (java.awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#forceRemoveView(java.awt.Component)
*/
@Override
protected void forceRemoveView(Component component) {
@@ -144,11 +132,8 @@
super.forceRemoveView(component);
}
- /*
- * (non-Javadoc)
- *
- * @seeorg.crosswire.bibledesktop.desktop.ViewLayout#update(org.crosswire.
- * bibledesktop.book.BibleViewPane)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#updateTitle(java.awt.Component)
*/
@Override
public void updateTitle(Component component) {
@@ -158,10 +143,8 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.crosswire.bibledesktop.desktop.ViewLayout#getSelected()
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.AbstractViewLayout#getSelected()
*/
@Override
public Component getSelected() {
@@ -171,13 +154,6 @@
return tabs.getSelectedComponent();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.AbstractViewLayout#select(java.awt
- * .Component)
- */
@Override
public void select(Component component) {
// If we don't have tabs then it is selected.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabPopupListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabPopupListener.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabPopupListener.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -52,31 +52,24 @@
tabs = tabbedPane;
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.MouseAdapter#mouseClicked(java.awt.event.MouseEvent)
*/
@Override
public void mouseClicked(MouseEvent e) {
doPopup(e);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.MouseAdapter#mouseReleased(java.awt.event.MouseEvent)
*/
@Override
public void mouseReleased(MouseEvent e) {
doPopup(e);
}
- /*
- * (non-Javadoc)
- *
- * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
+ /* (non-Javadoc)
+ * @see java.awt.event.MouseAdapter#mousePressed(java.awt.event.MouseEvent)
*/
@Override
public void mousePressed(MouseEvent e) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -74,9 +74,7 @@
GuiUtil.applyDefaultOrientation(this);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see javax.swing.JToolBar#add(javax.swing.Action)
*/
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -144,71 +144,50 @@
return tdiView;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#addView(java.awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#addView(java.awt.Component)
*/
public final void addView(Component component) {
getViewLayout().addView(component);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#closeAll()
*/
public void closeAll() {
getViewLayout().closeAll();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#closeOthers(java.awt.Component
- * )
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#closeOthers(java.awt.Component)
*/
public void closeOthers(Component component) {
getViewLayout().closeOthers(component);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#getView(int)
*/
public Component getView(int i) {
return getViewLayout().getView(i);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#getViews()
*/
public Collection<Component> getViews() {
return getViewLayout().getViews();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#moveTo(org.crosswire.common
- * .swing.desktop.AbstractViewLayout)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#moveTo(org.crosswire.common.swing.desktop.AbstractViewLayout)
*/
public void moveTo(AbstractViewLayout other) {
getViewLayout().moveTo(other);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#updateTitle(java.awt.Component
- * )
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#updateTitle(java.awt.Component)
*/
public void updateTitle(Component component) {
getViewLayout().updateTitle(component);
@@ -230,12 +209,8 @@
return view;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#removeView(java.awt.Component
- * )
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#removeView(java.awt.Component)
*/
public void removeView(Component view) {
// If it were the last one then clear it.
@@ -263,49 +238,36 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.crosswire.common.swing.desktop.Viewable#iterator()
+ /* (non-Javadoc)
+ * @see java.lang.Iterable#iterator()
*/
public Iterator<Component> iterator() {
return getViewLayout().iterator();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#visit(org.crosswire.common
- * .swing.desktop.ViewVisitor)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#visit(org.crosswire.common.swing.desktop.ViewVisitor)
*/
public void visit(ViewVisitor visitor) {
getViewLayout().visit(visitor);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#getViewCount()
*/
public int getViewCount() {
return getViewLayout().getViewCount();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#getSelected()
*/
public Component getSelected() {
return getViewLayout().getSelected();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#select(java.awt.Component)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#select(java.awt.Component)
*/
public void select(Component component) {
getViewLayout().select(component);
@@ -373,12 +335,8 @@
return initial.toInteger();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.ViewEventListener#viewRemoved(org.
- * crosswire.common.swing.desktop.ViewEvent)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.event.ViewEventListener#viewRemoved(org.crosswire.common.swing.desktop.event.ViewEvent)
*/
public void viewRemoved(ViewEvent event) {
Object view = event.getSource();
@@ -394,35 +352,24 @@
ViewManager.initial = LayoutType.fromInteger(initialLayout);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.bibledesktop.book.TitleChangedListener#titleChanged(org
- * .crosswire.bibledesktop.book.TitleChangedEvent )
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.event.TitleChangedListener#titleChanged(org.crosswire.common.swing.desktop.event.TitleChangedEvent)
*/
public void titleChanged(TitleChangedEvent ev) {
Component view = (Component) ev.getSource();
getViewLayout().updateTitle(view);
}
- /*
- * (non-Javadoc)
- *
- * @seeorg.crosswire.common.swing.desktop.Viewable#addViewEventListener(org.
- * crosswire.common.swing.desktop.event. ViewEventListener)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#addViewEventListener(org.crosswire.common.swing.desktop.event.ViewEventListener)
*/
public final void addViewEventListener(ViewEventListener listener) {
LayoutType.MDI.getLayout().addViewEventListener(listener);
LayoutType.TDI.getLayout().addViewEventListener(listener);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.common.swing.desktop.Viewable#removeViewEventListener(org
- * .crosswire.common.swing.desktop.event. ViewEventListener)
+ /* (non-Javadoc)
+ * @see org.crosswire.common.swing.desktop.Viewable#removeViewEventListener(org.crosswire.common.swing.desktop.event.ViewEventListener)
*/
public void removeViewEventListener(ViewEventListener listener) {
LayoutType.MDI.getLayout().removeViewEventListener(listener);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java 2015-02-12 16:27:53 UTC (rev 2311)
@@ -79,11 +79,8 @@
insets = new Insets(insetTop, insetLeft, insetBottom, insetRight);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.border.Border#paintBorder(java.awt.Component,
- * java.awt.Graphics, int, int, int, int)
+ /* (non-Javadoc)
+ * @see javax.swing.border.AbstractBorder#paintBorder(java.awt.Component, java.awt.Graphics, int, int, int, int)
*/
@Override
public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
@@ -114,10 +111,8 @@
g.translate(-x, -y);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.swing.border.Border#getBorderInsets(java.awt.Component)
+ /* (non-Javadoc)
+ * @see javax.swing.border.AbstractBorder#getBorderInsets(java.awt.Component)
*/
@Override
public Insets getBorderInsets(Component c) {
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2014-04-03 14:37:06 UTC (rev 2310)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2015-02-12 16:27:53 UTC (rev 2311)
@@ -155,7 +155,7 @@
H5 { font-size: 85%; font-weight: bold; }
H6 { font-size: 80%; font-weight: bold; }
.heading { color: #669966; text-align: center; }
- .canonical { color: #666699; }
+ .canonical { color: #666699; text-align: center; }
.gen { color: #996666; }
div.margin { font-size:90%; }
TABLE { width:100% }
@@ -310,14 +310,14 @@
<xsl:if test="milestone[@type = 'x-p'] or q[@who = 'Jesus']/milestone[@type = 'x-p']"><br/><br/></xsl:if>
<!-- If the verse doesn't start on its own line and -->
<!-- the verse is not the first verse of a set of siblings, -->
- <!-- output an extra space. -->
+ <!-- output an extra space.
<xsl:if test="$VLine = 'false' and preceding-sibling::*[local-name() = 'verse']">
<xsl:text> </xsl:text>
- </xsl:if>
+ </xsl:if> -->
<!-- Always output the verse -->
<xsl:choose>
<xsl:when test="$VLine = 'true'">
- <div class="l"><a name="{@osisID}"><xsl:call-template name="versenum"/></a><xsl:apply-templates/></div>
+ <div class="l"><xsl:call-template name="versenum"/><xsl:apply-templates/></div>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="versenum"/><xsl:apply-templates/>
@@ -344,14 +344,14 @@
<xsl:if test="milestone[@type = 'x-p']"><br/><br/></xsl:if>
<!-- If the verse doesn't start on its own line and -->
<!-- the verse is not the first verse of a set of siblings, -->
- <!-- output an extra space. -->
+ <!-- output an extra space.
<xsl:if test="$VLine = 'false' and preceding-sibling::*[local-name() = 'verse']">
<xsl:text> </xsl:text>
- </xsl:if>
+ </xsl:if> -->
<!-- Always output the verse -->
<xsl:choose>
<xsl:when test="$VLine = 'true'">
- <div class="l"><a name="{@osisID}"><xsl:call-template name="versenum"/></a><xsl:apply-templates mode="jesus"/></div>
+ <div class="l"><xsl:call-template name="versenum"/><xsl:apply-templates mode="jesus"/></div>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="versenum"/><xsl:apply-templates mode="jesus"/>
@@ -413,18 +413,16 @@
-->
<xsl:choose>
<xsl:when test="$TinyVNum = 'true' and $Notes = 'true'">
- <a name="{@osisID}"><sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup></a>
+ <a name="{@osisID}"><sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup></a><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="$TinyVNum = 'true' and $Notes = 'false'">
- <sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup>
+ <sup class="verse"><font><xsl:value-of select="$versenum"/></font></sup><xsl:text> </xsl:text>
</xsl:when>
<xsl:when test="$TinyVNum = 'false' and $Notes = 'true'">
- <a name="{@osisID}">(<font><xsl:value-of select="$versenum"/></font>)</a>
- <xsl:text> </xsl:text>
+ <a name="{@osisID}">(<font><xsl:value-of select="$versenum"/></font>)</a><xsl:text> </xsl:text>
</xsl:when>
<xsl:otherwise>
- (<font><xsl:value-of select="$versenum"/></font>)
- <xsl:text> </xsl:text>
+ (<font><xsl:value-of select="$versenum"/></font>)<xsl:text> </xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
@@ -797,8 +795,8 @@
<xsl:if test="@canonical = 'true' or $Headings = 'true'">
<xsl:variable name="heading">
<xsl:choose>
+ <xsl:when test="@type = 'x-gen'">gen</xsl:when>
<xsl:when test="@canonical = 'true'">canonical</xsl:when>
- <xsl:when test="@type = 'x-gen'">gen</xsl:when>
<xsl:otherwise>heading</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -812,7 +810,7 @@
<xsl:when test="@level = '3'">
<h3 class="{$heading}"><xsl:apply-templates/></h3>
</xsl:when>
- <xsl:when test="@level = '4'">
+ <xsl:when test="@level = '4' or @type = 'x-gen'">
<h4 class="{$heading}"><xsl:apply-templates/></h4>
</xsl:when>
<xsl:when test="@level = '5'">
@@ -821,9 +819,6 @@
<xsl:when test="@level = '6'">
<h6 class="{$heading}"><xsl:apply-templates/></h6>
</xsl:when>
- <xsl:when test="@type = 'x-gen'">
- <h4 class="{$heading}"><xsl:apply-templates/></h4>
- </xsl:when>
<xsl:otherwise>
<h3 class="{$heading}"><xsl:apply-templates /></h3>
</xsl:otherwise>
@@ -978,8 +973,10 @@
<div class="lg"><xsl:apply-templates mode="jesus"/></div>
</xsl:template>
- <xsl:template match="lg[@sID or @eID]"/>
- <xsl:template match="lg[@sID or @eID]" mode="jesus"/>
+ <xsl:template match="lg[@sID]"><br/></xsl:template>
+ <xsl:template match="lg[@sID]" mode="jesus"><br/></xsl:template>
+ <xsl:template match="lg[@eID]"/>
+ <xsl:template match="lg[@eID]" mode="jesus"/>
<xsl:template match="l[@sID]">
<xsl:call-template name="indent"/>
@@ -1001,10 +998,20 @@
</xsl:template>
<!-- Generate poetry indent. The x-indent values are from an old ESV module.
- This mechanism is not ideal. The visual appearance does not account for verse numbers.
+ This mechanism is not ideal. The visual appearance does not fully account for verse numbers.
-->
<xsl:template name="indent">
+ <!-- Account for the verse number by not indenting -->
+ <xsl:if test="$NoVNum = 'false' and preceding-sibling::*[local-name() != 'verse']">
+ <xsl:text>    </xsl:text>
<xsl:choose>
+ <xsl:when test="@type = 'selah'">
+ <xsl:text>                </xsl:text>
+ <xsl:text>                </xsl:text>
+ <xsl:text>                </xsl:text>
+ <xsl:text>                </xsl:text>
+ <xsl:text>                </xsl:text>
+ </xsl:when>
<xsl:when test="@level = '1'">
<xsl:text>    </xsl:text>
</xsl:when>
@@ -1021,6 +1028,7 @@
<xsl:text>    </xsl:text>
</xsl:otherwise>
</xsl:choose>
+ </xsl:if>
</xsl:template>
<!-- While a BR is a break, if it is immediately followed by punctuation,
@@ -1382,7 +1390,7 @@
<font class="normal"><xsl:apply-templates/></font>
</xsl:when>
<xsl:when test="$style = 'small-caps'">
- <font class="small-caps"><xsl:apply-templates/></font>
+ <font class="small-caps"><xsl:apply-templates mode="small-caps"/></font>
</xsl:when>
<xsl:when test="$style = 'sub'">
<sub><xsl:apply-templates/></sub>
@@ -1436,7 +1444,7 @@
<font class="normal"><xsl:apply-templates/></font>
</xsl:when>
<xsl:when test="$style = 'small-caps'">
- <font class="small-caps"><xsl:apply-templates/></font>
+ <font class="small-caps"><xsl:apply-templates mode="small-caps"/></font>
</xsl:when>
<xsl:when test="$style = 'sub'">
<sub><xsl:apply-templates/></sub>
More information about the jsword-svn
mailing list