[jsword-svn] r2328 - in trunk/bibledesktop/src/main: java/org/crosswire/bibledesktop java/org/crosswire/bibledesktop/book java/org/crosswire/bibledesktop/book/install java/org/crosswire/bibledesktop/desktop java/org/crosswire/bibledesktop/display java/org/crosswire/bibledesktop/display/basic java/org/crosswire/bibledesktop/passage java/org/crosswire/bibledesktop/util 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/desktop/event java/org/crosswire/common/swing/plaf resources resources/xsl/cswing
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Jan 23 09:54:30 MST 2016
Author: dmsmith
Date: 2016-01-23 09:54:30 -0700 (Sat, 23 Jan 2016)
New Revision: 2328
Removed:
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GriddedPanel.java
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleNameCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookListCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectListener.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectListener.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.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/book/install/BookNode.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallerFactoryComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplayFactory.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ScrolledBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeListener.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyListListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeNode.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/package-info.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/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/BooleanField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPaneListener.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/Field.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FieldMap.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FontField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/NumberField.java
trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/OptionsField.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/TextField.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/AbstractLayout.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/Actionable.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/CWAction.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWMsg.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOtherMsg.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/EdgeBorder.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/FontStore.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FormPane.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiUtil.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/MapTableModel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NudgeButton.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/StackTraceListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Clearable.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.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/TabbedPanePanel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Titleable.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewGenerator.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewVisitor.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Viewable.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedListener.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEvent.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEventListener.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/AbstractLFCustoms.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalBorderlessTabbedPaneUI.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/OtherLFCustoms.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsBorderlessTabbedPaneUI.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsLFCustoms.java
trunk/bibledesktop/src/main/resources/Authors.txt
trunk/bibledesktop/src/main/resources/BDMsg.properties
trunk/bibledesktop/src/main/resources/BDMsg_de.properties
trunk/bibledesktop/src/main/resources/BDMsg_fa.properties
trunk/bibledesktop/src/main/resources/BDMsg_in.properties
trunk/bibledesktop/src/main/resources/BDMsg_tr.properties
trunk/bibledesktop/src/main/resources/BDMsg_vi.properties
trunk/bibledesktop/src/main/resources/BDMsg_zh.properties
trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties
trunk/bibledesktop/src/main/resources/BookDataDisplay.plugin
trunk/bibledesktop/src/main/resources/CWMsg.properties
trunk/bibledesktop/src/main/resources/CWMsg_de.properties
trunk/bibledesktop/src/main/resources/CWMsg_fa.properties
trunk/bibledesktop/src/main/resources/CWMsg_in.properties
trunk/bibledesktop/src/main/resources/CWMsg_tr.properties
trunk/bibledesktop/src/main/resources/CWMsg_vi.properties
trunk/bibledesktop/src/main/resources/CWMsg_zh.properties
trunk/bibledesktop/src/main/resources/CWMsg_zh_CN.properties
trunk/bibledesktop/src/main/resources/CWOtherMsg.properties
trunk/bibledesktop/src/main/resources/CWOtherMsg_de.properties
trunk/bibledesktop/src/main/resources/CWOtherMsg_fa.properties
trunk/bibledesktop/src/main/resources/CWOtherMsg_in.properties
trunk/bibledesktop/src/main/resources/CWOtherMsg_vi.properties
trunk/bibledesktop/src/main/resources/ConfigEditor.plugin
trunk/bibledesktop/src/main/resources/Field.plugin
trunk/bibledesktop/src/main/resources/SiteEditor.plugin
trunk/bibledesktop/src/main/resources/config.properties
trunk/bibledesktop/src/main/resources/config.xml
trunk/bibledesktop/src/main/resources/config_de.properties
trunk/bibledesktop/src/main/resources/config_fa.properties
trunk/bibledesktop/src/main/resources/config_fa.txt
trunk/bibledesktop/src/main/resources/config_in.properties
trunk/bibledesktop/src/main/resources/config_vi.properties
trunk/bibledesktop/src/main/resources/config_zh.properties
trunk/bibledesktop/src/main/resources/config_zh_CN.properties
trunk/bibledesktop/src/main/resources/desktop.properties
trunk/bibledesktop/src/main/resources/limboConfig.properties
trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste.xsl
trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste2.xsl
trunk/bibledesktop/src/main/resources/xsl/cswing/index.txt
trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
trunk/bibledesktop/src/main/resources/xsl/cswing/simple2.xsl
Log:
Addressed CheckStyle 6.14 complaints.
Added checking for License header and updated them to 2016.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleNameCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleNameCellRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleNameCellRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookListCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookListCellRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookListCellRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BookSelectListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/ParallelBookPicker.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.book.install;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookIcon.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookNode.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookNode.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -1,20 +1,20 @@
/**
- * Distribution Licence:
+ * Distribution License:
* BibleDesktop is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License, version 2 or later
* as published by the Free Software Foundation. This program is distributed
* in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
- *
+ *
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/gpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
- *
- * The copyright to this program is held by its authors.
+ *
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/EditSitePane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallerFactoryComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallerFactoryComboBoxModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InstallerFactoryComboBoxModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/InternetWarning.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditor.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.book.install;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* An Install Manager for Books: Bibles, Commentaries and Dictionaries.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* This package contains Swing MVC models to help implementing a Swing GUI using JSword classes.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/AboutPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
@@ -992,8 +991,7 @@
public void propertyChange(PropertyChangeEvent evt) {
// When the font changes update all the visible locations
// using it.
- if ("BibleDisplay.ConfigurableFont".equals(evt.getPropertyName()))
- {
+ if ("BibleDisplay.ConfigurableFont".equals(evt.getPropertyName())) {
BibleViewPane view = (BibleViewPane) getViews().getSelected();
SplitBookDataDisplay da = view.getPassagePane();
da.getBookDataDisplay().refresh();
@@ -1001,8 +999,7 @@
reference.refresh();
}
- if ("BibleDisplay.MaxPickers".equals(evt.getPropertyName()))
- {
+ if ("BibleDisplay.MaxPickers".equals(evt.getPropertyName())) {
BibleViewPane view = (BibleViewPane) getViews().getSelected();
DisplaySelectPane selector = view.getSelectPane();
selector.getBiblePicker().enableButtons();
@@ -1251,7 +1248,7 @@
* @param aDesktop
* @param aSplash
*/
- public DesktopRunner(Desktop aDesktop, Splash aSplash) {
+ DesktopRunner(Desktop aDesktop, Splash aSplash) {
desktop = aDesktop;
splash = aSplash;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
@@ -23,6 +22,7 @@
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.util.Arrays;
@@ -118,15 +118,21 @@
};
ReflectionUtil.invoke(osxAdapter, osxAdapter, "enablePrefs", enablePrefArgs, enablePrefTypes);
return true;
- } catch (NoClassDefFoundError e) {
+ } catch (NoClassDefFoundError ex) {
// This is thrown when EAWT or MacOSXadapter is not present.
- log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", e);
- } catch (ClassNotFoundException e) {
+ log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", ex);
+ } catch (ClassNotFoundException ex) {
// Should not happen
- log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", e);
- } catch (Exception e) {
- // Everything else.
- log.error("Exception while loading the OSXAdapter:", e);
+ log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", ex);
+ } catch (NoSuchMethodException ex) {
+ // Should not happen
+ log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", ex);
+ } catch (IllegalAccessException ex) {
+ // Should not happen
+ log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", ex);
+ } catch (InvocationTargetException ex) {
+ // Should not happen
+ log.error("This version of Mac OS X does not support the Apple EAWT. Application Menu handling has been disabled.", ex);
}
}
return false;
@@ -143,14 +149,14 @@
Throwable th = null;
try {
Class<?> xwm = Class.forName("sun.awt.X11.XWM");
- Field awt_wmgr = xwm.getDeclaredField("awt_wmgr");
- awt_wmgr.setAccessible(true);
- Field other_wm = xwm.getDeclaredField("OTHER_WM");
- other_wm.setAccessible(true);
- if (awt_wmgr.get(null).equals(other_wm.get(null))) {
- Field metacity_wm = xwm.getDeclaredField("METACITY_WM");
- metacity_wm.setAccessible(true);
- awt_wmgr.set(null, metacity_wm.get(null));
+ Field awtMgr = xwm.getDeclaredField("awt_wmgr");
+ awtMgr.setAccessible(true);
+ Field otherWm = xwm.getDeclaredField("OTHER_WM");
+ otherWm.setAccessible(true);
+ if (awtMgr.get(null).equals(otherWm.get(null))) {
+ Field metacityWm = xwm.getDeclaredField("METACITY_WM");
+ metacityWm.setAccessible(true);
+ awtMgr.set(null, metacityWm.get(null));
}
} catch (ClassNotFoundException ex) {
th = ex;
@@ -511,7 +517,7 @@
/**
* @param show
*/
- public ShowSideBarVisitor(boolean show) {
+ ShowSideBarVisitor(boolean show) {
this.show = show;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/XSLTProperty.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.desktop;
@@ -121,7 +120,7 @@
* @param defaultState
* The initial state of the property.
*/
- private XSLTProperty(String name, boolean defaultState) {
+ XSLTProperty(String name, boolean defaultState) {
this(name, Boolean.toString(defaultState));
}
@@ -131,7 +130,7 @@
* @param defaultState
* The initial state of the property.
*/
- private XSLTProperty(String name, String defaultState) {
+ XSLTProperty(String name, String defaultState) {
this(name, defaultState, false);
}
@@ -141,7 +140,7 @@
* @param defaultState
* The initial state of the property.
*/
- private XSLTProperty(String name, String defaultState, boolean asURL) {
+ XSLTProperty(String name, String defaultState, boolean asURL) {
this.name = name;
this.defaultState = defaultState;
this.state = defaultState;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* The desktop is the main screen of Bible Desktop.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplayFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplayFactory.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplayFactory.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ScrolledBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ScrolledBookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ScrolledBookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/URIEventListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
@@ -35,7 +34,7 @@
* @author Yingjie Lan
*/
class FullHTMLTip extends JToolTip {
- public FullHTMLTip() {
+ FullHTMLTip() {
this.setLayout(new java.awt.CardLayout());
txtView = new AntiAliasedTextPane();
txtView.setEditable(false);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
@@ -182,11 +181,6 @@
Reporter.informUser(this, e);
} catch (TransformerException e) {
Reporter.informUser(this, e);
- } catch (Exception e) {
- // Generally it is bad to catch exception
- // However, this prevents the AWT exception handler from catching it
- // Allowing us to manage it better.
- Reporter.informUser(this, e);
}
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.bibledesktop.display.basic;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* This package provides the actual display of BookData.
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
This package contains the BookDataDisplay interface which is designed to
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* The org.crosswire.bibledesktop package contains the message catalog for everything Bible Desktop and is the root of the package tree for Bible Desktop.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyChangeListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyListListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyListListModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyListListModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeNode.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeNode.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.passage;
@@ -232,7 +231,7 @@
* Iterate over the Books
*/
private class WholeBibleEnumeration implements Enumeration<TreeNode> {
- public WholeBibleEnumeration(WholeBibleTreeNode treeNode) {
+ WholeBibleEnumeration(WholeBibleTreeNode treeNode) {
this.treeNode = treeNode;
}
@Override
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
/**
* This package contains Swing MVC models to help displaying passages.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/ConfigurableSwingConverter.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.bibledesktop.util;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/package-info.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/package-info.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/util/package-info.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -1,3 +1,21 @@
+/*
+ * Distribution License:
+ * BibleDesktop is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License, version 2 or later
+ * as published by the Free Software Foundation. This program is distributed
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/gpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * © CrossWire Bible Society, 2005 - 2016
+ */
/**
* This package contains various swing utility classes.
*/
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
@@ -266,7 +265,7 @@
/**
* Create a node with a name and path
*/
- public CompNode(String path) {
+ CompNode(String path) {
this.path = path;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/BooleanField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPaneListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPaneListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ButtonPaneListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/ConfigEditorFactory.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
@@ -100,7 +99,7 @@
/**
* To save to a URI
*/
- public URIActionListener(Config config, URI uri) {
+ URIActionListener(Config config, URI uri) {
this.config = config;
this.uri = uri;
}
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/DirectoryField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/Field.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/Field.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/Field.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FieldMap.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FieldMap.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FieldMap.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FileField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FontField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FontField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/FontField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/NumberField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/NumberField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/NumberField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/OptionsField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/OptionsField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/OptionsField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/PathField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
@@ -65,8 +64,8 @@
public StringArrayField() {
actions = new ActionFactory(this);
- list_model = new DefaultComboBoxModel();
- list = new JList(list_model);
+ listModel = new DefaultComboBoxModel();
+ list = new JList(listModel);
JPanel buttons = new JPanel(new FlowLayout());
@@ -113,9 +112,9 @@
* @return The current value
*/
public String[] getArray() {
- String[] retcode = new String[list_model.getSize()];
+ String[] retcode = new String[listModel.getSize()];
for (int i = 0; i < retcode.length; i++) {
- retcode[i] = (String) list_model.getElementAt(i);
+ retcode[i] = (String) listModel.getElementAt(i);
}
return retcode;
@@ -136,8 +135,8 @@
* The new text
*/
public void setArray(String[] value) {
- list_model = new DefaultComboBoxModel(value.clone());
- list.setModel(list_model);
+ listModel = new DefaultComboBoxModel(value.clone());
+ list.setModel(listModel);
}
/* (non-Javadoc)
@@ -155,9 +154,9 @@
InputPane input = new InputPane();
if (CWOptionPane.showConfirmDialog(this, input, CWOtherMsg.lookupText("New Class"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
- String new_name = input.name_field.getText();
+ String newName = input.nameField.getText();
- list_model.addElement(new_name);
+ listModel.addElement(newName);
}
}
@@ -166,13 +165,13 @@
*/
public void doUpdateEntry() {
InputPane input = new InputPane();
- input.name_field.setText(currentValue());
+ input.nameField.setText(currentValue());
if (CWOptionPane.showConfirmDialog(this, input, CWOtherMsg.lookupText("Edit Class"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) {
- String new_name = input.name_field.getText();
+ String newName = input.nameField.getText();
- list_model.removeElement(currentValue());
- list_model.addElement(new_name);
+ listModel.removeElement(currentValue());
+ listModel.addElement(newName);
}
}
@@ -180,7 +179,7 @@
* Delete the current value in the hashtable
*/
public void doRemoveEntry() {
- list_model.removeElement(currentValue());
+ listModel.removeElement(currentValue());
}
/**
@@ -189,7 +188,7 @@
* @return The currently selected value
*/
private String currentValue() {
- return (String) list_model.getElementAt(list.getSelectedIndex());
+ return (String) listModel.getElementAt(list.getSelectedIndex());
}
/**
@@ -226,7 +225,7 @@
c.gridwidth = GridBagConstraints.REMAINDER; // end row
c.fill = GridBagConstraints.HORIZONTAL;
c.weightx = 1.0;
- add(name_field, c);
+ add(nameField, c);
setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
}
@@ -234,7 +233,7 @@
/**
* To edit a name (hashtable key)
*/
- protected JTextField name_field = new JTextField();
+ protected JTextField nameField = new JTextField();
/**
* Serialization ID
@@ -252,7 +251,7 @@
/**
* The TableModel that points the JTable at the Hashtable
*/
- private DefaultComboBoxModel list_model;
+ private DefaultComboBoxModel listModel;
/**
* The Table - displays the Hashtble
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TextField.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TextField.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TextField.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.config.swing;
@@ -256,11 +255,11 @@
}
// Chop off all after the first dot
- int dot_pos = temp.indexOf('.');
- if (dot_pos == -1) {
+ int dotPos = temp.indexOf('.');
+ if (dotPos == -1) {
continue;
}
- temp = temp.substring(0, dot_pos);
+ temp = temp.substring(0, dotPos);
// Add it to the list if needed
if (temp.length() > 0 && !retcode.contains(temp)) {
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobCancelListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2008
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2008 - 2016
*/
package org.crosswire.common.progress.swing;
@@ -34,7 +33,7 @@
/**
* @param theJob
*/
- public JobCancelListener(Progress theJob) {
+ JobCancelListener(Progress theJob) {
job = theJob;
}
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.progress.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AbstractLayout.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AbstractLayout.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AbstractLayout.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ActionFactory.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/Actionable.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/Actionable.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/Actionable.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AltFixedSplitPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWLabel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWMsg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWMsg.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWMsg.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOptionPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2008
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2008 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOtherMsg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOtherMsg.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWOtherMsg.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWScrollPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CatchingThreadGroup.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CompositeIcon.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/EdgeBorder.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/EdgeBorder.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/EdgeBorder.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
@@ -337,7 +336,7 @@
/**
* @param ep
*/
- public SelectedItemListener(ExceptionPane ep) {
+ SelectedItemListener(ExceptionPane ep) {
pane = ep;
}
@@ -360,7 +359,7 @@
* @param ep
* @param cb
*/
- public SelectActionListener(ExceptionPane ep, JComboBox cb) {
+ SelectActionListener(ExceptionPane ep, JComboBox cb) {
pane = ep;
traces = cb;
}
@@ -394,7 +393,7 @@
* @param label
* The filename label
*/
- public CustomLister(StackTrace st, JTextArea text, JLabel label) {
+ CustomLister(StackTrace st, JTextArea text, JLabel label) {
this.st = st;
this.mytext = text;
this.mylabel = label;
@@ -421,9 +420,9 @@
name = name.substring(0, name.indexOf('$'));
}
- int line_num = st.getLineNumber(level);
+ int lineNum = st.getLineNumber(level);
String orig = name;
- Integer errorLine = Integer.valueOf(line_num);
+ Integer errorLine = Integer.valueOf(lineNum);
// TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source is unavailable.
mylabel.setText(BDMsg.gettext("No File"));
@@ -437,8 +436,8 @@
StringBuilder data = new StringBuilder();
// Attempt to note the line to highlight
- int selection_start = 0;
- int selection_end = 0;
+ int selectionStart = 0;
+ int selectionEnd = 0;
LineNumberReader in = null;
try {
@@ -455,12 +454,12 @@
}
data.append(line).append('\n');
- int current_line = in.getLineNumber();
- if (current_line == line_num - 1) {
- selection_start = data.length();
+ int currentLine = in.getLineNumber();
+ if (currentLine == lineNum - 1) {
+ selectionStart = data.length();
}
- if (current_line == line_num) {
- selection_end = data.length() - 1;
+ if (currentLine == lineNum) {
+ selectionEnd = data.length() - 1;
}
}
} catch (IOException ex) {
@@ -477,8 +476,8 @@
// Actually set the text
mytext.setText(data.toString());
- mytext.setSelectionStart(selection_start);
- mytext.setSelectionEnd(selection_end);
+ mytext.setSelectionStart(selectionStart);
+ mytext.setSelectionEnd(selectionEnd);
SwingUtilities.getRoot(mylabel).setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
return;
@@ -552,7 +551,7 @@
/**
* @param ev
*/
- public ExceptionRunner(ReporterEvent ev) {
+ ExceptionRunner(ReporterEvent ev) {
event = ev;
}
@@ -578,7 +577,7 @@
/**
* @param ev
*/
- public MessageRunner(ReporterEvent ev) {
+ MessageRunner(ReporterEvent ev) {
event = ev;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FixedSplitPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontChooser.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
@@ -192,10 +191,10 @@
return DEFAULT_FONT.getFont();
}
- int font_style = (bold.isSelected() ? Font.BOLD : Font.PLAIN) | (italic.isSelected() ? Font.ITALIC : Font.PLAIN);
- int font_size = ((Integer) size.getSelectedItem()).intValue();
+ int fontStyle = (bold.isSelected() ? Font.BOLD : Font.PLAIN) | (italic.isSelected() ? Font.ITALIC : Font.PLAIN);
+ int fontSize = ((Integer) size.getSelectedItem()).intValue();
- return selected.deriveFont(font_style, font_size);
+ return selected.deriveFont(fontStyle, fontSize);
}
/**
@@ -226,8 +225,7 @@
// We need to exclude certain fonts that cause the JVM to crash.
// BUG_PARADE(DMS): 6376296
// It will be fixed in Java 1.6 (Mustang)
- if ("padmaa".equals(names[i]) || "Rekha".equals(names[i]) || names[i].indexOf("Lohit") > -1 || names[i].indexOf("aakar") > -1)
- {
+ if ("padmaa".equals(names[i]) || "Rekha".equals(names[i]) || names[i].indexOf("Lohit") > -1 || names[i].indexOf("aakar") > -1) {
continue;
}
@@ -297,7 +295,7 @@
* render the items in a JComboBox
*/
static class CustomListCellRenderer extends DefaultListCellRenderer {
- public CustomListCellRenderer() {
+ CustomListCellRenderer() {
GuiUtil.applyDefaultOrientation(this);
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontStore.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontStore.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FontStore.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FormPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FormPane.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/FormPane.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Deleted: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GriddedPanel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GriddedPanel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GriddedPanel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -1,169 +0,0 @@
-/**
- * Copyright 1999-2002 Matthew Robinson and Pavel Vorobiev.
- * All Rights Reserved.
- *
- * ===================================================
- * This program contains code from the book "Swing"
- * 2nd Edition by Matthew Robinson and Pavel Vorobiev
- * http://www.spindoczine.com/sbe
- * ===================================================
- *
- * The above paragraph must be included in full, unmodified
- * and completely intact in the beginning of any source code
- * file that references, copies or uses (in any way, shape
- * or form) code contained in this file.
- */
-package org.crosswire.common.swing;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
-/**
- * A simple helper class that provides various easy to understand methods that
- * lays out the components using the GridBagLayout.
- *
- * @author James Tan
- */
-public class GriddedPanel extends JPanel {
- /**
- * Creates a grid bag layout panel using a default insets constraints.
- */
- public GriddedPanel() {
- this(new Insets(2, 2, 2, 2));
- }
-
- /**
- * Creates a grid bag layout panel using the specified insets constraints.
- */
- public GriddedPanel(Insets insets) {
- super(new GridBagLayout());
- // creates the constraints object and set the desired
- // default values
- constraints = new GridBagConstraints();
- constraints.anchor = GridBagConstraints.WEST;
- constraints.insets = insets;
- }
-
- /**
- * Adds the component to the specified row and col.
- */
- public void addComponent(JComponent component, int row, int col) {
- addComponent(component, row, col, C_WIDTH, C_HEIGHT, C_WEST, C_NONE);
- }
-
- /**
- * Adds the component to the specified row and col that spans across a
- * specified number of columns and rows.
- */
- public void addComponent(JComponent component, int row, int col, int width, int height) {
- addComponent(component, row, col, width, height, C_WEST, C_NONE);
- }
-
- /**
- * Adds the component to the specified row and col that anchors at the
- * specified position.
- */
- public void addAnchoredComponent(JComponent component, int row, int col, int anchor) {
- addComponent(component, row, col, C_WIDTH, C_HEIGHT, anchor, C_NONE);
- }
-
- /**
- * Adds the component to the specified row and col that spans across a
- * specified number of columns and rows that anchors at the specified
- * position.
- */
- public void addAnchoredComponent(JComponent component, int row, int col, int width, int height, int anchor) {
- addComponent(component, row, col, width, height, anchor, C_NONE);
- }
-
- /**
- * Adds the component to the specified row and col filling the column
- * horizontally.
- */
- public void addFilledComponent(JComponent component, int row, int col) {
- addComponent(component, row, col, C_WIDTH, C_HEIGHT, C_WEST, C_HORZ);
- }
-
- /**
- * Adds the component to the specified row and col with the specified
- * filling direction.
- */
- public void addFilledComponent(JComponent component, int row, int col, int fill) {
- addComponent(component, row, col, C_WIDTH, C_HEIGHT, C_WEST, fill);
- }
-
- /**
- * Adds the component to the specified row and col that spans across a
- * specified number of columns and rows with the specified filling
- * direction.
- */
- public void addFilledComponent(JComponent component, int row, int col, int width, int height, int fill) {
- addComponent(component, row, col, width, height, C_WEST, fill);
- }
-
- /**
- * Adds the component to the specified row and col that spans across a
- * specified number of columns and rows with the specified filling direction
- * and an anchoring position.
- */
- public void addComponent(JComponent component, int row, int col, int width, int height, int anchor, int fill) {
- // sets the constraints object
- constraints.gridx = col;
- constraints.gridy = row;
- constraints.gridwidth = width;
- constraints.gridheight = height;
- constraints.anchor = anchor;
- double weightx = 0.0;
- double weighty = 0.0;
-
- // only use the extra horizontal or vertical spaces if the component
- // spans more than one column or/and row.
- if (width > 1) {
- weightx = 1.0;
- }
-
- if (height > 1) {
- weighty = 1.0;
- }
-
- switch (fill) {
- case GridBagConstraints.HORIZONTAL:
- constraints.weightx = weightx;
- constraints.weighty = 0.0;
- break;
- case GridBagConstraints.VERTICAL:
- constraints.weighty = weighty;
- constraints.weightx = 0.0;
- break;
- case GridBagConstraints.BOTH:
- constraints.weightx = weightx;
- constraints.weighty = weighty;
- break;
- case GridBagConstraints.NONE:
- constraints.weightx = 0.0;
- constraints.weighty = 0.0;
- break;
- default:
- break;
- }
- constraints.fill = fill;
- add(component, constraints);
- }
-
- private GridBagConstraints constraints;
- // define some default constraints values
- private static final int C_HORZ = GridBagConstraints.HORIZONTAL;
- private static final int C_NONE = GridBagConstraints.NONE;
- private static final int C_WEST = GridBagConstraints.WEST;
- private static final int C_WIDTH = 1;
- private static final int C_HEIGHT = 1;
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 5924150977979727523L;
-}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiConvert.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiUtil.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiUtil.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/GuiUtil.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
@@ -146,8 +145,7 @@
// and we may be able to do better than that. Unfortunately the
// getSharedOwnerFrame() method is not public so we have to trick
// our way to finding if we got a duff default
- if (!option.getClass().getName().startsWith("javax.swing.SwingUtilities$"))
- {
+ if (!option.getClass().getName().startsWith("javax.swing.SwingUtilities$")) {
// So we think the JOptionPane root frame is our creation
return option;
}
@@ -432,16 +430,16 @@
public static void restrainedPack(Window win, float maxx, float maxy) {
win.pack();
- Dimension screen_dim = Toolkit.getDefaultToolkit().getScreenSize();
+ Dimension screenDim = Toolkit.getDefaultToolkit().getScreenSize();
// If the window is wider than the screen, clip it
- if (win.getSize().width > (screen_dim.width * maxx)) {
- win.setSize((int) (screen_dim.width * maxx), win.getSize().height);
+ if (win.getSize().width > (screenDim.width * maxx)) {
+ win.setSize((int) (screenDim.width * maxx), win.getSize().height);
}
// If the window is taller than the screen, clip it
- if (win.getSize().height > (screen_dim.height * maxy)) {
- win.setSize(win.getSize().width, (int) (screen_dim.height * maxy));
+ if (win.getSize().height > (screenDim.height * maxy)) {
+ win.setSize(win.getSize().width, (int) (screenDim.height * maxy));
}
refresh(win);
@@ -454,13 +452,13 @@
/**
* Set the size of a component
*/
- public static void enforceMinimumSize(Component comp, int min_width, int min_height) {
- if (comp.getSize().width < min_width) {
- comp.setSize(min_width, comp.getSize().height);
+ public static void enforceMinimumSize(Component comp, int minWidth, int minHeight) {
+ if (comp.getSize().width < minWidth) {
+ comp.setSize(minWidth, comp.getSize().height);
}
- if (comp.getSize().height < min_height) {
- comp.setSize(comp.getSize().width, min_height);
+ if (comp.getSize().height < minHeight) {
+ comp.setSize(comp.getSize().width, minHeight);
}
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/LookAndFeelUtil.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapComboBoxModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapEntryRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapTableModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapTableModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/MapTableModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
@@ -253,7 +252,7 @@
* @param v
* The non-null value.
*/
- public StringPair(String k, String v) {
+ StringPair(String k, String v) {
key = k;
value = v;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NudgeButton.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NudgeButton.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NudgeButton.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumberCellRenderer.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/NumericDocument.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/QuickHelpDialog.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/StackTraceListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/StackTraceListModel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/StackTraceListModel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Clearable.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Clearable.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Clearable.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2007
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2007 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/MDIViewLayout.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TDIViewLayout.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabPopupListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabbedPanePanel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabbedPanePanel.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/TabbedPanePanel.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Titleable.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Titleable.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Titleable.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewGenerator.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewGenerator.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewGenerator.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewManager.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
@@ -149,6 +148,22 @@
getViewLayout().addView(component);
}
+ /**
+ * Adds a view to the list in this Desktop.
+ */
+ public final Component addView() {
+
+ Component view = generator.createView();
+
+ if (view instanceof Titleable) {
+ ((Titleable) view).addTitleChangedListener(this);
+ }
+
+ addView(view);
+
+ return view;
+ }
+
/* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#closeAll()
*/
@@ -197,22 +212,6 @@
getViewLayout().updateTitle(component);
}
- /**
- * Adds a view to the list in this Desktop.
- */
- public final Component addView() {
-
- Component view = generator.createView();
-
- if (view instanceof Titleable) {
- ((Titleable) view).addTitleChangedListener(this);
- }
-
- addView(view);
-
- return view;
- }
-
/* (non-Javadoc)
* @see org.crosswire.common.swing.desktop.Viewable#removeView(java.awt.Component)
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewVisitor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewVisitor.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/ViewVisitor.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Viewable.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Viewable.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/Viewable.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop.event;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/TitleChangedListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop.event;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEvent.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEvent.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEvent.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop.event;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEventListener.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEventListener.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/event/ViewEventListener.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.desktop.event;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/AbstractLFCustoms.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/AbstractLFCustoms.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/AbstractLFCustoms.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalBorderlessTabbedPaneUI.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalBorderlessTabbedPaneUI.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalBorderlessTabbedPaneUI.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalLFCustoms.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
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 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/OtherLFCustoms.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/OtherLFCustoms.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/OtherLFCustoms.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsBorderlessTabbedPaneUI.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsBorderlessTabbedPaneUI.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsBorderlessTabbedPaneUI.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsLFCustoms.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsLFCustoms.java 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/plaf/WindowsLFCustoms.java 2016-01-23 16:54:30 UTC (rev 2328)
@@ -14,8 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
*/
package org.crosswire.common.swing.plaf;
Modified: trunk/bibledesktop/src/main/resources/Authors.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/Authors.txt 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/Authors.txt 2016-01-23 16:54:30 UTC (rev 2328)
@@ -1,3 +1,21 @@
+# Distribution License:
+# BibleDesktop is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License, version 2 or later
+# as published by the Free Software Foundation. This program is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# The License is available on the internet at:
+# http://www.gnu.org/copyleft/gpl.html
+# or by writing to:
+# Free Software Foundation, Inc.
+# 59 Temple Place - Suite 330
+# Boston, MA 02111-1307, USA
+#
+# Copyright CrossWire Bible Society, 2005 - 2016
+#
+
Bible Desktop Authors:
Joe Walker [joe at eireneh dot com]
DM Smith [dmsmith at crosswire dot org]
Modified: trunk/bibledesktop/src/main/resources/BDMsg.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
(This\ is\ also\ available\ from\ Books\ in\ the\ Tools\ menu.)=(This is also available from Books in the Tools menu.)
Modified: trunk/bibledesktop/src/main/resources/BDMsg_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_de.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_de.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
(This\ is\ also\ available\ from\ Books\ in\ the\ Tools\ menu.)=(Sie k\u00F6nnen dies auch sp\u00E4ter \u00FCber Extras -> B\u00FCcher... nachholen.)
Modified: trunk/bibledesktop/src/main/resources/BDMsg_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_fa.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_fa.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
(This\ is\ also\ available\ from\ Books\ in\ the\ Tools\ menu.)=\ \u0628\u0639\u062F\u0646 \u0647\u0645 \u0645\u0648\u0645\u06A9\u0646 \u0647\u0633\u062A.
Modified: trunk/bibledesktop/src/main/resources/BDMsg_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_in.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_in.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
(This\ is\ also\ available\ from\ Books\ in\ the\ Tools\ menu.)=(Ini juga tersedia di Buku pada Perkakas menu.)
Modified: trunk/bibledesktop/src/main/resources/BDMsg_tr.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_tr.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_tr.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Edit=Ara\u015Ft\u0131rmak
File=Dosya
Modified: trunk/bibledesktop/src/main/resources/BDMsg_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_vi.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_vi.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
(This\ is\ also\ available\ from\ Books\ in\ the\ Tools\ menu.)=(B\u1EA1n c\u00F3 th\u1EC3 t\u00ECm \u0111\u01B0\u1EE3c ch\u1EE9c n\u0103ng n\u00E0y t\u1EEB C\u00E1c S\u00E1ch trong C\u00F4ng C\u1EE5.)
Modified: trunk/bibledesktop/src/main/resources/BDMsg_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_zh.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_zh.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
/images/splash.png=/images/splash_zh_TW.png
Modified: trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BDMsg_zh_CN.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
/images/splash.png=/images/splash_zh_CN.png
Modified: trunk/bibledesktop/src/main/resources/BookDataDisplay.plugin
===================================================================
--- trunk/bibledesktop/src/main/resources/BookDataDisplay.plugin 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/BookDataDisplay.plugin 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
default=org.crosswire.bibledesktop.display.basic.TextPaneBookDataDisplay
Modified: trunk/bibledesktop/src/main/resources/CWMsg.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=_Add
Modified: trunk/bibledesktop/src/main/resources/CWMsg_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_de.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_de.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=Hinzuf\u00FCgen
Modified: trunk/bibledesktop/src/main/resources/CWMsg_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_fa.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_fa.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=\u0627\u0641\u0632\u0648\u062F\u0646
Modified: trunk/bibledesktop/src/main/resources/CWMsg_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_in.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_in.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=T_ambah
Modified: trunk/bibledesktop/src/main/resources/CWMsg_tr.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_tr.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_tr.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=Add
Modified: trunk/bibledesktop/src/main/resources/CWMsg_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_vi.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_vi.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=Th\u00EAm
Modified: trunk/bibledesktop/src/main/resources/CWMsg_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_zh.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_zh.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=\u589E\u52A0
Modified: trunk/bibledesktop/src/main/resources/CWMsg_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWMsg_zh_CN.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWMsg_zh_CN.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Add=\u589E\u52A0
Modified: trunk/bibledesktop/src/main/resources/CWOtherMsg.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWOtherMsg.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWOtherMsg.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Component\ Editor=Component Editor
Modified: trunk/bibledesktop/src/main/resources/CWOtherMsg_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWOtherMsg_de.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWOtherMsg_de.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Component\ Editor=Component Editor
Modified: trunk/bibledesktop/src/main/resources/CWOtherMsg_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWOtherMsg_fa.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWOtherMsg_fa.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Component\ Editor=Component Editor
Modified: trunk/bibledesktop/src/main/resources/CWOtherMsg_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWOtherMsg_in.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWOtherMsg_in.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Component\ Editor=Komponen Pengubah
Modified: trunk/bibledesktop/src/main/resources/CWOtherMsg_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/CWOtherMsg_vi.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/CWOtherMsg_vi.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Component\ Editor=S\u1EEDa Components
Modified: trunk/bibledesktop/src/main/resources/ConfigEditor.plugin
===================================================================
--- trunk/bibledesktop/src/main/resources/ConfigEditor.plugin 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/ConfigEditor.plugin 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,13 +7,12 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
default=org.crosswire.common.config.swing.TreeConfigEditor
Modified: trunk/bibledesktop/src/main/resources/Field.plugin
===================================================================
--- trunk/bibledesktop/src/main/resources/Field.plugin 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/Field.plugin 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
string=org.crosswire.common.config.swing.TextField
#password is now in jsword-limbo
Modified: trunk/bibledesktop/src/main/resources/SiteEditor.plugin
===================================================================
--- trunk/bibledesktop/src/main/resources/SiteEditor.plugin 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/SiteEditor.plugin 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
sword-ftp=org.crosswire.bibledesktop.book.install.SwordSiteEditor
Modified: trunk/bibledesktop/src/main/resources/config.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Bibles.name=Bibles
Modified: trunk/bibledesktop/src/main/resources/config.xml
===================================================================
--- trunk/bibledesktop/src/main/resources/config.xml 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config.xml 2016-01-23 16:54:30 UTC (rev 2328)
@@ -16,14 +16,12 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * Copyright: 2005 - 2016
*
* ID: $Id$
-->
<!--
- * Transforms OSIS to HTML for viewing within JSword browsers.
- * Note: There are custom protocols which the browser must handle.
+ * Options setup for Bible Desktop.
*
* @see gnu.gpl.License for license details.
* @author Joe Walker
Modified: trunk/bibledesktop/src/main/resources/config_de.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_de.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_de.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Modified: trunk/bibledesktop/src/main/resources/config_fa.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_fa.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Bibles.name=\u06A9\u062A\u0627\u0628 \u0645\u0642\u062F\u0633
Modified: trunk/bibledesktop/src/main/resources/config_fa.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/config_fa.txt 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_fa.txt 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
# The naming convention for the keys in the file is to match that of the
Modified: trunk/bibledesktop/src/main/resources/config_in.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_in.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_in.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Bibles.name=Terjemahan
Modified: trunk/bibledesktop/src/main/resources/config_vi.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_vi.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_vi.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,13 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
+# Copyright CrossWire Bible Society, 2005 - 2016
# The copyright to this program is held by its authors.
#
Modified: trunk/bibledesktop/src/main/resources/config_zh.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_zh.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_zh.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Modified: trunk/bibledesktop/src/main/resources/config_zh_CN.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/config_zh_CN.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/config_zh_CN.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Advanced.DefaultPassageType.alternative.0=Speed (Rocket)
Modified: trunk/bibledesktop/src/main/resources/desktop.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/desktop.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/desktop.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
# This file is deliberately empty
\ No newline at end of file
Modified: trunk/bibledesktop/src/main/resources/limboConfig.properties
===================================================================
--- trunk/bibledesktop/src/main/resources/limboConfig.properties 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/limboConfig.properties 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/gpl.html
+# http://www.gnu.org/copyleft/gpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
Remote.RemoteHost.path=Remote.Remote Host
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste.xsl 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste.xsl 2016-01-23 16:54:30 UTC (rev 2328)
@@ -9,14 +9,13 @@
* See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/lgpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
-->
<!--
* Transforms OSIS to HTML for viewing within JSword browsers.
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste2.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste2.xsl 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/cutandpaste2.xsl 2016-01-23 16:54:30 UTC (rev 2328)
@@ -9,14 +9,13 @@
* See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/lgpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
-->
<!--
* Transforms OSIS to HTML for viewing within JSword browsers.
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/index.txt
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/index.txt 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/index.txt 2016-01-23 16:54:30 UTC (rev 2328)
@@ -7,14 +7,13 @@
# See the GNU Lesser General Public License for more details.
#
# The License is available on the internet at:
-# http://www.gnu.org/copyleft/lgpl.html
+# http://www.gnu.org/copyleft/lgpl.html
# or by writing to:
# Free Software Foundation, Inc.
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-# Copyright: 2005-2013
-# The copyright to this program is held by its authors.
+# Copyright CrossWire Bible Society, 2005 - 2016
#
simple.xsl
\ No newline at end of file
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl 2016-01-23 16:54:30 UTC (rev 2328)
@@ -9,14 +9,13 @@
* See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/lgpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005-2015
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
-->
<!--
* Transforms OSIS to HTML for viewing within JSword browsers.
Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple2.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple2.xsl 2016-01-23 16:43:05 UTC (rev 2327)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple2.xsl 2016-01-23 16:54:30 UTC (rev 2328)
@@ -9,14 +9,13 @@
* See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/lgpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
- * The copyright to this program is held by its authors.
+ * © CrossWire Bible Society, 2005 - 2016
-->
<!--
* Transforms OSIS to HTML for viewing within JSword browsers.
More information about the jsword-svn
mailing list