[jsword-svn] r1937 - in trunk: common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/passage jsword-limbo/src/main/java/org/crosswire/common/swing
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Mar 1 10:16:41 MST 2009
Author: dmsmith
Date: 2009-03-01 10:16:41 -0700 (Sun, 01 Mar 2009)
New Revision: 1937
Modified:
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/AbstractLayout.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/CWOptionPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowColumns.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/CaseType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractKeyBackend.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BlockType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageListType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java
Log:
Added missing defaultSerializationID.
Fixed a startup bug when the initial dialog is canceled.
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -360,4 +360,9 @@
* The small task icon
*/
protected static final ImageIcon TASK_ICON_SMALL = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif"); //$NON-NLS-1$
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 6004078142151397638L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/AbstractLayout.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/AbstractLayout.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/AbstractLayout.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -181,4 +181,8 @@
*/
protected int vgap;
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -1275138133354908272L;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/CWOptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/CWOptionPane.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/CWOptionPane.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -628,12 +628,12 @@
return NO_OPTION;
}
- if (getActionName("OK").equals(selectedValue)) //$NON-NLS-1$
+ if (getActionName("OK").equals(selectedValue)) //$NON-NLS-1$
{
return OK_OPTION;
}
- if (getActionName("CANCEL").equals(selectedValue)) //$NON-NLS-1$
+ if (getActionName("Cancel").equals(selectedValue)) //$NON-NLS-1$
{
return CANCEL_OPTION;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -215,4 +215,9 @@
TDI,
MDI,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 5443546249176482187L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/CaseType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/CaseType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/CaseType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -253,4 +253,9 @@
SENTENCE,
UPPER,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -63772726311422060L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractKeyBackend.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractKeyBackend.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractKeyBackend.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -314,4 +314,9 @@
public void blur(int by, RestrictionType restrict)
{
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -2782112117361556089L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BlockType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BlockType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/BlockType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -168,4 +168,9 @@
BLOCK_CHAPTER,
BLOCK_VERSE,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 1411226089933054161L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -365,4 +365,9 @@
* The common user visible name for this work
*/
private String name;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3858640507828137034L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -815,4 +815,9 @@
* Characters that are used to indicate end of verse/chapter, part 2
*/
public static final String VERSE_END_MARK2 = "ff"; //$NON-NLS-1$
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3414238884915821959L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageListType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageListType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageListType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -173,4 +173,9 @@
VERSES,
RANGES,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 1019448872358899522L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -307,4 +307,9 @@
MIX,
TALLY,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 1678142015407980515L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -353,4 +353,9 @@
NONE,
CHAPTER,
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 5511668815596963817L;
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowColumns.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowColumns.java 2009-02-24 13:44:36 UTC (rev 1936)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowColumns.java 2009-03-01 17:16:41 UTC (rev 1937)
@@ -34,7 +34,6 @@
*/
public abstract class RowColumns extends DefaultTableColumnModel
{
-
/**
* Method getHeaders gets the headers for all the columns
* @return String[] of table headers.
@@ -175,4 +174,8 @@
return 0;
}
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 4465827492721960946L;
}
More information about the jsword-svn
mailing list