[jsword-svn] r1990 - in trunk/jsword-sword: .settings src/main/java/org/crosswire/sword/frontend/im src/main/java/org/crosswire/sword/keys src/main/java/org/crosswire/sword/mgr src/main/java/org/crosswire/sword/modules src/main/java/org/crosswire/sword/web src/test/java/org/crosswire/modedit
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Oct 23 11:55:43 MST 2010
Author: dmsmith
Date: 2010-10-23 11:55:43 -0700 (Sat, 23 Oct 2010)
New Revision: 1990
Modified:
trunk/jsword-sword/.settings/org.eclipse.jdt.core.prefs
trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/SWInputMethod.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/Canon.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/ListKey.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/SWKey.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/VerseKey.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWLocale.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWMgr.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/modules/SWModule.java
trunk/jsword-sword/src/main/java/org/crosswire/sword/web/PackageMod.java
trunk/jsword-sword/src/test/java/org/crosswire/modedit/MainFrame.java
Log:
remove NON-NLS comments
Modified: trunk/jsword-sword/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsword-sword/.settings/org.eclipse.jdt.core.prefs 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/.settings/org.eclipse.jdt.core.prefs 2010-10-23 18:55:43 UTC (rev 1990)
@@ -1,4 +1,4 @@
-#Thu Oct 29 08:52:55 EDT 2009
+#Sun Jan 31 17:56:05 EST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -27,12 +27,16 @@
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -48,6 +52,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
@@ -56,13 +61,18 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=disabled
@@ -76,13 +86,18 @@
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.4
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/SWInputMethod.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/SWInputMethod.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/SWInputMethod.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -10,7 +10,7 @@
public abstract class SWInputMethod {
- private String name = "InputMethod"; //$NON-NLS-1$
+ private String name = "InputMethod";
int state = 0;
public SWInputMethod(String name) {
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/Canon.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/Canon.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/Canon.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -48,45 +48,45 @@
}
public static final Book otbooks[] = new Book[] {
- new Book("Genesis", 50), //$NON-NLS-1$
- new Book("Exodus", 40), //$NON-NLS-1$
- new Book("Leviticus", 27), //$NON-NLS-1$
- new Book("Numbers", 36), //$NON-NLS-1$
- new Book("Deuteronomy", 34), //$NON-NLS-1$
- new Book("Joshua", 24), //$NON-NLS-1$
- new Book("Judges", 21), //$NON-NLS-1$
- new Book("Ruth", 4), //$NON-NLS-1$
- new Book("I Samuel", 31), //$NON-NLS-1$
- new Book("II Samuel", 24), //$NON-NLS-1$
- new Book("I Kings", 22), //$NON-NLS-1$
- new Book("II Kings", 25), //$NON-NLS-1$
- new Book("I Chronicles", 29), //$NON-NLS-1$
- new Book("II Chronicles", 36), //$NON-NLS-1$
- new Book("Ezra", 10), //$NON-NLS-1$
- new Book("Nehemiah", 13), //$NON-NLS-1$
- new Book("Esther", 10), //$NON-NLS-1$
- new Book("Job", 42), //$NON-NLS-1$
- new Book("Psalms", 150), //$NON-NLS-1$
- new Book("Proverbs", 31), //$NON-NLS-1$
- new Book("Ecclesiastes", 12), //$NON-NLS-1$
- new Book("Song of Solomon", 8), //$NON-NLS-1$
- new Book("Isaiah", 66), //$NON-NLS-1$
- new Book("Jeremiah", 52), //$NON-NLS-1$
- new Book("Lamentations", 5), //$NON-NLS-1$
- new Book("Ezekiel", 48), //$NON-NLS-1$
- new Book("Daniel", 12), //$NON-NLS-1$
- new Book("Hosea", 14), //$NON-NLS-1$
- new Book("Joel", 3), //$NON-NLS-1$
- new Book("Amos", 9), //$NON-NLS-1$
- new Book("Obadiah", 1), //$NON-NLS-1$
- new Book("Jonah", 4), //$NON-NLS-1$
- new Book("Micah", 7), //$NON-NLS-1$
- new Book("Nahum", 3), //$NON-NLS-1$
- new Book("Habakkuk", 3), //$NON-NLS-1$
- new Book("Zephaniah", 3), //$NON-NLS-1$
- new Book("Haggai", 2), //$NON-NLS-1$
- new Book("Zechariah", 14), //$NON-NLS-1$
- new Book("Malachi", 4) //$NON-NLS-1$
+ new Book("Genesis", 50),
+ new Book("Exodus", 40),
+ new Book("Leviticus", 27),
+ new Book("Numbers", 36),
+ new Book("Deuteronomy", 34),
+ new Book("Joshua", 24),
+ new Book("Judges", 21),
+ new Book("Ruth", 4),
+ new Book("I Samuel", 31),
+ new Book("II Samuel", 24),
+ new Book("I Kings", 22),
+ new Book("II Kings", 25),
+ new Book("I Chronicles", 29),
+ new Book("II Chronicles", 36),
+ new Book("Ezra", 10),
+ new Book("Nehemiah", 13),
+ new Book("Esther", 10),
+ new Book("Job", 42),
+ new Book("Psalms", 150),
+ new Book("Proverbs", 31),
+ new Book("Ecclesiastes", 12),
+ new Book("Song of Solomon", 8),
+ new Book("Isaiah", 66),
+ new Book("Jeremiah", 52),
+ new Book("Lamentations", 5),
+ new Book("Ezekiel", 48),
+ new Book("Daniel", 12),
+ new Book("Hosea", 14),
+ new Book("Joel", 3),
+ new Book("Amos", 9),
+ new Book("Obadiah", 1),
+ new Book("Jonah", 4),
+ new Book("Micah", 7),
+ new Book("Nahum", 3),
+ new Book("Habakkuk", 3),
+ new Book("Zephaniah", 3),
+ new Book("Haggai", 2),
+ new Book("Zechariah", 14),
+ new Book("Malachi", 4)
};
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/ListKey.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/ListKey.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/ListKey.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -21,7 +21,7 @@
*/
public ListKey() {
- this(""); //$NON-NLS-1$
+ this("");
}
public ListKey(String ikey) {
@@ -175,7 +175,7 @@
((SWKey) array.get(arraypos)).position(pos);
setText(((SWKey) array.get(arraypos)).getText());
} else
- setText(""); //$NON-NLS-1$
+ setText("");
return error;
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/SWKey.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/SWKey.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/SWKey.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -17,7 +17,7 @@
* SWKey Constructor - initializes instance of SWKey. ENT: ikey - text key
*/
public SWKey() {
- this(""); //$NON-NLS-1$
+ this("");
}
public SWKey(String ikey) {
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/VerseKey.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/VerseKey.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/keys/VerseKey.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -101,7 +101,7 @@
* VerseKey::parse for more detailed information)
*/
public VerseKey() {
- this(""); //$NON-NLS-1$
+ this("");
}
public VerseKey(SWKey ikey) {
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWConfig.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -101,12 +101,12 @@
*/
public static void main(String[] args) {
if (args.length < 1) {
- System.out.println("Usage: java SWConfig <file> [<file> <file> ...]"); //$NON-NLS-1$
+ System.out.println("Usage: java SWConfig <file> [<file> <file> ...]");
System.exit(0);
}
try {
- System.out.println("Showing Properties in file: " + args[0]); //$NON-NLS-1$
+ System.out.println("Showing Properties in file: " + args[0]);
SWConfig config = new SWConfig(args[0]);
// If there were multiple files given, load them
// all.
@@ -118,18 +118,18 @@
Iterator sit = config.sectionNames();
while (sit.hasNext()) {
String sectionName = (String) sit.next();
- System.out.println("Section: " + sectionName); //$NON-NLS-1$
+ System.out.println("Section: " + sectionName);
Iterator spit = config.propertyNames(sectionName);
while (spit.hasNext()) {
String key = (String) spit.next();
Iterator vit = config.getProperties(sectionName, key);
while (vit.hasNext()) {
- System.out.println("\t" + key + ": " + vit.next()); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("\t" + key + ": " + vit.next());
}
}
}
} catch (Exception ex) {
- System.err.println("Error: " + ex.getMessage()); //$NON-NLS-1$
+ System.err.println("Error: " + ex.getMessage());
ex.printStackTrace(System.err);
}
@@ -157,7 +157,7 @@
}
// check to see if this is the SectionName
- if (((String) key).startsWith("[")) { //$NON-NLS-1$
+ if (((String) key).startsWith("[")) {
String skey = (String) key;
this.name = skey.substring(1, (skey.length() - 1));
// Shouldn't be any values associated with this
@@ -236,7 +236,7 @@
// Otherwise create a List, set a single value
// and return an Iterator for it.
List list = new LinkedList();
- list.add(value != null ? value : ""); //$NON-NLS-1$
+ list.add(value != null ? value : "");
return list.iterator();
}
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWLocale.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWLocale.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWLocale.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -43,12 +43,12 @@
localeSource = new SWConfig(ifilename);
try {
- name = localeSource.getProperty("Meta", "Name"); //$NON-NLS-1$ //$NON-NLS-2$
+ name = localeSource.getProperty("Meta", "Name");
} catch (Exception e) { /* no name, bad locale file */
}
try {
- description = localeSource.getProperty("Meta", "Description"); //$NON-NLS-1$ //$NON-NLS-2$
+ description = localeSource.getProperty("Meta", "Description");
} catch (Exception e) { /* no description, maybe bad locale file */
}
}
@@ -60,7 +60,7 @@
if (entry == null) {
String confEntry = null;
try {
- confEntry = localeSource.getProperty("Text", text); //$NON-NLS-1$
+ confEntry = localeSource.getProperty("Text", text);
} catch (Exception e) { /* no entry in locale file */
}
if (confEntry == null)
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWMgr.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWMgr.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/mgr/SWMgr.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -90,17 +90,17 @@
init();
path = iConfigPath;
- if (!path.endsWith("/")) //$NON-NLS-1$
- path += "/"; //$NON-NLS-1$
+ if (!path.endsWith("/"))
+ path += "/";
- if (existsFile(path, "mods.conf")) { //$NON-NLS-1$
+ if (existsFile(path, "mods.conf")) {
prefixPath = path;
- path += "mods.conf"; //$NON-NLS-1$
+ path += "mods.conf";
configPath = path;
} else {
- if (existsDir(path, "mods.d")) { //$NON-NLS-1$
+ if (existsDir(path, "mods.d")) {
prefixPath = path;
- path += "mods.d"; //$NON-NLS-1$
+ path += "mods.d";
configPath = path;
configType = 1;
}
@@ -116,7 +116,7 @@
private boolean existsFile(String ipath, String ifileName) {
String path = ipath;
- path += "/"; //$NON-NLS-1$
+ path += "/";
String filePath = path + ifileName;
File testFile = new File(filePath);
return testFile.exists();
@@ -124,7 +124,7 @@
private boolean existsDir(String ipath, String idirName) {
String path = ipath;
- path += "/"; //$NON-NLS-1$
+ path += "/";
String filePath = path + idirName;
File testDir = new File(filePath);
return testDir.isDirectory();
@@ -188,16 +188,16 @@
if (dirList.isDirectory()) {
String names[] = dirList.list(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".conf"); //$NON-NLS-1$
+ return name.endsWith(".conf");
}
});
try {
for (int i = 0; i < names.length; i++) {
- if ((!names[i].equals(".")) && (!names[i].equals(".."))) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((!names[i].equals(".")) && (!names[i].equals(".."))) {
newmodfile = ipath;
- if (!newmodfile.endsWith("/")) //$NON-NLS-1$
- newmodfile += "/"; //$NON-NLS-1$
+ if (!newmodfile.endsWith("/"))
+ newmodfile += "/";
newmodfile += names[i];
if (config != null) {
SWConfig tmpConfig = new SWConfig(newmodfile);
@@ -210,7 +210,7 @@
if (config == null) { // if no .conf file exist yet, create a
// default
newmodfile = ipath;
- newmodfile += "/globals.conf"; //$NON-NLS-1$
+ newmodfile += "/globals.conf";
config = myconfig = new SWConfig(newmodfile);
}
} catch (java.io.IOException e) {
@@ -263,7 +263,7 @@
// (configPath) ? configPath : "<configPath is null>");
// exit(-1);
System.err
- .println("SWMgr: Can't find 'mods.conf' or 'mods.d'. Try setting:\n\tSWORD_PATH=<directory containing mods.conf>\n\tOr see the README file for a full description of setup options (" + ((configPath != null) ? configPath : "<configPath is null>") + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .println("SWMgr: Can't find 'mods.conf' or 'mods.d'. Try setting:\n\tSWORD_PATH=<directory containing mods.conf>\n\tOr see the README file for a full description of setup options (" + ((configPath != null) ? configPath : "<configPath is null>") + ")");
}
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/modules/SWModule.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/modules/SWModule.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/modules/SWModule.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -343,7 +343,7 @@
*/
String stripText() {
- return ""; //stripText(null, -1); //$NON-NLS-1$
+ return ""; //stripText(null, -1);
}
/*
@@ -387,7 +387,7 @@
setKey(tmpKey);
- retVal = ""; //renderText(); //$NON-NLS-1$
+ retVal = ""; //renderText();
setKey(savekey);
@@ -423,6 +423,6 @@
}
public String getText() {
- return ""; //$NON-NLS-1$
+ return "";
}
}
Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/web/PackageMod.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/web/PackageMod.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/web/PackageMod.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -26,10 +26,10 @@
public static void copyFileToZip(ZipOutputStream zos, String sourceDir, String fileName, String prefix) {
try {
- if ((prefix.length() > 0) && (!prefix.endsWith("/"))) //$NON-NLS-1$
- prefix += "/"; //$NON-NLS-1$
+ if ((prefix.length() > 0) && (!prefix.endsWith("/")))
+ prefix += "/";
zos.putNextEntry(new ZipEntry(prefix + fileName));
- fileName = sourceDir + ((sourceDir.endsWith("/")) ? "" : "/") + fileName; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ fileName = sourceDir + ((sourceDir.endsWith("/")) ? "" : "/") + fileName;
FileInputStream fin = new FileInputStream(fileName);
byte[] buffer = new byte[20000];
int len;
@@ -48,8 +48,8 @@
// Vector files = new Vector();
long lastModFile = 0;
- if (!sourceDir.endsWith("/")) //$NON-NLS-1$
- sourceDir += "/"; //$NON-NLS-1$
+ if (!sourceDir.endsWith("/"))
+ sourceDir += "/";
try {
if (mgr.config.contains(modName)) {
@@ -65,14 +65,14 @@
String modFile;
String sourceOrig = sourceDir;
- modDir = mgr.config.getProperty(modName, "DataPath"); //$NON-NLS-1$
+ modDir = mgr.config.getProperty(modName, "DataPath");
if (modDir != null) {
- entry = mgr.config.getProperty(modName, "ModDrv"); //$NON-NLS-1$
+ entry = mgr.config.getProperty(modName, "ModDrv");
if (entry != null) {
- if (entry.equals("RawLD") || entry.equals("RawLD4")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (entry.equals("RawLD") || entry.equals("RawLD4"))
modDir = modDir.substring(0, modDir.lastIndexOf('/'));
}
- if (modDir.startsWith("./")) //$NON-NLS-1$
+ if (modDir.startsWith("./"))
modDir = modDir.substring(2);
sourceDir += modDir;
@@ -80,7 +80,7 @@
String names[] = dataDir.list();
for (int i = 0; i < names.length; i++) {
- if ((!names[i].equals(".")) && (!names[i].equals(".."))) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((!names[i].equals(".")) && (!names[i].equals(".."))) {
File testFile = new File(dataDir, names[i]);
if (testFile.canRead()) {
if (testFile.lastModified() > lastModFile) {
@@ -91,17 +91,17 @@
}
}
sourceDir = sourceOrig;
- sourceDir += "mods.d/"; //$NON-NLS-1$
+ sourceDir += "mods.d/";
File dataDir = new File(sourceDir);
String names[] = dataDir.list(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".conf"); //$NON-NLS-1$
+ return name.endsWith(".conf");
}
});
for (int i = 0; i < names.length; i++) {
- if ((!names[i].equals(".")) && (!names[i].equals(".."))) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((!names[i].equals(".")) && (!names[i].equals(".."))) {
modFile = sourceDir;
modFile += names[i];
SWConfig config = new SWConfig(modFile);
@@ -128,31 +128,31 @@
String entry = null;
Iterator fileList = null;
- if (!sourceDir.endsWith("/")) //$NON-NLS-1$
- sourceDir += "/"; //$NON-NLS-1$
+ if (!sourceDir.endsWith("/"))
+ sourceDir += "/";
try {
if (mgr.config.contains(modName)) {
- fileList = mgr.config.getProperties(modName, "File"); //$NON-NLS-1$
+ fileList = mgr.config.getProperties(modName, "File");
if (fileList.hasNext()) { // copy each file
while (fileList.hasNext()) {
- copyFileToZip(zstream, sourceDir, (String) fileList.next(), ""); //$NON-NLS-1$
+ copyFileToZip(zstream, sourceDir, (String) fileList.next(), "");
}
} else { // copy all files in DataPath directory
String modDir;
String modFile;
String sourceOrig = sourceDir;
- modDir = mgr.config.getProperty(modName, "DataPath"); //$NON-NLS-1$
+ modDir = mgr.config.getProperty(modName, "DataPath");
if (modDir != null) {
- entry = mgr.config.getProperty(modName, "ModDrv"); //$NON-NLS-1$
+ entry = mgr.config.getProperty(modName, "ModDrv");
if (entry != null) {
- if (entry.equals("RawLD") || entry.equals("RawLD4")) //$NON-NLS-1$ //$NON-NLS-2$
+ if (entry.equals("RawLD") || entry.equals("RawLD4"))
modDir = modDir.substring(0, modDir.lastIndexOf('/'));
}
- if (modDir.startsWith("./")) //$NON-NLS-1$
+ if (modDir.startsWith("./"))
modDir = modDir.substring(2);
sourceDir += modDir;
@@ -160,35 +160,35 @@
String names[] = dataDir.list();
for (int i = 0; i < names.length; i++) {
- if ((!names[i].equals(".")) && (!names[i].equals(".."))) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((!names[i].equals(".")) && (!names[i].equals(".."))) {
modFile = modDir;
- if (!modFile.endsWith("/")) //$NON-NLS-1$
- modFile += "/"; //$NON-NLS-1$
+ if (!modFile.endsWith("/"))
+ modFile += "/";
modFile += names[i];
- copyFileToZip(zstream, sourceOrig, modFile, ""); //$NON-NLS-1$
+ copyFileToZip(zstream, sourceOrig, modFile, "");
}
}
}
sourceDir = sourceOrig;
- sourceDir += "mods.d/"; //$NON-NLS-1$
+ sourceDir += "mods.d/";
File dataDir = new File(sourceDir);
String names[] = dataDir.list(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".conf"); //$NON-NLS-1$
+ return name.endsWith(".conf");
}
});
for (int i = 0; i < names.length; i++) {
- if ((!names[i].equals(".")) && (!names[i].equals(".."))) { //$NON-NLS-1$ //$NON-NLS-2$
+ if ((!names[i].equals(".")) && (!names[i].equals(".."))) {
modFile = sourceDir;
modFile += names[i];
SWConfig config = new SWConfig(modFile);
if (config.contains(modName)) {
if (triggerInstall)
- copyFileToZip(zstream, sourceOrig + "mods.d/", names[i], "newmods/"); //$NON-NLS-1$ //$NON-NLS-2$
+ copyFileToZip(zstream, sourceOrig + "mods.d/", names[i], "newmods/");
else
- copyFileToZip(zstream, sourceOrig, "mods.d/" + names[i], ""); //$NON-NLS-1$ //$NON-NLS-2$
+ copyFileToZip(zstream, sourceOrig, "mods.d/" + names[i], "");
}
}
}
Modified: trunk/jsword-sword/src/test/java/org/crosswire/modedit/MainFrame.java
===================================================================
--- trunk/jsword-sword/src/test/java/org/crosswire/modedit/MainFrame.java 2010-10-23 18:53:40 UTC (rev 1989)
+++ trunk/jsword-sword/src/test/java/org/crosswire/modedit/MainFrame.java 2010-10-23 18:55:43 UTC (rev 1990)
@@ -88,34 +88,34 @@
contentPane.setLayout(borderLayout1);
this.setJMenuBar(jMenuBar1);
this.setSize(new Dimension(549, 300));
- this.setTitle("ModEdit"); //$NON-NLS-1$
+ this.setTitle("ModEdit");
jPanel1.setLayout(borderLayout5);
jPanel2.setLayout(borderLayout2);
jPanel3.setLayout(borderLayout3);
jLabel1.setMinimumSize(new Dimension(90, 13));
jLabel1.setPreferredSize(new Dimension(90, 13));
jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);
- jLabel1.setText("FontURL"); //$NON-NLS-1$
+ jLabel1.setText("FontURL");
jLabel2.setMinimumSize(new Dimension(90, 13));
jLabel2.setPreferredSize(new Dimension(90, 13));
jLabel2.setHorizontalAlignment(SwingConstants.RIGHT);
- jLabel2.setText("contentURL"); //$NON-NLS-1$
- jTextField1.setToolTipText(""); //$NON-NLS-1$
- jTextField1.setText("http://www.crosswire.org/~scribe/ElEdit/1kg1.uni"); //$NON-NLS-1$
- jTextField2.setText("http://www.crosswire.org/~scribe/ElEdit/yoyo.ttf"); //$NON-NLS-1$
- jButton1.setText("Load"); //$NON-NLS-1$
+ jLabel2.setText("contentURL");
+ jTextField1.setToolTipText("");
+ jTextField1.setText("http://www.crosswire.org/~scribe/ElEdit/1kg1.uni");
+ jTextField2.setText("http://www.crosswire.org/~scribe/ElEdit/yoyo.ttf");
+ jButton1.setText("Load");
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jButton1_actionPerformed();
}
});
- jButton2.setText("Load"); //$NON-NLS-1$
+ jButton2.setText("Load");
jButton2.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jButton2_actionPerformed();
}
});
- jTextArea1.setText(""); //$NON-NLS-1$
+ jTextArea1.setText("");
jTextArea1.setLineWrap(true);
jTextArea1.addKeyListener(new java.awt.event.KeyAdapter() {
/* @Override */
@@ -124,7 +124,7 @@
}
});
jTextArea1.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
- statusBar.setText(""); //$NON-NLS-1$
+ statusBar.setText("");
jPanel4.setLayout(borderLayout4);
jSlider1.setMinimum(1);
jSlider1.addChangeListener(new javax.swing.event.ChangeListener() {
@@ -132,39 +132,39 @@
jSlider1_stateChanged();
}
});
- jLabel3.setText("Keyboard"); //$NON-NLS-1$
+ jLabel3.setText("Keyboard");
imComboBox.addItemListener(new java.awt.event.ItemListener() {
public void itemStateChanged(ItemEvent e) {
imComboBox_itemStateChanged();
}
});
- jMenu1.setText("File"); //$NON-NLS-1$
- jMenuItem1.setText("Lookup Url"); //$NON-NLS-1$
+ jMenu1.setText("File");
+ jMenuItem1.setText("Lookup Url");
jMenuItem1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jMenuItem1_actionPerformed();
}
});
- jMenuItem2.setText("Exit"); //$NON-NLS-1$
+ jMenuItem2.setText("Exit");
jMenuItem2.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jMenuItem2_actionPerformed();
}
});
- jMenuItem3.setText("Save"); //$NON-NLS-1$
+ jMenuItem3.setText("Save");
jMenuItem3.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jMenuItem3_actionPerformed();
}
});
- jMenu2.setText("Edit"); //$NON-NLS-1$
- jMenuItem4.setText("Copy"); //$NON-NLS-1$
+ jMenu2.setText("Edit");
+ jMenuItem4.setText("Copy");
jMenuItem4.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jMenuItem4_actionPerformed();
}
});
- jMenuItem5.setText("Paste"); //$NON-NLS-1$
+ jMenuItem5.setText("Paste");
jMenuItem5.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(ActionEvent e) {
jMenuItem5_actionPerformed();
@@ -195,9 +195,9 @@
jMenu2.add(jMenuItem4);
jMenu2.add(jMenuItem5);
jSlider1.setValue(jTextArea1.getFont().getSize());
- imComboBox.addItem(new HebrewDurusauIM("Durusau")); //$NON-NLS-1$
- imComboBox.addItem(new NullIM("Latin")); //$NON-NLS-1$
- imComboBox.addItem(new HebrewMCIM("Michigan-Claremont")); //$NON-NLS-1$
+ imComboBox.addItem(new HebrewDurusauIM("Durusau"));
+ imComboBox.addItem(new NullIM("Latin"));
+ imComboBox.addItem(new HebrewMCIM("Michigan-Claremont"));
}
/** Overridden so we can exit when window is closed */
@@ -211,7 +211,7 @@
void jButton2_actionPerformed() {
try {
- statusBar.setText("Loading font..."); //$NON-NLS-1$
+ statusBar.setText("Loading font...");
statusBar.paintImmediately(statusBar.getVisibleRect());
URLConnection connection = new URL(jTextField2.getText()).openConnection();
InputStream is = connection.getInputStream();
@@ -220,7 +220,7 @@
jSlider1.setValue(18);
this.jTextArea1.setFont(newFont);
is.close();
- statusBar.setText("New Font Loaded."); //$NON-NLS-1$
+ statusBar.setText("New Font Loaded.");
} catch (Exception ex) {
ex.printStackTrace(System.err);
}
@@ -229,7 +229,7 @@
void jButton1_actionPerformed() {
try {
- statusBar.setText("Loading content..."); //$NON-NLS-1$
+ statusBar.setText("Loading content...");
statusBar.paintImmediately(statusBar.getVisibleRect());
URLConnection connection = new URL(jTextField1.getText()).openConnection();
InputStream is = connection.getInputStream();
@@ -244,9 +244,9 @@
if (len != -1)
bos.write(inBuf, 0, len);
} while (len != -1);
- newText = new String(bos.toByteArray(), "UTF-8"); //$NON-NLS-1$
+ newText = new String(bos.toByteArray(), "UTF-8");
jTextArea1.setText(newText);
- statusBar.setText(Integer.toString(newText.length()) + " characters of content loaded."); //$NON-NLS-1$
+ statusBar.setText(Integer.toString(newText.length()) + " characters of content loaded.");
} catch (Exception ex) {
ex.printStackTrace(System.err);
}
@@ -256,13 +256,13 @@
void jTextArea1_keyTyped(KeyEvent e) {
char typedChar = e.getKeyChar();
String pushChar = null;
- statusBar.setText(""); //$NON-NLS-1$
+ statusBar.setText("");
SWInputMethod inputMethod = (SWInputMethod) imComboBox.getSelectedItem();
pushChar = inputMethod.translate(typedChar);
if (inputMethod.getState() > 1) {
- statusBar.setText("Compound '" + typedChar + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ statusBar.setText("Compound '" + typedChar + "'");
e.consume();
} else {
if (pushChar.length() > 1) {
@@ -285,19 +285,19 @@
void jMenuItem1_actionPerformed() {
String currentEntry = jTextField1.getText();
- javax.swing.JFileChooser fileChooser = new JFileChooser((currentEntry.startsWith("file://") ? currentEntry.substring(7) : ".")); //$NON-NLS-1$ //$NON-NLS-2$
+ javax.swing.JFileChooser fileChooser = new JFileChooser((currentEntry.startsWith("file://") ? currentEntry.substring(7) : "."));
if (fileChooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
- jTextField1.setText("file://" + fileChooser.getSelectedFile().getAbsolutePath()); //$NON-NLS-1$
+ jTextField1.setText("file://" + fileChooser.getSelectedFile().getAbsolutePath());
}
}
void jMenuItem3_actionPerformed() {
String currentEntry = jTextField1.getText();
- javax.swing.JFileChooser fileChooser = new JFileChooser((currentEntry.startsWith("file://") ? currentEntry.substring(7) : ".")); //$NON-NLS-1$ //$NON-NLS-2$
+ javax.swing.JFileChooser fileChooser = new JFileChooser((currentEntry.startsWith("file://") ? currentEntry.substring(7) : "."));
if (fileChooser.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) {
File outFile = fileChooser.getSelectedFile();
try {
- jTextArea1.write(new OutputStreamWriter(new FileOutputStream(outFile), "UTF-8")); //$NON-NLS-1$
+ jTextArea1.write(new OutputStreamWriter(new FileOutputStream(outFile), "UTF-8"));
} catch (Exception e1) {
e1.printStackTrace(System.err);
}
More information about the jsword-svn
mailing list