[jsword-svn] r1998 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/index/lucene
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Oct 23 20:05:03 MST 2010
Author: dmsmith
Date: 2010-10-23 20:05:03 -0700 (Sat, 23 Oct 2010)
New Revision: 1998
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java
trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java
Log:
More NON-NLS removal
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -660,8 +660,7 @@
// private static final String BEFORE = "Before";
/**
- * In our parsing we use space quite a lot and this ensures there is only
- * one and that we don't have lots of NON-NLS comments everywhere
+ * In our parsing we use space quite a lot and this ensures there is only one.
*/
private static final String SPACE = " ";
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -120,7 +120,7 @@
}
if (book == null || Books.installed().getBook(book.getName()) == null) {
- txtView.setText("Book Unavailable!"); //$NON-NLS-1$
+ txtView.setText("Book Unavailable!");
title.setTitle("Exception");
return;
}
@@ -139,7 +139,7 @@
BookMetaData bmd = book.getBookMetaData();
if (bmd == null) {
- txtView.setText("Book Meta Data Unavailable!"); //$NON-NLS-1$
+ txtView.setText("Book Meta Data Unavailable!");
title.setTitle("Exception");
return;
}
@@ -150,10 +150,10 @@
try {
SAXEventProvider osissep = bdata.getSAXEventProvider();
TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
- XSLTProperty.DIRECTION.setState(direction ? "ltr" : "rtl"); //$NON-NLS-1$ //$NON-NLS-2$
+ XSLTProperty.DIRECTION.setState(direction ? "ltr" : "rtl");
URI loc = bmd.getLocation();
- XSLTProperty.BASE_URL.setState(loc == null ? "" : loc.getPath()); //$NON-NLS-1$
+ XSLTProperty.BASE_URL.setState(loc == null ? "" : loc.getPath());
if (bmd.getBookCategory() == BookCategory.BIBLE) {
XSLTProperty.setProperties(htmlsep);
@@ -172,10 +172,10 @@
*/
/* Apply the fix if the text is too long and we are not Java 1.5 or greater */
if (txt.length() > 32768 && BookCategory.GENERAL_BOOK.equals(book.getBookCategory())) {
- String javaVersion = System.getProperty("java.specification.version"); //$NON-NLS-1$
- if (javaVersion == null || "1.5".compareTo(javaVersion) > 0) //$NON-NLS-1$
+ String javaVersion = System.getProperty("java.specification.version");
+ if (javaVersion == null || "1.5".compareTo(javaVersion) > 0)
{
- txt = txt.substring(0, 32760) + "..."; //$NON-NLS-1$
+ txt = txt.substring(0, 32760) + "...";
}
}
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 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/LazyHTMLEditorKit.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -58,7 +58,7 @@
if (mls[i] instanceof HTMLEditorKit.LinkController){
if (linkCtrl == null)
linkCtrl = (HTMLEditorKit.LinkController) mls[i];
- else throw new RuntimeException("Multiple Link Controllers!"); //$NON-NLS-1$
+ else throw new RuntimeException("Multiple Link Controllers!");
}
//c.removeMouseListener(linkCtrl);
c.removeMouseMotionListener(linkCtrl);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -139,7 +139,7 @@
}
if (book == null || Books.installed().getBook(book.getName()) == null) {
- txtView.setText("Book Unavailable!"); //$NON-NLS-1$
+ txtView.setText("Book Unavailable!");
title.setTitle("Exception");
return;
}
@@ -158,7 +158,7 @@
BookMetaData bmd = book.getBookMetaData();
if (bmd == null) {
- txtView.setText("Book Meta Data Unavailable!"); //$NON-NLS-1$
+ txtView.setText("Book Meta Data Unavailable!");
title.setTitle("Exception");
return;
}
@@ -169,10 +169,10 @@
try {
SAXEventProvider osissep = bdata.getSAXEventProvider();
TransformingSAXEventProvider htmlsep = (TransformingSAXEventProvider) converter.convert(osissep);
- XSLTProperty.DIRECTION.setState(direction ? "ltr" : "rtl"); //$NON-NLS-1$ //$NON-NLS-2$
+ XSLTProperty.DIRECTION.setState(direction ? "ltr" : "rtl");
URI loc = bmd.getLocation();
- XSLTProperty.BASE_URL.setState(loc == null ? "" : loc.getPath()); //$NON-NLS-1$
+ XSLTProperty.BASE_URL.setState(loc == null ? "" : loc.getPath());
if (bmd.getBookCategory() == BookCategory.BIBLE) {
XSLTProperty.setProperties(htmlsep);
@@ -191,10 +191,10 @@
*/
/* Apply the fix if the text is too long and we are not Java 1.5 or greater */
if (txt.length() > 32768 && BookCategory.GENERAL_BOOK.equals(book.getBookCategory())) {
- String javaVersion = System.getProperty("java.specification.version"); //$NON-NLS-1$
- if (javaVersion == null || "1.5".compareTo(javaVersion) > 0) { //$NON-NLS-1$
+ String javaVersion = System.getProperty("java.specification.version");
+ if (javaVersion == null || "1.5".compareTo(javaVersion) > 0) {
- txt = txt.substring(0, 32760) + "..."; //$NON-NLS-1$
+ txt = txt.substring(0, 32760) + "...";
}
}
Modified: trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -252,7 +252,7 @@
* @param oldUri
* The URI to move
* @param newUri
- * The desitination URI
+ * The destination URI
*/
public static boolean move(URI oldUri, URI newUri) throws IOException {
checkFileURI(oldUri);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java 2010-10-23 20:53:47 UTC (rev 1997)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java 2010-10-24 03:05:03 UTC (rev 1998)
@@ -136,8 +136,7 @@
}
/**
- * In our parsing we use space quite a lot and this ensures there is only
- * one and that we don't have lots of NON-NLS comments everywhere
+ * In our parsing we use space quite a lot and this ensures there is only one.
*/
private static final String SPACE = " ";
private static final char QUOTE = '"';
More information about the jsword-svn
mailing list