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

[jswordcvs at crosswire.org]

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

Modified Files:
	ViewSourcePane.java DesktopActions.java XSLTProperty.java 
Log Message:
Bug Fix: View -> No Verse Numbers was not working.

Index: XSLTProperty.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/XSLTProperty.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XSLTProperty.java	22 Jun 2005 03:50:49 -0000	1.7
--- XSLTProperty.java	31 Dec 2005 14:32:49 -0000	1.8
***************
*** 24,27 ****
--- 24,29 ----
  import java.io.Serializable;
  
+ import org.crosswire.common.xml.TransformingSAXEventProvider;
+ 
  
  /**
***************
*** 117,120 ****
--- 119,135 ----
          state = newState;
      }
+     
+     public void setProperty(TransformingSAXEventProvider provider)
+     {
+         provider.setParameter(name, Boolean.toString(state));
+     }
+ 
+     public static void setProperties(TransformingSAXEventProvider provider)
+     {
+         for (int i = 0; i < VALUES.length; i++)
+         {
+             VALUES[i].setProperty(provider);
+         }
+     }
  
      /**

Index: DesktopActions.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/DesktopActions.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** DesktopActions.java	22 Jun 2005 03:50:49 -0000	1.30
--- DesktopActions.java	31 Dec 2005 14:32:49 -0000	1.31
***************
*** 302,305 ****
--- 302,316 ----
      }
  
+     public void doNoVNum()
+     {
+         XSLTProperty.VERSE_NUMBERS.setState(false);
+         XSLTProperty.CV.setState(false);
+         XSLTProperty.BCV.setState(false);
+         XSLTProperty.NO_VERSE_NUMBERS.setState(true);
+         BibleViewPane view = (BibleViewPane) getDesktop().getViews().getSelected();
+         SplitBookDataDisplay da = view.getPassagePane();
+         da.getBookDataDisplay().refresh();
+     }
+ 
      public void doNotes(ActionEvent ev)
      {

Index: ViewSourcePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/ViewSourcePane.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ViewSourcePane.java	22 Jun 2005 03:50:49 -0000	1.20
--- ViewSourcePane.java	31 Dec 2005 14:32:49 -0000	1.21
***************
*** 87,101 ****
  
              TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
!             if (bmd.getType() == BookCategory.BIBLE)
              {
!                 htmlsep.setParameter(XSLTProperty.STRONGS_NUMBERS.getName(), Boolean.toString(XSLTProperty.STRONGS_NUMBERS.getState()));
!                 htmlsep.setParameter(XSLTProperty.MORPH.getName(), Boolean.toString(XSLTProperty.MORPH.getState()));
!                 htmlsep.setParameter(XSLTProperty.START_VERSE_ON_NEWLINE.getName(), Boolean.toString(XSLTProperty.START_VERSE_ON_NEWLINE.getState()));
!                 htmlsep.setParameter(XSLTProperty.VERSE_NUMBERS.getName(), Boolean.toString(XSLTProperty.VERSE_NUMBERS.getState()));
!                 htmlsep.setParameter(XSLTProperty.CV.getName(), Boolean.toString(XSLTProperty.CV.getState()));
!                 htmlsep.setParameter(XSLTProperty.BCV.getName(), Boolean.toString(XSLTProperty.BCV.getState()));
!                 htmlsep.setParameter(XSLTProperty.TINY_VERSE_NUMBERS.getName(), Boolean.toString(XSLTProperty.TINY_VERSE_NUMBERS.getState()));
!                 htmlsep.setParameter(XSLTProperty.NOTES.getName(), Boolean.toString(XSLTProperty.NOTES.getState()));
!                 htmlsep.setParameter(XSLTProperty.XREF.getName(), Boolean.toString(XSLTProperty.XREF.getState()));
              }
              htmlsep.setParameter("direction", direction ? "ltr" : "rtl"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
--- 87,93 ----
  
              TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
!             if (bmd.getBookCategory() == BookCategory.BIBLE)
              {
!                 XSLTProperty.setProperties(htmlsep);
              }
              htmlsep.setParameter("direction", direction ? "ltr" : "rtl"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$