[jsword-svn] r2273 - in trunk: bibledesktop/etc/eclipse bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/progress/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/plaf
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Feb 21 11:14:01 MST 2013
Author: dmsmith
Date: 2013-02-21 11:14:01 -0700 (Thu, 21 Feb 2013)
New Revision: 2273
Modified:
trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/FormPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/MapTableModel.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java
Log:
Initial preparation for release.
Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2013-02-21 18:14:01 UTC (rev 2273)
@@ -21,7 +21,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="bibledesktop"/> </runtimeClasspathEntry> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.crosswire.bibledesktop.desktop.Desktop"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -360,25 +360,7 @@
is.defaultReadObject();
}
- protected File saved;
- private transient EventListenerList listeners;
- private DisplaySelectPane pnlSelect;
- protected SplitBookDataDisplay pnlPassg;
- private JFileChooser chooser;
- private static final String BOOKMARK_DIR = "bookmarks";
- private static final String EXTENSION = ".lst";
-
/**
- * The log stream
- */
- protected static final Logger log = Logger.getLogger(BibleViewPane.class);
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3258415036346282038L;
-
- /**
* Filter out verse lists
*/
static final class CustomFileFilter extends FileFilter {
@@ -399,4 +381,22 @@
return BDMsg.gettext("Verse Lists ({0})", EXTENSION);
}
}
+
+ protected File saved;
+ private transient EventListenerList listeners;
+ private DisplaySelectPane pnlSelect;
+ protected SplitBookDataDisplay pnlPassg;
+ private JFileChooser chooser;
+ private static final String BOOKMARK_DIR = "bookmarks";
+ private static final String EXTENSION = ".lst";
+
+ /**
+ * The log stream
+ */
+ protected static final Logger log = Logger.getLogger(BibleViewPane.class);
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258415036346282038L;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -412,52 +412,7 @@
is.defaultReadObject();
}
- private static final String GOOD_ICON = "toolbarButtonGraphics/general/About24.gif";
- private static final String BAD_ICON = "toolbarButtonGraphics/general/Stop24.gif";
-
/**
- * To convert strings into Biblical keys
- */
- protected transient PassageKeyFactory keyf = PassageKeyFactory.instance();
-
- /**
- * If escape was pressed we don't want to update the parent
- */
- protected boolean bailout;
-
- /**
- * Prevent us getting in an event cascade loop
- */
- private boolean changing;
-
- /**
- * The passage we are editing
- */
- private Passage ref;
-
- /**
- * The ActionFactory holding the actions used by this Component.
- */
- private transient ActionFactory actions;
-
- /*
- * GUI Components
- */
- private transient Icon icoGood;
- private transient Icon icoBad;
- private JTree treAll;
- private JList lstSel;
- private RangeListModel model;
- private JTextField txtDisplay;
- private JLabel lblMessage;
- protected JDialog dlgMain;
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3546920298944673072L;
-
- /**
* Update the list whenever the textbox changes
*/
class CustomDocumentEvent implements DocumentListener {
@@ -508,4 +463,49 @@
copyListToText();
}
}
+
+ private static final String GOOD_ICON = "toolbarButtonGraphics/general/About24.gif";
+ private static final String BAD_ICON = "toolbarButtonGraphics/general/Stop24.gif";
+
+ /**
+ * To convert strings into Biblical keys
+ */
+ protected transient PassageKeyFactory keyf = PassageKeyFactory.instance();
+
+ /**
+ * If escape was pressed we don't want to update the parent
+ */
+ protected boolean bailout;
+
+ /**
+ * Prevent us getting in an event cascade loop
+ */
+ private boolean changing;
+
+ /**
+ * The passage we are editing
+ */
+ private Passage ref;
+
+ /**
+ * The ActionFactory holding the actions used by this Component.
+ */
+ private transient ActionFactory actions;
+
+ /*
+ * GUI Components
+ */
+ private transient Icon icoGood;
+ private transient Icon icoBad;
+ private JTree treAll;
+ private JList lstSel;
+ private RangeListModel model;
+ private JTextField txtDisplay;
+ private JLabel lblMessage;
+ protected JDialog dlgMain;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3546920298944673072L;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookTreeCellRenderer.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -71,5 +71,4 @@
* Serialization ID
*/
private static final long serialVersionUID = -942626483282049048L;
-
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -198,5 +198,4 @@
* Serialization ID
*/
private static final long serialVersionUID = 3834589894202175795L;
-
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -176,16 +176,7 @@
is.defaultReadObject();
}
- private transient CustomWorkListener listener = new CustomWorkListener();
-
- private static final String SPLASH_FONT = "SanSerif";
-
/**
- * Serialization ID
- */
- private static final long serialVersionUID = 3258133565731256119L;
-
- /**
* Pack the frame if we get new jobs that could shunt things around
*/
final class CustomWorkListener implements WorkListener {
@@ -206,4 +197,14 @@
// we don't care about these events.
}
}
+
+ private transient CustomWorkListener listener = new CustomWorkListener();
+
+ private static final String SPLASH_FONT = "SanSerif";
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258133565731256119L;
+
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -70,7 +70,7 @@
private JTextPane txtView;
/**
- * randomly generated sid.
+ * Serialization ID
*/
private static final long serialVersionUID = 6364125062683029727L;
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -19,7 +19,6 @@
*
* ID: $Id: org.eclipse.jdt.ui.prefs 1178 2006-11-06 12:48:02Z lanyjie $
*/
-
package org.crosswire.bibledesktop.display.basic;
import java.awt.event.MouseListener;
@@ -35,13 +34,13 @@
* @author Yingjie Lan [lanyjie at yahoo dot com]
*/
public class LazyHTMLEditorKit extends HTMLEditorKit {
- /**
- * Called when the kit is being installed into the
- * a JEditorPane.
- *
- * @param c the JEditorPane
- */
- @Override
+ /**
+ * Called when the kit is being installed into the a JEditorPane.
+ *
+ * @param c
+ * the JEditorPane
+ */
+ @Override
public void install(JEditorPane c) {
super.install(c);
MouseListener[] mls = c.getMouseListeners();
@@ -55,29 +54,30 @@
}
}
c.removeMouseMotionListener(linkCtrl);
- }
+ }
- /**
- * Called when the kit is being removed from the
- * JEditorPane. This is used to unregister any
- * listeners that were attached.
- *
- * @param c the JEditorPane
- */
- @Override
- public void deinstall(JEditorPane c) {
- c.addMouseMotionListener(linkCtrl);
- super.deinstall(c);
- linkCtrl = null;
- }
+ /**
+ * Called when the kit is being removed from the JEditorPane. This is used
+ * to unregister any listeners that were attached.
+ *
+ * @param c
+ * the JEditorPane
+ */
+ @Override
+ public void deinstall(JEditorPane c) {
+ c.addMouseMotionListener(linkCtrl);
+ super.deinstall(c);
+ linkCtrl = null;
+ }
- public HTMLEditorKit.LinkController getLinkCtrl() {
- return linkCtrl;
- }
+ public HTMLEditorKit.LinkController getLinkCtrl() {
+ return linkCtrl;
+ }
- /**
- * Auto generated.
- */
- private static final long serialVersionUID = 4673477549981614993L;
- private HTMLEditorKit.LinkController linkCtrl;
+ private HTMLEditorKit.LinkController linkCtrl;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 4673477549981614993L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -173,16 +173,6 @@
}
/**
- * A hash of components
- */
- protected Map<String, Component> comps;
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3616451198199345203L;
-
- /**
* A custom data model for the TreeConfig Tree
*
* @author Joe Walker
@@ -354,4 +344,14 @@
*/
private static final long serialVersionUID = 3256720688860576049L;
}
+
+ /**
+ * A hash of components
+ */
+ protected Map<String, Component> comps;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3616451198199345203L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -221,41 +221,6 @@
}
/**
- * The name of the blank tab
- */
- protected static final String BLANK = "$$BLANK$$";
-
- /**
- * The tree containing the Field sets
- */
- protected JTree tree;
-
- /**
- * The custom tree model for the tree
- */
- protected transient ConfigureTreeModel ctm;
-
- /**
- * The title for the config panels
- */
- protected JLabel title;
-
- /**
- * Contains the configuration panels
- */
- protected JPanel deck;
-
- /**
- * Layout for the config panels
- */
- protected CardLayout layout;
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3256720688860576049L;
-
- /**
* A custom data model for the TreeConfig Tree
*
* @author Claude Duguay
@@ -475,4 +440,39 @@
*/
private String path;
}
+
+ /**
+ * The name of the blank tab
+ */
+ protected static final String BLANK = "$$BLANK$$";
+
+ /**
+ * The tree containing the Field sets
+ */
+ protected JTree tree;
+
+ /**
+ * The custom tree model for the tree
+ */
+ protected transient ConfigureTreeModel ctm;
+
+ /**
+ * The title for the config panels
+ */
+ protected JLabel title;
+
+ /**
+ * Contains the configuration panels
+ */
+ protected JPanel deck;
+
+ /**
+ * Layout for the config panels
+ */
+ protected CardLayout layout;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256720688860576049L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -245,42 +245,8 @@
is.defaultReadObject();
}
- /**
- * Where we store the currently displayed jobs
- */
- protected transient Map<Progress, JobData> jobs;
/**
- * Array telling us what y position the jobs have in the window
- */
- private transient List<JobData> positions;
-
- /**
- * The font for the progress-bars
- */
- private Font font;
-
- /**
- * Shape numbers into locale representation.
- */
- private NumberShaper shaper = new NumberShaper();
-
- /**
- * The home of the stop action.
- */
- private transient ActionFactory actions;
-
- /**
- * The log stream
- */
- private static final Logger log = Logger.getLogger(JobsProgressBar.class);
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3257563988660663606L;
-
- /**
* A simple class to group information about a Job
*/
private static class JobData implements WorkListener {
@@ -388,4 +354,39 @@
private Component comp;
private JButton cancelButton;
}
+
+ /**
+ * Where we store the currently displayed jobs
+ */
+ protected transient Map<Progress, JobData> jobs;
+
+ /**
+ * Array telling us what y position the jobs have in the window
+ */
+ private transient List<JobData> positions;
+
+ /**
+ * The font for the progress-bars
+ */
+ private Font font;
+
+ /**
+ * Shape numbers into locale representation.
+ */
+ private NumberShaper shaper = new NumberShaper();
+
+ /**
+ * The home of the stop action.
+ */
+ private transient ActionFactory actions;
+
+ /**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(JobsProgressBar.class);
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3257563988660663606L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -73,12 +73,12 @@
}
/**
- * Serialization ID
+ * Do we anti-alias the text box?
*/
- private static final long serialVersionUID = 3256728398477734965L;
+ private static boolean antiAliasing;
/**
- * Do we anti-alias the text box?
+ * Serialization ID
*/
- private static boolean antiAliasing;
+ private static final long serialVersionUID = 3256728398477734965L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FormPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FormPane.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FormPane.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -136,15 +136,15 @@
private static final String SUFFIX_COMP = "_comp";
private static final String SUFFIX_LABEL = "_label";
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3258135738867790641L;
-
private JPanel inner;
/**
* A store of the available components
*/
protected Hashtable<String, Component> comps = new Hashtable<String, Component>();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258135738867790641L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/MapTableModel.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/MapTableModel.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/MapTableModel.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -244,29 +244,6 @@
}
/**
- * The List that is a copy of the list. A list is used for direct access
- * performance.
- */
- private transient List<StringPair> list;
-
- /**
- * The backing map
- */
- private Map<Object, Object> map;
-
- /**
- * The default column names
- */
- private String[] colNames = new String[] {
- CWOtherMsg.lookupText("Keys"), CWOtherMsg.lookupText("Values"),
- };
-
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 3546365041277352241L;
-
- /**
* A simple holder of a key/value pair of Strings.
*/
private static final class StringPair implements Serializable {
@@ -309,6 +286,28 @@
* Serialization ID
*/
private static final long serialVersionUID = 1730905297956834949L;
-
}
+
+ /**
+ * The List that is a copy of the list. A list is used for direct access
+ * performance.
+ */
+ private transient List<StringPair> list;
+
+ /**
+ * The backing map
+ */
+ private Map<Object, Object> map;
+
+ /**
+ * The default column names
+ */
+ private String[] colNames = new String[] {
+ CWOtherMsg.lookupText("Keys"), CWOtherMsg.lookupText("Values"),
+ };
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3546365041277352241L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java 2013-02-20 16:36:29 UTC (rev 2272)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/plaf/MetalPanelBorder.java 2013-02-21 18:14:01 UTC (rev 2273)
@@ -124,11 +124,6 @@
return insets;
}
- /**
- * Serialization ID
- */
- private static final long serialVersionUID = 7929433986066846750L;
-
private int insetTop = 1;
private int insetLeft = 1;
private int insetBottom = 2;
@@ -137,4 +132,9 @@
private int flags;
private Insets insets;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 7929433986066846750L;
}
More information about the jsword-svn
mailing list