[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Mar 6 13:21:38 MST 2005
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv26420/java/main/org/crosswire/bibledesktop/book
Modified Files:
DisplaySelectPane.java PassageSelectionPane.java
SidebarPane.java BibleComboBoxModel.java
DriversComboBoxModel.java AdvancedSearchPane.java
CommentaryPane.java DriversListModel.java
DisplaySelectEvent.java BookListCellRenderer.java
Log Message:
Changes to satisfy CheckStyle
Index: DriversComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DriversComboBoxModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DriversComboBoxModel.java 28 Nov 2004 21:36:04 -0000 1.2
--- DriversComboBoxModel.java 6 Mar 2005 20:21:36 -0000 1.3
***************
*** 32,36 ****
public class DriversComboBoxModel extends DriversListModel implements ComboBoxModel
{
! /**
* Basic Constructor
*/
--- 32,36 ----
public class DriversComboBoxModel extends DriversListModel implements ComboBoxModel
{
! /**
* Basic Constructor
*/
Index: AdvancedSearchPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/AdvancedSearchPane.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AdvancedSearchPane.java 28 Nov 2004 21:36:04 -0000 1.2
--- AdvancedSearchPane.java 6 Mar 2005 20:21:36 -0000 1.3
***************
*** 69,73 ****
public class AdvancedSearchPane extends JPanel implements DocumentListener
{
! /**
* This is the default constructor
*/
--- 69,73 ----
public class AdvancedSearchPane extends JPanel implements DocumentListener
{
! /**
* This is the default constructor
*/
***************
*** 560,617 ****
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout = false;
/**
* The ActionFactory holding the actions used by this Component.
*/
! private ActionFactory actions = null;
/**
* The entries in the restrictions preset
*/
! private String[] presets = null;
/**
* If we are editing the restrict text box, ignore preset updates
*/
! private boolean editingRestrict = false;
/*
* GUI Components
*/
! private PassageSelectionPane dlgSelect = null;
! private JLabel lblPhrase = null;
! private JLabel lblIncludes = null;
! private JTextField txtIncludes = null;
! private JTextField txtPhrase = null;
! private JLabel lblExcludes = null;
! private JTextField txtExcludes = null;
! private JLabel lblHeading = null;
! private JCheckBox chkRestrict = null;
! private JLabel lblRestrict = null;
! private JTextField txtRestrict = null;
! private JButton btnRestrict = null;
! private JButton btnGo = null;
! private JLabel lblPresets = null;
! private JComboBox cboPresets = null;
! protected JDialog dlgMain = null;
! // private JCheckBox chkHebGrk = null;
! // private JLabel lblHebInc = null;
! // private JTextField txtHebInc = null;
! // private JLabel lblHebExc = null;
! // private JTextField txtHebExc = null;
! // private JLabel lblGrkInc = null;
! // private JTextField txtGrkInc = null;
! // private JLabel lblGrkExc = null;
! // private JTextField txtGrkExc = null;
! // private JCheckBox chkTime = null;
! // private JLabel lblBefore = null;
! // private JTextField txtBefore = null;
! // private JLabel lblAfter = null;
! // private JTextField txtAfter = null;
! private JLabel lblSummary = null;
! private JCheckBox chkSummary = null;
! private JTextArea txtSummary = null;
! private JScrollPane scrSummary = null;
/**
--- 560,617 ----
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout;
/**
* The ActionFactory holding the actions used by this Component.
*/
! private ActionFactory actions;
/**
* The entries in the restrictions preset
*/
! private String[] presets;
/**
* If we are editing the restrict text box, ignore preset updates
*/
! private boolean editingRestrict;
/*
* GUI Components
*/
! private PassageSelectionPane dlgSelect;
! private JLabel lblPhrase;
! private JLabel lblIncludes;
! private JTextField txtIncludes;
! private JTextField txtPhrase;
! private JLabel lblExcludes;
! private JTextField txtExcludes;
! private JLabel lblHeading;
! private JCheckBox chkRestrict;
! private JLabel lblRestrict;
! private JTextField txtRestrict;
! private JButton btnRestrict;
! private JButton btnGo;
! private JLabel lblPresets;
! private JComboBox cboPresets;
! protected JDialog dlgMain;
! // private JCheckBox chkHebGrk;
! // private JLabel lblHebInc;
! // private JTextField txtHebInc;
! // private JLabel lblHebExc;
! // private JTextField txtHebExc;
! // private JLabel lblGrkInc;
! // private JTextField txtGrkInc;
! // private JLabel lblGrkExc;
! // private JTextField txtGrkExc;
! // private JCheckBox chkTime;
! // private JLabel lblBefore;
! // private JTextField txtBefore;
! // private JLabel lblAfter;
! // private JTextField txtAfter;
! private JLabel lblSummary;
! private JCheckBox chkSummary;
! private JTextArea txtSummary;
! private JScrollPane scrSummary;
/**
Index: DisplaySelectPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DisplaySelectPane.java 17 Feb 2005 03:40:19 -0000 1.20
--- DisplaySelectPane.java 6 Mar 2005 20:21:36 -0000 1.21
***************
*** 86,89 ****
--- 86,91 ----
private void initialize()
{
+ advanced = new AdvancedSearchPane();
+
title = Msg.UNTITLED.toString(new Integer(base++));
***************
*** 121,125 ****
public void actionPerformed(ActionEvent e)
{
! JComboBox cbo = (JComboBox)e.getSource();
if (cbo.getSelectedIndex() == -1 && cbo.getItemCount() > 0)
{
--- 123,127 ----
public void actionPerformed(ActionEvent e)
{
! JComboBox cbo = (JComboBox) e.getSource();
if (cbo.getSelectedIndex() == -1 && cbo.getItemCount() > 0)
{
***************
*** 206,210 ****
/**
! *
*/
public void clear()
--- 208,212 ----
/**
! *
*/
public void clear()
***************
*** 224,228 ****
/**
! *
*/
public boolean isClear()
--- 226,230 ----
/**
! *
*/
public boolean isClear()
***************
*** 601,628 ****
private static int base = 1;
! private String title = null;
! private transient List listeners = null;
! private QuickHelpDialog dlgHelp = null;
! private ActionFactory actions = null;
! private BookMetaData selected = null;
/*
* GUI Components
*/
! private BooksComboBoxModel mdlBible = null;
! private PassageSelectionPane dlgSelect = null;
! private JTextField txtKey = null;
! private JTextField txtSearch = null;
! private JCheckBox chkMatch = null;
! private JButton btnAdvanced = null;
! private JButton btnSearch = null;
! private JButton btnKey = null;
! private JButton btnKeyGo = null;
! private AdvancedSearchPane advanced = new AdvancedSearchPane();
! private JButton btnIndex = null;
/**
--- 603,630 ----
private static int base = 1;
! private String title;
! private transient List listeners;
! private QuickHelpDialog dlgHelp;
! private ActionFactory actions;
! private BookMetaData selected;
/*
* GUI Components
*/
! private BooksComboBoxModel mdlBible;
! private PassageSelectionPane dlgSelect;
! private JTextField txtKey;
! private JTextField txtSearch;
! private JCheckBox chkMatch;
! private JButton btnAdvanced;
! private JButton btnSearch;
! private JButton btnKey;
! private JButton btnKeyGo;
! private AdvancedSearchPane advanced;
! private JButton btnIndex;
/**
Index: SidebarPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SidebarPane.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SidebarPane.java 28 Nov 2004 21:36:04 -0000 1.6
--- SidebarPane.java 6 Mar 2005 20:21:36 -0000 1.7
***************
*** 35,39 ****
public class SidebarPane extends JPanel
{
! /**
* Simple ctor
*/
--- 35,39 ----
public class SidebarPane extends JPanel
{
! /**
* Simple ctor
*/
Index: DriversListModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DriversListModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DriversListModel.java 28 Nov 2004 21:36:04 -0000 1.4
--- DriversListModel.java 6 Mar 2005 20:21:36 -0000 1.5
***************
*** 45,49 ****
public class DriversListModel extends AbstractListModel
{
! /**
* Basic constructor
*/
--- 45,49 ----
public class DriversListModel extends AbstractListModel
{
! /**
* Basic constructor
*/
***************
*** 163,167 ****
public static class BibleListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
--- 163,167 ----
public static class BibleListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
Index: DisplaySelectEvent.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectEvent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DisplaySelectEvent.java 28 Nov 2004 21:36:04 -0000 1.5
--- DisplaySelectEvent.java 6 Mar 2005 20:21:36 -0000 1.6
***************
*** 32,36 ****
public class DisplaySelectEvent extends EventObject
{
! /**
* For when a command has been made
* @param source The thing that started this off
--- 32,36 ----
public class DisplaySelectEvent extends EventObject
{
! /**
* For when a command has been made
* @param source The thing that started this off
Index: BookListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookListCellRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BookListCellRenderer.java 28 Nov 2004 21:36:04 -0000 1.5
--- BookListCellRenderer.java 6 Mar 2005 20:21:36 -0000 1.6
***************
*** 43,47 ****
public class BookListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
--- 43,47 ----
public class BookListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
***************
*** 149,153 ****
* border if we do not have focus
*/
! private static Border noFocus = null;
/**
--- 149,153 ----
* border if we do not have focus
*/
! private static Border noFocus;
/**
Index: PassageSelectionPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/PassageSelectionPane.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PassageSelectionPane.java 13 Feb 2005 01:07:39 -0000 1.15
--- PassageSelectionPane.java 6 Mar 2005 20:21:36 -0000 1.16
***************
*** 400,414 ****
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout = false;
/**
* Prevent us getting in an event cascade loop
*/
! private boolean changing = false;
/**
* The passage we are editing
*/
! private Passage ref = null;
/**
--- 400,414 ----
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout;
/**
* Prevent us getting in an event cascade loop
*/
! private boolean changing;
/**
* The passage we are editing
*/
! private Passage ref;
/**
***************
*** 420,430 ****
* GUI Components
*/
! private Icon icoGood = null;
! private Icon icoBad = null;
! private JTree treAll = null;
! private JList lstSel = null;
! private JTextField txtDisplay = null;
! private JLabel lblMessage = null;
! protected JDialog dlgMain = null;
/**
--- 420,430 ----
* GUI Components
*/
! private Icon icoGood;
! private Icon icoBad;
! private JTree treAll;
! private JList lstSel;
! private JTextField txtDisplay;
! private JLabel lblMessage;
! protected JDialog dlgMain;
/**
Index: CommentaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/CommentaryPane.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CommentaryPane.java 6 Mar 2005 04:55:44 -0000 1.10
--- CommentaryPane.java 6 Mar 2005 20:21:36 -0000 1.11
***************
*** 51,55 ****
public class CommentaryPane extends JPanel implements BookDataDisplay
{
! /**
* Simple constructor that uses all the Books
*/
--- 51,55 ----
public class CommentaryPane extends JPanel implements BookDataDisplay
{
! /**
* Simple constructor that uses all the Books
*/
Index: BibleComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BibleComboBoxModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BibleComboBoxModel.java 24 Jan 2005 23:24:19 -0000 1.6
--- BibleComboBoxModel.java 6 Mar 2005 20:21:36 -0000 1.7
***************
*** 273,282 ****
* What is currently selected?
*/
! private Object selected = null;
/**
* Are we a book, chapter or verse selector
*/
! protected int level = 0;
/**
--- 273,282 ----
* What is currently selected?
*/
! private Object selected;
/**
* Are we a book, chapter or verse selector
*/
! protected int level;
/**
More information about the jsword-svn
mailing list