[115727] externalize strings that need them or mark them as non-nls
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPResourceEncodingDetector.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPResourceEncodingDetector.java
index 105980e..41127ad 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPResourceEncodingDetector.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/contenttype/JSPResourceEncodingDetector.java
@@ -345,7 +345,7 @@
if (parts.length == 1) {
if (parts[0].length() > 6) {
String checkForCharset = parts[0].substring(0, 7);
- if (checkForCharset.equalsIgnoreCase("charset")) {
+ if (checkForCharset.equalsIgnoreCase("charset")) { //$NON-NLS-1$
int eqpos = parts[0].indexOf('=');
eqpos = eqpos + 1;
if (eqpos < parts[0].length()) {
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java
index b18a99a..259418b 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/document/PageDirectiveAdapterFactory.java
@@ -89,7 +89,7 @@
// if is equal to null, create a new one
pageDirectiveAdapterInstance = new PageDirectiveAdapterImpl(target);
}
- Assert.isNotNull(pageDirectiveAdapterInstance, "pageDipageDirectiveAdapterInstance was null");
+ Assert.isNotNull(pageDirectiveAdapterInstance, "pageDipageDirectiveAdapterInstance was null"); //$NON-NLS-1$
return pageDirectiveAdapterInstance;
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslationExtension.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslationExtension.java
index ec9921e..265259d 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslationExtension.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslationExtension.java
@@ -55,7 +55,7 @@
DEBUG= value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
}
- private static final String CT_ID_JSP_FRAGMENT = "org.eclipse.jst.jsp.core.jspfragmentsource";
+ private static final String CT_ID_JSP_FRAGMENT = "org.eclipse.jst.jsp.core.jspfragmentsource"; //$NON-NLS-1$
// just a convenience data structure
// to keep track of java position deltas
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
index 2aa8e4f..685e121 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
@@ -595,7 +595,7 @@
}
}
catch(Exception e) {
- Logger.logException("JSPTranslation error", e);
+ Logger.logException("JSPTranslation error", e); //$NON-NLS-1$
}
Logger.log(Logger.INFO_DEBUG, debugString.toString());
}
@@ -622,7 +622,7 @@
TaglibHelper helper = TaglibHelperManager.getInstance().getTaglibHelper(f);
IStructuredDocumentRegion customTag = getCurrentNode();
TaglibVariable[] taglibVars = helper.getTaglibVariables(tagToAdd, getStructuredDocument(), customTag);
- String decl = "";
+ String decl = ""; //$NON-NLS-1$
for (int i = 0; i < taglibVars.length; i++) {
decl = taglibVars[i].getDeclarationString();
appendToBuffer(decl, fUserCode, false, fCurrentNode);
@@ -805,17 +805,17 @@
//fScopeDepth++;
StringBuffer text = new StringBuffer();
//for(int i=0; i<fScopeDepth; i++) text.append(" "); //$NON-NLS-1$
- text.append("{ // <");
+ text.append("{ // <"); //$NON-NLS-1$
text.append(getRegionName(fCurrentNode));
- text.append(">\n");
+ text.append(">\n"); //$NON-NLS-1$
appendToBuffer(text.toString(), fUserCode, false, fCurrentNode); //$NON-NLS-1$
}
private void endScope() {
StringBuffer text = new StringBuffer();
- text.append("} // </");
+ text.append("} // </"); //$NON-NLS-1$
text.append(getRegionName(fCurrentNode));
- text.append(">\n");
+ text.append(">\n"); //$NON-NLS-1$
appendToBuffer(text.toString(), fUserCode, false, fCurrentNode); //$NON-NLS-1$
}
@@ -1074,7 +1074,7 @@
IStructuredDocumentRegion sdr = getCurrentNode().getNext();
int start = sdr.getStartOffset();
int end = sdr.getEndOffset();
- String sdrText = "";
+ String sdrText = ""; //$NON-NLS-1$
// read structured document regions until
// </jsp:scriptlet> or EOF
@@ -1087,7 +1087,7 @@
if(sdr.getType() == DOMRegionContext.XML_CDATA_TEXT){
// just to be safe, make sure CDATA start & end are there
- if(sdrText.startsWith("<![CDATA[") && sdrText.endsWith("]]>")) {
+ if(sdrText.startsWith("<![CDATA[") && sdrText.endsWith("]]>")) { //$NON-NLS-1$ //$NON-NLS-2$
start = sdr.getStartOffset() + 9; // <![CDATA[
end = sdr.getEndOffset() - 3; // ]]>
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
index b4b035f..6a7ae9d 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/XMLJSPRegionHelper.java
@@ -219,9 +219,9 @@
private void startScope(String tagName) {
//IStructuredDocumentRegion currentNode = fTranslator.getCurrentNode();
StringBuffer text = new StringBuffer();
- text.append("{ // <");
+ text.append("{ // <"); //$NON-NLS-1$
text.append(tagName);
- text.append(">\n");
+ text.append(">\n"); //$NON-NLS-1$
//this.fTranslator.translateScriptletString(text.toString(), currentNode, currentNode.getStartOffset(), currentNode.getLength()); //$NON-NLS-1$
fScriptlets.add(text.toString());
}
@@ -229,9 +229,9 @@
private void endScope(String tagName) {
//IStructuredDocumentRegion currentNode = fTranslator.getCurrentNode();
StringBuffer text = new StringBuffer();
- text.append("} // </");
+ text.append("} // </"); //$NON-NLS-1$
text.append(tagName);
- text.append(">\n");
+ text.append(">\n"); //$NON-NLS-1$
//this.fTranslator.translateScriptletString(text.toString(), currentNode, currentNode.getStartOffset(), currentNode.getLength()); //$NON-NLS-1$
fScriptlets.add(text.toString());
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPIndexManager.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPIndexManager.java
index b32e5cb..13d74a1 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPIndexManager.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPIndexManager.java
@@ -541,11 +541,8 @@
for (int i = 0; i < files.length; i++) {
if (files[i].toLowerCase().endsWith(".index")) { //$NON-NLS-1$
locay = jspModelWorkingLocation.toString() + "/" + files[i]; //$NON-NLS-1$
- index = new Index(locay, "Index for " + locay, true /*
- * reuse
- * index
- * file
- */); //$NON-NLS-1$
+ // reuse index file
+ index = new Index(locay, "Index for " + locay, true); //$NON-NLS-1$
indexManager.saveIndex(index);
}
}
@@ -590,7 +587,7 @@
// attempt to make sure this indexing job is litterally
// done before continuing, since we are shutting down
waitTillNotRunning(maxwait, processFilesJob);
-
+
if (indexingJob != null) {
indexingJob.cancel();
}
@@ -604,7 +601,8 @@
while (count++ < maxtries && job.getState() == Job.RUNNING) {
try {
Thread.sleep(pauseTime);
- //System.out.println("count: " + count + " max: " + maxtries);
+ // System.out.println("count: " + count + " max: " +
+ // maxtries);
}
catch (InterruptedException e) {
Logger.logException(e);
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibClassLoader.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibClassLoader.java
index 457f7b9..a6a0278 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibClassLoader.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibClassLoader.java
@@ -47,11 +47,11 @@
* @param filename - full path to the jar file
*/
public void addJar(String filename) {
- if(DEBUG) System.out.println("trying to add: [" + filename + "] to classpath");
+ if(DEBUG) System.out.println("trying to add: [" + filename + "] to classpath"); //$NON-NLS-1$ //$NON-NLS-2$
// don't add the same entry twice, or search times will get even worse
if(!jarsList.contains(filename)) {
jarsList.add(filename);
- if(DEBUG) System.out.println( " + [" + filename + "] added to classpath");
+ if(DEBUG) System.out.println( " + [" + filename + "] added to classpath"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -62,13 +62,13 @@
*/
public void removeJar(String filename) {
jarsList.remove(filename);
- if(DEBUG) System.out.println("removed: [" + filename + "] from classpath");
+ if(DEBUG) System.out.println("removed: [" + filename + "] from classpath"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void addDirectory(String dirPath) {
if(!dirsList.contains(dirPath)) {
dirsList.add(dirPath);
- if(DEBUG) System.out.println("added: [" + dirPath + "] to classpath");
+ if(DEBUG) System.out.println("added: [" + dirPath + "] to classpath"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -79,7 +79,7 @@
*/
public void removeDirectory(String dirPath) {
dirsList.remove(dirPath);
- if(DEBUG) System.out.println("removed: [" + dirPath + "] from classpath");
+ if(DEBUG) System.out.println("removed: [" + dirPath + "] from classpath"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -123,7 +123,7 @@
*/
protected synchronized Class findClass(String className) throws ClassNotFoundException {
- if(DEBUG) System.out.println(">> TaglibClassLoader finding class: " + className);
+ if(DEBUG) System.out.println(">> TaglibClassLoader finding class: " + className); //$NON-NLS-1$
Class newClass = null;
JarFile jarfile = null;
@@ -137,7 +137,7 @@
Iterator dirs = dirsList.iterator();
File f;
String dirName;
- String fileToFind = "";
+ String fileToFind = ""; //$NON-NLS-1$
while (dirs.hasNext()) {
dirName = (String) dirs.next();
fileToFind = dirName + "/" + fileName; //$NON-NLS-1$
@@ -147,7 +147,7 @@
stream = new FileInputStream(f);
usedDirs.add(dirName);
//loadedClassFilenames.add(fileToFind);
- if(DEBUG) System.out.println(">> added file from dir: " + dirName + "/" + fileName);
+ if(DEBUG) System.out.println(">> added file from dir: " + dirName + "/" + fileName); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
@@ -162,7 +162,7 @@
byte[] byteArray = byteStream.toByteArray();
try {
- if(DEBUG) System.out.println(">> defining newClass:" + className);
+ if(DEBUG) System.out.println(">> defining newClass:" + className); //$NON-NLS-1$
newClass = defineClass(className, byteArray, 0, byteArray.length);
resolveClass(newClass);
}
@@ -173,7 +173,7 @@
// try parent loader
try {
Class c = getParent().loadClass(className);
- if(DEBUG) System.out.println(">> loaded: " + className + " with: " + getParent());
+ if(DEBUG) System.out.println(">> loaded: " + className + " with: " + getParent()); //$NON-NLS-1$ //$NON-NLS-2$
return c;
}
catch (ClassNotFoundException cnf) {
@@ -202,7 +202,7 @@
jarfile = new JarFile(jarName);
}
catch (IOException e){
- if(DEBUG) Logger.logException("bad jar file", e);
+ if(DEBUG) Logger.logException("bad jar file", e); //$NON-NLS-1$
}
if (jarfile == null) {
continue;
@@ -210,9 +210,9 @@
entry = jarfile.getJarEntry(fileName);
- if(DEBUG) System.out.println("looking for filename: " + fileName + " in: " + jarfile.getName());
+ if(DEBUG) System.out.println("looking for filename: " + fileName + " in: " + jarfile.getName()); //$NON-NLS-1$ //$NON-NLS-2$
if (entry != null) {
- if(DEBUG) System.out.println("found the entry: " + entry + " for filename: " + fileName);
+ if(DEBUG) System.out.println("found the entry: " + entry + " for filename: " + fileName); //$NON-NLS-1$ //$NON-NLS-2$
// found the class
if (!usedJars.contains(jarName)) {
// add the jar to the list of in-use jars
@@ -242,7 +242,7 @@
byte[] byteArray = byteStream.toByteArray();
try {
- if(DEBUG) System.out.println(">> defining newClass:" + className);
+ if(DEBUG) System.out.println(">> defining newClass:" + className); //$NON-NLS-1$
// define the class from the byte array
newClass = defineClass(className, byteArray, 0, byteArray.length);
resolveClass(newClass);
@@ -254,7 +254,7 @@
// try parent
try {
Class c = getParent().loadClass(className);
- if(DEBUG) System.out.println(">> loaded: " + className + " with: " + getParent());
+ if(DEBUG) System.out.println(">> loaded: " + className + " with: " + getParent()); //$NON-NLS-1$ //$NON-NLS-2$
return c;
}
catch (ClassNotFoundException cnf) {
@@ -282,7 +282,7 @@
}
if (newClass != null) {
- if(DEBUG) System.out.println(">> loaded: " + newClass + " with: " + this);
+ if(DEBUG) System.out.println(">> loaded: " + newClass + " with: " + this); //$NON-NLS-1$ //$NON-NLS-2$
return newClass;
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelper.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelper.java
index ddc7886..5d8ad0e 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelper.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelper.java
@@ -274,7 +274,7 @@
String message = "teiClassname: ["; //$NON-NLS-1$
if (teiClassname != null)
message += teiClassname;
- message += "]";
+ message += "]"; //$NON-NLS-1$
Logger.logException(message, e);
}
@@ -289,8 +289,8 @@
Hashtable tagDataTable = new Hashtable();
ITextRegionList regions = customTag.getRegions();
ITextRegion r = null;
- String attrName = "";
- String attrValue = "";
+ String attrName = ""; //$NON-NLS-1$
+ String attrValue = ""; //$NON-NLS-1$
for (int i = 0; i < regions.size(); i++) {
r = regions.get(i);
// check if attr name
@@ -366,7 +366,7 @@
entry = entries[i];
if(DEBUG)
- System.out.println("current entry is: " + entry);
+ System.out.println("current entry is: " + entry); //$NON-NLS-1$
switch (entry.getEntryKind()) {
case IClasspathEntry.CPE_SOURCE:
@@ -395,7 +395,7 @@
private void addVariableEntry(TaglibClassLoader loader, IPath wkspaceRoot, IClasspathEntry entry) {
if (DEBUG)
- System.out.println(" -> adding variable entry: [" + entry + "]");
+ System.out.println(" -> adding variable entry: [" + entry + "]"); //$NON-NLS-1$ //$NON-NLS-2$
// variable should either be a project or a library entry
@@ -446,7 +446,7 @@
private void addProjectEntry(TaglibClassLoader loader, IClasspathEntry entry) {
if (DEBUG)
- System.out.println(" -> project entry: [" + entry + "]");
+ System.out.println(" -> project entry: [" + entry + "]"); //$NON-NLS-1$ //$NON-NLS-2$
IPath path = entry.getPath();
IProject refereceProj = ResourcesPlugin.getWorkspace().getRoot().getProject(path.toString());
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelperCache.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelperCache.java
index 4f241fb..f4f95cd 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelperCache.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibHelperCache.java
@@ -46,7 +46,7 @@
fProjectPath = projectPath;
}
public String toString() {
- return "Taglib Helper Entry [" + getProjectPath() + "]";
+ return "Taglib Helper Entry [" + getProjectPath() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -85,7 +85,7 @@
fHelpers.remove(entry);
fHelpers.add(1, entry);
if(DEBUG) {
- Logger.log(Logger.INFO, "(->) TaglibHelperCache moved: " + entry + " to the front of the list");
+ Logger.log(Logger.INFO, "(->) TaglibHelperCache moved: " + entry + " to the front of the list"); //$NON-NLS-1$ //$NON-NLS-2$
printCacheContents();
}
}
@@ -113,14 +113,14 @@
Entry newEntry = new Entry(projectPath, helper);
fHelpers.add(0, newEntry);
if(DEBUG) {
- Logger.log(Logger.INFO, "(+) TaglibHelperCache added: " + newEntry);
+ Logger.log(Logger.INFO, "(+) TaglibHelperCache added: " + newEntry); //$NON-NLS-1$
printCacheContents();
}
if(fHelpers.size() > MAX_SIZE) {
// one too many, remove last
Object removed = fHelpers.remove(fHelpers.size()-1);
if(DEBUG) {
- Logger.log(Logger.INFO, "(-) TaglibHelperCache removed: " + removed);
+ Logger.log(Logger.INFO, "(-) TaglibHelperCache removed: " + removed); //$NON-NLS-1$
printCacheContents();
}
}
@@ -135,7 +135,7 @@
if(entry.getProjectPath().equals(projectPath)) {
fHelpers.remove(entry);
if(DEBUG) {
- Logger.log(Logger.INFO, "(-) TaglibHelperCache removed: " + entry);
+ Logger.log(Logger.INFO, "(-) TaglibHelperCache removed: " + entry); //$NON-NLS-1$
printCacheContents();
}
break;
@@ -145,11 +145,11 @@
private void printCacheContents() {
StringBuffer debugString = new StringBuffer();
- debugString.append("\n-----------------------------------------------------------");
- debugString.append("\ncache contents:");
+ debugString.append("\n-----------------------------------------------------------"); //$NON-NLS-1$
+ debugString.append("\ncache contents:"); //$NON-NLS-1$
for (int i=0; i<fHelpers.size(); i++)
- debugString.append("\n -" + i + "- " + fHelpers.get(i));
- debugString.append("\n-----------------------------------------------------------");
+ debugString.append("\n -" + i + "- " + fHelpers.get(i)); //$NON-NLS-1$ //$NON-NLS-2$
+ debugString.append("\n-----------------------------------------------------------"); //$NON-NLS-1$
Logger.log(Logger.INFO, debugString.toString());
}
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
index dd41c01..0e0cecc 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/taglib/TaglibVariable.java
@@ -9,7 +9,7 @@
private String fVarClass = null;
private String fVarName = null;
- private final String ENDL = "\n";
+ private final String ENDL = "\n"; //$NON-NLS-1$
/**
*
*/
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java
index aa6c412..946ebc8 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/text/StructuredTextPartitionerForJSP.java
@@ -258,7 +258,7 @@
result = new StructuredTextPartitionerForHTML();
result.connect(structuredDocument);
}
- else if (contentType.equalsIgnoreCase(XML_MIME_TYPE) || contentType.endsWith("+xml")) {
+ else if (contentType.equalsIgnoreCase(XML_MIME_TYPE) || contentType.endsWith("+xml")) { //$NON-NLS-1$
result = new StructuredTextPartitionerForXML();
result.connect(structuredDocument);
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/DocumentProvider.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/DocumentProvider.java
index 1d5577c..b6d6f03 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/DocumentProvider.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/util/DocumentProvider.java
@@ -263,7 +263,7 @@
result.removeChild(children.item(i));
}
// we're going through this effort to avoid a NS element
- Element settings = result.createElementNS("http://www.w3.org/XML/1998/namespace", getRootElementName());
+ Element settings = result.createElementNS("http://www.w3.org/XML/1998/namespace", getRootElementName()); //$NON-NLS-1$
result.appendChild(settings);
return result;
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/ProjectDescription.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/ProjectDescription.java
index 98735ca..e2ed719 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/ProjectDescription.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/ProjectDescription.java
@@ -328,7 +328,7 @@
*/
public String getURI() {
if (info == null)
- return "";
+ return ""; //$NON-NLS-1$
return info.uri;
}
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/TaglibIndex.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/TaglibIndex.java
index 50abe17..d861ae2 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/TaglibIndex.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/taglib/TaglibIndex.java
@@ -362,7 +362,7 @@
}
public static synchronized void startup() {
- ENABLED = !"false".equalsIgnoreCase(System.getProperty(TaglibIndex.class.getName()));
+ ENABLED = !"false".equalsIgnoreCase(System.getProperty(TaglibIndex.class.getName())); //$NON-NLS-1$
_instance = new TaglibIndex();
}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java
index d8818b3..4d61836 100644
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java
+++ b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java
@@ -180,7 +180,7 @@
IPropertyDescriptor[] resultArray = new IPropertyDescriptor[descriptors.size()];
if (PERF_GETDESCRIPTORS) {
- System.out.println(getClass().getName() + ".getPropertyDescriptors: " + (System.currentTimeMillis() - time0) + "ms");
+ System.out.println(getClass().getName() + ".getPropertyDescriptors: " + (System.currentTimeMillis() - time0) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
}
return (IPropertyDescriptor[]) descriptors.toArray(resultArray);
}
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
index bae0593..34f5f10 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/CMDocumentFactoryDTD.java
@@ -37,7 +37,7 @@
result = DTDImpl.buildCMDocument(uri);
}
catch (Exception e) {
- Logger.logException("could not create content model for URI: " + uri, e);
+ Logger.logException("could not create content model for URI: " + uri, e); //$NON-NLS-1$
}
return result;
}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
index ea41132..46b4c33 100644
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
+++ b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
@@ -120,7 +120,7 @@
public IMenuListener getMenuListener(TreeViewer viewer) {
if (fMenuHelper == null) {
// fMenuHelper = new DTDContextMenuHelper(getEditor());
- System.out.println("DTDContextMenuHelper not implemented");
+ System.out.println("DTDContextMenuHelper not implemented"); //$NON-NLS-1$
}
// fMenuHelper.createMenuListenersFor(viewer);
// return fMenuHelper.getMenuListener();
diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java
index d185e30..dc4df1f 100644
--- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java
+++ b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidationReporter.java
@@ -90,7 +90,7 @@
// add by myself?
String id = HTMLValidator.class.getName();
String location = Integer.toString(mes.getLineNumber());
- String name = "";
+ String name = ""; //$NON-NLS-1$
IPath filePath = this.file.getFullPath();
if (filePath != null) {
name = filePath.toString();
diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
index f3e24a7..756566a 100644
--- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
+++ b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
@@ -56,8 +56,8 @@
import org.w3c.dom.Text;
public class HTMLValidator implements IValidator, ISourceValidator {
- private static final String ORG_ECLIPSE_JST_JSP_CORE_JSPSOURCE = "org.eclipse.jst.jsp.core.jspsource";
- private static final String ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE = "org.eclipse.wst.html.core.htmlsource";
+ private static final String ORG_ECLIPSE_JST_JSP_CORE_JSPSOURCE = "org.eclipse.jst.jsp.core.jspsource"; //$NON-NLS-1$
+ private static final String ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
static boolean shouldValidate(IFile file) {
IResource resource = file;
@@ -266,7 +266,7 @@
rep.clear();
adapter.setReporter(rep);
- String fileName = "";
+ String fileName = ""; //$NON-NLS-1$
IPath filePath = file.getFullPath();
if (filePath != null) {
fileName = filePath.toString();
@@ -336,7 +336,7 @@
rep.clear();
adapter.setReporter(rep);
if (reporter != null) {
- String fileName = "";
+ String fileName = ""; //$NON-NLS-1$
IPath filePath = file.getFullPath();
if (filePath != null) {
fileName = filePath.toString();
