From dmsmith at crosswire.org Thu Feb 12 09:27:54 2015 From: dmsmith at crosswire.org (dmsmith at crosswire.org) Date: Thu, 12 Feb 2015 09:27:54 -0700 Subject: [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 Message-ID: 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. -
+
There are several implementation of this interface in sub-packages. -
+
We have spent some time investigating alternatives to the JDK HTML widget. The requirements were:

-JRex (Embed Mozilla)
+JRex (Embed Mozilla)
Very good html displayer, but probably very complex to get working and installed, especially over WebStart. JNI+webstart anyone? See mozdev.

-Jazilla (Mozilla re-write in Java)
+Jazilla (Mozilla re-write in Java)
Interesting project, but one that seems more interested in XUL than the Java renderer, proceeding slowly. See their home page.

-JXWB (OSS Java Browser)
+JXWB (OSS Java Browser)
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 @@

-SWT Browser Component
+SWT Browser Component
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 @@

-FOP -> PNG
+FOP -> PNG
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 @@

-Dynamic Swing GUI
+Dynamic Swing GUI
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 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 { /** - *
+ *
* 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.
+ * and field is one of the CWAction constants, e.g. LargeIcon.
* Field is one of: *