clean-ups: minor compiler warnings and FindBug issues resloved
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 c35f0c9..6e046dd 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
@@ -20,14 +20,14 @@
org.eclipse.wst.xml.vex.core.internal.css;x-friends:="org.eclipse.wst.xml.vex.core.tests",
org.eclipse.wst.xml.vex.core.internal.dom;x-friends:="org.eclipse.wst.xml.vex.core.tests",
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-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.provisional.dom.I;x-internal:=true,
+ 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.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,
org.eclipse.wst.xml.vex.core.internal.validator;x-internal:=true,
- org.eclipse.wst.xml.vex.core.internal.widget;x-internal:=true,
+ org.eclipse.wst.xml.vex.core.internal.widget;x-friends:="org.eclipse.wst.xml.vex.core.tests",
org.w3c.flute.parser,
org.w3c.flute.parser.selectors,
org.w3c.flute.util
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
index 2216d43..3bb778c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
@@ -7,13 +7,10 @@
public class VEXModelTranslator extends RootTranslator {
-
private static Translator[] children;
- private static final DomEMFPackage VEX_PKG = DomEMFPackage.eINSTANCE;
-
public VEXModelTranslator(String domNameAndPath) {
- super(domNameAndPath, VEX_PKG.eINSTANCE.getVEXDocument());
+ super(domNameAndPath, DomEMFPackage.eINSTANCE.getVEXDocument());
}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
index 082b3df..50c3c22 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.dita/build.properties
@@ -1,5 +1,5 @@
bin.includes = plugin.xml,\
- dita132/,\
+ dita11/,\
plugin.properties,\
META-INF/,\
css/,\
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
index bba1c28..1d36385 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/PropertyTest.java
@@ -111,7 +111,7 @@
styles.put(CSS.BORDER_LEFT_STYLE, CSS.SOLID);
prop = new BorderWidthProperty(CSS.BORDER_LEFT_WIDTH,
CSS.BORDER_LEFT_STYLE, IProperty.AXIS_HORIZONTAL);
- assertEquals(new Integer(10), prop.calculate(MockLU.createFloat(
+ assertEquals(Integer.valueOf(10), prop.calculate(MockLU.createFloat(
LexicalUnit.SAC_INCH, 0.2f), parentStyles, styles));
}
@@ -122,7 +122,7 @@
public void testColorProperty() throws Exception {
}
- private class DummyDisplayDevice extends DisplayDevice {
+ private static class DummyDisplayDevice extends DisplayDevice {
public DummyDisplayDevice(int horizontalPPI, int verticalPPI) {
this.horizontalPPI = horizontalPPI;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
index e2ab217..1a9545a 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/css/RuleTest.java
@@ -25,8 +25,6 @@
/**
* Test rule matching.
*/
-@SuppressWarnings("restriction")
-
public class RuleTest extends TestCase {
public void testRuleMatching() throws Exception {
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
index 78d6068..e4564ae 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/BlockElementBoxTest.java
@@ -28,7 +28,6 @@
import junit.framework.TestCase;
-@SuppressWarnings("restriction")
public class BlockElementBoxTest extends TestCase {
private Graphics g;
@@ -61,14 +60,10 @@
BlockElementBox box = new BlockElementBox(context, parentBox, doc
.getRootElement());
- List childrenList = box.createChildren(context);
-
- Box[] children = new Box[childrenList.size()];
- childrenList.toArray(children);
+ List<Box> childrenList = box.createChildren(context);
+ Box[] children = childrenList.toArray(new Box[childrenList.size()]);
assertNotNull("No Children created.", children);
assertEquals(3, children.length);
-
- Box child = children[1];
}
public int getGap(BlockElementBox box, int n) throws SecurityException,
@@ -77,7 +72,7 @@
Method getGap = BlockElementBox.class.getDeclaredMethod("getGap",
new Class[] { Integer.TYPE });
getGap.setAccessible(true);
- return ((Integer) getGap.invoke(box, new Object[] { new Integer(n) }))
+ return ((Integer) getGap.invoke(box, new Object[] { Integer.valueOf(n) }))
.intValue();
}
}
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
index 8887624..f08a13f 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/SpaceNormalizerTest.java
@@ -55,7 +55,6 @@
/**
* Test the SpaceNormalizer class.
*/
-@SuppressWarnings("restriction")
public class SpaceNormalizerTest extends TestCase {
protected static IProject fTestProject;