[245844] Refactoring visualization part
diff --git a/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
index 2cf384f..46705fc 100644
--- a/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.blind/META-INF/MANIFEST.MF
@@ -16,4 +16,3 @@
org.eclipse.actf.visualization.ui.report,
org.eclipse.actf.ui
Eclipse-LazyStart: true
-Export-Package: org.eclipse.actf.visualization.blind.ui.views
diff --git a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/PartControlBlind.java b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/PartControlBlind.java
index cc4cd88..af57d18 100644
--- a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/PartControlBlind.java
+++ b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/PartControlBlind.java
@@ -133,7 +133,8 @@
vizView.setStatusMessage(Messages
.getString("BlindView.Now_rendering"));
CreateReport cr = new CreateReport(checkResult, new File(
- BlindVizEnginePlugin.getTempDirectory(), BLIND_REPORT_FILE));
+ BlindVizEnginePlugin.getTempDirectory(),
+ BLIND_REPORT_FILE));
if (isShowResult) {
_blindBrowser.navigate(resultFilePath);
_shell.getDisplay().asyncExec(cr);
@@ -172,8 +173,8 @@
// TODO encoding
SaveReportBlind.saveReport((Document) resultDoc.cloneNode(true),
- mediator.getReport(vizView), sFileName,
- imageBriefDir, maxReachingTimeS, _pageEval, bAccessory);
+ mediator.getReport(vizView), sFileName, imageBriefDir,
+ maxReachingTimeS, _pageEval, bAccessory);
vizView.setStatusMessage(Messages
.getString("BlindView.end_saving_file")); // //$NON-NLS-1$
@@ -191,8 +192,8 @@
}
public void run() {
- _pageEval = PageEvaluation.createPageReport(_checkResult
- .getProblemList(), _pageData);
+ _pageEval = new PageEvaluation(_checkResult.getProblemList(),
+ _pageData);
VisualizeReportUtil.createReport(this.targetFile, _pageEval);
_shell.getDisplay().asyncExec(new Runnable() {
public void run() {
diff --git a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/SelectionListenerBlind.java b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/SelectionListenerBlind.java
index a5fc3de..a09fb7d 100644
--- a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/SelectionListenerBlind.java
+++ b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/internal/SelectionListenerBlind.java
@@ -37,6 +37,7 @@
this.prb = prb;
}
+ @SuppressWarnings("unchecked")
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
if (selection == null || !(selection instanceof IStructuredSelection)) {
System.err.println(this.getClass().getName() + ":" + "Iselection");
diff --git a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/views/BlindView.java b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/views/BlindView.java
index c07998d..0002624 100644
--- a/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/views/BlindView.java
+++ b/plugins/org.eclipse.actf.visualization.blind/src/org/eclipse/actf/visualization/blind/ui/views/BlindView.java
@@ -32,11 +32,8 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-
public class BlindView extends ViewPart implements IVisualizationView {
- public static final String ID = BlindView.class.getName();
-
private IBaseLabelProvider baseLabelProvider;
private ResultTableSorter viewerSorter;
@@ -79,7 +76,8 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID
+ + IVisualizationView.ID_BLINDVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setStatusMessage(statusMessage);
}
@@ -92,7 +90,8 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID
+ + IVisualizationView.ID_BLINDVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setInfoMessage(infoMessage);
}
@@ -118,7 +117,8 @@
private void setStatusLine() {
getViewSite().getActionBars().getStatusLineManager().add(
- new VisualizationStatusLineContributionItem(ID));
+ new VisualizationStatusLineContributionItem(
+ IVisualizationView.ID_BLINDVIEW));
}
public IBaseLabelProvider getLabelProvider() {
@@ -141,23 +141,23 @@
}
public void modelserviceChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ // do nothing
}
public void modelserviceInputChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ // do nothing
}
public void reportChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ // TODO implement report update here
}
public void reportGeneratorChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
-
+ // do nothing
+ }
+
+ public void setVisualizeMode(int mode) {
+ // do nothing
}
}
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/VisualizeEngine.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/VisualizeEngine.java
index 3720232..3fefab3 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/VisualizeEngine.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/VisualizeEngine.java
@@ -23,8 +23,8 @@
import org.eclipse.actf.util.html2view.Html2ViewMapData;
import org.eclipse.actf.visualization.engines.blind.html.eval.BlindProblem;
-import org.eclipse.actf.visualization.engines.blind.html.eval.ImgChecker;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.DocumentCleaner;
+import org.eclipse.actf.visualization.engines.blind.html.internal.util.ImgChecker;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.LinkAnalyzer;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.NodeInfoCreator;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizationNodeInfo;
@@ -33,8 +33,8 @@
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizeMapDataImpl;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizeMapUtil;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizeViewUtil;
-import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.VisualizeStyleInfo;
-import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.VisualizeStyleInfoManager;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.VisualizeStyleInfo;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.VisualizeStyleInfoManager;
import org.eclipse.actf.visualization.engines.blind.html.util.Id2LineViaAccId;
import org.eclipse.actf.visualization.engines.blind.util.ParamBlind;
import org.eclipse.actf.visualization.engines.blind.util.TextChecker;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/BlindProblem.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/BlindProblem.java
index 4a4b893..6bf0cae 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/BlindProblem.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/BlindProblem.java
@@ -208,7 +208,7 @@
*
* @return List
*/
- public List getNodeList() {
+ public List<Node> getNodeList() {
return nodeList;
}
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/ImgChecker.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/ImgChecker.java
similarity index 96%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/ImgChecker.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/ImgChecker.java
index ae4f5c2..7cb055a 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/eval/ImgChecker.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/ImgChecker.java
@@ -9,14 +9,14 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.eval;
+package org.eclipse.actf.visualization.engines.blind.html.internal.util;
import java.util.Map;
import java.util.Vector;
import org.eclipse.actf.visualization.engines.blind.html.IVisualizeMapData;
import org.eclipse.actf.visualization.engines.blind.html.VisualizeEngine;
-import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizationNodeInfo;
+import org.eclipse.actf.visualization.engines.blind.html.eval.BlindProblem;
import org.eclipse.actf.visualization.engines.blind.util.TextChecker;
import org.eclipse.actf.visualization.eval.problem.IProblemItem;
import org.w3c.dom.Document;
@@ -24,7 +24,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
public class ImgChecker {
// separated from visualizeEngine
@@ -37,7 +36,7 @@
// private Map idMap;
- private Map mapMap;
+ private Map<String, Element> mapMap;
private TextChecker textChecker;
@@ -58,7 +57,7 @@
* @param baseUrl
* @param checkItems
*/
- public ImgChecker(IVisualizeMapData mapData, Map mapMap,
+ public ImgChecker(IVisualizeMapData mapData, Map<String, Element> mapMap,
TextChecker textChecker, Vector<IProblemItem> problemV,
String baseUrl, boolean[] checkItems) {
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/VisualizationAttributeInfo.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/VisualizationAttributeInfo.java
index 697af8a..7187f10 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/VisualizationAttributeInfo.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/internal/util/VisualizationAttributeInfo.java
@@ -16,10 +16,10 @@
import java.util.Stack;
import org.eclipse.actf.visualization.engines.blind.html.IVisualizeMapData;
-import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.ElementInfoProviderExtension;
import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IElementViewerAccessKeyInfo;
import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IElementViewerIdInfo;
import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IElementViewerInfoProvider;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.ElementInfoProviderExtension;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerManager.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerManager.java
index 8646c45..c2d5509 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerManager.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerManager.java
@@ -11,6 +11,10 @@
package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.IViewerPanel;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.ViewerPanelJFace;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.VisualizeStyleInfo;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.VisualizeStyleInfoManager;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IVisualizeStyleInfoListener.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IVisualizeStyleInfoListener.java
index 3a95ea3..c280f9e 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IVisualizeStyleInfoListener.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IVisualizeStyleInfoListener.java
@@ -11,6 +11,8 @@
package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl.VisualizeStyleInfo;
+
public interface IVisualizeStyleInfoListener {
void update(VisualizeStyleInfo styleInfo);
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/CSSViewer.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/CSSViewer.java
similarity index 99%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/CSSViewer.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/CSSViewer.java
index aa3be45..c0230a7 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/CSSViewer.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/CSSViewer.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.Iterator;
import java.util.Set;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementInfoProviderExtension.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementInfoProviderExtension.java
similarity index 96%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementInfoProviderExtension.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementInfoProviderExtension.java
index 99d5a61..d55bca1 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementInfoProviderExtension.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementInfoProviderExtension.java
@@ -9,12 +9,13 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.actf.visualization.engines.blind.html.HtmlVizPlugin;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IElementViewerInfoProvider;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.Platform;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementLabelAndColorProvider.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementLabelAndColorProvider.java
similarity index 96%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementLabelAndColorProvider.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementLabelAndColorProvider.java
index d7913a6..4deaf2e 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementLabelAndColorProvider.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementLabelAndColorProvider.java
@@ -10,12 +10,13 @@
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.Enumeration;
import java.util.HashSet;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizationAttributeInfo;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IElementViewerInfoProvider;
import org.eclipse.jface.viewers.IColorProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerJFace.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementViewerJFace.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerJFace.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementViewerJFace.java
index 498265c..265f2db 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ElementViewerJFace.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ElementViewerJFace.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.ArrayList;
import java.util.Iterator;
@@ -20,6 +20,7 @@
import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
import org.eclipse.actf.model.ui.util.ModelServiceUtils;
import org.eclipse.actf.visualization.engines.blind.html.internal.util.VisualizationAttributeInfo;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IHighlightElementListener;
import org.eclipse.actf.visualization.eval.problem.HighlightTargetId;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IViewerPanel.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/IViewerPanel.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IViewerPanel.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/IViewerPanel.java
index 2174a9e..7b13c01 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/IViewerPanel.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/IViewerPanel.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import org.eclipse.actf.ui.util.IDialogConstants;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/PopupMenu.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/PopupMenu.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/PopupMenu.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/PopupMenu.java
index facd16b..eec5d4c 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/PopupMenu.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/PopupMenu.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ViewerPanelJFace.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ViewerPanelJFace.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ViewerPanelJFace.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ViewerPanelJFace.java
index c55de3b..431dbc6 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/ViewerPanelJFace.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/ViewerPanelJFace.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.List;
@@ -17,6 +17,7 @@
import org.eclipse.actf.model.ui.editor.browser.IWebBrowserACTF;
import org.eclipse.actf.model.ui.util.ModelServiceUtils;
import org.eclipse.actf.visualization.engines.blind.BlindVizEnginePlugin;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IHighlightElementListener;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfo.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfo.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfo.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfo.java
index 216ccc1..747c5c2 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfo.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfo.java
@@ -9,7 +9,7 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfoManager.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfoManager.java
similarity index 92%
rename from plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfoManager.java
rename to plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfoManager.java
index 8cece55..875988e 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/VisualizeStyleInfoManager.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/ui/elementViewer/impl/VisualizeStyleInfoManager.java
@@ -9,11 +9,13 @@
* Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer;
+package org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.impl;
import java.util.ArrayList;
import java.util.Iterator;
+import org.eclipse.actf.visualization.engines.blind.html.ui.elementViewer.IVisualizeStyleInfoListener;
+
public class VisualizeStyleInfoManager {
private static VisualizeStyleInfoManager INSTANCE;
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/Id2LineViaAccId.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/Id2LineViaAccId.java
index 54f16ca..31290d1 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/Id2LineViaAccId.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/Id2LineViaAccId.java
@@ -16,54 +16,54 @@
import org.eclipse.actf.util.html2view.Html2ViewMapData;
-
-
public class Id2LineViaAccId {
- private Map id2AccId;
+ private Map<Integer, Integer> id2AccId;
- private Vector html2ViewMapDataV;
+ private Vector<Html2ViewMapData> html2ViewMapDataV;
- //TODO
- private boolean is1base = true;
+ // TODO
+ private boolean is1base = true;
- public Id2LineViaAccId(Map id2AccId, Vector html2ViewMapDataV) {
- this(id2AccId, html2ViewMapDataV, true);
- }
+ public Id2LineViaAccId(Map<Integer, Integer> id2AccId,
+ Vector<Html2ViewMapData> html2ViewMapDataV) {
+ this(id2AccId, html2ViewMapDataV, true);
+ }
- public Id2LineViaAccId(Map id2AccId, Vector html2ViewMapDataV, boolean is1base) {
- this.id2AccId = id2AccId;
- this.html2ViewMapDataV = html2ViewMapDataV;
- this.is1base = is1base;
- }
+ public Id2LineViaAccId(Map<Integer, Integer> id2AccId,
+ Vector<Html2ViewMapData> html2ViewMapDataV, boolean is1base) {
+ this.id2AccId = id2AccId;
+ this.html2ViewMapDataV = html2ViewMapDataV;
+ this.is1base = is1base;
+ }
- public int getLine(int nodeId) {
- int result = -1;
- Integer id = new Integer(nodeId);
+ public int getLine(int nodeId) {
+ int result = -1;
+ Integer id = new Integer(nodeId);
- if (id2AccId.containsKey(id)) {
- int accId = ((Integer) id2AccId.get(id)).intValue();
- if (accId > -1 && accId < html2ViewMapDataV.size()) {
- Html2ViewMapData tmpData = (Html2ViewMapData) html2ViewMapDataV.get(accId);
- result = tmpData.getStartLine();//? +1 ?
- }
- }
+ if (id2AccId.containsKey(id)) {
+ int accId = id2AccId.get(id).intValue();
+ if (accId > -1 && accId < html2ViewMapDataV.size()) {
+ Html2ViewMapData tmpData = html2ViewMapDataV.get(accId);
+ result = tmpData.getStartLine();// ? +1 ?
+ }
+ }
- return (result);
- }
+ return (result);
+ }
- public Html2ViewMapData getViewMapData(int nodeId) {
- return (getViewMapData(new Integer(nodeId)));
- }
+ public Html2ViewMapData getViewMapData(int nodeId) {
+ return (getViewMapData(new Integer(nodeId)));
+ }
- public Html2ViewMapData getViewMapData(Integer nodeId) {
- Html2ViewMapData result = null;
- if (id2AccId.containsKey(nodeId)) {
- int accId = ((Integer) id2AccId.get(nodeId)).intValue();
- if (accId > -1 && accId < html2ViewMapDataV.size()) {
- result = (Html2ViewMapData) html2ViewMapDataV.get(accId);
- }
- }
- return (result);
- }
+ public Html2ViewMapData getViewMapData(Integer nodeId) {
+ Html2ViewMapData result = null;
+ if (id2AccId.containsKey(nodeId)) {
+ int accId = id2AccId.get(nodeId).intValue();
+ if (accId > -1 && accId < html2ViewMapDataV.size()) {
+ result = html2ViewMapDataV.get(accId);
+ }
+ }
+ return (result);
+ }
}
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/ODFVisualizeViewUtil.java b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/ODFVisualizeViewUtil.java
index cca8ba7..b579422 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/ODFVisualizeViewUtil.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind.html/src/org/eclipse/actf/visualization/engines/blind/html/util/ODFVisualizeViewUtil.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Tatsuya ISHIHARA - initial API and implementation
+ * Kentarou FUKUDA - initial API and implementation
*******************************************************************************/
package org.eclipse.actf.visualization.engines.blind.html.util;
@@ -24,7 +25,7 @@
import org.w3c.dom.NodeList;
public class ODFVisualizeViewUtil {
- public static void visualizeError(Document resultDoc, List problems) {
+ public static void visualizeError(Document resultDoc, List<IProblemItem> problems) {
final String NO_ALT_IMAGE = "10101";
int size = problems.size();
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/EvaluationResultBlind.java b/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/EvaluationResultBlind.java
index 57cfdae..258191c 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/EvaluationResultBlind.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/EvaluationResultBlind.java
@@ -38,9 +38,9 @@
super.setProblemList(problemList);
}
- private void stripProblem(Collection c){
+ private void stripProblem(Collection<IProblemItem> c){
GuidelineHolder holder = GuidelineHolder.getInstance();
- for (Iterator i = c.iterator(); i.hasNext();) {
+ for (Iterator<IProblemItem> i = c.iterator(); i.hasNext();) {
try {
IProblemItem tmpItem = (IProblemItem) i.next();
if (holder.isMatchedCheckItem(tmpItem.getEvaluationItem())) {
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/PageEvaluation.java b/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/PageEvaluation.java
index d32617a..09e7886 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/PageEvaluation.java
+++ b/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/eval/PageEvaluation.java
@@ -13,23 +13,20 @@
import java.io.File;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import org.eclipse.actf.visualization.IVisualizationConst;
import org.eclipse.actf.visualization.engines.blind.BlindVizEnginePlugin;
import org.eclipse.actf.visualization.engines.blind.internal.Messages;
-import org.eclipse.actf.visualization.engines.blind.util.RadarChartNonSVG;
import org.eclipse.actf.visualization.eval.guideline.GuidelineHolder;
import org.eclipse.actf.visualization.eval.html.statistics.PageData;
import org.eclipse.actf.visualization.eval.problem.IProblemItem;
-
+import org.eclipse.actf.visualization.util.RadarChart;
public class PageEvaluation {
- private GuidelineHolder guidelineHolder = GuidelineHolder
- .getInstance();
+ private GuidelineHolder guidelineHolder = GuidelineHolder.getInstance();
private PageData pageData;
@@ -39,9 +36,11 @@
private int[] scores = new int[metricsSize];
- public PageEvaluation(PageData pageData) {
+ public PageEvaluation(List<IProblemItem> problems, PageData pageData) {
this.pageData = pageData;
Arrays.fill(scores, 100);
+
+ createPageReport(problems, pageData);
}
public void addProblem(IProblemItem pti) {
@@ -104,8 +103,7 @@
private int getMinScore() {
int minValue = 100;
- boolean[] enabled = GuidelineHolder.getInstance()
- .getMatchedMetrics();
+ boolean[] enabled = GuidelineHolder.getInstance().getMatchedMetrics();
for (int i = 0; i < metricsSize; i++) {
if (enabled[i] && minValue > scores[i]) {
@@ -156,27 +154,18 @@
return (rating);
}
- // TODO move to constructor
- public static PageEvaluation createPageReport(List problems,
- PageData pageData) {
- PageEvaluation eval = new PageEvaluation(pageData);
- return createPageReport(problems, pageData, eval);
- }
-
- protected static PageEvaluation createPageReport(List problems,
- PageData pageData, PageEvaluation eval) {
- for (Iterator i = problems.iterator(); i.hasNext();) {
- eval.addProblem((IProblemItem) i.next());
+ private void createPageReport(List<IProblemItem> problems, PageData pageData) {
+ for (IProblemItem item : problems) {
+ this.addProblem(item);
}
- eval.setInvalidLinkRatio(pageData.getInvalidLinkRatio());
+ this.setInvalidLinkRatio(pageData.getInvalidLinkRatio());
- eval.checkMinus();
+ this.checkMinus();
- boolean[] enabled = GuidelineHolder.getInstance()
- .getMatchedMetrics();
- String[] metrics = eval.getMetrics();
- int[] scores = eval.getScores();
+ boolean[] enabled = GuidelineHolder.getInstance().getMatchedMetrics();
+ String[] metrics = this.getMetrics();
+ int[] scores = this.getScores();
Vector<String> metricsV = new Vector<String>();
Vector<Integer> scoresV = new Vector<Integer>();
@@ -196,7 +185,7 @@
}
try {
- RadarChartNonSVG chart = new RadarChartNonSVG(metrics, scores);
+ RadarChart chart = new RadarChart(metrics, scores);
// TODO use tmp file
chart.writeToPNG(new File(BlindVizEnginePlugin.getTempDirectory(),
@@ -205,7 +194,6 @@
// e.printStackTrace();
// TODO create empty png
}
- return (eval);
}
public String[] getMetrics() {
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
index 17ac2cc..e9fb3eb 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/META-INF/MANIFEST.MF
@@ -11,9 +11,7 @@
org.eclipse.actf.visualization.eval,
org.eclipse.actf.model.ui
Export-Package: org.eclipse.actf.visualization.engines.lowvision,
- org.eclipse.actf.visualization.engines.lowvision.color,
org.eclipse.actf.visualization.engines.lowvision.image,
- org.eclipse.actf.visualization.engines.lowvision.io,
- org.eclipse.actf.visualization.engines.lowvision.operator
+ org.eclipse.actf.visualization.engines.lowvision.io
Bundle-Activator: org.eclipse.actf.visualization.engines.lowvision.LowVisionPlugin
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/IoUtil.java b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/internal/io/IoUtil.java
similarity index 95%
rename from plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/IoUtil.java
rename to plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/internal/io/IoUtil.java
index 4b2ce19..4a6118f 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/IoUtil.java
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/internal/io/IoUtil.java
@@ -9,7 +9,7 @@
* Junji MAEDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.lowvision.io;
+package org.eclipse.actf.visualization.engines.lowvision.internal.io;
public class IoUtil {
public static final short TYPE_UNKNOWN = 0;
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader.java b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader.java
index 3073ef7..fe72a50 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader.java
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader.java
@@ -18,6 +18,7 @@
import org.eclipse.actf.visualization.engines.lowvision.image.Int2D;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.BMPReader;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.ImageFileReader;
+import org.eclipse.actf.visualization.engines.lowvision.internal.io.IoUtil;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.JPEGReader;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.PBMReader;
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader14.java b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader14.java
index de97b87..e080f0d 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader14.java
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageReader14.java
@@ -21,6 +21,7 @@
import org.eclipse.actf.visualization.engines.lowvision.image.ImageUtil;
import org.eclipse.actf.visualization.engines.lowvision.image.Int2D;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.BMPReader;
+import org.eclipse.actf.visualization.engines.lowvision.internal.io.IoUtil;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.PBMReader;
public class ImageReader14 {
diff --git a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageWriter.java b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageWriter.java
index bc535e7..ae4666e 100644
--- a/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageWriter.java
+++ b/plugins/org.eclipse.actf.visualization.engines.lowvision/src/org/eclipse/actf/visualization/engines/lowvision/io/ImageWriter.java
@@ -20,6 +20,7 @@
import org.eclipse.actf.visualization.engines.lowvision.image.ImageUtil;
import org.eclipse.actf.visualization.engines.lowvision.image.Int2D;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.BMPWriter;
+import org.eclipse.actf.visualization.engines.lowvision.internal.io.IoUtil;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.JPEGWriter;
import org.eclipse.actf.visualization.engines.lowvision.internal.io.PBMWriter;
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 0b14f3e..ec363a2 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
@@ -65,13 +65,13 @@
}
}
- public HighlightTargetId[] getHighlightTargetIds(Map node2Id) {
+ public HighlightTargetId[] getHighlightTargetIds(Map<Node, Integer> node2Id) {
HighlightTargetId[] result = new HighlightTargetId[0];
switch (mode) {
case SINGLE:
if (node2Id != null && node2Id.containsKey(targetNode)) {
try {
- int nodeId = ((Integer) node2Id.get(targetNode)).intValue();
+ int nodeId = node2Id.get(targetNode).intValue();
result = new HighlightTargetId[1];
result[0] = new HighlightTargetId(nodeId, nodeId);
} catch (Exception e) {
@@ -85,12 +85,12 @@
int start = 0;
int end = 0;
try {
- start = ((Integer) node2Id.get(startTarget)).intValue();
+ start = node2Id.get(startTarget).intValue();
state += 1;
} catch (Exception e) {
}
try {
- end = ((Integer) node2Id.get(endTarget)).intValue();
+ end = node2Id.get(endTarget).intValue();
state += 2;
} catch (Exception e) {
}
@@ -119,7 +119,7 @@
for (int i = 0; i < targets.length; i++) {
if (node2Id != null && node2Id.containsKey(targets[i])) {
try {
- int nodeId = ((Integer) node2Id.get(targets[i])).intValue();
+ int nodeId = node2Id.get(targets[i]).intValue();
tmpV.add(new HighlightTargetId(nodeId, nodeId));
} catch (Exception e) {
}
@@ -134,7 +134,7 @@
return result;
}
- public HighlightTargetSourceInfo[] getHighlightTargetSourceInfo(Vector html2ViewMapDataV){
+ public HighlightTargetSourceInfo[] getHighlightTargetSourceInfo(Vector<Html2ViewMapData> html2ViewMapDataV){
HighlightTargetSourceInfo[] result = new HighlightTargetSourceInfo[0];
switch (mode) {
case SINGLE:
@@ -172,14 +172,14 @@
return result;
}
- private Html2ViewMapData getViewMapData(Node targetN, Vector html2ViewMapDataV) {
+ private Html2ViewMapData getViewMapData(Node targetN, Vector<Html2ViewMapData> html2ViewMapDataV) {
if (targetN != null && html2ViewMapDataV != null) {
try {
String targetId = ((Element) targetN).getAttribute(Html2ViewMapData.ACTF_ID);
if (!targetId.equals("")) {
int target = Integer.parseInt(targetId);
if (target > -1 && target < html2ViewMapDataV.size()) {
- Html2ViewMapData h2vmd = (Html2ViewMapData) html2ViewMapDataV.get(target);
+ Html2ViewMapData h2vmd = html2ViewMapDataV.get(target);
return h2vmd;
}
} else {
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
index 9efcbad..66447d1 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.lowvision/META-INF/MANIFEST.MF
@@ -15,5 +15,3 @@
org.eclipse.actf.model.dom.html,
org.eclipse.actf.ui
Eclipse-LazyStart: true
-Export-Package: org.eclipse.actf.visualization.lowvision.ui.preferences,
- org.eclipse.actf.visualization.lowvision.ui.views
diff --git a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
index 9239b8e..34ef6ff 100644
--- a/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
+++ b/plugins/org.eclipse.actf.visualization.lowvision/src/org/eclipse/actf/visualization/lowvision/ui/views/LowVisionView.java
@@ -28,8 +28,6 @@
public class LowVisionView extends ViewPart implements IVisualizationView {
- public static final String ID = LowVisionView.class.getName();
-
private PartControlLowVision partRightLowVision;
private IBaseLabelProvider baseLabelProvider = new ResultTableLabelProviderLV();
@@ -68,7 +66,8 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID
+ + IVisualizationView.ID_LOWVISIONVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setStatusMessage(statusMessage);
}
@@ -81,7 +80,8 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID
+ + IVisualizationView.ID_LOWVISIONVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setInfoMessage(infoMessage);
}
@@ -90,7 +90,8 @@
private void setStatusLine() {
getViewSite().getActionBars().getStatusLineManager().add(
- new VisualizationStatusLineContributionItem(ID));
+ new VisualizationStatusLineContributionItem(
+ IVisualizationView.ID_LOWVISIONVIEW));
}
public IBaseLabelProvider getLabelProvider() {
@@ -123,13 +124,16 @@
}
public void reportChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
+ // TODO implement report update here
}
public void reportGeneratorChanged(MediatorEvent event) {
- // TODO Auto-generated method stub
+ //do nothing
+ }
+ public void setVisualizeMode(int mode) {
+ // do nothing
}
}
diff --git a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
index 91234e1..d804821 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Eclipse ACTF Presentation Visualization Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.actf.visualization.presentation;singleton:=true
Bundle-Version: 0.0.1.qualifier
-Bundle-Activator: org.eclipse.actf.visualization.presentation.RoomPlugin
+Bundle-Activator: org.eclipse.actf.visualization.presentation.internal.RoomPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
@@ -14,4 +14,4 @@
org.eclipse.actf.visualization.ui.report
Eclipse-LazyStart: true
Bundle-ClassPath: runtimes/simulator_room.jar
-Export-Package: org.eclipse.actf.visualization.presentation.ui.views
+Export-Package: org.eclipse.actf.visualization.presentation
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/IPresentationVisualizationModes.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/IPresentationVisualizationModes.java
new file mode 100644
index 0000000..cd7b2a9
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/IPresentationVisualizationModes.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and Others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Kentarou FUKUDA - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.actf.visualization.presentation;
+
+import org.eclipse.actf.visualization.presentation.util.ParamRoom;
+
+public interface IPresentationVisualizationModes {
+
+ /**
+ * The mode id to simulate a presentation in a small room.
+ */
+ public static final int SMALL_ROOM = ParamRoom.ROOM_SMALL;
+ /**
+ * The mode id to simulate a presentation in a large room.
+ */
+ public static final int LARGE_ROOM = ParamRoom.ROOM_MIDDLE;
+ /**
+ * The mode id to simulate a presentation in an auditorium.
+ */
+ public static final int AUDITORIUM = ParamRoom.ROOM_LARGE;
+
+}
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/RoomPlugin.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/internal/RoomPlugin.java
similarity index 98%
rename from plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/RoomPlugin.java
rename to plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/internal/RoomPlugin.java
index eb2ea1b..b44a768 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/RoomPlugin.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/internal/RoomPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* Daisuke SATO - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.presentation;
+package org.eclipse.actf.visualization.presentation.internal;
import java.io.File;
import java.io.IOException;
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
index 371257e..3f53f07 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.actf.visualization.presentation.ui.actions;
-import org.eclipse.actf.visualization.presentation.RoomPlugin;
+import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
import org.eclipse.jface.action.Action;
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
index ec1ce8d..5648456 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.actf.visualization.presentation.ui.actions;
-import org.eclipse.actf.visualization.presentation.RoomPlugin;
+import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
import org.eclipse.jface.action.Action;
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
index 0b7d5f1..e2125c0 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
@@ -11,7 +11,7 @@
package org.eclipse.actf.visualization.presentation.ui.actions;
-import org.eclipse.actf.visualization.presentation.RoomPlugin;
+import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
import org.eclipse.jface.action.Action;
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/internal/PartControlRoom.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/internal/PartControlRoom.java
index 8af8096..218d2d7 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/internal/PartControlRoom.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/internal/PartControlRoom.java
@@ -21,8 +21,8 @@
import org.eclipse.actf.visualization.IVisualizationConst;
import org.eclipse.actf.visualization.engines.lowvision.image.PageImage;
import org.eclipse.actf.visualization.engines.lowvision.io.ImageDumpUtil;
-import org.eclipse.actf.visualization.presentation.RoomPlugin;
import org.eclipse.actf.visualization.presentation.eval.CheckResultPresentation;
+import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
import org.eclipse.actf.visualization.presentation.util.SimulateRoom;
import org.eclipse.actf.visualization.ui.IPositionSize;
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/views/RoomView.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/views/RoomView.java
index 64246b5..edba809 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/views/RoomView.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/views/RoomView.java
@@ -12,8 +12,8 @@
package org.eclipse.actf.visualization.presentation.ui.views;
import org.eclipse.actf.mediator.MediatorEvent;
+import org.eclipse.actf.visualization.presentation.IPresentationVisualizationModes;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
-import org.eclipse.actf.visualization.presentation.util.ParamRoom;
import org.eclipse.actf.visualization.ui.IVisualizationView;
import org.eclipse.actf.visualization.ui.VisualizationStatusLineContributionItem;
import org.eclipse.actf.visualization.ui.report.table.ResultTableLabelProviderLV;
@@ -28,14 +28,6 @@
public class RoomView extends ViewPart implements IVisualizationView {
- public static final String ID = RoomView.class.getName();
-
- public static final int ROOM_SMALL = ParamRoom.ROOM_SMALL;
-
- public static final int ROOM_LARGE = ParamRoom.ROOM_MIDDLE;
-
- public static final int ROOM_AUDITORIUM = ParamRoom.ROOM_LARGE;
-
private IBaseLabelProvider baseLabelProvider = new ResultTableLabelProviderLV();
private ViewerSorter viewerSorter = new ResultTableSorterLV();
@@ -64,7 +56,7 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID + IVisualizationView.ID_PRESENTATIONVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setStatusMessage(statusMessage);
}
@@ -77,7 +69,7 @@
for (int i = 0; i < items.length; i++) {
if (null != items[i]
&& items[i].getId().equals(
- VisualizationStatusLineContributionItem.ID + ID)) {
+ VisualizationStatusLineContributionItem.ID + IVisualizationView.ID_PRESENTATIONVIEW)) {
((VisualizationStatusLineContributionItem) items[i])
.setInfoMessage(infoMessage);
}
@@ -86,7 +78,7 @@
private void setStatusLine() {
getViewSite().getActionBars().getStatusLineManager().add(
- new VisualizationStatusLineContributionItem(ID));
+ new VisualizationStatusLineContributionItem(IVisualizationView.ID_PRESENTATIONVIEW));
}
public IBaseLabelProvider getLabelProvider() {
@@ -106,7 +98,7 @@
}
public void setVisualizeMode(int mode) {
- if (mode == ROOM_AUDITORIUM || mode == ROOM_LARGE || mode == ROOM_SMALL) {
+ if (mode == IPresentationVisualizationModes.AUDITORIUM || mode == IPresentationVisualizationModes.LARGE_ROOM || mode == IPresentationVisualizationModes.SMALL_ROOM) {
partRightRoom.getParamLowVision().setType(mode);
}
}
diff --git a/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/IVisualizationConst.java b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/IVisualizationConst.java
index 58eb0d6..1614f8d 100644
--- a/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/IVisualizationConst.java
+++ b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/IVisualizationConst.java
@@ -11,19 +11,18 @@
package org.eclipse.actf.visualization;
-
public interface IVisualizationConst {
- String PREFIX_RUNTIME_HTML = "runtime";
- String PREFIX_SOURCE_HTML = "source";
- String PREFIX_RESULT = "result";
- String SUFFIX_HTML = ".html";
- String SUFFIX_BMP = ".bmp";
- String PREFIX_SCREENSHOT = "screenshot";
- String PREFIX_MERGED_IMAGE = "merged_screenshot";
- String PREFIX_REPORT = "report";
- String PREFIX_VISUALIZATION = "visualization";
+ String PREFIX_RUNTIME_HTML = "runtime";
+ String PREFIX_SOURCE_HTML = "source";
+ String PREFIX_RESULT = "result";
+ String SUFFIX_HTML = ".html";
+ String SUFFIX_BMP = ".bmp";
+ String PREFIX_SCREENSHOT = "screenshot";
+ String PREFIX_MERGED_IMAGE = "merged_screenshot";
+ String PREFIX_REPORT = "report";
+ String PREFIX_VISUALIZATION = "visualization";
- public static final String DEFAULT_ENCODING = "MS932";
+ public static final String DEFAULT_ENCODING = "MS932";
public static final String RATING_V_GOOD = "VeryGood.png";
public static final String RATING_GOOD = "Good.png";
diff --git a/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/ui/IVisualizationView.java b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/ui/IVisualizationView.java
index 570ef8c..9d1e9d0 100644
--- a/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/ui/IVisualizationView.java
+++ b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/ui/IVisualizationView.java
@@ -15,17 +15,27 @@
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ViewerSorter;
-public interface IVisualizationView extends IACTFReportGenerator{
- public static final int MODE_DEFAULT = 0;
- public static final int MODE_LOWVISION = 1;
-
- IBaseLabelProvider getLabelProvider();
- ViewerSorter getTableSorter();
-
- public void setStatusMessage(String statusMessage);
- public void setInfoMessage(String infoMessage);
-
- int getResultTableMode();
- void doVisualize();
-
+public interface IVisualizationView extends IACTFReportGenerator {
+ public static final String ID_BLINDVIEW = "org.eclipse.actf.visualization.blind.ui.views.BlindView";
+ public static final String ID_LOWVISIONVIEW = "org.eclipse.actf.visualization.lowvision.ui.views.LowVisionView";
+ public static final String ID_PRESENTATIONVIEW = "org.eclipse.actf.visualization.presentation.ui.views.RoomView";
+
+ public static final int MODE_DEFAULT = 0;
+ public static final int MODE_LOWVISION = 1;
+
+
+ IBaseLabelProvider getLabelProvider();
+
+ ViewerSorter getTableSorter();
+
+ public void setStatusMessage(String statusMessage);
+
+ public void setInfoMessage(String infoMessage);
+
+ public void setVisualizeMode(int mode);
+
+ int getResultTableMode();
+
+ void doVisualize();
+
}
diff --git a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/util/RadarChartNonSVG.java b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/util/RadarChart.java
similarity index 97%
rename from plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/util/RadarChartNonSVG.java
rename to plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/util/RadarChart.java
index 59ae931..9d380a7 100644
--- a/plugins/org.eclipse.actf.visualization.engines.blind/src/org/eclipse/actf/visualization/engines/blind/util/RadarChartNonSVG.java
+++ b/plugins/org.eclipse.actf.visualization/src/org/eclipse/actf/visualization/util/RadarChart.java
@@ -8,7 +8,7 @@
* Contributors:
* Junji MAEDA - initial API and implementation
*******************************************************************************/
-package org.eclipse.actf.visualization.engines.blind.util;
+package org.eclipse.actf.visualization.util;
import java.awt.Color;
import java.awt.Font;
@@ -28,7 +28,7 @@
import javax.imageio.ImageIO;
-public class RadarChartNonSVG {
+public class RadarChart {
//TODO move to common util
@@ -90,7 +90,7 @@
private boolean smoothing = true; // hidden selection
- public RadarChartNonSVG(String[] _names, int[] _values) throws Exception {
+ public RadarChart(String[] _names, int[] _values) throws Exception {
names = _names;
values = _values;
numItems = values.length;
