[jsword-svn] r1394 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop/src/main/java/org/crosswire/bibledesktop/display bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common-swing/src/main/java/org/crosswire/common/swing jsword/src/main/java/org/crosswire/jsword/book jsword-limbo/src/main/java/org/crosswire/bibledesktop/book jsword-limbo/src/main/java/org/crosswire/bibledesktop/display/jdtb jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Fri Jun 8 05:45:48 MST 2007
Author: dmsmith
Date: 2007-06-08 05:45:47 -0700 (Fri, 08 Jun 2007)
New Revision: 1394
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/display/jdtb/JDTBBookDataDisplay.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java
Log:
Made it possible to pass a compare flag to BookData to control differences.
Made BookDataDisplay a PropertyChangeListener to decouple classes.
Added "Compare Differences" to the View menu.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -25,6 +25,7 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -170,6 +171,14 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ display.propertyChange(evt);
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public void addURIEventListener(URIEventListener listener)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -30,6 +30,7 @@
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.net.MalformedURLException;
@@ -56,6 +57,7 @@
import javax.swing.JSplitPane;
import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
+import javax.swing.event.SwingPropertyChangeSupport;
import org.crosswire.bibledesktop.book.BibleViewPane;
import org.crosswire.bibledesktop.book.DisplaySelectEvent;
@@ -227,6 +229,7 @@
sptBlog = new FixedSplitPane(false);
// blogPanel = BlogClientFrame.getInstance();
+ changeSupport = new SwingPropertyChangeSupport(this);
views = new ViewManager(this);
views.addViewEventListener(this);
history = new History();
@@ -451,6 +454,8 @@
verseMenu.add(radio).addMouseListener(barStatus);
menuView.addSeparator();
+ toggle = new JCheckBoxMenuItem(actions.getAction(DesktopActions.COMPARE_TOGGLE));
+ menuView.add(toggle).addMouseListener(barStatus);
toggle = new JCheckBoxMenuItem(actions.getAction(XSLTProperty.HEADINGS.getName()));
toggle.setSelected(XSLTProperty.HEADINGS.getDefaultState());
menuView.add(toggle).addMouseListener(barStatus);
@@ -555,6 +560,7 @@
BookDataDisplay display = view.getPassagePane().getBookDataDisplay();
display.addURIEventListener(this);
display.addURIEventListener(barStatus);
+ changeSupport.addPropertyChangeListener(BookDataDisplay.COMPARE_BOOKS, display);
DisplaySelectPane dsp = view.getSelectPane();
dsp.addCommandListener(this);
return view;
@@ -569,6 +575,7 @@
BookDataDisplay display = view.getPassagePane().getBookDataDisplay();
display.removeURIEventListener(this);
display.removeURIEventListener(barStatus);
+ changeSupport.removePropertyChangeListener(BookDataDisplay.COMPARE_BOOKS, display);
DisplaySelectPane dsp = view.getSelectPane();
dsp.removeCommandListener(this);
}
@@ -900,6 +907,24 @@
}
/**
+ * @param show Whether to show differences between versions of the Bible
+ */
+ public void setCompareShowing(boolean show)
+ {
+ boolean old = compareShowing;
+ compareShowing = show;
+ changeSupport.firePropertyChange(BookDataDisplay.COMPARE_BOOKS, old, compareShowing);
+ }
+
+ /**
+ * @return Whether to show differences between versions of the Bible
+ */
+ public boolean isCompareShowing()
+ {
+ return compareShowing;
+ }
+
+ /**
* @param show Whether to show the web journal at start up.
*/
public static void setWebJournalShowing(boolean show)
@@ -1178,6 +1203,11 @@
private static boolean sidebarShowing;
/**
+ * Whether to show differences between versions of the Bible
+ */
+ private static boolean compareShowing;
+
+ /**
* Whether to show the web journal at startup
*/
private static boolean webJournalShowing = true;
@@ -1214,6 +1244,7 @@
private JSplitPane sptBooks;
private JPanel mainPanel;
private transient History history;
+ private PropertyChangeSupport changeSupport;
/**
* Serialization ID
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.properties 2007-06-08 12:45:47 UTC (rev 1394)
@@ -323,6 +323,16 @@
TinyVNum.AcceleratorKey=
TinyVNum.AcceleratorKey.Modifiers=
+CompareToggle.Enabled=true
+CompareToggle.Name=Show Differences
+CompareToggle.ShortDescription=Toggle display of differences
+CompareToggle.LongDescription=Toggle display of differences between different Bibles
+CompareToggle.SmallIcon=
+CompareToggle.LargeIcon=
+CompareToggle.MnemonicKey=
+CompareToggle.AcceleratorKey=
+CompareToggle.AcceleratorKey.Modifiers=
+
Headings.Name=Show Headings
Headings.ShortDescription=Show Headings
Headings.LongDescription=Show Headings
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -342,6 +342,15 @@
da.getBookDataDisplay().refresh();
}
+ /**
+ * Show differences between Bible Book versions.
+ */
+ public void doCompareToggle(ActionEvent ev)
+ {
+ JCheckBoxMenuItem toggle = (JCheckBoxMenuItem) ev.getSource();
+ getDesktop().setCompareShowing(toggle.getState());
+ }
+
public void doHeadings(ActionEvent ev)
{
JCheckBoxMenuItem toggle = (JCheckBoxMenuItem) ev.getSource();
@@ -569,6 +578,7 @@
static final String COPY = "Copy"; //$NON-NLS-1$
static final String BACK = "Back"; //$NON-NLS-1$
static final String FORWARD = "Forward"; //$NON-NLS-1$
+ static final String COMPARE_TOGGLE = "CompareToggle"; //$NON-NLS-1$
static final String TOOLTIP_TOGGLE = "ToolTipToggle"; //$NON-NLS-1$
static final String STATUS_TOGGLE = "StatusToggle"; //$NON-NLS-1$
static final String SIDEBAR_TOGGLE = "SidebarToggle"; //$NON-NLS-1$
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/BookDataDisplay.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -22,6 +22,7 @@
package org.crosswire.bibledesktop.display;
import java.awt.Component;
+import java.beans.PropertyChangeListener;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.passage.Key;
@@ -33,9 +34,14 @@
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
-public interface BookDataDisplay
+public interface BookDataDisplay extends PropertyChangeListener
{
/**
+ * Used by property change listeners to listen for when books should be compared.
+ */
+ String COMPARE_BOOKS = "ComparingBooks"; //$NON-NLS-1$
+
+ /**
* Copy the selection to the clipboard
*/
void copy();
@@ -64,8 +70,8 @@
/**
* Set the BookData to be displayed.
- * The data to be displayed is specified as a book and key rather than the
- * more obvious BookData (the result of reading a book using a key)
+ * The data to be displayed is specified as a books and key rather than the
+ * more obvious BookData (the result of reading books using a key)
* since some displays may wish so split up the display and only look up
* smaller sections at a time.
* @param books The Books to read data from
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/ProxyBookDataDisplay.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -22,6 +22,7 @@
package org.crosswire.bibledesktop.display;
import java.awt.Component;
+import java.beans.PropertyChangeEvent;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.passage.Key;
@@ -56,6 +57,14 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ proxy.propertyChange(evt);
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public void addURIEventListener(URIEventListener listener)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -23,6 +23,7 @@
import java.awt.BorderLayout;
import java.awt.Component;
+import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -216,6 +217,20 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ // Now go through all the known syncs and add this one in
+ Iterator iter = displays.iterator();
+ while (iter.hasNext())
+ {
+ BookDataDisplay bdd = (BookDataDisplay) iter.next();
+ bdd.propertyChange(evt);
+ }
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public synchronized void addURIEventListener(URIEventListener listener)
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -24,6 +24,8 @@
import java.awt.Component;
import java.awt.ComponentOrientation;
import java.awt.event.MouseListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.net.MalformedURLException;
import java.net.URI;
import java.text.MessageFormat;
@@ -66,7 +68,7 @@
* @author Joe Walker [joe at eireneh dot com]
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class TextPaneBookDataDisplay implements BookDataDisplay, HyperlinkListener
+public class TextPaneBookDataDisplay implements BookDataDisplay, HyperlinkListener, PropertyChangeListener
{
/**
* Simple ctor
@@ -100,6 +102,15 @@
this.books = books;
this.key = key;
+ if (books == null || books.length == 0 || books[0] == null || key == null)
+ {
+ bdata = null;
+ }
+ else if (bdata == null || !books.equals(bdata.getBooks()) || !key.equals(bdata.getKey()))
+ {
+ bdata = new BookData(books, key, compareBooks);
+ }
+
refresh();
}
@@ -108,7 +119,7 @@
*/
public void refresh()
{
- if (books == null || books.length == 0 || books[0] == null || key == null)
+ if (bdata == null)
{
txtView.setText(""); //$NON-NLS-1$
return;
@@ -127,7 +138,6 @@
try
{
- BookData bdata = new BookData(books, key);
SAXEventProvider osissep = bdata.getSAXEventProvider();
TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
@@ -252,6 +262,23 @@
}
}
+ /* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ if (evt.getPropertyName().equals(BookDataDisplay.COMPARE_BOOKS))
+ {
+ compareBooks = Boolean.valueOf(evt.getNewValue().toString()).booleanValue();
+ if (bdata != null)
+ {
+ bdata = new BookData(bdata.getBooks(), bdata.getKey(), compareBooks);
+ refresh();
+ }
+ }
+
+ }
+
private String[] getParts(String reference) throws MalformedURLException
{
String protocol = RELATIVE_URI_PROTOCOL;
@@ -428,6 +455,11 @@
protected static final Logger log = Logger.getLogger(TextPaneBookDataDisplay.class);
/**
+ * The book data being shown.
+ */
+ private BookData bdata;
+
+ /**
* The current books
*/
private Book[] books;
@@ -438,6 +470,11 @@
private Key key;
/**
+ * Whether the books should be compared.
+ */
+ private boolean compareBooks;
+
+ /**
* To convert OSIS to HTML
*/
private Converter converter;
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -194,8 +194,8 @@
/**
* Build a button from an action that consist solely of the icon.
- * @param key
- * @return
+ * @param key the action to use
+ * @return the button
*/
public JButton createJButton(String key)
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -66,13 +66,14 @@
/**
* Create BookData for multiple books.
*/
- public BookData(Book[] books, Key key)
+ public BookData(Book[] books, Key key, boolean compare)
{
assert books != null && books.length > 0;
assert key != null;
this.books = (Book[]) books.clone();
this.key = key;
+ this.comparingBooks = compare;
}
/**
@@ -138,6 +139,14 @@
return key;
}
+ /**
+ * @return whether the books should be compared.
+ */
+ public boolean isComparingBooks()
+ {
+ return comparingBooks;
+ }
+
private Element getOsisContent() throws BookException
{
Element div = OSISUtil.factory().createDiv();
@@ -176,7 +185,8 @@
BookCategory prevCategory = prevBook.getBookCategory();
String prevName = prevBook.getInitials();
- showDiffs[i - 1] = BookCategory.BIBLE.equals(category)
+ showDiffs[i - 1] = comparingBooks
+ && BookCategory.BIBLE.equals(category)
&& category.equals(prevCategory)
&& book.getLanguage().equals(prevBook.getLanguage())
&& !book.getInitials().equals(prevName);
@@ -277,6 +287,11 @@
private Book[] books;
/**
+ * Whether the Books should be compared.
+ */
+ private boolean comparingBooks;
+
+ /**
* The complete osis container for the element
*/
private Element osis;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/book/CommentaryPane.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -26,6 +26,7 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
import javax.swing.BorderFactory;
import javax.swing.JComboBox;
@@ -222,6 +223,14 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ display.propertyChange(evt);
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public void addURIEventListener(URIEventListener listener)
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/display/jdtb/JDTBBookDataDisplay.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/display/jdtb/JDTBBookDataDisplay.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/display/jdtb/JDTBBookDataDisplay.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -22,6 +22,7 @@
package org.crosswire.bibledesktop.display.jdtb;
import java.awt.Component;
+import java.beans.PropertyChangeEvent;
import java.net.URL;
import org.crosswire.bibledesktop.display.BookDataDisplay;
@@ -123,6 +124,13 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public void addURIEventListener(URIEventListener listener)
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java 2007-06-07 18:37:44 UTC (rev 1393)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/reference/ReferencedPane.java 2007-06-08 12:45:47 UTC (rev 1394)
@@ -23,6 +23,7 @@
import java.awt.BorderLayout;
import java.awt.Component;
+import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.List;
@@ -118,7 +119,7 @@
});
scrEntries.setViewportView(treEntries);
- scrDisplay.setViewportView(txtDisplay.getComponent());
+ scrDisplay.setViewportView(display.getComponent());
sptMain.setOrientation(JSplitPane.VERTICAL_SPLIT);
sptMain.setTopComponent(scrEntries);
@@ -167,7 +168,7 @@
*/
public void copy()
{
- txtDisplay.copy();
+ display.copy();
}
/* (non-Javadoc)
@@ -202,11 +203,19 @@
}
/* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ display.propertyChange(evt);
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.bibledesktop.display.BookDataDisplay#addURIEventListener(org.crosswire.bibledesktop.display.URIEventListener)
*/
public void addURIEventListener(URIEventListener listener)
{
- txtDisplay.addURIEventListener(listener);
+ display.addURIEventListener(listener);
}
/* (non-Javadoc)
@@ -214,7 +223,7 @@
*/
public void removeURIEventListener(URIEventListener listener)
{
- txtDisplay.removeURIEventListener(listener);
+ display.removeURIEventListener(listener);
}
/**
@@ -298,7 +307,7 @@
Key key = getKey();
if (key != null)
{
- txtDisplay.setBookData(new Book[] {book}, key);
+ display.setBookData(new Book[] {book}, key);
}
}
catch (Exception ex)
@@ -310,7 +319,7 @@
/**
* The display of OSIS data
*/
- private BookDataDisplay txtDisplay = BookDataDisplayFactory.createBookDataDisplay();
+ private BookDataDisplay display = BookDataDisplayFactory.createBookDataDisplay();
/*
* Gui components
More information about the jsword-svn
mailing list