[245847] reduce warnings
diff --git a/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
index b05979e..8161bcb 100644
--- a/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.gui/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@
org.eclipse.actf.ui,
org.eclipse.actf.visualization,
com.ibm.icu
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.gui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
index 84fd69f..6e85ecd 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/AccessibleObjectFactory.java
@@ -82,7 +82,7 @@
if (id.equals(currentFactoryId)) {
return false;
}
- AccessibleFactoryEntry entry = (AccessibleFactoryEntry) factoryEntries
+ AccessibleFactoryEntry entry = factoryEntries
.get(id);
if (null != entry) {
currentFactoryId = id;
@@ -93,11 +93,11 @@
}
public static AccessibleFactoryEntry getFactoryEntry(String id) {
- return (AccessibleFactoryEntry) factoryEntries.get(id);
+ return factoryEntries.get(id);
}
public static String[] getFactoryIds() {
- return (String[]) factoryEntries.keySet().toArray(
+ return factoryEntries.keySet().toArray(
new String[factoryEntries.size()]);
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventMonitor.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventMonitor.java
index e593b68..c1ba27b 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventMonitor.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/event/IAccessibleEventMonitor.java
@@ -14,7 +14,7 @@
public interface IAccessibleEventMonitor {
- public void installEventHook(IAccessibleEventListener listener, Set filter);
+ public void installEventHook(IAccessibleEventListener listener, Set<Integer> filter);
public void removeEventHook();
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
index 5180060..b4e2b3c 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/accservice/swtbridge/internal/InternalEventMonitor.java
@@ -24,12 +24,12 @@
private Callback callback = null;
private int hWinEventHook = 0;
private IAccessibleEventListener listener = null;
- private Set filter;
+ private Set<Integer> filter;
/* (non-Javadoc)
* @see org.eclipse.actf.accservice.swtbridge.IAccessibleEventMonitor#installEventHook(org.eclipse.actf.accservice.swtbridge.IAccessibleEventListener, int[])
*/
- public void installEventHook(IAccessibleEventListener listener, Set filter) {
+ public void installEventHook(IAccessibleEventListener listener, Set<Integer> filter) {
removeEventHook();
this.listener = listener;
this.filter = filter;
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/GuiTargetWindowData.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/GuiTargetWindowData.java
index c15cb0c..869ebc5 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/GuiTargetWindowData.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/GuiTargetWindowData.java
@@ -29,8 +29,8 @@
*/
public class GuiTargetWindowData implements IModelService {
- private static final String categoryBrowser = Messages.msaa_external_browsers; //$NON-NLS-1$
- private static final String categoryWindow = Messages.msaa_external_windows; //$NON-NLS-1$
+ private static final String categoryBrowser = Messages.msaa_external_browsers;
+ private static final String categoryWindow = Messages.msaa_external_windows;
private int hwnd;
private boolean isBrowser;
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/IGuiViewIDs.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/IGuiViewIDs.java
index f8673c3..34d0428 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/IGuiViewIDs.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/IGuiViewIDs.java
@@ -25,7 +25,7 @@
/**
* ID of Flash DOM view
*/
- public static final String ID_FLASHDOMVIEW = "org.eclipse.actf.visualization.flash.ui.views.FlashDOMView";
+ public static final String ID_FLASHDOMVIEW = "org.eclipse.actf.visualization.flash.ui.views.FlashDOMView"; //$NON-NLS-1$
/**
* ID of GUI Summary view
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiPlugin.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiPlugin.java
index 47b1618..c09aec5 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiPlugin.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiPlugin.java
@@ -19,7 +19,7 @@
*/
public class GuiPlugin extends AbstractUIPlugin {
- public static final String PLUGIN_ID = "org.eclipse.actf.visualization.gui";
+ public static final String PLUGIN_ID = "org.eclipse.actf.visualization.gui"; //$NON-NLS-1$
//The shared instance.
private static GuiPlugin plugin;
@@ -61,6 +61,6 @@
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); //$NON-NLS-1$
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
index 952ccfd..21532e2 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/GuiTargetWindowDataProvider.java
@@ -39,7 +39,7 @@
}
hwnd = WindowUtil.GetNextWindow (hwnd);
}
- return (IModelService[])dsList.toArray(new IModelService[dsList.size()]);
+ return dsList.toArray(new IModelService[dsList.size()]);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/GuiImages.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/GuiImages.java
index 6061235..4d5c825 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/GuiImages.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/GuiImages.java
@@ -45,7 +45,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 ) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
index 2e4055b..e8af01c 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/ScreenReaderRenderer.java
@@ -32,6 +32,7 @@
import com.ibm.icu.text.MessageFormat;
public class ScreenReaderRenderer {
+ private static final String SPACE = " "; //$NON-NLS-1$
private int lastHwnd = 0;
private String lastText = ""; //$NON-NLS-1$
private StyledText text;
@@ -161,13 +162,13 @@
.getWindow()) {
appendText(
Messages.msaa_flash_start
- + "\n", SWT.COLOR_GRAY, SWT.COLOR_CYAN, false); //$NON-NLS-1$ //$NON-NLS-2$
+ + "\n", SWT.COLOR_GRAY, SWT.COLOR_CYAN, false); //$NON-NLS-1$
sayFlashEnd[0] = true;
}
} else {
appendText(
Messages.msaa_flash_inaccessible
- + " wmode=" + wmode + "\n", SWT.COLOR_GRAY, SWT.COLOR_RED, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + " wmode=" + wmode + "\n", SWT.COLOR_GRAY, SWT.COLOR_RED, false); //$NON-NLS-1$ //$NON-NLS-2$
if (null != flashDOMView) {
flashDOMView
.addWindowlessElement(accObject);
@@ -187,7 +188,7 @@
display.syncExec(new Runnable() {
public void run() {
if (!(cancel || text.isDisposed())) {
- appendText(Messages.msaa_flash_end + "\n",
+ appendText(Messages.msaa_flash_end + "\n", //$NON-NLS-1$
SWT.COLOR_GRAY, SWT.COLOR_CYAN,
false);
}
@@ -230,7 +231,7 @@
: Messages.msaa_edit_readonly;
outText = accObject.getAccValue();
if (null == outText || 0 == outText.length()) {
- outText = " "; //$NON-NLS-1$
+ outText = SPACE;
}
break;
}
@@ -254,12 +255,12 @@
prefix = Messages.msaa_link;
break;
case MSAA.ROLE_SYSTEM_CHECKBUTTON:
- prefix = Messages.msaa_checkbox + " ";
+ prefix = Messages.msaa_checkbox + SPACE;
prefix += 0 != (accState & MSAA.STATE_CHECKED) ? Messages.msaa_checked
: Messages.msaa_not_checked;
break;
case MSAA.ROLE_SYSTEM_RADIOBUTTON:
- prefix = Messages.msaa_radiobutton + " ";
+ prefix = Messages.msaa_radiobutton + SPACE;
prefix += 0 != (accState & MSAA.STATE_CHECKED) ? Messages.msaa_checked
: Messages.msaa_not_checked;
break;
@@ -291,7 +292,7 @@
outText = Integer.toString(parentIndex);
foreground = SWT.COLOR_RED;
} else {
- outText = " "; //$NON-NLS-1$
+ outText = SPACE;
}
}
break;
@@ -302,7 +303,7 @@
case MSAA.ROLE_SYSTEM_LIST:
postfix = Messages.msaa_listbox;
if (0 != (accState & MSAA.STATE_SELECTED)) {
- postfix += " " + Messages.msaa_selected;
+ postfix += SPACE + Messages.msaa_selected;
}
break;
case MSAA.ROLE_SYSTEM_COMBOBOX:
@@ -330,7 +331,7 @@
case MSAA.ROLE_SYSTEM_OUTLINEITEM:
postfix = Messages.msaa_treeview;
if (0 != (accState & MSAA.STATE_SELECTED)) {
- postfix += " " + Messages.msaa_selected;
+ postfix += SPACE + Messages.msaa_selected;
} else if (isFlash) {
outText = ""; // Ignore in flash //$NON-NLS-1$
}
@@ -402,7 +403,7 @@
}
if (null != style) {
postfix = MessageFormat.format(Messages.ia2_style_shape,
- new Object[] { style }); //$NON-NLS-1$
+ new Object[] { style });
} else {
postfix += Messages.ia2_shape;
}
@@ -435,7 +436,7 @@
} catch (Exception e) {
}
prefix = MessageFormat.format(Messages.ia2_heading_level,
- new Object[] { level }); //$NON-NLS-1$
+ new Object[] { level });
case IA2.IA2_ROLE_PARAGRAPH:
outText = accObject.getAccValue();
if (null == outText || 0 == outText.length()) {
@@ -449,12 +450,12 @@
String speakText = ""; //$NON-NLS-1$
Point point = new Point(text.getCharCount(), 0);
if (null != outText && outText.length() > 0) {
- if (" ".equals(outText)) { //$NON-NLS-1$
+ if (SPACE.equals(outText)) {
outText = ""; //$NON-NLS-1$
}
if (prefix.length() > 0) {
if (outText.length() > 0) {
- prefix += " "; //$NON-NLS-1$
+ prefix += SPACE;
}
appendText(prefix, SWT.COLOR_GRAY, background, false);
speakText += prefix;
@@ -465,7 +466,7 @@
}
if (postfix.length() > 0) {
if (speakText.length() > 0) {
- postfix = " " + postfix; //$NON-NLS-1$
+ postfix = SPACE + postfix;
}
appendText(postfix, SWT.COLOR_GRAY, background, false);
speakText += postfix;
@@ -497,7 +498,7 @@
break;
}
if (eventText.length() > 0) {
- appendText(eventText, SWT.COLOR_GRAY, -1, false); //$NON-NLS-1$
+ appendText(eventText, SWT.COLOR_GRAY, -1, false);
text.append("\n"); //$NON-NLS-1$
lastText = eventText;
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TTSMonitor.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TTSMonitor.java
index ad5006a..9a9de10 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TTSMonitor.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TTSMonitor.java
@@ -96,8 +96,8 @@
return RegistryUtil
.getRegistryInt(
RegistryUtil.HKEY_LOCAL_MACHINE,
- "SOFTWARE\\Microsoft\\Speech\\Voices\\Tokens\\AcTFTTS\\Settings",
- "MonitorPort");
+ "SOFTWARE\\Microsoft\\Speech\\Voices\\Tokens\\AcTFTTS\\Settings", //$NON-NLS-1$
+ "MonitorPort"); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindowDataCollector.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindowDataCollector.java
index c111035..763c8cc 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindowDataCollector.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TargetWindowDataCollector.java
@@ -100,7 +100,7 @@
if( null != comparator ) {
Collections.sort(resultList, comparator);
}
- return (String[])resultList.toArray(new String[resultList.size()]);
+ return resultList.toArray(new String[resultList.size()]);
}
public Object[] getElements(String category) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TextMap.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TextMap.java
index 6bf88f2..5abe367 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TextMap.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/internal/util/TextMap.java
@@ -18,28 +18,29 @@
public class TextMap extends LinkedHashMap<AccessibleObject, Point> {
- private static final long serialVersionUID = -8640673640566349712L;
+ private static final long serialVersionUID = -8640673640566349712L;
- public void clear() {
+ public void clear() {
super.clear();
}
public Point put(AccessibleObject accObject, Point point) {
- return super.put(accObject,point);
+ return super.put(accObject, point);
}
public Point getPoint(AccessibleObject accObject) {
return get(accObject);
}
-
+
public AccessibleObject getAccessibleObject(Point point) {
AccessibleObject retObject = null;
- for( Iterator it = keySet().iterator(); it.hasNext(); ) {
- AccessibleObject accObject = (AccessibleObject)it.next();
+ for (Iterator<AccessibleObject> it = keySet().iterator(); it.hasNext();) {
+ AccessibleObject accObject = it.next();
Point accPoint = getPoint(accObject);
- if( accPoint.x <= point.x && point.x < accPoint.y ) {
+ if (accPoint.x <= point.x && point.x < accPoint.y) {
retObject = accObject;
- if( accPoint.x != accPoint.y ) break;
+ if (accPoint.x != accPoint.y)
+ break;
}
}
return retObject;
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
index b7c737b..d3a4e09 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/checker/MSAAProblemChecker.java
@@ -138,7 +138,7 @@
.getChildren(ao),isFlash)));
}
}
- return (MSAAProblem[]) problems
+ return problems
.toArray(new MSAAProblem[problems.size()]);
}
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AbstractPropertyInvokeSource.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AbstractPropertyInvokeSource.java
index 2f91337..f0e0911 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AbstractPropertyInvokeSource.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AbstractPropertyInvokeSource.java
@@ -23,7 +23,7 @@
public abstract class AbstractPropertyInvokeSource implements IPropertyInvoke {
- private Map methodMap = new HashMap();
+ private Map<Object, MethodData> methodMap = new HashMap<Object, MethodData>();
protected void addMethodData(Object id, MethodData methodData) {
methodMap.put(id, methodData);
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AccessibleObjectPropertySource.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AccessibleObjectPropertySource.java
index d55414d..4f34e57 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AccessibleObjectPropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AccessibleObjectPropertySource.java
@@ -143,7 +143,7 @@
}
public IPropertyDescriptor[] getPropertyDescriptors() {
- return (IPropertyDescriptor[])descriptors.toArray(new IPropertyDescriptor[descriptors.size()]);
+ return descriptors.toArray(new IPropertyDescriptor[descriptors.size()]);
}
public Object getPropertyValue(Object id) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AttributePropertySource.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AttributePropertySource.java
index d0f07b1..87f1b17 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AttributePropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/AttributePropertySource.java
@@ -23,7 +23,7 @@
public class AttributePropertySource implements IPropertySource {
- private Map attrMap = new LinkedHashMap();
+ private Map<Object, Object> attrMap = new LinkedHashMap<Object, Object>();
private String attributes;
private String editableText;
@@ -61,7 +61,7 @@
public IPropertyDescriptor[] getPropertyDescriptors() {
List<PropertyDescriptor> descriptors = new ArrayList<PropertyDescriptor>();
- for( Iterator it = attrMap.keySet().iterator(); it.hasNext(); ) {
+ for( Iterator<Object> it = attrMap.keySet().iterator(); it.hasNext(); ) {
Object name = it.next();
descriptors.add(new PropertyDescriptor(name,(String)name));
}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/ObjectArrayPropertySource.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/ObjectArrayPropertySource.java
index 86bb22d..e05257e 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/ObjectArrayPropertySource.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/msaa/properties/ObjectArrayPropertySource.java
@@ -91,7 +91,7 @@
else {
strRet += "; "; //$NON-NLS-1$
}
- strRet += /*"#"+i+": "+*/objArray[i]; //$NON-NLS-1$ //$NON-NLS-2$
+ strRet += /*"#"+i+": "+*/objArray[i];
}
}
return strRet;
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
index 5524398..563be41 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/actions/WindowListAction.java
@@ -195,8 +195,8 @@
return topMost;
}
- private static final String CATEGORY_BROWSER = Messages.msaa_external_browsers; //$NON-NLS-1$
- private static final String CATEGORY_WINDOW = Messages.msaa_external_windows; //$NON-NLS-1$
+ private static final String CATEGORY_BROWSER = Messages.msaa_external_browsers;
+ private static final String CATEGORY_WINDOW = Messages.msaa_external_windows;
private class CategoryComparator implements Comparator<Object> {
private Collator collator = Collator.getInstance();
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
index b00b409..2f67ac6 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAEventView.java
@@ -399,15 +399,15 @@
if (showRawEvent/* Action.isChecked() */) {
text
.append("event=" + MSAA.getEventTypeText(event) + ", " + //$NON-NLS-1$ //$NON-NLS-2$
- "accName="
+ "accName=" //$NON-NLS-1$
+ accObject.getAccName()
- + ", " + //$NON-NLS-1$ //$NON-NLS-2$
- "accRole="
+ + ", " + //$NON-NLS-1$
+ "accRole=" //$NON-NLS-1$
+ accObject.getRoleText()
- + ", " + //$NON-NLS-1$ //$NON-NLS-2$
- "accState="
+ + ", " + //$NON-NLS-1$
+ "accState=" //$NON-NLS-1$
+ MSAA.getStateText(accState)
- + "(0x" + Integer.toHexString(accState) + ")\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + "(0x" + Integer.toHexString(accState) + ")\n"); //$NON-NLS-1$ //$NON-NLS-2$
}
String str = null;
boolean doRender = true;
@@ -509,7 +509,7 @@
public boolean getFilterEnabled(int event) {
Integer key = new Integer(event);
- Boolean enabled = (Boolean) filters.get(key);
+ Boolean enabled = filters.get(key);
if (null == enabled) {
enabled = Boolean.FALSE;
filters.put(key, enabled);
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAListView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAListView.java
index 9e5256b..f99aa67 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAListView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAListView.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.actf.visualization.gui.ui.views;
-
import java.util.List;
import java.util.Vector;
@@ -58,27 +57,26 @@
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.part.ViewPart;
-
-
-
public class MSAAListView extends ViewPart implements IMSAAListView {
- private static final String[] HEADINGS = { "#", Messages.msaa_name, Messages.msaa_role, Messages.msaa_state, "X", "Y", "W", "H"};
- private static final int[] WEIGHTS = { 1,5,5,5,1,1,1,1 };
- private static final int[] ALIGNMENTS = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT };
+ private static final String[] HEADINGS = {
+ "#", Messages.msaa_name, Messages.msaa_role, Messages.msaa_state, "X", "Y", "W", "H" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ private static final int[] WEIGHTS = { 1, 5, 5, 5, 1, 1, 1, 1 };
+ private static final int[] ALIGNMENTS = { SWT.RIGHT, SWT.LEFT, SWT.LEFT,
+ SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT };
- private TableViewer viewer;
-
- private MSAASiblingViewerSorter sorter = new MSAASiblingViewerSorter();
- private boolean suppressHilight = false;
-
- private Action refreshAction;
- private AccessibleObject objectOnAppear = null;
- private static final MSAATreeContentProvider provider = MSAATreeContentProvider.getDefault();
-
- private static final Color GRAY_COLOR = Display.getCurrent().getSystemColor(SWT.COLOR_GRAY);
+ private TableViewer viewer;
+ private MSAASiblingViewerSorter sorter = new MSAASiblingViewerSorter();
+ private boolean suppressHilight = false;
-
+ private Action refreshAction;
+ private AccessibleObject objectOnAppear = null;
+ private static final MSAATreeContentProvider provider = MSAATreeContentProvider
+ .getDefault();
+
+ private static final Color GRAY_COLOR = Display.getCurrent()
+ .getSystemColor(SWT.COLOR_GRAY);
+
/**
* The constructor.
*/
@@ -86,70 +84,71 @@
}
/**
- * This is a callback that will allow us
- * to create the viewer and initialize it.
+ * This is a callback that will allow us to create the viewer and initialize
+ * it.
*/
public void createPartControl(Composite parent) {
- Table table = new Table(parent,SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE | SWT.FULL_SELECTION);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- for( int i=0; i<HEADINGS.length; i++ ) {
- layout.addColumnData(new ColumnWeightData(WEIGHTS[i]));
- TableColumn tc = new TableColumn(table, SWT.NONE);
- tc.setText(HEADINGS[i]);
- tc.setAlignment(ALIGNMENTS[i]);
- tc.setResizable(true);
- final int newSortingColumn = i+1;
- tc.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- if( newSortingColumn== sorter.sortingColumn ) {
- sorter.sortingColumn = -newSortingColumn;
- }
- else {
- sorter.sortingColumn = newSortingColumn;
- }
- viewer.refresh();
- }
- });
- }
+ Table table = new Table(parent, SWT.BORDER | SWT.H_SCROLL
+ | SWT.V_SCROLL | SWT.SINGLE | SWT.FULL_SELECTION);
+ TableLayout layout = new TableLayout();
+ table.setLayout(layout);
+ table.setLinesVisible(true);
+ table.setHeaderVisible(true);
+ for (int i = 0; i < HEADINGS.length; i++) {
+ layout.addColumnData(new ColumnWeightData(WEIGHTS[i]));
+ TableColumn tc = new TableColumn(table, SWT.NONE);
+ tc.setText(HEADINGS[i]);
+ tc.setAlignment(ALIGNMENTS[i]);
+ tc.setResizable(true);
+ final int newSortingColumn = i + 1;
+ tc.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ if (newSortingColumn == sorter.sortingColumn) {
+ sorter.sortingColumn = -newSortingColumn;
+ } else {
+ sorter.sortingColumn = newSortingColumn;
+ }
+ viewer.refresh();
+ }
+ });
+ }
- viewer = new TableViewer(table);
+ viewer = new TableViewer(table);
MSAASiblingContentAndLabelProvider provider = new MSAASiblingContentAndLabelProvider();
viewer.setContentProvider(provider);
viewer.setLabelProvider(provider);
viewer.setSorter(sorter);
- viewer.addSelectionChangedListener(new ISelectionChangedListener(){
- public void selectionChanged(SelectionChangedEvent event) {
- if( suppressHilight ) return;
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection) {
- Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
- if (selectedElement instanceof AccessibleObject) {
- AccessibleObject object = (AccessibleObject) selectedElement;
- if (null != object) {
- IMSAAOutlineView outlineView = (IMSAAOutlineView)MSAAViewRegistory.findView(IGuiViewIDs.ID_OUTLINEVIEW);
- if( null != outlineView ) {
- outlineView.setSelection(object);
- }
- else {
- HighlightComposite.flashRectangle(object.getAccLocation());
- }
- }
- }
- }
-
- }
+ viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ if (suppressHilight)
+ return;
+ ISelection selection = event.getSelection();
+ if (selection instanceof IStructuredSelection) {
+ Object selectedElement = ((IStructuredSelection) selection)
+ .getFirstElement();
+ if (selectedElement instanceof AccessibleObject) {
+ AccessibleObject object = (AccessibleObject) selectedElement;
+ IMSAAOutlineView outlineView = (IMSAAOutlineView) MSAAViewRegistory
+ .findView(IGuiViewIDs.ID_OUTLINEVIEW);
+ if (null != outlineView) {
+ outlineView.setSelection(object);
+ } else {
+ HighlightComposite.flashRectangle(object
+ .getAccLocation());
+ }
+ }
+ }
+
+ }
});
-
+
makeActions();
hookContextMenu();
contributeToActionBars();
- if( null != MSAAViewRegistory.outlineObject ) {
+ if (null != MSAAViewRegistory.outlineObject) {
setSelection(MSAAViewRegistory.outlineObject);
}
-
+
HighlightComposite.initOverlayWindow();
}
@@ -158,26 +157,26 @@
*/
public void setFocus() {
viewer.getControl().setFocus();
- if( null != objectOnAppear ) {
- setSelection(objectOnAppear);
- }
+ if (null != objectOnAppear) {
+ setSelection(objectOnAppear);
+ }
}
public void setSelection(AccessibleObject object) {
- if( !viewer.getControl().isVisible() ) {
- objectOnAppear = object;
- return;
- }
- objectOnAppear = null;
+ if (!viewer.getControl().isVisible()) {
+ objectOnAppear = object;
+ return;
+ }
+ objectOnAppear = null;
suppressHilight = true;
AccessibleObject newInput = object.getCachedParent();
- if( null != newInput ) {
- AccessibleObject oldInput = (AccessibleObject)viewer.getInput();
- if( oldInput != newInput ) {
- viewer.setInput(newInput);
- }
- }
- viewer.setSelection(new StructuredSelection(object),true);
+ if (null != newInput) {
+ AccessibleObject oldInput = (AccessibleObject) viewer.getInput();
+ if (oldInput != newInput) {
+ viewer.setInput(newInput);
+ }
+ }
+ viewer.setSelection(new StructuredSelection(object), true);
suppressHilight = false;
}
@@ -208,24 +207,25 @@
// Other plug-ins can contribute there actions here
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
-
+
private void fillLocalToolBar(IToolBarManager manager) {
manager.add(refreshAction);
}
private void makeActions() {
- refreshAction = new Action(Messages.msaa_refresh) {
- public void run() {
+ refreshAction = new Action(Messages.msaa_refresh) {
+ public void run() {
viewer.refresh();
- }
- };
- refreshAction.setToolTipText(Messages.msaa_refresh);
- refreshAction.setImageDescriptor(GuiImages.IMAGE_REFRESH);
+ }
+ };
+ refreshAction.setToolTipText(Messages.msaa_refresh);
+ refreshAction.setImageDescriptor(GuiImages.IMAGE_REFRESH);
}
-
- private class MSAASiblingContentAndLabelProvider extends LabelProvider implements IStructuredContentProvider,
- IPropertyChangeListener, ITableLabelProvider, ITableColorProvider {
-
+
+ private class MSAASiblingContentAndLabelProvider extends LabelProvider
+ implements IStructuredContentProvider, IPropertyChangeListener,
+ ITableLabelProvider, ITableColorProvider {
+
private Object[] lastElements;
public MSAASiblingContentAndLabelProvider() {
@@ -234,22 +234,24 @@
public Object[] getElements(Object inputElement) {
lastElements = null;
- if( inputElement instanceof AccessibleObject ) {
- Object[] accChildren = provider.getElements(inputElement);
- List childList = new Vector();
- for (int i = 0; i < accChildren.length; i++) {
- try {
- int visibleState = ((AccessibleObject)accChildren[i]).getAccState() & (MSAA.STATE_INVISIBLE|MSAA.STATE_OFFSCREEN);
- if( MSAA.STATE_INVISIBLE != visibleState ) {
- childList.add(accChildren[i]);
- }
- } catch (Exception e) {
- }
- ;
- }
- lastElements = childList.toArray();
+ if (inputElement instanceof AccessibleObject) {
+ Object[] accChildren = provider.getElements(inputElement);
+ List<Object> childList = new Vector<Object>();
+ for (int i = 0; i < accChildren.length; i++) {
+ try {
+ int visibleState = ((AccessibleObject) accChildren[i])
+ .getAccState()
+ & (MSAA.STATE_INVISIBLE | MSAA.STATE_OFFSCREEN);
+ if (MSAA.STATE_INVISIBLE != visibleState) {
+ childList.add(accChildren[i]);
+ }
+ } catch (Exception e) {
+ }
+ ;
+ }
+ lastElements = childList.toArray();
}
- return lastElements;
+ return lastElements;
}
public void dispose() {
@@ -273,55 +275,62 @@
}
public String getColumnText(Object element, int columnIndex) {
- if( element instanceof AccessibleObject ) {
- switch( columnIndex ) {
+ if (element instanceof AccessibleObject) {
+ switch (columnIndex) {
case 0:
- if( null!=lastElements ) {
- for( int i=0; i<lastElements.length; i++ ) {
- if( element.equals(lastElements[i]) ) {
- return Integer.toString(i+1);
+ if (null != lastElements) {
+ for (int i = 0; i < lastElements.length; i++) {
+ if (element.equals(lastElements[i])) {
+ return Integer.toString(i + 1);
}
}
}
return ""; //$NON-NLS-1$
case 1:
- return ((AccessibleObject)element).getAccName();
+ return ((AccessibleObject) element).getAccName();
case 2:
- return ((AccessibleObject)element).getRoleText();
+ return ((AccessibleObject) element).getRoleText();
case 3:
- return MSAA.getStateText(((AccessibleObject)element).getAccState());
+ return MSAA.getStateText(((AccessibleObject) element)
+ .getAccState());
case 4:
case 5:
case 6:
case 7:
- Rectangle location = ((AccessibleObject)element).getAccLocation();
- if( null==location ) return ""; //$NON-NLS-1$
- switch( columnIndex-4 ) {
- case 0: return Integer.toString(location.x);
- case 1: return Integer.toString(location.y);
- case 2: return Integer.toString(location.width);
- case 3: return Integer.toString(location.height);
+ Rectangle location = ((AccessibleObject) element)
+ .getAccLocation();
+ if (null == location)
+ return ""; //$NON-NLS-1$
+ switch (columnIndex - 4) {
+ case 0:
+ return Integer.toString(location.x);
+ case 1:
+ return Integer.toString(location.y);
+ case 2:
+ return Integer.toString(location.width);
+ case 3:
+ return Integer.toString(location.height);
}
default:
- return "?"; //$NON-NLS-1$
+ return "?"; //$NON-NLS-1$
}
}
return null;
}
- public Color getBackground(Object element, int columnIndex) {
- return null;
- }
+ public Color getBackground(Object element, int columnIndex) {
+ return null;
+ }
- public Color getForeground(Object element, int columnIndex) {
- if( element instanceof AccessibleObject ) {
- int accState = ((AccessibleObject)element).getAccState();
- if( 0 != (accState & MSAA.STATE_INVISIBLE) ) {
- return GRAY_COLOR;
- }
- }
- return null;
- }
+ public Color getForeground(Object element, int columnIndex) {
+ if (element instanceof AccessibleObject) {
+ int accState = ((AccessibleObject) element).getAccState();
+ if (0 != (accState & MSAA.STATE_INVISIBLE)) {
+ return GRAY_COLOR;
+ }
+ }
+ return null;
+ }
}
private class MSAASiblingViewerSorter extends ViewerSorter {
@@ -329,26 +338,29 @@
public int sortingColumn = 0;
public int compare(Viewer viewer, Object e1, Object e2) {
- if( 0 != sortingColumn && viewer instanceof TableViewer ) {
- IBaseLabelProvider labelProvider = ((TableViewer)viewer).getLabelProvider();
- if( labelProvider instanceof ITableLabelProvider ) {
- int columnIndex = Math.abs(sortingColumn)-1;
- String s1 = ((ITableLabelProvider)labelProvider).getColumnText(e1,columnIndex);
- String s2 = ((ITableLabelProvider)labelProvider).getColumnText(e2,columnIndex);
+ if (0 != sortingColumn && viewer instanceof TableViewer) {
+ IBaseLabelProvider labelProvider = ((TableViewer) viewer)
+ .getLabelProvider();
+ if (labelProvider instanceof ITableLabelProvider) {
+ int columnIndex = Math.abs(sortingColumn) - 1;
+ String s1 = ((ITableLabelProvider) labelProvider)
+ .getColumnText(e1, columnIndex);
+ String s2 = ((ITableLabelProvider) labelProvider)
+ .getColumnText(e2, columnIndex);
int result = 0;
- switch( columnIndex ) {
- default:
- try {
- result = Integer.parseInt(s1)-Integer.parseInt(s2);
- break;
- }
- catch( Exception e ) {
- }
- case 1:
- case 2:
- case 3:
- result = collator.compare(s1,s2);
+ switch (columnIndex) {
+ default:
+ try {
+ result = Integer.parseInt(s1)
+ - Integer.parseInt(s2);
break;
+ } catch (Exception e) {
+ }
+ case 1:
+ case 2:
+ case 3:
+ result = collator.compare(s1, s2);
+ break;
}
return sortingColumn > 0 ? result : -result;
}
@@ -356,4 +368,5 @@
return 0;
}
- }}
+ }
+}
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
index b676211..43967af 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAOutlineView.java
@@ -294,7 +294,7 @@
}
}
};
- collapseAllAction.setToolTipText(Messages.msaa_collapse_all); //$NON-NLS-1$
+ collapseAllAction.setToolTipText(Messages.msaa_collapse_all);
collapseAllAction.setImageDescriptor(GuiImages.IMAGE_COLLAPSE_ALL);
refreshAction = new RefreshRootAction();
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAProblemsView.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAProblemsView.java
index 1e8adc6..8a80ffa 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAProblemsView.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAAProblemsView.java
@@ -74,7 +74,8 @@
public class MSAAProblemsView extends ViewPart implements IMSAAProblemsView, MSAAProblemConst {
- private static final String[] HEADINGS = { "", Messages.msaa_description, "Name", "Role", "State", "X", "Y", "W", "H" };
+ private static final String[] HEADINGS = {
+ "", Messages.msaa_description, "Name", "Role", "State", "X", "Y", "W", "H" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
private static final int[] WEIGHTS = { 1, 15, 8, 6, 10, 2, 2, 2, 2 };
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
index da47949..5206f9c 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/gui/ui/views/MSAATreeContentProvider.java
@@ -73,7 +73,6 @@
return false;
}
- @SuppressWarnings("restriction")
public Object[] getElements(Object inputElement) {
Object[] elements;
if (inputElement instanceof Object[]) {
diff --git a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/internal/gui/ui/GUIPerspective.java b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/internal/gui/ui/GUIPerspective.java
index 928c3d7..0e90b45 100644
--- a/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/internal/gui/ui/GUIPerspective.java
+++ b/plugins/org.eclipse.actf.visualization.gui/src/org/eclipse/actf/visualization/internal/gui/ui/GUIPerspective.java
@@ -25,18 +25,18 @@
layout.setEditorAreaVisible(false);
IFolderLayout reportFolder = layout
- .createFolder("actf.report.folder", IPageLayout.BOTTOM,
+ .createFolder("actf.report.folder", IPageLayout.BOTTOM, //$NON-NLS-1$
0.7f, editorArea);
IFolderLayout rightReportFolder = layout.createFolder(
- "actf.report.left.folder", IPageLayout.RIGHT, 0.5f,
- "actf.report.folder");
- IFolderLayout summaryFolder = layout.createFolder("actf.summary.folder",
+ "actf.report.left.folder", IPageLayout.RIGHT, 0.5f, //$NON-NLS-1$
+ "actf.report.folder"); //$NON-NLS-1$
+ IFolderLayout summaryFolder = layout.createFolder("actf.summary.folder", //$NON-NLS-1$
IPageLayout.RIGHT, 0.3f, editorArea);
IFolderLayout outlineFolder = layout.createFolder(
- "actf.outline.folder", IPageLayout.RIGHT, 1/3f, "actf.summary.folder");
+ "actf.outline.folder", IPageLayout.RIGHT, 1/3f, "actf.summary.folder"); //$NON-NLS-1$ //$NON-NLS-2$
IFolderLayout propertyFolder = layout.createFolder(
- "actf.property.folder", IPageLayout.RIGHT, 0.5f,
- "actf.outline.folder");
+ "actf.property.folder", IPageLayout.RIGHT, 0.5f, //$NON-NLS-1$
+ "actf.outline.folder"); //$NON-NLS-1$
try {
reportFolder.addView(IGuiViewIDs.ID_EVENTVIEW);
rightReportFolder.addView(IGuiViewIDs.ID_REPORTVIEW);
