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

Sun May 1 18:29:26 MST 2005

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

Modified Files:
	KeySidebar.java PassageListCellRenderer.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: KeySidebar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeySidebar.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeySidebar.java	11 Apr 2005 11:26:29 -0000	1.6
--- KeySidebar.java	2 May 2005 01:29:24 -0000	1.7
***************
*** 96,107 ****
  
          JButton delete = new JButton(actDelete);
!         delete.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
          delete.setText(null);
          JButton blur1 = new JButton(actBlur1);
          blur1.setText(null);
!         blur1.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
          JButton blur5 = new JButton(actBlur5);
          blur5.setText(null);
!         blur5.setBorder(BorderFactory.createEmptyBorder(2,5,2,5));
  
          JPanel mutate = new JPanel(new FlowLayout());
--- 96,107 ----
  
          JButton delete = new JButton(actDelete);
!         delete.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
          delete.setText(null);
          JButton blur1 = new JButton(actBlur1);
          blur1.setText(null);
!         blur1.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
          JButton blur5 = new JButton(actBlur5);
          blur5.setText(null);
!         blur5.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 5));
  
          JPanel mutate = new JPanel(new FlowLayout());

Index: PassageListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PassageListCellRenderer.java	24 Jan 2005 23:25:18 -0000	1.8
--- PassageListCellRenderer.java	2 May 2005 01:29:24 -0000	1.9
***************
*** 86,90 ****
                  {
                      BookData bdata = bible.getData(range);
!                     String simple = bdata.getPlainText();
                      text = "<html><b>" + range.getName() + "</b> " + simple; //$NON-NLS-1$ //$NON-NLS-2$
                      hash.put(range, text);
--- 86,90 ----
                  {
                      BookData bdata = bible.getData(range);
!                     String simple = bdata.getVerseText();
                      text = "<html><b>" + range.getName() + "</b> " + simple; //$NON-NLS-1$ //$NON-NLS-2$
                      hash.put(range, text);