clean-ups: minor compiler warnings and FindBug issues resolved
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
index 6e046dd..42f555f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@
org.eclipse.wst.xml.vex.core.internal.layout;x-friends:="org.eclipse.wst.xml.vex.core.tests",
org.eclipse.wst.xml.vex.core.internal.provisional.dom;x-friends:="org.eclipse.wst.xml.vex.core.tests",
org.eclipse.wst.xml.vex.core.internal.provisional.dom.I;x-friends:="org.eclipse.wst.xml.vex.core.tests",
- org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl;x-internal:=true,
+ org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl;x-friends:="org.eclipse.wst.xml.vex.core.tests",
org.eclipse.wst.xml.vex.core.internal.provisional.dom.util;x-internal:=true,
org.eclipse.wst.xml.vex.core.internal.undo;x-internal:=true,
org.eclipse.wst.xml.vex.core.internal.util;x-internal:=true,
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
index 4a00dd3..a90c154 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
@@ -647,9 +647,6 @@
gd.verticalAlignment = GridData.FILL;
this.vexWidget.setLayoutData(gd);
- VexActionBarContributor contributor = (VexActionBarContributor) this
- .getEditorSite().getActionBarContributor();
-
MenuManager menuManager = new MenuManager();
getSite().registerContextMenu("org.eclipse.wst.xml.vex.ui.popup", menuManager, vexWidget);
vexWidget.setMenu(menuManager.createContextMenu(vexWidget));
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
index 00f84e0..9ee6211 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
@@ -178,44 +178,36 @@
public void testFragments() throws Exception {
- VEXDocument doc;
- VEXDocumentFragment frag;
- List<VEXNode> nodes;
- VEXElement root;
- VEXElement x;
- VEXElement y;
- VEXElement z;
-
// Case 1: just text
//
// root
// * a b c *
// 0 1 2 3 4 5
- doc = new Document(new RootElement("root"));
+ VEXDocument doc = new Document(new RootElement("root"));
doc.insertText(1, "abc");
try {
- frag = doc.getFragment(2, 2);
+ doc.getFragment(2, 2);
fail();
} catch (IllegalArgumentException ex) {
}
try {
- frag = doc.getFragment(-1, 0);
+ doc.getFragment(-1, 0);
fail();
} catch (IllegalArgumentException ex) {
}
try {
- frag = doc.getFragment(4, 5);
+ doc.getFragment(4, 5);
fail();
} catch (IllegalArgumentException ex) {
}
- frag = doc.getFragment(2, 3);
+ VEXDocumentFragment frag = doc.getFragment(2, 3);
assertEquals(1, frag.getContent().getLength());
assertEquals(0, frag.getElements().size());
- nodes = frag.getNodes();
+ List<VEXNode> nodes = frag.getNodes();
assertEquals(1, nodes.size());
this.assertIsText(nodes.get(0), "b", 0, 1);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
index 637123b..189a211 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutTestSuite.java
@@ -46,7 +46,6 @@
* Runs several suites of layout tests. Each suite is defined in an XML file.
* The XML files to run are registered in the suite() method.
*/
-@SuppressWarnings("restriction")
public class LayoutTestSuite extends TestCase {
public String id;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
index 84e64e7..275306f 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
@@ -21,7 +21,6 @@
import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
-@SuppressWarnings("restriction")
public class TestBlockElementBox extends TestCase {
FakeGraphics g;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
index 3b5ce1e..b7737ae 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlocksInInlines.java
@@ -29,7 +29,6 @@
* Tests proper function of a block-level element within an inline element.
* These must be layed out as a block child of the containing block element.
*/
-@SuppressWarnings("restriction")
public class TestBlocksInInlines extends TestCase {
FakeGraphics g;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
index 010e14d..63b21cb 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestDocumentTextBox.java
@@ -29,7 +29,6 @@
* Tests the DocumentTestBox class. We focus here on proper offsets, since text
* splitting is tested thoroughly in TestStaticTextBox.
*/
-@SuppressWarnings("restriction")
public class TestDocumentTextBox extends TestCase {
FakeGraphics g;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockGapContent.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockGapContent.java
index b4d02d2..fe8d484 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockGapContent.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockGapContent.java
@@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.wst.xml.vex.core.internal.provisional.dom.tests;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.*;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Position;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl.ContentImpl;
import org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl.PositionImpl;
@@ -31,7 +31,8 @@
private char[] content;
private int gapStart;
private int gapEnd;
- private final Map positions = new HashMap();
+ private final Set<Position> positions = new HashSet<Position>();
+
/**
* Class constructor.
@@ -55,12 +56,9 @@
* initial offset of the position
*/
public Position createPosition(int offset) {
-
assertOffset(offset, 0, this.getLength());
-
Position pos = new GapContentPosition(offset);
- this.positions.put(pos, pos);
-
+ positions.add(pos);
return pos;
}
@@ -97,8 +95,7 @@
//
// Update positions
//
- for (Iterator i = this.positions.keySet().iterator(); i.hasNext();) {
- GapContentPosition pos = (GapContentPosition) i.next();
+ for (Position pos : positions) {
if (pos.getOffset() >= offset) {
pos.setOffset(pos.getOffset() + s.length());
}
@@ -122,8 +119,7 @@
this.moveGap(offset + length);
this.gapStart -= length;
- for (Iterator i = this.positions.keySet().iterator(); i.hasNext();) {
- GapContentPosition pos = (GapContentPosition) i.next();
+ for (Position pos : positions) {
if (pos.getOffset() >= offset + length) {
pos.setOffset(pos.getOffset() - length);
} else if (pos.getOffset() >= offset) {