[245847] reduce warnings
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
index f55b16a..45240df 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.ui.report/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
org.eclipse.actf.visualization,
org.eclipse.actf.visualization.eval,
org.eclipse.actf.ui
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.ui.report.table
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ProblemTree.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ProblemTree.java
index 991fd7c..3c227da 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ProblemTree.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ProblemTree.java
@@ -98,15 +98,15 @@
node1_1 = new TreeItem(nodeRoot, SWT.NULL);
node1_1.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(
- EvaluationUtil.PLUGIN_ID, "icons/Err.png").createImage());
+ EvaluationUtil.PLUGIN_ID, "icons/Err.png").createImage()); //$NON-NLS-1$
node1_2 = new TreeItem(nodeRoot, SWT.NULL);
node1_2.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(
- EvaluationUtil.PLUGIN_ID, "icons/Warn.png").createImage());
+ EvaluationUtil.PLUGIN_ID, "icons/Warn.png").createImage()); //$NON-NLS-1$
node1_3 = new TreeItem(nodeRoot, SWT.NULL);
node1_3.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(
- EvaluationUtil.PLUGIN_ID, "icons/Info.png").createImage());
+ EvaluationUtil.PLUGIN_ID, "icons/Info.png").createImage()); //$NON-NLS-1$
nodeRoot.setExpanded(true);
@@ -152,10 +152,10 @@
int all = error + user + info;
- nodeRoot.setText(IProblemConst.ALL_ERRORS + " (" + all + ")");
- node1_1.setText(IProblemConst.ESSENTIAL + " (" + error + ")");
- node1_2.setText(IProblemConst.USER_CHECK + " (" + user + ")");
- node1_3.setText(IProblemConst.INFO + " (" + info + ")");
+ nodeRoot.setText(IProblemConst.ALL_ERRORS + " (" + all + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ node1_1.setText(IProblemConst.ESSENTIAL + " (" + error + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ node1_2.setText(IProblemConst.USER_CHECK + " (" + user + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ node1_3.setText(IProblemConst.INFO + " (" + info + ")"); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportDisplay.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportDisplay.java
index 8960408..1fc7384 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportDisplay.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportDisplay.java
@@ -63,7 +63,7 @@
// activate OLE
if (!(webControlSite.doVerb(OLE.OLEIVERB_INPLACEACTIVATE) == OLE.S_OK)) {
- DebugPrintUtil.devOrDebugPrintln("ole init failure");
+ DebugPrintUtil.devOrDebugPrintln("ole init failure"); //$NON-NLS-1$
}
if (oleAutomation != null) {
@@ -80,13 +80,13 @@
gridData.grabExcessVerticalSpace = true;
webFrame.setLayoutData(gridData);
- displayReportFile("");
+ displayReportFile(""); //$NON-NLS-1$
}
public void displayReportFile(String url) {
File targetFile = new File(url);
if (!targetFile.exists()) {
- url = "about:blank";
+ url = "about:blank"; //$NON-NLS-1$
}
if (oleAutomation != null) {
Variant[] rgvarg = new Variant[1];
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportPlugin.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportPlugin.java
index 4162d82..4ed19f7 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportPlugin.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/ReportPlugin.java
@@ -20,7 +20,7 @@
public class ReportPlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.actf.visualization.ui.report";
+ public static final String PLUGIN_ID = "org.eclipse.actf.visualization.ui.report"; //$NON-NLS-1$
// The shared instance
private static ReportPlugin plugin;
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/action/ShowGuidelineAction.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/action/ShowGuidelineAction.java
index 4abfa66..c81d80b 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/action/ShowGuidelineAction.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/action/ShowGuidelineAction.java
@@ -24,7 +24,7 @@
*
*/
public ShowGuidelineAction(IGuidelineItem targetItem) {
- super(targetItem.getGuidelineName() + ": " + targetItem.getId());
+ super(targetItem.getGuidelineName() + ": " + targetItem.getId()); //$NON-NLS-1$
this._targetItem = targetItem;
}
@@ -36,7 +36,7 @@
public void run() {
// launch default web browser
- Program program = Program.findProgram(".html");
+ Program program = Program.findProgram(".html"); //$NON-NLS-1$
if (null != program) {
program.execute(this._targetItem.getUrl());
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewer.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewer.java
index db094c1..ed33c8b 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewer.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewer.java
@@ -366,7 +366,7 @@
styledText.setText(""); //$NON-NLS-1$
//TODO check
try {
- String encoding = "MS932";
+ String encoding = "MS932"; //$NON-NLS-1$
JapaneseEncodingDetector JED = null;
@@ -472,8 +472,8 @@
styledText.setStyleRange(null);
for (int i = 0; i < startV.size(); i++) {
StyleRange styleRange = new StyleRange();
- styleRange.start = ((Integer) startV.get(i)).intValue();
- styleRange.length = ((Integer) lenV.get(i)).intValue();
+ styleRange.start = (startV.get(i)).intValue();
+ styleRange.length = (lenV.get(i)).intValue();
styleRange.foreground = fgV.get(i);
styleRange.background = bgV.get(i);
styledText.setStyleRange(styleRange);
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewerForPT.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewerForPT.java
index 24ee31b..df6f15f 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewerForPT.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/internal/ui/report/srcviewer/SrcViewerForPT.java
@@ -86,7 +86,7 @@
}
_srcViewerShell = new Shell(display);
_srcViewerShell.setLayout(new FillLayout());
- _srcViewerShell.setImage(ReportPlugin.imageDescriptorFromPlugin(ReportPlugin.PLUGIN_ID, "icons/excla_squ.png").createImage());
+ _srcViewerShell.setImage(ReportPlugin.imageDescriptorFromPlugin(ReportPlugin.PLUGIN_ID, "icons/excla_squ.png").createImage()); //$NON-NLS-1$
_srcViewerShell.setText("HTML Source");
_srcViewer = new SrcViewer(_srcViewerShell);
_srcViewerShell.setSize(600, 750);
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/MetricsLabelProvider.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/MetricsLabelProvider.java
index e3d9cbd..3ab1725 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/MetricsLabelProvider.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/MetricsLabelProvider.java
@@ -16,38 +16,37 @@
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-
-
/**
*
*/
-public class MetricsLabelProvider extends LabelProvider implements ITableLabelProvider {
+public class MetricsLabelProvider extends LabelProvider implements
+ ITableLabelProvider {
- private GuidelineHolder guidelineHolder = GuidelineHolder.getInstance();
+ private GuidelineHolder guidelineHolder = GuidelineHolder.getInstance();
- private int numMetrics;
+ private int numMetrics;
- /**
+ /**
*
*/
- public MetricsLabelProvider() {
- super();
- numMetrics = guidelineHolder.getMetricsNames().length;
- }
+ public MetricsLabelProvider() {
+ super();
+ numMetrics = guidelineHolder.getMetricsNames().length;
+ }
- public Image getColumnImage(Object arg0, int arg1) {
- IProblemItem tmpItem = (IProblemItem) arg0;
- if (arg1 >= 0 && arg1 < numMetrics) {
- return (tmpItem.getEvaluationItem().getMetricsIcons()[arg1]);
- }
- return null;
- }
+ public Image getColumnImage(Object arg0, int arg1) {
+ IProblemItem tmpItem = (IProblemItem) arg0;
+ if (arg1 >= 0 && arg1 < numMetrics) {
+ return (tmpItem.getEvaluationItem().getMetricsIcons()[arg1]);
+ }
+ return null;
+ }
- public String getColumnText(Object arg0, int arg1) {
- IProblemItem tmpItem = (IProblemItem) arg0;
- if (arg1 >= 0 && arg1 < numMetrics) {
- return (tmpItem.getEvaluationItem().getTableDataMetrics()[arg1]);
- }
- return "";
- }
+ public String getColumnText(Object arg0, int arg1) {
+ IProblemItem tmpItem = (IProblemItem) arg0;
+ if (arg1 >= 0 && arg1 < numMetrics) {
+ return (tmpItem.getEvaluationItem().getTableDataMetrics()[arg1]);
+ }
+ return ""; //$NON-NLS-1$
+ }
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProvider.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProvider.java
index 08371ec..5655123 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProvider.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProvider.java
@@ -43,7 +43,7 @@
if (arg1 == 0) {
if (tmpItem.isCanHighlight()) {
return (ReportPlugin.imageDescriptorFromPlugin(
- EvaluationUtil.PLUGIN_ID, "icons/star.gif")
+ EvaluationUtil.PLUGIN_ID, "icons/star.gif") //$NON-NLS-1$
.createImage());
}
} else if (arg1 < metricsFinPos) {
@@ -76,7 +76,7 @@
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProviderLV.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProviderLV.java
index 2a56d83..76c7e93 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProviderLV.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableLabelProviderLV.java
@@ -80,7 +80,7 @@
case 6:
return (tmpItem.getDescription());
default:
- return ("");
+ return (""); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableSorterBase.java b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableSorterBase.java
index d95e892..0315fcb 100644
--- a/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableSorterBase.java
+++ b/plugins/org.eclipse.actf.visualization.ui.report/src/org/eclipse/actf/visualization/ui/report/table/ResultTableSorterBase.java
@@ -170,8 +170,8 @@
IProblemItem item2 = (IProblemItem) o2;
String id1 = item1.getId();
String id2 = item2.getId();
- String[] id1tokens = id1.split("_");
- String[] id2tokens = id2.split("_");
+ String[] id1tokens = id1.split("_"); //$NON-NLS-1$
+ String[] id2tokens = id2.split("_"); //$NON-NLS-1$
if (id1tokens.length < 2 || id2tokens.length < 2)
return super.resolve(item1.getId(), item2.getId());
else {