[245847] reduce warnings
diff --git a/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
index baee564..76f74fc 100644
--- a/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.eval/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
org.eclipse.actf.visualization,
org.eclipse.actf.ui,
com.ibm.icu
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.eval,
org.eclipse.actf.visualization.eval.guideline,
org.eclipse.actf.visualization.eval.html,
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationResultImpl.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationResultImpl.java
index 2de3014..57ad91c 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationResultImpl.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationResultImpl.java
@@ -77,14 +77,14 @@
public String getSummaryReportText() {
if (_summaryReportText == null) {
- return "";
+ return ""; //$NON-NLS-1$
}
return this._summaryReportText;
}
public String getSummaryReportUrl() {
if (_summaryReportUrl == null) {
- return "";
+ return ""; //$NON-NLS-1$
}
return _summaryReportUrl;
}
@@ -101,7 +101,7 @@
public String getTargetUrl() {
if (_targetUrl == null) {
- return "";
+ return ""; //$NON-NLS-1$
}
return _targetUrl;
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationUtil.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationUtil.java
index b38217e..048868f 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationUtil.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/EvaluationUtil.java
@@ -22,7 +22,7 @@
/**
* The plug-in ID
*/
- public static final String PLUGIN_ID = "org.eclipse.actf.visualization.eval";
+ public static final String PLUGIN_ID = "org.eclipse.actf.visualization.eval"; //$NON-NLS-1$
/**
* Check user selection of target DOM (original source or live)
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/IEvaluationItem.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/IEvaluationItem.java
index aa63346..e7726aa 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/IEvaluationItem.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/IEvaluationItem.java
@@ -35,17 +35,17 @@
/**
* String for error severity
*/
- public static final String SEV_ERROR_STR = "error";
+ public static final String SEV_ERROR_STR = "error"; //$NON-NLS-1$
/**
* String for warning severity
*/
- public static final String SEV_WARNING_STR = "warning";
+ public static final String SEV_WARNING_STR = "warning"; //$NON-NLS-1$
/**
* String for informational severity
*/
- public static final String SEV_INFO_STR = "info";
+ public static final String SEV_INFO_STR = "info"; //$NON-NLS-1$
/**
* @return ID of evaluation item
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
index 3852496..28678d3 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/guideline/GuidelineHolder.java
@@ -45,6 +45,8 @@
*/
public class GuidelineHolder {
+ private static final String UNDERSCORE = "_"; //$NON-NLS-1$
+
private static GuidelineHolder INSTANCE = null;
private IPreferenceStore preferenceStore = EvaluationPlugin.getDefault()
@@ -98,7 +100,7 @@
private Set<IGuidelineSlectionChangedListener> guidelineSelectionChangedListenerSet = new HashSet<IGuidelineSlectionChangedListener>();
- private String currentMimeType = "text/html";
+ private String currentMimeType = "text/html"; //$NON-NLS-1$
// TODO guideline base -> check item base On/Off
@@ -106,7 +108,7 @@
private GuidelineHolder() {
Bundle bundle = EvaluationPlugin.getDefault().getBundle();
Enumeration<URL> guidelines = bundle.findEntries(
- "resources/guidelines", "*.xml", false);
+ "resources/guidelines", "*.xml", false); //$NON-NLS-1$ //$NON-NLS-2$
InputStream is;
@@ -123,7 +125,7 @@
if (null != iss) {
DebugPrintUtil.devOrDebugPrintln(checkerInfo.getClass()
.getName()
- + ":" + iss.length);
+ + ":" + iss.length); //$NON-NLS-1$
for (InputStream tmpIs : iss) {
readGuidelines(tmpIs);
}
@@ -143,8 +145,8 @@
for (int j = 0; j < levels.length; j++) {
GuidelineData subData = data.getSubLevelData(levels[j]);
tmpV.add(subData);
- String name = subData.getGuidelineName() + " ("
- + subData.getLevelStr() + ")";
+ String name = subData.getGuidelineName() + " (" //$NON-NLS-1$
+ + subData.getLevelStr() + ")"; //$NON-NLS-1$
tmpV2.add(name);
}
} else {
@@ -161,7 +163,7 @@
try {
is = FileLocator.openStream(bundle, new Path(
- "resources/checkitem.xml"), false);
+ "resources/checkitem.xml"), false); //$NON-NLS-1$
CheckItemReader cir = CheckItemReader.parse(is, this);
Set<String> metricsNameSet = new HashSet<String>();
if (cir.isSucceed()) {
@@ -171,14 +173,17 @@
for (ICheckerInfoProvider checkerInfo : checkerInfos) {
InputStream[] iss = checkerInfo.getCheckItemInputStreams();
if (null != iss) {
- System.out.println(checkerInfo.getClass().getName()
- + ":" + iss.length);
+ DebugPrintUtil
+ .devOrDebugPrintln(checkerInfo.getClass().getName()
+ + ":" + iss.length); //$NON-NLS-1$
for (InputStream tmpIs : iss) {
try {
cir = CheckItemReader.parse(tmpIs, this);
} catch (Exception e) {
- System.out.println("can't parse: "
- + checkerInfo.getClass().getName());
+ DebugPrintUtil
+ .devOrDebugPrintln("can't parse: " //$NON-NLS-1$
+ + checkerInfo.getClass()
+ .getName());
}
if (cir.isSucceed()) {
checkitemMap.putAll(cir.getCheckItemMap());
@@ -254,8 +259,7 @@
*/
public IGuidelineItem getGuidelineItem(String guidelineName, String id) {
if (guidelineMaps.containsKey(guidelineName)) {
- IGuidelineData data = (IGuidelineData) guidelineMaps
- .get(guidelineName);
+ IGuidelineData data = guidelineMaps.get(guidelineName);
return (data.getGuidelineItem(id));
}
return (null);
@@ -326,7 +330,7 @@
for (int i = 0; i < guidelineNameArray.length; i++) {
if (guidelineMaps.containsKey(guidelineNameArray[i])) {
- GuidelineData data = (GuidelineData) guidelineMaps
+ GuidelineData data = guidelineMaps
.get(guidelineNameArray[i]);
if (levelArray[i] == null) {
data.setEnabled(true);
@@ -466,7 +470,7 @@
String[] subLevels = data.getLevels();
if (subLevels.length == 0) {
String tmpS = ICheckerPreferenceConstants.GUIDELINE_PREFIX
- + data.getGuidelineName() + "_";
+ + data.getGuidelineName() + UNDERSCORE;
if (preferenceStore.contains(tmpS)
&& preferenceStore.getBoolean(tmpS)) {
data.setEnabled(false);
@@ -478,7 +482,7 @@
GuidelineData subData = data
.getSubLevelData(subLevels[j]);
String tmpS = ICheckerPreferenceConstants.GUIDELINE_PREFIX
- + subData.getGuidelineName() + "_" + j;
+ + subData.getGuidelineName() + UNDERSCORE + j;
if (preferenceStore.contains(tmpS)
|| preferenceStore.getBoolean(tmpS)) {
subData.setEnabled(false);
@@ -501,16 +505,16 @@
if (subLevels.length == 0) {
preferenceStore.setValue(
ICheckerPreferenceConstants.GUIDELINE_PREFIX
- + data.getGuidelineName() + "_", !data
- .isEnabled());
+ + data.getGuidelineName() + UNDERSCORE,
+ !data.isEnabled());
} else {
for (int j = 0; j < subLevels.length; j++) {
IGuidelineData subData = data
.getSubLevelData(subLevels[j]);
preferenceStore.setValue(
ICheckerPreferenceConstants.GUIDELINE_PREFIX
- + subData.getGuidelineName() + "_" + j,
- !subData.isEnabled());
+ + subData.getGuidelineName()
+ + UNDERSCORE + j, !subData.isEnabled());
}
}
}
@@ -590,8 +594,7 @@
*/
public boolean isMatchedInTopLevel(IGuidelineItem target) {
if (guidelineMaps.containsKey(target.getGuidelineName())) {
- IGuidelineData data = (IGuidelineData) guidelineMaps.get(target
- .getGuidelineName());
+ IGuidelineData data = guidelineMaps.get(target.getGuidelineName());
return (data.isEnabled() && data.isTargetMIMEtype(currentMimeType));
}
return (false);
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlEvalUtil.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlEvalUtil.java
index ccc8946..15f8b7c 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlEvalUtil.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlEvalUtil.java
@@ -64,10 +64,10 @@
private static final XPathService xpathService = XPathServiceFactory
.newService();
- private static final Object EXP1 = xpathService.compile(".//a[@"
- + ATTR_HREF + "]");
+ private static final Object EXP1 = xpathService.compile(".//a[@" //$NON-NLS-1$
+ + ATTR_HREF + "]"); //$NON-NLS-1$
private static final Object EXP2 = xpathService
- .compile("//h1|//h2|//h3|//h4|//h5|//h6");
+ .compile("//h1|//h2|//h3|//h4|//h5|//h6"); //$NON-NLS-1$
private Document target;
@@ -216,6 +216,7 @@
* @param isLive
* true if target is live DOM
*/
+ @SuppressWarnings("nls")
public HtmlEvalUtil(Document target, Document resultDoc, String url,
Map<Node, Integer> document2IdMap, Document srcDom,
Document liveDom, PageData pageData, int invisibleElementCount,
@@ -437,6 +438,7 @@
return result;
}
+ @SuppressWarnings("nls")
private void collectScriptElements() {
script_elements = getElementsArray(target, "script");
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlTagUtil.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlTagUtil.java
index dab50d6..b9ee8d8 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlTagUtil.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/HtmlTagUtil.java
@@ -22,6 +22,7 @@
/**
* Utility class for HTML evaluation.
*/
+@SuppressWarnings("nls")
public class HtmlTagUtil implements IHtmlEventHandlerAttributes {
public static final String ATTR_HREF = "href";
@@ -131,7 +132,7 @@
} else {
curNode = null;
while ((curNode == null) && (stack.size() > 0)) {
- curNode = (Node) stack.pop();
+ curNode = stack.pop();
curNode = curNode.getNextSibling();
}
}
@@ -164,7 +165,7 @@
} else {
curNode = null;
while ((curNode == null) && (stack.size() > 0)) {
- curNode = (Node) stack.pop();
+ curNode = stack.pop();
curNode = curNode.getNextSibling();
}
}
@@ -196,7 +197,7 @@
} else {
curNode = null;
while ((curNode == null) && (stack.size() > 0)) {
- curNode = (Node) stack.pop();
+ curNode = stack.pop();
curNode = curNode.getNextSibling();
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/IHtmlEventHandlerAttributes.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/IHtmlEventHandlerAttributes.java
index 651e176..048b8df 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/IHtmlEventHandlerAttributes.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/IHtmlEventHandlerAttributes.java
@@ -14,6 +14,7 @@
/**
* Interface contains HTML event handler attributes.
*/
+@SuppressWarnings("nls")
public interface IHtmlEventHandlerAttributes {
public static final String ATTR_ONKEYDOWN = "onkeydown";
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/FlashData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/FlashData.java
index 327332e..24d11ba 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/FlashData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/FlashData.java
@@ -18,6 +18,7 @@
/**
* FlashData is used for flash content information
*/
+@SuppressWarnings("nls")
public class FlashData implements IPageStatisticsTag {
public static final String FLASH_IS_OBJECT = "isObject";
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/HeadingsData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/HeadingsData.java
index 24480fe..d3bf3b1 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/HeadingsData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/HeadingsData.java
@@ -118,7 +118,7 @@
}
private String getAttr(String name, String value) {
- return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" "));
+ return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" ")); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -127,8 +127,8 @@
* @return heading tag information as XML fragment
*/
public String getItemXML() {
- return ("<" + HEADING + " " + getAttr(NAME, tagName)
- + getAttr(VALUE, text) + getAttr(XPATH, xpath) + " />");
+ return ("<" + HEADING + " " + getAttr(NAME, tagName) //$NON-NLS-1$ //$NON-NLS-2$
+ + getAttr(VALUE, text) + getAttr(XPATH, xpath) + " />"); //$NON-NLS-1$
}
/**
@@ -149,6 +149,6 @@
return (new HeadingsData(tmpName, tmpValue, tmpXPath));
}
throw (new StatisticsDataFormatException(
- "Invalid item format: HeadingsData"));
+ "Invalid item format: HeadingsData")); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/IPageStatisticsTag.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/IPageStatisticsTag.java
index 6474317..09f0ae2 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/IPageStatisticsTag.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/IPageStatisticsTag.java
@@ -14,6 +14,7 @@
/**
* Contains constants for page statistics
*/
+@SuppressWarnings("nls")
public interface IPageStatisticsTag {
String IMAGES = "Images";
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/ImageStatData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/ImageStatData.java
index d3061a8..2af850d 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/ImageStatData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/ImageStatData.java
@@ -31,21 +31,21 @@
*/
public class ImageStatData implements IPageStatisticsTag {
- public static final String ISMAP = "ismap";
+ public static final String ISMAP = "ismap"; //$NON-NLS-1$
- public static final String USEMAP = "usemap";
+ public static final String USEMAP = "usemap"; //$NON-NLS-1$
- public static final String LONGDESC = "longdesc";
+ public static final String LONGDESC = "longdesc"; //$NON-NLS-1$
private static final XPathService xpathService = XPathServiceFactory
.newService();
- private static final Object EXP1 = xpathService.compile("ancestor::a");
+ private static final Object EXP1 = xpathService.compile("ancestor::a"); //$NON-NLS-1$
- protected String altS = "";
+ protected String altS = ""; //$NON-NLS-1$
protected Element ancestorLink = null;
- protected String destUrlS = "";
+ protected String destUrlS = ""; //$NON-NLS-1$
protected boolean hasAlt = false;
@@ -57,24 +57,24 @@
protected boolean hasWidth = false;
- protected String heightS = "";
+ protected String heightS = ""; //$NON-NLS-1$
protected boolean isInLink = false;
protected boolean isMap = false;
- protected String longDescS = "";
+ protected String longDescS = ""; //$NON-NLS-1$
// for problem statistics
protected Vector<IProblemItem> problemV = new Vector<IProblemItem>();
- protected String srcS = "";
+ protected String srcS = ""; //$NON-NLS-1$
- protected String urlS = "";
+ protected String urlS = ""; //$NON-NLS-1$
- protected String useMapS = "";
+ protected String useMapS = ""; //$NON-NLS-1$
- protected String widthS = "";
+ protected String widthS = ""; //$NON-NLS-1$
protected ImageStatData() {
}
@@ -149,7 +149,7 @@
if (idS != null) {
IProblemItem tmpItem = new ProblemItemImpl(idS);
- if (!tmpItem.getId().equals("unknown")) {
+ if (!tmpItem.getId().equals("unknown")) { //$NON-NLS-1$
if (targetS != null) {
tmpItem.setTargetStringForExport(targetS);
}
@@ -190,7 +190,7 @@
}
private String getAttr(String name, String value) {
- return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" "));
+ return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" ")); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -213,6 +213,7 @@
*
* @return image information as XML fragment
*/
+ @SuppressWarnings("nls")
public String getItemXML() {
StringBuffer tmpSB = new StringBuffer("<" + IMAGE + " "
+ getAttr(SRC, srcS) + getAttr(URL, urlS)
@@ -241,7 +242,7 @@
} else {
tmpSB.append(" >" + FileUtils.LINE_SEP);
for (int i = 0; i < size; i++) {
- IProblemItem pItem = (IProblemItem) problemV.get(i);
+ IProblemItem pItem = problemV.get(i);
tmpSB.append("<" + ERROR + " " + getAttr(ID, pItem.getId())
+ getAttr(TARGET_STRING, pItem.getTargetStringForExport())
+ " />" + FileUtils.LINE_SEP);
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/PageData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/PageData.java
index 8b510d3..00f6f7c 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/PageData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/html/statistics/PageData.java
@@ -151,6 +151,7 @@
*
* @return page data information as XML fragment
*/
+ @SuppressWarnings("nls")
public String getReportFragment() {
StringBuffer tmpSB = new StringBuffer();
tmpSB.append("<" + IMAGES + " " + TOTAL + "=\"" + totalImageNumber
@@ -192,7 +193,7 @@
}
private String getAttr(String name, String value) {
- return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" "));
+ return ((name + "=\"" + XMLStringUtil.canonicalize(value) + "\" ")); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -446,16 +447,16 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.actf.visualization.eval.problem.IProblemItemVisitor#visit(org.eclipse.actf.visualization.eval.problem.IProblemItem)
+ * @see
+ * org.eclipse.actf.visualization.eval.problem.IProblemItemVisitor#visit
+ * (org.eclipse.actf.visualization.eval.problem.IProblemItem)
*/
public void visit(IProblemItem item) {
- ImageStatData imageData = (ImageStatData) imageDataMap.get(item
- .getTargetNode());
+ ImageStatData imageData = imageDataMap.get(item.getTargetNode());
if (imageData != null) {
imageData.addProblemItem(item);
} else {
- imageData = (ImageStatData) linkImageDataMap.get(item
- .getTargetNode());
+ imageData = linkImageDataMap.get(item.getTargetNode());
if (imageData != null) {// TODO check
imageData.addProblemItem(item);
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
index 7764d3b..028ac76 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelinePreferencePage.java
@@ -144,8 +144,8 @@
boolean isHTMLType = false;
String[] mimeTypes = guidelineDataArray[i].getMIMEtypes();
for (int j = 0; j < mimeTypes.length; j++) {
- if (mimeTypes[j].equals("text/html")
- || mimeTypes[j].equals("application/xhtml+xml")) {
+ if (mimeTypes[j].equals("text/html") //$NON-NLS-1$
+ || mimeTypes[j].equals("application/xhtml+xml")) { //$NON-NLS-1$
isHTMLType = true;
break;
}
@@ -271,7 +271,7 @@
setParameters();
- if (this._guidelineHolder.isEnabledMetric("Navigability")) {
+ if (this._guidelineHolder.isEnabledMetric("Navigability")) { //$NON-NLS-1$
IGuidelineData[] datas = this._guidelineHolder
.getLeafGuidelineData();
@@ -282,13 +282,13 @@
for (int i = 0; i < datas.length; i++) {
if (datas[i].isEnabled()) {
if (datas[i].getGuidelineName().matches(
- "Section508|JIS|IBMGuideline")) {
+ "Section508|JIS|IBMGuideline")) { //$NON-NLS-1$
isOtherComp = true;
- } else if (datas[i].getGuidelineName().equals("WCAG")) {
+ } else if (datas[i].getGuidelineName().equals("WCAG")) { //$NON-NLS-1$
isWcagOn = true;
}
} else {
- if (datas[i].getGuidelineName().equals("WCAG")) {
+ if (datas[i].getGuidelineName().equals("WCAG")) { //$NON-NLS-1$
isWcagOff = true;
}
}
@@ -302,7 +302,7 @@
case NavigabilityWarningDialog.ENABLE_ALL:
for (int i = 0; i < this._guidelineTreeItems.length; i++) {
if (this._guidelineTreeItems[i].getText().indexOf(
- "WCAG") > -1) {
+ "WCAG") > -1) { //$NON-NLS-1$
this._guidelineTreeItems[i].setChecked(true);
}
}
@@ -310,7 +310,7 @@
case NavigabilityWarningDialog.DISABLE_NAVIGABILITY:
for (int i = 0; i < this._criteriaCheckButtons.length; i++) {
if (this._criteriaCheckButtons[i].getText().indexOf(
- "Navigability") > -1) {
+ "Navigability") > -1) { //$NON-NLS-1$
this._criteriaCheckButtons[i].setSelection(false);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
index 685a677..c1193e6 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemData.java
@@ -52,11 +52,11 @@
private int _index;
- private String _name = "";
+ private String _name = ""; //$NON-NLS-1$
- private String _category = "";
+ private String _category = ""; //$NON-NLS-1$
- private String _description = "";
+ private String _description = ""; //$NON-NLS-1$
//TODO use extension (CheckerInfoProvider)
@@ -82,7 +82,8 @@
return this._guideline;
}
- public void setName(String name) {
+ @SuppressWarnings("nls")
+ public void setName(String name) {
this._name = name;
if (null != this._name) {
@@ -109,7 +110,8 @@
}
- public Image getGuidelineImage() {
+ @SuppressWarnings("nls")
+ public Image getGuidelineImage() {
switch (getGuideline()) {
case GUIDELINE_WCAG_P1:
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemType.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemType.java
index 6781dfd..aefa9dd 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemType.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/GuidelineTreeItemType.java
@@ -53,7 +53,8 @@
}
- public String getTypeStr() {
+ @SuppressWarnings("nls")
+ public String getTypeStr() {
switch (this._type) {
case TYPE_HTML:
@@ -68,7 +69,8 @@
}
- public Image getTypeImage() {
+ @SuppressWarnings("nls")
+ public Image getTypeImage() {
switch (this._type) {
case TYPE_HTML:
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/ICheckerPreferenceConstants.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/ICheckerPreferenceConstants.java
index a0c99aa..c45a95d 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/ICheckerPreferenceConstants.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/ICheckerPreferenceConstants.java
@@ -12,6 +12,7 @@
package org.eclipse.actf.visualization.eval.preferences;
+@SuppressWarnings("nls")
public interface ICheckerPreferenceConstants {
String GUIDELINE_PREFIX = "GUIDELINE_";
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/IPreferenceConstants.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/IPreferenceConstants.java
index d016689..7daa799 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/IPreferenceConstants.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/preferences/IPreferenceConstants.java
@@ -11,6 +11,7 @@
package org.eclipse.actf.visualization.eval.preferences;
+@SuppressWarnings("nls")
public interface IPreferenceConstants {
// Accessibility Check Properties
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/HighlightTargetNodeInfo.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/HighlightTargetNodeInfo.java
index 1a97be8..02a1ddc 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/HighlightTargetNodeInfo.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/HighlightTargetNodeInfo.java
@@ -225,7 +225,7 @@
try {
String targetId = ((Element) targetN)
.getAttribute(Html2ViewMapData.ACTF_ID);
- if (!targetId.equals("")) {
+ if (!targetId.equals("")) { //$NON-NLS-1$
int target = Integer.parseInt(targetId);
if (target > -1 && target < html2ViewMapDataV.size()) {
Html2ViewMapData h2vmd = html2ViewMapDataV.get(target);
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/IProblemConst.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/IProblemConst.java
index b376d95..a68c1ff 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/IProblemConst.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/IProblemConst.java
@@ -17,37 +17,37 @@
* Interface for constants commonly used for evaluation in visualization part
*/
public interface IProblemConst {
- public static final String ALL_ERRORS = Messages.ProblemConst_All_Errors_1; //$NON-NLS-1$
+ public static final String ALL_ERRORS = Messages.ProblemConst_All_Errors_1;
- public static final String ESSENTIAL = Messages.ProblemConst_Essential_2; //$NON-NLS-1$
+ public static final String ESSENTIAL = Messages.ProblemConst_Essential_2;
- public static final String USER_CHECK = Messages.ProblemConst_User_Check_5; //$NON-NLS-1$
+ public static final String USER_CHECK = Messages.ProblemConst_User_Check_5;
public static final String INFO = Messages.ProblemConst_Info;
- public static final String COMPLIANCE = Messages.ProblemConst_Compliance_6; //$NON-NLS-1$
+ public static final String COMPLIANCE = Messages.ProblemConst_Compliance_6;
- public static final String ACCESSIBILITY = Messages.ProblemConst_0; //$NON-NLS-1$
+ public static final String ACCESSIBILITY = Messages.ProblemConst_0;
// the titles of the Problem Table
- public final static String TITLE_ICON = Messages.ProblemConst_Type_11; //$NON-NLS-1$
+ public final static String TITLE_ICON = Messages.ProblemConst_Type_11;
- public final static String TITLE_LINE = Messages.ProblemConst_Line_12; //$NON-NLS-1$
+ public final static String TITLE_LINE = Messages.ProblemConst_Line_12;
- public final static String TITLE_HIGHLIGHT = Messages.ProblemConst_Highlight; //$NON-NLS-1$
+ public final static String TITLE_HIGHLIGHT = Messages.ProblemConst_Highlight;
- public final static String TITLE_DESCRIPTION = Messages.ProblemConst_Problem_Description_17; //$NON-NLS-1$
+ public final static String TITLE_DESCRIPTION = Messages.ProblemConst_Problem_Description_17;
- public final static String TITLE_FORECOLOR = Messages.ProblemConst_Foreground_18; //$NON-NLS-1$
+ public final static String TITLE_FORECOLOR = Messages.ProblemConst_Foreground_18;
- public final static String TITLE_BACKCOLOR = Messages.ProblemConst_Background_19; //$NON-NLS-1$
+ public final static String TITLE_BACKCOLOR = Messages.ProblemConst_Background_19;
- public final static String TITLE_SEVERITY = Messages.ProblemConst_Severity_20; //$NON-NLS-1$
+ public final static String TITLE_SEVERITY = Messages.ProblemConst_Severity_20;
- public final static String TITLE_X = Messages.ProblemConst_X_21; //$NON-NLS-1$
+ public final static String TITLE_X = Messages.ProblemConst_X_21;
- public final static String TITLE_Y = Messages.ProblemConst_Y_22; //$NON-NLS-1$
+ public final static String TITLE_Y = Messages.ProblemConst_Y_22;
- public final static String TITLE_AREA = Messages.ProblemConst_Area_23; //$NON-NLS-1$
+ public final static String TITLE_AREA = Messages.ProblemConst_Area_23;
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/ProblemItemImpl.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/ProblemItemImpl.java
index d6ee63f..4e382d3 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/ProblemItemImpl.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/eval/problem/ProblemItemImpl.java
@@ -11,6 +11,7 @@
package org.eclipse.actf.visualization.eval.problem;
+import org.eclipse.actf.util.logging.DebugPrintUtil;
import org.eclipse.actf.visualization.eval.IEvaluationItem;
import org.eclipse.actf.visualization.eval.guideline.GuidelineHolder;
import org.eclipse.actf.visualization.internal.eval.EvaluationItemImpl;
@@ -23,6 +24,8 @@
*/
public class ProblemItemImpl implements IProblemItem {
+ private static final String NULL_STRING = ""; //$NON-NLS-1$
+
private static GuidelineHolder GUIDELINE_HOLDER = GuidelineHolder
.getInstance();
@@ -30,7 +33,7 @@
private IEvaluationItem checkItem;
- private String description = "";
+ private String description = NULL_STRING;
private int serialNumber = -1;
@@ -44,9 +47,9 @@
private Node targetNode = null;
- protected String targetStringForHPB = "";
+ protected String targetStringForHPB = NULL_STRING;
- protected String targetString = "";
+ protected String targetString = NULL_STRING;
protected int subType;
@@ -59,13 +62,15 @@
* evaluation item ID
* @see GuidelineHolder#getEvaluationItem(String)
*/
+ @SuppressWarnings("nls")
public ProblemItemImpl(String id) {
checkItem = GUIDELINE_HOLDER.getEvaluationItem(id);
if (checkItem == null) {
checkItem = new EvaluationItemImpl("unknown",
EvaluationItemImpl.SEV_INFO_STR);
- System.err.println("Problem Item: unknown id \"" + id + "\"");
+ DebugPrintUtil.devOrDebugPrintln("Problem Item: unknown id \"" + id
+ + "\"");
} else {
description = checkItem.createDescription();
@@ -196,7 +201,7 @@
if (curLine > -1) {
return (Integer.toString(curLine));
} else {
- return ("");
+ return NULL_STRING;
}
}
@@ -207,7 +212,7 @@
for (int i = 0; i < targetSources.length; i++) {
int tmp = targetSources[i].getStartLine() + 1;
tmpSB.append(tmp);
- tmpSB.append(", ");
+ tmpSB.append(", "); //$NON-NLS-1$
}
String result = tmpSB.substring(0, tmpSB.length() - 2);
return result;
@@ -215,7 +220,7 @@
if (line > -1) {
return (Integer.toString(line));
} else {
- return ("");
+ return NULL_STRING;
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/CheckerExtension.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/CheckerExtension.java
index 4188e4a..84b8915 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/CheckerExtension.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/CheckerExtension.java
@@ -23,13 +23,13 @@
import org.eclipse.core.runtime.Platform;
public class CheckerExtension {
- private static final String EXTENSION_NAME = "checkers";
+ private static final String EXTENSION_NAME = "checkers"; //$NON-NLS-1$
- private static final String CHECKER = "checker";
+ private static final String CHECKER = "checker"; //$NON-NLS-1$
- private static final String ATTR_CLASS = "class";
+ private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
- private static final String ATTR_INFO_PROVIDER = "infoprovider";
+ private static final String ATTR_INFO_PROVIDER = "infoprovider"; //$NON-NLS-1$
private static CheckerExtension[] extensions;
@@ -86,7 +86,7 @@
.getExtensionPoint(EvaluationUtil.PLUGIN_ID, EXTENSION_NAME)
.getExtensions();
- DebugPrintUtil.devOrDebugPrintln("Checker extensions:"
+ DebugPrintUtil.devOrDebugPrintln("Checker extensions:" //$NON-NLS-1$
+ tmpExtensions.length);
List<CheckerExtension> l = new ArrayList<CheckerExtension>();
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/EvaluationItemImpl.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/EvaluationItemImpl.java
index 33cb751..0aacff4 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/EvaluationItemImpl.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/EvaluationItemImpl.java
@@ -21,8 +21,13 @@
import com.ibm.icu.text.MessageFormat;
+@SuppressWarnings("nls")
public class EvaluationItemImpl implements IEvaluationItem {
+ private static final String LISTENABILITY = "listenability";
+ private static final String NAVIGABILITY = "navigability";
+ private static final String COMPLIANCE = "compliance";
+
private static final Image ERROR_C_IMAGE = EvaluationPlugin
.getImageDescriptor("icons/ErrC.png").createImage();
private static final Image ERROR_N_IMAGE = EvaluationPlugin
@@ -178,11 +183,11 @@
switch (this.severity) {
case SEV_ERROR:
- if (curName.equalsIgnoreCase("compliance")) {
+ if (curName.equalsIgnoreCase(COMPLIANCE)) {
metricsIcons[i] = ERROR_C_IMAGE;
- } else if (curName.equalsIgnoreCase("navigability")) {
+ } else if (curName.equalsIgnoreCase(NAVIGABILITY)) {
metricsIcons[i] = ERROR_N_IMAGE;
- } else if (curName.equalsIgnoreCase("listenability")) {
+ } else if (curName.equalsIgnoreCase(LISTENABILITY)) {
metricsIcons[i] = ERROR_L_IMAGE;
} else {
metricsIcons[i] = ERROR_IMAGE;
@@ -191,11 +196,11 @@
+ IProblemConst.ESSENTIAL + ")";
break;
case SEV_WARNING:
- if (curName.equalsIgnoreCase("compliance")) {
+ if (curName.equalsIgnoreCase(COMPLIANCE)) {
metricsIcons[i] = WARN_C_IMAGE;
- } else if (curName.equalsIgnoreCase("navigability")) {
+ } else if (curName.equalsIgnoreCase(NAVIGABILITY)) {
metricsIcons[i] = WARN_N_IMAGE;
- } else if (curName.equalsIgnoreCase("listenability")) {
+ } else if (curName.equalsIgnoreCase(LISTENABILITY)) {
metricsIcons[i] = WARN_L_IMAGE;
} else {
metricsIcons[i] = WARN_IMAGE;
@@ -204,12 +209,12 @@
+ IProblemConst.USER_CHECK + ")";
break;
case SEV_INFO:
- if (curName.equalsIgnoreCase("compliance")) {
+ if (curName.equalsIgnoreCase(COMPLIANCE)) {
metricsIcons[i] = INFO_C_IMAGE;
- } else if (curName.equalsIgnoreCase("navigability")) {
+ } else if (curName.equalsIgnoreCase(NAVIGABILITY)) {
metricsIcons[i] = INFO_N_IMAGE;
- } else if (curName.equalsIgnoreCase("listenability")) {
+ } else if (curName.equalsIgnoreCase(LISTENABILITY)) {
metricsIcons[i] = INFO_L_IMAGE;
} else {
metricsIcons[i] = INFO_IMAGE;
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/GuidelineItemImpl.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/GuidelineItemImpl.java
index 1e85490..1774156 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/GuidelineItemImpl.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/GuidelineItemImpl.java
@@ -30,9 +30,9 @@
*/
public GuidelineItemImpl(String guidelineName) {
this.guidelineName = guidelineName;
- this.id = "";
- this.level = "";
- this.url = "";
+ this.id = ""; //$NON-NLS-1$
+ this.level = ""; //$NON-NLS-1$
+ this.url = ""; //$NON-NLS-1$
}
/* (non-Javadoc)
@@ -85,6 +85,6 @@
}
public String toString() {
- return (guidelineName + ": " + id + ",\t" + level + ",\t" + url);
+ return (guidelineName + ": " + id + ",\t" + level + ",\t" + url); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/XMLStringUtil.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/XMLStringUtil.java
index 2035fba..70ea358 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/XMLStringUtil.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/XMLStringUtil.java
@@ -25,6 +25,7 @@
* the target String
* @return canonicalized String
*/
+ @SuppressWarnings("nls")
public static String canonicalize(String targetS) {
return (targetS.replaceAll("\\p{Cntrl}", "").replaceAll("&", "&")
.replaceAll("<", "<").replaceAll(">", ">").replaceAll(
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
index 75a01b7..7ecfcd5 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/CheckItemReader.java
@@ -21,6 +21,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.eclipse.actf.util.logging.DebugPrintUtil;
import org.eclipse.actf.visualization.eval.IEvaluationItem;
import org.eclipse.actf.visualization.eval.IGuidelineItem;
import org.eclipse.actf.visualization.eval.guideline.GuidelineHolder;
@@ -29,8 +30,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
-
-
+@SuppressWarnings("nls")
public class CheckItemReader extends DefaultHandler {
private static final String CHECKER_CONFIG = "checker-config";
@@ -56,7 +56,7 @@
private static final String DESCRIPTION = "description";
-// private static final String LANG = "lang";
+ // private static final String LANG = "lang";
private static final short IN_DEFAULT = 0;
@@ -94,7 +94,8 @@
private Vector<IGuidelineItem> guidelineV = new Vector<IGuidelineItem>();
- private Set<String> metricsSet = new TreeSet<String>(new MetricsNameComparator());
+ private Set<String> metricsSet = new TreeSet<String>(
+ new MetricsNameComparator());
// comparator
// &
@@ -138,7 +139,7 @@
} else if (qName.equals(CHECK_ITEM)) {
checkItemMap.put(curItem.getId(), curItem);
if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
+ status = (statusStack.pop()).shortValue();
}
} else if (qName.equals(GUIDELINE)) {
@@ -147,7 +148,7 @@
curItem.setGuidelines(gis);
if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
+ status = (statusStack.pop()).shortValue();
}
} else if (qName.equals(METRICS)) {
@@ -156,19 +157,19 @@
curItem.setMetrics(mis);
if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
+ status = (statusStack.pop()).shortValue();
}
} else if (qName.equals(DESCRIPTION)) {
// TODO
if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
+ status = (statusStack.pop()).shortValue();
}
} else if (qName.equals(CHECKER_CONFIG)) {
} else {
// in metrics
- System.out.println("unknown element(end): " + qName);
+ DebugPrintUtil.devOrDebugPrintln("unknown element(end): " + qName);
}
}
@@ -181,11 +182,13 @@
/**
*
*/
- public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) {
curValue = "";
if (qName.equals(GITEM)) {
- IGuidelineItem gi = guidelineHolder.getGuidelineItem(getValue(NAME, attributes, true), getValue(ID, attributes, true));
+ IGuidelineItem gi = guidelineHolder.getGuidelineItem(getValue(NAME,
+ attributes, true), getValue(ID, attributes, true));
// System.out.println(getValue(NAME,attributes)+"
// "+getValue(ID,attributes)+" : "+gi);
if (gi != null) {
@@ -201,7 +204,8 @@
}
} else if (qName.equals(CHECK_ITEM)) {
- curItem = new EvaluationItemImpl(getValue(ID, attributes), getValue(TYPE, attributes));
+ curItem = new EvaluationItemImpl(getValue(ID, attributes),
+ getValue(TYPE, attributes));
statusStack.push(new Short(status));
status = IN_DEFAULT;
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineData.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineData.java
index e66b3e7..bed62ab 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineData.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineData.java
@@ -49,7 +49,7 @@
private Map<String, IGuidelineItem> guidelineItemMap = new HashMap<String, IGuidelineItem>();
- private String currentMIMEtype = "text/html";
+ private String currentMIMEtype = "text/html"; //$NON-NLS-1$
/**
* @param guidelineName
@@ -91,7 +91,7 @@
// TODO
if (levelStr == null) {
- this.levelStr = "";
+ this.levelStr = ""; //$NON-NLS-1$
} else {
this.levelStr = levelStr;
}
@@ -107,7 +107,7 @@
* @see org.eclipse.actf.visualization.eval.guideline.IGuidelineData#getGuidelineItem(java.lang.String)
*/
public IGuidelineItem getGuidelineItem(String id) {
- return ((IGuidelineItem) guidelineItemMap.get(id));
+ return guidelineItemMap.get(id);
}
/* (non-Javadoc)
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemDescription.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemDescription.java
index 64ab65e..03136ab 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemDescription.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemDescription.java
@@ -22,7 +22,7 @@
private static final String BUNDLE_NAME = "resources/description"; //$NON-NLS-1$
- private static final String EMPTY_STRING = "";
+ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
.getBundle(BUNDLE_NAME);
@@ -48,7 +48,7 @@
return result;
}
}
- DebugPrintUtil.devOrDebugPrintln("Can't find description: " + '!' + key + '!');
+ DebugPrintUtil.devOrDebugPrintln("Can't find description: " + '!' + key + '!'); //$NON-NLS-1$
}
return (result);
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemReader.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemReader.java
index c806786..7e0816c 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemReader.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/GuidelineItemReader.java
@@ -25,298 +25,305 @@
import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
-
-
+@SuppressWarnings("nls")
public class GuidelineItemReader extends DefaultHandler {
- private static final String GUIDELINE = "guideline";
+ private static final String GUIDELINE = "guideline";
- private static final String MIMETYPES = "mimetypes";
+ private static final String MIMETYPES = "mimetypes";
- private static final String MIMETYPE = "mimetype";
+ private static final String MIMETYPE = "mimetype";
- private static final String ITEMS = "items";
+ private static final String ITEMS = "items";
- private static final String GITEM = "gItem";
+ private static final String GITEM = "gItem";
- private static final String LEVELS = "levels";
+ private static final String LEVELS = "levels";
- private static final String LEVEL = "level";
+ private static final String LEVEL = "level";
- private static final String NAME = "name";
+ private static final String NAME = "name";
- private static final String ID = "id";
+ private static final String ID = "id";
- private static final String HELP_URL = "helpUrl";
+ private static final String HELP_URL = "helpUrl";
- private static final String ORDER = "order";
+ private static final String ORDER = "order";
- private static final String DESCRIPTION = "description";
+ private static final String DESCRIPTION = "description";
- private static final String CATEGORY = "category";
+ private static final String CATEGORY = "category";
- // TODO id,level-> attribute url -> lang
+ // TODO id,level-> attribute url -> lang
- private static final short IN_GUIDELINE = 0;
+ private static final short IN_GUIDELINE = 0;
- private static final short IN_LEVELS = 1;
+ private static final short IN_LEVELS = 1;
- private static final short IN_ITEMS = 2;
+ private static final short IN_ITEMS = 2;
- private static final short IN_ITEM = 3;
+ private static final short IN_ITEM = 3;
- private static final short IN_MIMETYPES = 4;
+ private static final short IN_MIMETYPES = 4;
- private static final short IN_LEVEL = 5;
+ private static final short IN_LEVEL = 5;
- public static GuidelineData getGuidelineData(InputStream is) {
- GuidelineItemReader glir = new GuidelineItemReader();
- try {
- SAXParserFactory spfactory = SAXParserFactory.newInstance();
- SAXParser parser = spfactory.newSAXParser();
- parser.parse(is, glir);
- } catch (Exception e) {
- }
- if (glir.isSucceed() && glir.guidelineName.length() > 0) {
- return (new GuidelineData(glir.guidelineName, glir.order, glir.category, glir.description, glir.levels,
- glir.categories, glir.descriptions, glir.mimetypes, glir.itemMap));
- } else {
- // TODO dialog
- return (null);
- }
- }
+ public static GuidelineData getGuidelineData(InputStream is) {
+ GuidelineItemReader glir = new GuidelineItemReader();
+ try {
+ SAXParserFactory spfactory = SAXParserFactory.newInstance();
+ SAXParser parser = spfactory.newSAXParser();
+ parser.parse(is, glir);
+ } catch (Exception e) {
+ }
+ if (glir.isSucceed() && glir.guidelineName.length() > 0) {
+ return (new GuidelineData(glir.guidelineName, glir.order,
+ glir.category, glir.description, glir.levels,
+ glir.categories, glir.descriptions, glir.mimetypes,
+ glir.itemMap));
+ } else {
+ // TODO dialog
+ return (null);
+ }
+ }
- private Vector<String> levelsV = new Vector<String>();
+ private Vector<String> levelsV = new Vector<String>();
- private Vector<String> descriptionsV = new Vector<String>();
+ private Vector<String> descriptionsV = new Vector<String>();
- private Vector<String> categoriesV = new Vector<String>();
+ private Vector<String> categoriesV = new Vector<String>();
- private Vector<String> mimeV = new Vector<String>();
+ private Vector<String> mimeV = new Vector<String>();
- private IGuidelineItem curItem = new GuidelineItemImpl("");
+ private IGuidelineItem curItem = new GuidelineItemImpl("");
- private Stack<Short> statusStack = new Stack<Short>();
+ private Stack<Short> statusStack = new Stack<Short>();
- private String curValue;
+ private String curValue;
- private HashMap<String, IGuidelineItem> itemMap;
+ private HashMap<String, IGuidelineItem> itemMap;
- private String guidelineName;
+ private String guidelineName;
- private int order;
+ private int order;
- // for sub-levels
- private String levels[] = new String[0];
+ // for sub-levels
+ private String levels[] = new String[0];
- private String descriptions[] = new String[0];
+ private String descriptions[] = new String[0];
- private String categories[] = new String[0];
+ private String categories[] = new String[0];
- // for root-level guideline
- private String description = "";
+ // for root-level guideline
+ private String description = "";
- private String category = "";
+ private String category = "";
- private String mimetypes[] = new String[0];
+ private String mimetypes[] = new String[0];
- private short status = IN_GUIDELINE;
+ private short status = IN_GUIDELINE;
- private boolean succeed = false;
+ private boolean succeed = false;
- /**
+ /**
*
*/
- public GuidelineItemReader() {
- itemMap = new HashMap<String, IGuidelineItem>();
- }
+ public GuidelineItemReader() {
+ itemMap = new HashMap<String, IGuidelineItem>();
+ }
- /**
+ /**
*
*/
- public void characters(char[] ch, int offset, int length) {
+ public void characters(char[] ch, int offset, int length) {
- if (length > 0) {
- curValue += (new String(ch, offset, length));
- }
- }
+ if (length > 0) {
+ curValue += (new String(ch, offset, length));
+ }
+ }
- /**
+ /**
*
*/
- public void endDocument() {
- levels = new String[levelsV.size()];
- levelsV.toArray(levels);
+ public void endDocument() {
+ levels = new String[levelsV.size()];
+ levelsV.toArray(levels);
- categories = new String[categoriesV.size()];
- categoriesV.toArray(categories);
+ categories = new String[categoriesV.size()];
+ categoriesV.toArray(categories);
- descriptions = new String[descriptionsV.size()];
- descriptionsV.toArray(descriptions);
+ descriptions = new String[descriptionsV.size()];
+ descriptionsV.toArray(descriptions);
- mimetypes = new String[mimeV.size()];
- mimeV.toArray(mimetypes);
+ mimetypes = new String[mimeV.size()];
+ mimeV.toArray(mimetypes);
- // TODO validation
- succeed = true;
- }
+ // TODO validation
+ succeed = true;
+ }
- private String getLocalGuidelineURL(String url) {
- if (url.startsWith("${")) {
- int bundleNameEnd = url.indexOf("}");
- if (bundleNameEnd==-1) return null;
- String bundleName = url.substring(2, bundleNameEnd);
- String href = "/" + bundleName + "/" + url.substring(bundleNameEnd+2);
- return PlatformUI.getWorkbench().getHelpSystem().resolve(href, true).toString();
- }
- return null;
- }
-
- /**
+ private String getLocalGuidelineURL(String url) {
+ if (url.startsWith("${")) {
+ int bundleNameEnd = url.indexOf("}");
+ if (bundleNameEnd == -1)
+ return null;
+ String bundleName = url.substring(2, bundleNameEnd);
+ String href = "/" + bundleName + "/"
+ + url.substring(bundleNameEnd + 2);
+ return PlatformUI.getWorkbench().getHelpSystem()
+ .resolve(href, true).toString();
+ }
+ return null;
+ }
+
+ /**
*
*/
- public void endElement(String uri, String localName, String qName) {
+ public void endElement(String uri, String localName, String qName) {
- // TODO
- if (qName.equalsIgnoreCase(GITEM)) {
- itemMap.put(curItem.getId(), curItem);
- if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
- }
- } else if (qName.equalsIgnoreCase(HELP_URL)) {
- switch (status) {
- case IN_ITEM:
- String localUrl = getLocalGuidelineURL(curValue);
- if (localUrl!=null) curItem.setUrl(localUrl);
- else curItem.setUrl(curValue);
- break;
- default:
- }
- ;
- } else if (qName.equalsIgnoreCase(DESCRIPTION)) {
- switch (status) {
- case IN_LEVEL:
- descriptionsV.add(curValue);
- break;
- case IN_GUIDELINE:
- description = curValue;
- break;
- default:
- }
- ;
+ // TODO
+ if (qName.equalsIgnoreCase(GITEM)) {
+ itemMap.put(curItem.getId(), curItem);
+ if (!statusStack.isEmpty()) {
+ status = (statusStack.pop()).shortValue();
+ }
+ } else if (qName.equalsIgnoreCase(HELP_URL)) {
+ switch (status) {
+ case IN_ITEM:
+ String localUrl = getLocalGuidelineURL(curValue);
+ if (localUrl != null)
+ curItem.setUrl(localUrl);
+ else
+ curItem.setUrl(curValue);
+ break;
+ default:
+ }
+ ;
+ } else if (qName.equalsIgnoreCase(DESCRIPTION)) {
+ switch (status) {
+ case IN_LEVEL:
+ descriptionsV.add(curValue);
+ break;
+ case IN_GUIDELINE:
+ description = curValue;
+ break;
+ default:
+ }
+ ;
- } else if (qName.equalsIgnoreCase(CATEGORY)) {
- switch (status) {
- case IN_LEVEL:
- categoriesV.add(curValue);
- break;
- case IN_GUIDELINE:
- category = curValue;
- break;
- default:
- }
- ;
- } else if (qName.equalsIgnoreCase(GUIDELINE)) {
+ } else if (qName.equalsIgnoreCase(CATEGORY)) {
+ switch (status) {
+ case IN_LEVEL:
+ categoriesV.add(curValue);
+ break;
+ case IN_GUIDELINE:
+ category = curValue;
+ break;
+ default:
+ }
+ ;
+ } else if (qName.equalsIgnoreCase(GUIDELINE)) {
- } else if (qName.equalsIgnoreCase(MIMETYPES)) {
- if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
- }
- } else if (qName.equalsIgnoreCase(ITEMS)) {
- if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
- }
- } else if (qName.equalsIgnoreCase(LEVELS)) {
- if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
- }
- } else if (qName.equalsIgnoreCase(MIMETYPE)) {
- switch (status) {
- case IN_MIMETYPES:
- mimeV.add(curValue);
- break;
- default:
- }
- ;
- } else if (qName.equalsIgnoreCase(LEVEL)) {
- if (!statusStack.isEmpty()) {
- status = ((Short) statusStack.pop()).shortValue();
- }
- if (levelsV.size() > descriptionsV.size()) {
- descriptionsV.add("");
- }
- if (levelsV.size() > categoriesV.size()) {
- categoriesV.add("");
- }
+ } else if (qName.equalsIgnoreCase(MIMETYPES)) {
+ if (!statusStack.isEmpty()) {
+ status = (statusStack.pop()).shortValue();
+ }
+ } else if (qName.equalsIgnoreCase(ITEMS)) {
+ if (!statusStack.isEmpty()) {
+ status = (statusStack.pop()).shortValue();
+ }
+ } else if (qName.equalsIgnoreCase(LEVELS)) {
+ if (!statusStack.isEmpty()) {
+ status = (statusStack.pop()).shortValue();
+ }
+ } else if (qName.equalsIgnoreCase(MIMETYPE)) {
+ switch (status) {
+ case IN_MIMETYPES:
+ mimeV.add(curValue);
+ break;
+ default:
+ }
+ ;
+ } else if (qName.equalsIgnoreCase(LEVEL)) {
+ if (!statusStack.isEmpty()) {
+ status = (statusStack.pop()).shortValue();
+ }
+ if (levelsV.size() > descriptionsV.size()) {
+ descriptionsV.add("");
+ }
+ if (levelsV.size() > categoriesV.size()) {
+ categoriesV.add("");
+ }
- } else {
- System.out.println("unknown element(end): " + qName);
- }
- }
+ } else {
+ System.out.println("unknown element(end): " + qName);
+ }
+ }
- /**
+ /**
*
*/
- public void startDocument() {
- }
+ public void startDocument() {
+ }
- /**
+ /**
*
*/
- public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) {
- curValue = "";
- if (qName.equalsIgnoreCase(GITEM)) {
- statusStack.push(new Short(status));
- status = IN_ITEM;
- curItem = new GuidelineItemImpl(guidelineName);
- curItem.setLevel(getAttribute(attributes, LEVEL));
- curItem.setId(getAttribute(attributes, ID));
- } else if (qName.equalsIgnoreCase(HELP_URL)) {
+ curValue = "";
+ if (qName.equalsIgnoreCase(GITEM)) {
+ statusStack.push(new Short(status));
+ status = IN_ITEM;
+ curItem = new GuidelineItemImpl(guidelineName);
+ curItem.setLevel(getAttribute(attributes, LEVEL));
+ curItem.setId(getAttribute(attributes, ID));
+ } else if (qName.equalsIgnoreCase(HELP_URL)) {
- } else if (qName.equalsIgnoreCase(GUIDELINE)) {
- guidelineName = getAttribute(attributes, NAME);
- getGuidelineOrder(attributes);
- } else if (qName.equalsIgnoreCase(MIMETYPES)) {
- statusStack.push(new Short(status));
- status = IN_MIMETYPES;
- } else if (qName.equalsIgnoreCase(LEVELS)) {
- statusStack.push(new Short(status));
- status = IN_LEVELS;
- } else if (qName.equalsIgnoreCase(LEVEL)) {
- statusStack.push(new Short(status));
- status = IN_LEVEL;
- levelsV.add(getAttribute(attributes, ID));
- } else if (qName.equalsIgnoreCase(ITEMS)) {
- statusStack.push(new Short(status));
- status = IN_ITEMS;
- } else {
+ } else if (qName.equalsIgnoreCase(GUIDELINE)) {
+ guidelineName = getAttribute(attributes, NAME);
+ getGuidelineOrder(attributes);
+ } else if (qName.equalsIgnoreCase(MIMETYPES)) {
+ statusStack.push(new Short(status));
+ status = IN_MIMETYPES;
+ } else if (qName.equalsIgnoreCase(LEVELS)) {
+ statusStack.push(new Short(status));
+ status = IN_LEVELS;
+ } else if (qName.equalsIgnoreCase(LEVEL)) {
+ statusStack.push(new Short(status));
+ status = IN_LEVEL;
+ levelsV.add(getAttribute(attributes, ID));
+ } else if (qName.equalsIgnoreCase(ITEMS)) {
+ statusStack.push(new Short(status));
+ status = IN_ITEMS;
+ } else {
- }
+ }
- }
+ }
- public boolean isSucceed() {
- return succeed;
- }
+ public boolean isSucceed() {
+ return succeed;
+ }
- private String getAttribute(Attributes attr, String target) {
- String result = attr.getValue(target);
- if (result == null) {
- result = "";
- }
- return result;
- }
+ private String getAttribute(Attributes attr, String target) {
+ String result = attr.getValue(target);
+ if (result == null) {
+ result = "";
+ }
+ return result;
+ }
- private void getGuidelineOrder(Attributes attr) {
- String idS = attr.getValue(ORDER);
- order = Integer.MAX_VALUE;
+ private void getGuidelineOrder(Attributes attr) {
+ String idS = attr.getValue(ORDER);
+ order = Integer.MAX_VALUE;
- if (guidelineName != null) {
- try {
- order = Integer.parseInt(idS);
- } catch (Exception e) {
- }
- }
- }
+ if (guidelineName != null) {
+ try {
+ order = Integer.parseInt(idS);
+ } catch (Exception e) {
+ }
+ }
+ }
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsItem.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsItem.java
index 41142ea..4e0406d 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsItem.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsItem.java
@@ -13,7 +13,7 @@
public class MetricsItem {
- private String metricsName = "";
+ private String metricsName = ""; //$NON-NLS-1$
private int score = 0;
@@ -57,7 +57,7 @@
}
public String toString(){
- return(metricsName+" : "+score);
+ return(metricsName+" : "+score); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsNameComparator.java b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsNameComparator.java
index 64b0467..f754d74 100644
--- a/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsNameComparator.java
+++ b/plugins/org.eclipse.actf.visualization.eval/src/org/eclipse/actf/visualization/internal/eval/guideline/MetricsNameComparator.java
@@ -17,30 +17,34 @@
public class MetricsNameComparator implements Comparator<String> {
- public int compare(String s1, String s2) {
+ private static final String NAVIGABILITY = "navigability"; //$NON-NLS-1$
+ private static final String LISTENABILITY = "listenability"; //$NON-NLS-1$
+ private static final String COMPLIANCE = "compliance"; //$NON-NLS-1$
+
+ public int compare(String s1, String s2) {
if(s1.equalsIgnoreCase(s2)){
return(0);
}
- if(s1.equalsIgnoreCase("compliance")){
+ if(s1.equalsIgnoreCase(COMPLIANCE)){
return(-1);
}
- if(s2.equalsIgnoreCase("compliance")){
+ if(s2.equalsIgnoreCase(COMPLIANCE)){
return(1);
}
- if(s1.equalsIgnoreCase("listenability")){
+ if(s1.equalsIgnoreCase(LISTENABILITY)){
return(-1);
}
- if(s2.equalsIgnoreCase("listenability")){
+ if(s2.equalsIgnoreCase(LISTENABILITY)){
return(1);
}
- if(s1.equalsIgnoreCase("navigability")){
+ if(s1.equalsIgnoreCase(NAVIGABILITY)){
return(-1);
}
- if(s2.equalsIgnoreCase("navigability")){
+ if(s2.equalsIgnoreCase(NAVIGABILITY)){
return(1);
}
diff --git a/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
index f6cf8e8..e670719 100644
--- a/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.flash/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@
org.eclipse.actf.util.win32,
org.eclipse.actf.util.win32.comclutch,
com.ibm.icu
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/actions/FlashRectFinder.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/actions/FlashRectFinder.java
index f817441..0e59781 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/actions/FlashRectFinder.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/actions/FlashRectFinder.java
@@ -59,10 +59,10 @@
public void find(Shell shell) {
if (viewVisible) {
if (null == msaaRect) {
- MessageDialog.openInformation(shell, Messages.flash_flash_dom, //$NON-NLS-1$
+ MessageDialog.openInformation(shell, Messages.flash_flash_dom,
Messages.flash_error_no_location);
} else if (null == playerWindow) {
- MessageDialog.openInformation(shell, Messages.flash_flash_dom, //$NON-NLS-1$
+ MessageDialog.openInformation(shell, Messages.flash_flash_dom,
Messages.flash_error_select_flash);
} else {
reCalculateRect();
@@ -78,7 +78,6 @@
}
}
- @SuppressWarnings("restriction")
private void reCalculateRect() {
IDispatch idisp = FlashMSAAUtil.getHtmlElementFromPtr(playerWindow
.getPtr());
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashNodePropertySource.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashNodePropertySource.java
index 87fbdc3..5212954 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashNodePropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashNodePropertySource.java
@@ -52,7 +52,7 @@
new PropertyDescriptor(ASNODE_IS_OPAQUE_OBJECT,
ASNODE_IS_OPAQUE_OBJECT),
new PropertyDescriptor(ASNODE_IS_INPUTABLE, ASNODE_IS_INPUTABLE),
- new PropertyDescriptor(ATTR_WMODE, ATTR_WMODE) // 15 //$NON-NLS-1$
+ new PropertyDescriptor(ATTR_WMODE, ATTR_WMODE) // 15
};
public FlashNodePropertySource(IASNode flashNode) {
@@ -104,10 +104,10 @@
strValue = flashNode.getTitle();
} else if (PID_LOCATION.equals(id)) {
try {
- double x = flashNode.getX(); //$NON-NLS-1$
- double y = flashNode.getY(); //$NON-NLS-1$
- double w = flashNode.getWidth(); //$NON-NLS-1$
- double h = flashNode.getHeight(); //$NON-NLS-1$
+ double x = flashNode.getX();
+ double y = flashNode.getY();
+ double w = flashNode.getWidth();
+ double h = flashNode.getHeight();
if (Double.NaN != x) {
strValue = x
+ ", " + y + ", " + (x + w) + ", " + (y + h) + " (width=" + w + ", height=" + h + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
@@ -123,7 +123,7 @@
strValue = String.valueOf(flashNode.getTabIndex());
}
} else if (ASNODE_ACCINFO.equals(id)) {
- ASAccInfo accInfo = flashNode.getAccInfo(); //$NON-NLS-1$
+ ASAccInfo accInfo = flashNode.getAccInfo();
if (null != accInfo) {
AttributePropertySource attrSource = new AttributePropertySource(
null, accInfo.toString());
@@ -132,9 +132,9 @@
Object keyValue = accInfo.get(keyName);
if (keyValue instanceof Integer) {
int intValue = ((Integer) keyValue).intValue();
- if (IFlashConst.ACCINFO_ROLE.equals(keyName)) { //$NON-NLS-1$
+ if (IFlashConst.ACCINFO_ROLE.equals(keyName)) {
keyValue = MSAA.getRoleText(intValue);
- } else if (IFlashConst.ACCINFO_STATE.equals(keyName)) { //$NON-NLS-1$
+ } else if (IFlashConst.ACCINFO_STATE.equals(keyName)) {
keyValue = MSAA.getStateText(intValue);
}
}
@@ -148,7 +148,7 @@
}
return attrSource;
}
- } else if (null == strValue) {
+ } else {
Object obj = flashNode.getObject(id.toString());
if (null != obj) {
strValue = obj.toString();
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashPlayerPropertySource.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashPlayerPropertySource.java
index f4a9903..6d7df7e 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashPlayerPropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/properties/FlashPlayerPropertySource.java
@@ -42,7 +42,7 @@
STR_MOVIE = "movie"; // 11 //$NON-NLS-1$
private static final IPropertyDescriptor[] DESCRIPTORS = new IPropertyDescriptor[] {
- new PropertyDescriptor(PLAYER_VERSION, "Flash player version"),
+ new PropertyDescriptor(PLAYER_VERSION, "Flash player version"), //$NON-NLS-1$
new PropertyDescriptor(PID_STATUS, STR_STATUS),
new PropertyDescriptor(PID_ID, STR_ID),
new PropertyDescriptor(PID_ALLOW_ACCESS, STR_ALLOW_ACCESS),
@@ -104,7 +104,7 @@
if (null != propertyName) {
strValue = flashPlayer.getPlayerProperty(propertyName);
}
- return strValue;// null==strValue ? "null" : strValue; //$NON-NLS-1$
+ return strValue;// null==strValue ? "null" : strValue;
}
public boolean isPropertySet(Object id) {
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/views/FlashDOMView.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/views/FlashDOMView.java
index 2dd4bed..33b9c4f 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/views/FlashDOMView.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/flash/ui/views/FlashDOMView.java
@@ -70,7 +70,7 @@
IFlashConst {
public static final String ID = FlashDOMView.class.getName();
- private static final String ON_RELEASE = "onRelease";
+ private static final String ON_RELEASE = "onRelease"; //$NON-NLS-1$
private TreeViewer viewer;
private Action expandAction;
@@ -150,7 +150,7 @@
.format(
Messages.flash_element_found, new Object[] { new Integer(finder.foundCount) });
}
- MessageDialog.openInformation(viewer.getControl().getShell(), Messages.flash_flash_dom, //$NON-NLS-1$
+ MessageDialog.openInformation(viewer.getControl().getShell(), Messages.flash_flash_dom,
strMessage);
}
@@ -196,7 +196,7 @@
throw new Error(
MessageFormat
.format(
- Messages.flash_error_target_length, new Object[] { new Integer(flashNode.getLevel()) }) + "\n" + flashNode.getTarget()); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.flash_error_target_length, new Object[] { new Integer(flashNode.getLevel()) }) + "\n" + flashNode.getTarget()); //$NON-NLS-1$
}
double x = flashNode.getX();
if (x >= flashRight + MARGIN) {
@@ -328,11 +328,11 @@
}
};
expandAllAction
- .setToolTipText(org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_expand_all); //$NON-NLS-1$
+ .setToolTipText(org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_expand_all);
expandAllAction.setImageDescriptor(GuiImages.IMAGE_EXPAND_ALL);
collapseAllAction = new Action(
- org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_collapse_all) { //$NON-NLS-1$
+ org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_collapse_all) {
public void run() {
try {
viewer.collapseAll();
@@ -342,12 +342,12 @@
}
};
collapseAllAction
- .setToolTipText(org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_collapse_all); //$NON-NLS-1$
+ .setToolTipText(org.eclipse.actf.visualization.gui.internal.util.Messages.msaa_collapse_all);
collapseAllAction.setImageDescriptor(GuiImages.IMAGE_COLLAPSE_ALL);
refreshAction = new RefreshRootAction();
- informativeTreeAction = new Action(Messages.flash_filter_noninformative, Action.AS_CHECK_BOX) { //$NON-NLS-1$
+ informativeTreeAction = new Action(Messages.flash_filter_noninformative, Action.AS_CHECK_BOX) {
public void run() {
FlashDOMContentProvider provider = (FlashDOMContentProvider) viewer
.getContentProvider();
@@ -375,7 +375,7 @@
}
};
- scanWindowlessAction = new Action(Messages.flash_scanWindowless, Action.AS_CHECK_BOX) { //$NON-NLS-1$
+ scanWindowlessAction = new Action(Messages.flash_scanWindowless, Action.AS_CHECK_BOX) {
public void run() {
FlashMSAAUtil.setScanAll(scanWindowlessAction.isChecked());
MSAAViewRegistory.refreshRootObject();
@@ -429,16 +429,16 @@
if (null == node.getText()
&& !ASNODE_TYPE_MOVIECLIP.equals(node
.getType())
- && //$NON-NLS-1$
+ &&
!ASNODE_CLASS_BUTTON.equals(node
.getClassName())
- && //$NON-NLS-1$
+ &&
!ACC_PROPS.equals(node.getObjectName())
- && //$NON-NLS-1$
+ &&
!ACC_IMPL.equals(node.getObjectName())
- && //$NON-NLS-1$
+ &&
!ON_RELEASE
- .equals(node.getObjectName())) //$NON-NLS-1$
+ .equals(node.getObjectName()))
{
continue;
}
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/FlashImages.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/FlashImages.java
index e013856..db6c8e4 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/FlashImages.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/FlashImages.java
@@ -43,7 +43,7 @@
if (null == path) {
return null;
}
- Image image = (Image) imageMap.get(path);
+ Image image = imageMap.get(path);
if (null == image) {
ImageDescriptor descriptor = getImageDescriptor(path);
if (null != descriptor) {
@@ -60,7 +60,7 @@
return null;
}
String totalPath = basePath + "|" + overlayPath; //$NON-NLS-1$
- Image image = (Image) imageMap.get(totalPath);
+ Image image = imageMap.get(totalPath);
if (null == image) {
ImageDescriptor descriptor = getImageDescriptor(basePath);
if (null != descriptor) {
@@ -79,7 +79,7 @@
public static ImageDescriptor getImageDescriptor(String path) {
ImageDescriptor descriptor = AbstractUIPlugin
.imageDescriptorFromPlugin(
- "org.eclipse.actf.visualization.flash", path);
+ "org.eclipse.actf.visualization.flash", path); //$NON-NLS-1$
if (null != descriptor) {
return descriptor;
}
diff --git a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/ui/FlashPerspective.java b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/ui/FlashPerspective.java
index ff6d830..fb70ffd 100644
--- a/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/ui/FlashPerspective.java
+++ b/plugins/org.eclipse.actf.visualization.flash/src/org/eclipse/actf/visualization/internal/flash/ui/FlashPerspective.java
@@ -26,20 +26,20 @@
layout.setEditorAreaVisible(true);
IFolderLayout reportFolder = layout.createFolder(
- "actf.flash.report.folder", IPageLayout.BOTTOM, 0.7f,
+ "actf.flash.report.folder", IPageLayout.BOTTOM, 0.7f, //$NON-NLS-1$
editorArea);
IFolderLayout rightReportFolder = layout.createFolder(
- "actf.flash.report.left.folder", IPageLayout.RIGHT, 0.5f,
- "actf.flash.report.folder");
+ "actf.flash.report.left.folder", IPageLayout.RIGHT, 0.5f, //$NON-NLS-1$
+ "actf.flash.report.folder"); //$NON-NLS-1$
IFolderLayout simulatorFolder = layout.createFolder(
- "actf.flash.simulator.folder", IPageLayout.RIGHT, 0.5f,
+ "actf.flash.simulator.folder", IPageLayout.RIGHT, 0.5f, //$NON-NLS-1$
editorArea);
IFolderLayout outlineFolder = layout.createFolder(
- "actf.flash.outline.folder", IPageLayout.RIGHT, 0.5f,
- "actf.flash.simulator.folder");
+ "actf.flash.outline.folder", IPageLayout.RIGHT, 0.5f, //$NON-NLS-1$
+ "actf.flash.simulator.folder"); //$NON-NLS-1$
IFolderLayout flashDomFolder = layout.createFolder(
- "actf.flash.flashdom.folder", IPageLayout.BOTTOM, 0.5f,
- "actf.flash.outline.folder");
+ "actf.flash.flashdom.folder", IPageLayout.BOTTOM, 0.5f, //$NON-NLS-1$
+ "actf.flash.outline.folder"); //$NON-NLS-1$
reportFolder.addView(IGuiViewIDs.ID_EVENTVIEW);
rightReportFolder.addView(IGuiViewIDs.ID_PROPERTIESVIEW);
