Various potential bugs fixed from FindBugs reporting tool.
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
index 3421d13..e68aadd 100755
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
+++ b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
@@ -11,6 +11,7 @@
*******************************************************************************/
package org.eclipse.wst.xml.xpath.ui.internal.contentassist;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -46,7 +47,10 @@
* templates.
*/
public class XPathTemplateCompletionProcessor extends TemplateCompletionProcessor {
- private static final class ProposalComparator implements Comparator {
+ private static final class ProposalComparator implements Comparator, Serializable {
+
+ private static final long serialVersionUID = 1686588609390747536L;
+
public int compare(Object o1, Object o2) {
return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance();
}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java
index 5009bae..197a4fa 100755
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java
+++ b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java
@@ -47,7 +47,7 @@
// save a descriptor for each image
@SuppressWarnings("unchecked")
private HashMap fImageDescRegistry = null;
- private final String PLUGINID = XPathUIPlugin.PLUGIN_ID;
+ //private final String PLUGINID = XPathUIPlugin.PLUGIN_ID;
/**
* Creates an image from the given resource and adds the image to the
@@ -83,7 +83,7 @@
*/
@SuppressWarnings("unchecked")
private ImageDescriptor createImageDescriptor(String imageFilePath) {
- ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath);
+ ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID, imageFilePath);
if (imageDescriptor != null) {
getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
}
