[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/desktop s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Nov 28 14:36:06 MST 2004
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop
In directory www.crosswire.org:/tmp/cvs-serv11205/java/main/org/crosswire/bibledesktop/desktop
Modified Files:
StatusBar.java Desktop.java Splash.java AboutPane.java
DebugPane.java
Log Message:
intellij refactor - safe
Index: DebugPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/DebugPane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DebugPane.java 8 Sep 2004 19:57:58 -0000 1.7
--- DebugPane.java 28 Nov 2004 21:36:04 -0000 1.8
***************
*** 55,59 ****
public class DebugPane extends JPanel
{
! /**
* Simple ctor
*/
--- 55,59 ----
public class DebugPane extends JPanel
{
! /**
* Simple ctor
*/
***************
*** 146,150 ****
StringBuffer reply = new StringBuffer();
! reply.append("\n" + Msg.DEBUG_VIEWS.toString()); //$NON-NLS-1$
int i = 0;
Iterator it = desktop.getViews().iterator();
--- 146,150 ----
StringBuffer reply = new StringBuffer();
! reply.append('\n' + Msg.DEBUG_VIEWS.toString());
int i = 0;
Iterator it = desktop.getViews().iterator();
***************
*** 152,156 ****
{
BibleViewPane view = (BibleViewPane) it.next();
! reply.append((i++) + ": " + view.getTitle() + " " + view.toString()); //$NON-NLS-1$ //$NON-NLS-2$
}
--- 152,156 ----
{
BibleViewPane view = (BibleViewPane) it.next();
! reply.append((i++) + ": " + view.getTitle() + ' ' + view.toString()); //$NON-NLS-1$ //$NON-NLS-2$
}
***************
*** 255,261 ****
/**
! * SERIALUID(dms): A placeholder for the ultimate version id.
*/
! private static final long serialVersionUID = 1L;
/**
--- 255,261 ----
/**
! * Serialization ID
*/
! private static final long serialVersionUID = 3257853185987983152L;
/**
***************
*** 264,268 ****
private static final class CustomListCellRenderer extends DefaultListCellRenderer
{
! /* (non-Javadoc)
* @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
--- 264,268 ----
private static final class CustomListCellRenderer extends DefaultListCellRenderer
{
! /* (non-Javadoc)
* @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
*/
***************
*** 276,279 ****
--- 276,284 ----
return this;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3257853185987983152L;
}
}
Index: Splash.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Splash.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Splash.java 8 Sep 2004 19:57:58 -0000 1.9
--- Splash.java 28 Nov 2004 21:36:04 -0000 1.10
***************
*** 34,38 ****
* s.close();
* </pre>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 34,38 ----
* s.close();
* </pre>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 58,62 ****
public class Splash extends JWindow
{
! /**
* Create a splash window
*/
--- 58,62 ----
public class Splash extends JWindow
{
! /**
* Create a splash window
*/
***************
*** 104,108 ****
//lblInfo.setBorder(BorderFactory.createEmptyBorder(5, 5, 0, 5));
lblInfo.setHorizontalAlignment(SwingConstants.RIGHT);
! lblInfo.setText(Msg.getVersionInfo() + " "); //$NON-NLS-1$
lblInfo.setOpaque(true);
--- 104,108 ----
//lblInfo.setBorder(BorderFactory.createEmptyBorder(5, 5, 0, 5));
lblInfo.setHorizontalAlignment(SwingConstants.RIGHT);
! lblInfo.setText(Msg.getVersionInfo() + ' ');
lblInfo.setOpaque(true);
***************
*** 156,159 ****
--- 156,164 ----
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258133565731256119L;
+
+ /**
* Pack the frame if we get new jobs that could shunt things around
*/
Index: StatusBar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/StatusBar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StatusBar.java 2 Sep 2004 17:44:46 -0000 1.4
--- StatusBar.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 52,56 ****
public class StatusBar extends JComponent implements MouseListener, URLEventListener
{
! /**
* Create a new StatusBar
*/
--- 52,56 ----
public class StatusBar extends JComponent implements MouseListener, URLEventListener
{
! /**
* Create a new StatusBar
*/
***************
*** 196,198 ****
--- 196,203 ----
*/
private JLabel lbl_name = new JLabel();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3546920264718955568L;
}
Index: Desktop.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Desktop.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Desktop.java 9 Oct 2004 21:45:24 -0000 1.32
--- Desktop.java 28 Nov 2004 21:36:04 -0000 1.33
***************
*** 7,11 ****
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
- import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
--- 7,10 ----
***************
*** 68,72 ****
import org.crosswire.jsword.util.Project;
import org.jdom.Document;
- import org.jdom.JDOMException;
/**
--- 67,70 ----
***************
*** 104,108 ****
public class Desktop extends JFrame implements URLEventListener, ViewEventListener, ViewGenerator
{
! /**
* Central start point.
* @param args The command line arguments
--- 102,106 ----
public class Desktop extends JFrame implements URLEventListener, ViewEventListener, ViewGenerator
{
! /**
* Central start point.
* @param args The command line arguments
***************
*** 535,539 ****
* Load the config.xml file
*/
! public void generateConfig()
{
fillChoiceFactory();
--- 533,537 ----
* Load the config.xml file
*/
! public final void generateConfig()
{
fillChoiceFactory();
***************
*** 545,559 ****
xmlconfig = XMLUtil.getDocument(CONFIG_KEY);
}
! catch (JDOMException e)
{
// Something went wrong before we've managed to get on our feet.
// so we want the best possible shot at working out what failed.
! e.printStackTrace();
! ExceptionPane.showExceptionDialog(null, e);
! }
! catch (IOException e)
! {
! e.printStackTrace();
! ExceptionPane.showExceptionDialog(null, e);
}
--- 543,552 ----
xmlconfig = XMLUtil.getDocument(CONFIG_KEY);
}
! catch (Exception ex)
{
// Something went wrong before we've managed to get on our feet.
// so we want the best possible shot at working out what failed.
! ex.printStackTrace();
! ExceptionPane.showExceptionDialog(null, ex);
}
***************
*** 567,579 ****
config.setProperties(ResourceUtil.getProperties(DESKTOP_KEY));
}
! catch (MalformedURLException e1)
! {
! e1.printStackTrace();
! ExceptionPane.showExceptionDialog(null, e1);
! }
! catch (IOException e1)
{
! e1.printStackTrace();
! ExceptionPane.showExceptionDialog(null, e1);
}
--- 560,567 ----
config.setProperties(ResourceUtil.getProperties(DESKTOP_KEY));
}
! catch (Exception ex)
{
! ex.printStackTrace();
! ExceptionPane.showExceptionDialog(null, ex);
}
***************
*** 654,658 ****
* Setup the book choices
*/
! protected void refreshBooks()
{
// Create the array of Bibles
--- 642,646 ----
* Setup the book choices
*/
! protected final void refreshBooks()
{
// Create the array of Bibles
***************
*** 768,770 ****
--- 756,763 ----
private DictionaryPane reference;
private JSplitPane sptBooks;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3977014029116191800L;
}
Index: AboutPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/AboutPane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AboutPane.java 8 Sep 2004 19:57:58 -0000 1.7
--- AboutPane.java 28 Nov 2004 21:36:04 -0000 1.8
***************
*** 199,204 ****
private static final String ABOUT_OK = "AboutOK"; //$NON-NLS-1$
! private static boolean advanced;
! private JDialog dlgMain;
! private JPanel pnlMain;
}
--- 199,204 ----
private static final String ABOUT_OK = "AboutOK"; //$NON-NLS-1$
! private static boolean advanced = false;
! private JDialog dlgMain = null;
! private JPanel pnlMain = null;
}
More information about the jsword-svn
mailing list