[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/desktop s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun May 8 18:28:32 MST 2005
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop
In directory www.crosswire.org:/tmp/cvs-serv5786/java/main/org/crosswire/bibledesktop/desktop
Modified Files:
DesktopActions.java Splash.java Msg.java StatusBar.java
Desktop.java ViewSourcePane.java
Log Message:
Moved unused code to limbo.
Upgraded support-tools: checkstyle, pmd and findbugs to most recent.
Addressed over 100 issues reported by findbugs and checkstyle.
Resulted in major refactoring of GBFFilter.
Net result is that code size is significantly smaller.
Index: StatusBar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/StatusBar.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StatusBar.java 6 Mar 2005 20:21:36 -0000 1.6
--- StatusBar.java 9 May 2005 01:28:29 -0000 1.7
***************
*** 103,107 ****
{
String protocol = ev.getProtocol();
! String url = ev.getUrl();
if (protocol.length() == 0)
{
--- 103,107 ----
{
String protocol = ev.getProtocol();
! String url = ev.getURL();
if (protocol.length() == 0)
{
Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Msg.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Msg.java 17 Feb 2005 03:40:19 -0000 1.12
--- Msg.java 9 May 2005 01:28:29 -0000 1.13
***************
*** 67,72 ****
static final Msg SOURCE_MISSING = new Msg("DesktopActions.SourceMissing"); //$NON-NLS-1$
! // Strings for ViewLayout
! static final Msg UNTITLED = new Msg("ViewLayout.Untitled"); //$NON-NLS-1$
// Strings for AboutPane and Splash
--- 67,72 ----
static final Msg SOURCE_MISSING = new Msg("DesktopActions.SourceMissing"); //$NON-NLS-1$
! // Strings for AbstractViewLayout
! static final Msg UNTITLED = new Msg("AbstractViewLayout.Untitled"); //$NON-NLS-1$
// Strings for AboutPane and Splash
Index: DesktopActions.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/DesktopActions.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DesktopActions.java 4 May 2005 00:26:43 -0000 1.24
--- DesktopActions.java 9 May 2005 01:28:29 -0000 1.25
***************
*** 400,412 ****
JCheckBoxMenuItem toggle = (JCheckBoxMenuItem) ev.getSource();
final boolean show = toggle.isSelected();
! desktop.getViews().visit(new ViewVisitor()
{
! public void visitView(Component component)
! {
! BibleViewPane view = (BibleViewPane) component;
! SplitBookDataDisplay sbDisplay = view.getPassagePane();
! sbDisplay.showSidebar(show);
! }
! });
}
--- 400,430 ----
JCheckBoxMenuItem toggle = (JCheckBoxMenuItem) ev.getSource();
final boolean show = toggle.isSelected();
! desktop.getViews().visit(new ShowSideBarVisitor(show));
! }
!
! /**
! *
! */
! private static final class ShowSideBarVisitor implements ViewVisitor
! {
! /**
! * @param show
! */
! public ShowSideBarVisitor(boolean show)
{
! this.show = show;
! }
!
! /* (non-Javadoc)
! * @see org.crosswire.common.swing.desktop.ViewVisitor#visitView(java.awt.Component)
! */
! public void visitView(Component component)
! {
! BibleViewPane view = (BibleViewPane) component;
! SplitBookDataDisplay sbDisplay = view.getPassagePane();
! sbDisplay.showSidebar(show);
! }
!
! private boolean show;
}
***************
*** 443,447 ****
* The factory for actions that this class works with
*/
! private ActionFactory actions;
/**
--- 461,465 ----
* The factory for actions that this class works with
*/
! private transient ActionFactory actions;
/**
Index: Splash.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Splash.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Splash.java 6 Mar 2005 20:21:36 -0000 1.11
--- Splash.java 9 May 2005 01:28:29 -0000 1.12
***************
*** 151,155 ****
}
! private CustomWorkListener listener = new CustomWorkListener();
private static final String SPLASH_FONT = "SanSerif"; //$NON-NLS-1$
--- 151,155 ----
}
! private transient CustomWorkListener listener = new CustomWorkListener();
private static final String SPLASH_FONT = "SanSerif"; //$NON-NLS-1$
Index: ViewSourcePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/ViewSourcePane.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ViewSourcePane.java 4 May 2005 00:26:43 -0000 1.13
--- ViewSourcePane.java 9 May 2005 01:28:29 -0000 1.14
***************
*** 223,227 ****
private JPanel pnlButtons;
private JDialog frame;
! private ActionFactory actions;
private static Converter converter = ConverterFactory.getConverter();
--- 223,227 ----
private JPanel pnlButtons;
private JDialog frame;
! private transient ActionFactory actions;
private static Converter converter = ConverterFactory.getConverter();
Index: Desktop.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Desktop.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Desktop.java 2 May 2005 01:29:24 -0000 1.41
--- Desktop.java 9 May 2005 01:28:29 -0000 1.42
***************
*** 494,498 ****
barStatus.activateURL(ev);
String protocol = ev.getProtocol();
! String data = ev.getUrl();
try
--- 494,498 ----
barStatus.activateURL(ev);
String protocol = ev.getProtocol();
! String data = ev.getURL();
try
***************
*** 830,834 ****
* The configuration engine
*/
! private Config config;
/**
--- 830,834 ----
* The configuration engine
*/
! private transient Config config;
/**
***************
*** 842,846 ****
protected static final Logger log = Logger.getLogger(Desktop.class);
! protected DesktopActions actions;
/**
--- 842,846 ----
protected static final Logger log = Logger.getLogger(Desktop.class);
! protected transient DesktopActions actions;
/**
***************
*** 849,853 ****
private static final ImageIcon ICON_APP = GuiUtil.getIcon("images/icon16.png"); //$NON-NLS-1$
! private ViewManager views;
private JPanel corePanel;
private ToolBar pnlTbar;
--- 849,853 ----
private static final ImageIcon ICON_APP = GuiUtil.getIcon("images/icon16.png"); //$NON-NLS-1$
! private transient ViewManager views;
private JPanel corePanel;
private ToolBar pnlTbar;
***************
*** 855,859 ****
private DictionaryPane reference;
private JSplitPane sptBooks;
! private History history;
/**
--- 855,859 ----
private DictionaryPane reference;
private JSplitPane sptBooks;
! private transient History history;
/**
More information about the jsword-svn
mailing list