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

[jswordcvs at crosswire.org]

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

Modified Files:
	KeySidebar.java KeySidebar.properties PassageGuiUtil.java 
Log Message:
Made showing the sidebar a default and set it to no.
Cleaned up the code to consistently use "book" to refer to "module"

Index: KeySidebar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeySidebar.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** KeySidebar.java	6 Jun 2005 00:17:45 -0000	1.13
--- KeySidebar.java	11 Jun 2005 20:41:15 -0000	1.14
***************
*** 47,50 ****
--- 47,51 ----
  import org.crosswire.jsword.passage.Passage;
  import org.crosswire.jsword.passage.RestrictionType;
+ import org.crosswire.jsword.passage.VerseRange;
  
  /**
***************
*** 201,206 ****
      public void doDeleteSelected()
      {
!         PassageGuiUtil.deleteSelectedVersesFromList(list);
          fireKeyChanged(new KeyChangeEvent(this, key));
      }
  
--- 202,221 ----
      public void doDeleteSelected()
      {
!         RangeListModel rlm = (RangeListModel) list.getModel();
! 
!         Passage ref = rlm.getPassage();
!         Object[] selected = list.getSelectedValues();
!         for (int i = 0; i < selected.length; i++)
!         {
!             VerseRange range = (VerseRange) selected[i];
!             ref.remove(range);
!         }
! 
!         list.setSelectedIndices(new int[0]);
! 
!         partial = null;
!         model.setPassage((Passage) key);
          fireKeyChanged(new KeyChangeEvent(this, key));
+         setActive();
      }
  
***************
*** 232,236 ****
          else
          {
!             key = (Key) newKey.clone();
          }
          partial = null;
--- 247,254 ----
          else
          {
!             if (key != newKey)
!             {
!                 key = (Key) newKey.clone();
!             }
          }
          partial = null;

Index: KeySidebar.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeySidebar.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KeySidebar.properties	2 Sep 2004 17:44:47 -0000	1.1
--- KeySidebar.properties	11 Jun 2005 20:41:15 -0000	1.2
***************
*** 1,7 ****
  
  Blur1.Enabled=true
! Blur1.Name=Blur by 1 verse
! Blur1.ShortDescription=Blur passage by 1 verse
! Blur1.LongDescription=Blur the current passage by 1 verse.
  Blur1.SmallIcon=images/Blur1_16.gif
  Blur1.LargeIcon=images/Blur1_16.gif
--- 1,7 ----
  
  Blur1.Enabled=true
! Blur1.Name=Expand by 1 verse
! Blur1.ShortDescription=Expand passage by 1 verse
! Blur1.LongDescription=Expand all or the selected passage by 1 verse.
  Blur1.SmallIcon=images/Blur1_16.gif
  Blur1.LargeIcon=images/Blur1_16.gif
***************
*** 11,17 ****
  
  Blur5.Enabled=true
! Blur5.Name=Blur by 5 verse
! Blur5.ShortDescription=Blur passage by 5 verses
! Blur5.LongDescription=Blur the current passage by 5 verses.
  Blur5.SmallIcon=images/Blur5_16.gif
  Blur5.LargeIcon=images/Blur5_16.gif
--- 11,17 ----
  
  Blur5.Enabled=true
! Blur5.Name=Expand by 5 verse
! Blur5.ShortDescription=Expand passage by 5 verses
! Blur5.LongDescription=Expand all or the selected passage by 5 verses.
  Blur5.SmallIcon=images/Blur5_16.gif
  Blur5.LargeIcon=images/Blur5_16.gif
***************
*** 21,27 ****
  
  DeleteSelected.Enabled=true
! DeleteSelected.Name=Delete Selected
! DeleteSelected.ShortDescription=Delete selected verses
! DeleteSelected.LongDescription=Deleted the selected verses in the current verse list.
  DeleteSelected.SmallIcon=toolbarButtonGraphics/general/Remove16.gif
  DeleteSelected.LargeIcon=toolbarButtonGraphics/general/Remove24.gif
--- 21,27 ----
  
  DeleteSelected.Enabled=true
! DeleteSelected.Name=Remove Selected
! DeleteSelected.ShortDescription=Remove selected verses in list
! DeleteSelected.LongDescription=Remove the selected verses in the current verse list.
  DeleteSelected.SmallIcon=toolbarButtonGraphics/general/Remove16.gif
  DeleteSelected.LargeIcon=toolbarButtonGraphics/general/Remove24.gif

Index: PassageGuiUtil.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/PassageGuiUtil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PassageGuiUtil.java	17 May 2005 00:44:31 -0000	1.10
--- PassageGuiUtil.java	11 Jun 2005 20:41:15 -0000	1.11
***************
*** 49,55 ****
      public static void deleteSelectedVersesFromList(JList list)
      {
!         PassageListModel plm = (PassageListModel) list.getModel();
  
!         Passage ref = plm.getPassage();
          Object[] selected = list.getSelectedValues();
          for (int i = 0; i < selected.length; i++)
--- 49,55 ----
      public static void deleteSelectedVersesFromList(JList list)
      {
!         RangeListModel rlm = (RangeListModel) list.getModel();
  
!         Passage ref = rlm.getPassage();
          Object[] selected = list.getSelectedValues();
          for (int i = 0; i < selected.length; i++)