[jsword-svn] bibledesktop/java/limbo/org/crosswire/bibledesktop/display/jdtb s

jswordcvs at crosswire.org jswordcvs at crosswire.org
Sat Dec 31 20:06:41 MST 2005


Update of /cvs/jsword/bibledesktop/java/limbo/org/crosswire/bibledesktop/display/jdtb
In directory www.crosswire.org:/tmp/cvs-serv14968/java/limbo/org/crosswire/bibledesktop/display/jdtb

Modified Files:
	JDTBBookDataDisplay.java 
Log Message:
Updated tooling (Note could not upgrade checkstyle)

Index: JDTBBookDataDisplay.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/limbo/org/crosswire/bibledesktop/display/jdtb/JDTBBookDataDisplay.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JDTBBookDataDisplay.java	22 Jun 2005 03:50:49 -0000	1.8
--- JDTBBookDataDisplay.java	1 Jan 2006 03:06:39 -0000	1.9
***************
*** 23,28 ****
  
  import java.awt.Component;
- import java.awt.ComponentOrientation;
- import java.awt.event.MouseListener;
  import java.net.URL;
  
--- 23,26 ----
***************
*** 32,38 ****
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookData;
- import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.passage.Key;
! import org.jdesktop.jdic.browser.WebBrowser;
  
  /**
--- 30,35 ----
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.passage.Key;
! //import org.jdesktop.jdic.browser.WebBrowser;
  
  /**
***************
*** 58,62 ****
      public JDTBBookDataDisplay()
      {
!         txtView = new WebBrowser();
      }
  
--- 55,59 ----
      public JDTBBookDataDisplay()
      {
! //        txtView = new WebBrowser();
      }
  
***************
*** 81,101 ****
              if (book == null && key == null)
              {
!                 txtView.setURL();
                  return;
              }
  
              // Make sure Hebrew displays from Right to Left
!             BookMetaData bmd = book.getBookMetaData();
!             boolean direction = bmd.isLeftToRight();
!             txtView.applyComponentOrientation(direction ? ComponentOrientation.LEFT_TO_RIGHT : ComponentOrientation.RIGHT_TO_LEFT);
  
              BookData bdata = book.getData(key);
              if (bdata == null)
              {
!                 txtView.setURL();
                  return;
              }
  
!             txtView.setURL(JDTBURLConnection.createURL(book, key));
          }
          catch (Exception ex)
--- 78,98 ----
              if (book == null && key == null)
              {
! //                txtView.setURL();
                  return;
              }
  
              // Make sure Hebrew displays from Right to Left
! //            BookMetaData bmd = book.getBookMetaData();
! //            boolean direction = bmd.isLeftToRight();
! //            txtView.applyComponentOrientation(direction ? ComponentOrientation.LEFT_TO_RIGHT : ComponentOrientation.RIGHT_TO_LEFT);
  
              BookData bdata = book.getData(key);
              if (bdata == null)
              {
! //                txtView.setURL();
                  return;
              }
  
! //            txtView.setURL(JDTBURLConnection.createURL(book, key));
          }
          catch (Exception ex)
***************
*** 110,114 ****
      public Component getComponent()
      {
!         return txtView;
      }
  
--- 107,111 ----
      public Component getComponent()
      {
!         return null; // txtView;
      }
  
***************
*** 137,153 ****
       * Forward the mouse listener to our child components
       */
!     public void removeMouseListener(MouseListener li)
      {
!         txtView.removeMouseListener(li);
      }
! 
      /**
       * Forward the mouse listener to our child components
       */
!     public void addMouseListener(MouseListener li)
      {
!         txtView.addMouseListener(li);
      }
! 
      /* (non-Javadoc)
       * @see org.crosswire.bibledesktop.display.BookDataDisplay#getKey()
--- 134,150 ----
       * Forward the mouse listener to our child components
       */
! /*    public void removeMouseListener(MouseListener li)
      {
! //        txtView.removeMouseListener(li);
      }
! */
      /**
       * Forward the mouse listener to our child components
       */
! /*    public void addMouseListener(MouseListener li)
      {
! //        txtView.addMouseListener(li);
      }
! */
      /* (non-Javadoc)
       * @see org.crosswire.bibledesktop.display.BookDataDisplay#getKey()
***************
*** 179,182 ****
       * The display component
       */
!     private WebBrowser txtView;
  }
\ No newline at end of file
--- 176,179 ----
       * The display component
       */
! //    private WebBrowser txtView;
  }
\ No newline at end of file



More information about the jsword-svn mailing list