[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/book s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv26230/java/main/org/crosswire/bibledesktop/book

Modified Files:
	DisplaySelectPane.java AdvancedSearchPane.java 
Log Message:
Fixed the bug where notes were being indexed by adding getVerseText as a replacement for getPlainText. The latter is still needed for non-bibles.
Also cleaned up checkstyle reports and added/corrected javadoc.

Index: DisplaySelectPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** DisplaySelectPane.java	11 Apr 2005 11:26:29 -0000	1.30
--- DisplaySelectPane.java	2 May 2005 01:29:24 -0000	1.31
***************
*** 158,164 ****
          btnKey = new JButton(actions.getAction(MORE));
          btnKey.setIcon(ICON_SELECT);
!         btnKey.setBorder(BorderFactory.createEmptyBorder(3,5,3,5));
          btnKeyGo = new JButton(actions.getAction(GO_PASSAGE));
!         btnKeyGo.setBorder(BorderFactory.createEmptyBorder(4,5,4,5));
  
          txtSearch = new JTextField();
--- 158,164 ----
          btnKey = new JButton(actions.getAction(MORE));
          btnKey.setIcon(ICON_SELECT);
!         btnKey.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
          btnKeyGo = new JButton(actions.getAction(GO_PASSAGE));
!         btnKeyGo.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
  
          txtSearch = new JTextField();
***************
*** 167,181 ****
          lblSearch.setLabelFor(txtSearch);
          btnSearch = new JButton(actions.getAction(GO_SEARCH));
!         btnSearch.setBorder(BorderFactory.createEmptyBorder(4,5,4,5));
  
          JButton btnHelp = new JButton(actions.getAction(HELP));
!         btnHelp.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
          btnHelp.setText(null);
          dlgHelp = new QuickHelpDialog(GuiUtil.getFrame(this), Msg.HELP_TITLE.toString(), Msg.HELP_TEXT.toString());
  
          btnAdvanced = new JButton(actions.getAction(ADVANCED));
!         btnAdvanced.setBorder(BorderFactory.createEmptyBorder(3,5,3,5));
          btnIndex = new JButton(actions.getAction(INDEX));
!         btnIndex.setBorder(BorderFactory.createEmptyBorder(3,15,3,15));
  
          this.setLayout(new GridBagLayout());
--- 167,181 ----
          lblSearch.setLabelFor(txtSearch);
          btnSearch = new JButton(actions.getAction(GO_SEARCH));
!         btnSearch.setBorder(BorderFactory.createEmptyBorder(4, 5, 4, 5));
  
          JButton btnHelp = new JButton(actions.getAction(HELP));
!         btnHelp.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
          btnHelp.setText(null);
          dlgHelp = new QuickHelpDialog(GuiUtil.getFrame(this), Msg.HELP_TITLE.toString(), Msg.HELP_TEXT.toString());
  
          btnAdvanced = new JButton(actions.getAction(ADVANCED));
!         btnAdvanced.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5));
          btnIndex = new JButton(actions.getAction(INDEX));
!         btnIndex.setBorder(BorderFactory.createEmptyBorder(3, 15, 3, 15));
  
          this.setLayout(new GridBagLayout());

Index: AdvancedSearchPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/AdvancedSearchPane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AdvancedSearchPane.java	25 Apr 2005 01:22:35 -0000	1.7
--- AdvancedSearchPane.java	2 May 2005 01:29:24 -0000	1.8
***************
*** 128,133 ****
          sliderRank = new JSlider(SwingConstants.HORIZONTAL,
                      0, DisplaySelectPane.getMaxNumRankedVerses(), DisplaySelectPane.getNumRankedVerses());
!         sliderRank.setMajorTickSpacing(DisplaySelectPane.getMaxNumRankedVerses()/5);
!         sliderRank.setMinorTickSpacing(DisplaySelectPane.getMaxNumRankedVerses()/20);
          sliderRank.setPaintTicks(true);
          sliderRank.setPaintLabels(true);
--- 128,133 ----
          sliderRank = new JSlider(SwingConstants.HORIZONTAL,
                      0, DisplaySelectPane.getMaxNumRankedVerses(), DisplaySelectPane.getNumRankedVerses());
!         sliderRank.setMajorTickSpacing(DisplaySelectPane.getMaxNumRankedVerses() / 5);
!         sliderRank.setMinorTickSpacing(DisplaySelectPane.getMaxNumRankedVerses() / 20);
          sliderRank.setPaintTicks(true);
          sliderRank.setPaintLabels(true);
***************
*** 137,141 ****
              public void stateChanged(ChangeEvent e)
              {
!                 JSlider source = (JSlider)e.getSource();
                  int val = source.getValue();
                  if (source.getValueIsAdjusting())
--- 137,141 ----
              public void stateChanged(ChangeEvent e)
              {
!                 JSlider source = (JSlider) e.getSource();
                  int val = source.getValue();
                  if (source.getValueIsAdjusting())