[nobug] code cleanup
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateCompletionProcessor.java
index 115c116..da86f32 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateCompletionProcessor.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateCompletionProcessor.java
@@ -11,6 +11,7 @@
*******************************************************************************/
package org.eclipse.wst.xsl.ui.internal.contentassist;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -46,7 +47,10 @@
* templates.
*/
class XSLTemplateCompletionProcessor extends TemplateCompletionProcessor {
- private static final class ProposalComparator implements Comparator {
+ private static final class ProposalComparator implements Comparator, Serializable {
+
+ private static final long serialVersionUID = 4678061726393872083L;
+
public int compare(Object o1, Object o2) {
return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance();
}
@@ -59,6 +63,7 @@
* Copied from super class except instead of calling createContext(viewer,
* region) call createContext(viewer, region, offset) instead
*/
+ @Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
ITextSelection selection = (ITextSelection) viewer.getSelectionProvider().getSelection();
@@ -128,10 +133,12 @@
return null;
}
+ @Override
protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) {
return new CustomTemplateProposal(template, context, region, getImage(template), relevance);
}
+ @Override
protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
TemplateContextType type = null;
@@ -143,6 +150,7 @@
return type;
}
+ @Override
protected Image getImage(Template template) {
// just return the same image for now
return XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_XPATH_FUNCTION);
@@ -152,6 +160,7 @@
return XSLUIPlugin.getDefault().getTemplateContextRegistry();
}
+ @Override
protected Template[] getTemplates(String contextTypeId) {
Template templates[] = null;
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateContentAssistProcessor.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateContentAssistProcessor.java
index 18c8dd7..7f010a1 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateContentAssistProcessor.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLTemplateContentAssistProcessor.java
@@ -10,10 +10,8 @@
*******************************************************************************/
package org.eclipse.wst.xsl.ui.internal.contentassist;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import org.eclipse.jface.text.ITextViewer;
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/AttributeShowingLabelProvider.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/AttributeShowingLabelProvider.java
index 8672721..1183731 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/AttributeShowingLabelProvider.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/AttributeShowingLabelProvider.java
@@ -12,7 +12,6 @@
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
import org.eclipse.wst.xsl.core.XSLCore;
-import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -26,6 +25,7 @@
fShowAttributes = showAttributes;
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return true;
}
@@ -35,6 +35,7 @@
*
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object o) {
StringBuffer text = null;
if (o instanceof Node) {
@@ -155,6 +156,7 @@
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.CellLabelProvider#getToolTipText(java.lang.Object)
*/
+ @Override
public String getToolTipText(Object element) {
if (element instanceof Node) {
switch (((Node) element).getNodeType()) {
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapter.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapter.java
index d099953..cd89aaa 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapter.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapter.java
@@ -15,18 +15,15 @@
import java.util.Collection;
import java.util.Iterator;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapterFactory.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapterFactory.java
index 9dff75f..40f9468 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapterFactory.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeAdapterFactory.java
@@ -70,6 +70,7 @@
if (listeners[i] instanceof StructuredViewer) {
final StructuredViewer viewer = (StructuredViewer) listeners[i];
Job refresh = new UIJob(XMLUIMessages.refreshoutline_0) {
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
Control refreshControl = viewer.getControl();
if ((refreshControl != null) && !refreshControl.isDisposed()) {
@@ -85,6 +86,7 @@
else if (listeners[i] instanceof Viewer) {
final Viewer viewer = (Viewer) listeners[i];
Job refresh = new UIJob(XMLUIMessages.refreshoutline_0) {
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
Control refreshControl = viewer.getControl();
if ((refreshControl != null) && !refreshControl.isDisposed()) {
@@ -122,6 +124,7 @@
fListeners.add(listener);
}
+ @Override
public INodeAdapterFactory copy() {
return new JFaceNodeAdapterFactory(getAdapterKey(), isShouldRegisterAdapter());
}
@@ -129,6 +132,7 @@
/**
* Create a new JFace adapter for the DOM node passed in
*/
+ @Override
protected INodeAdapter createAdapter(INodeNotifier node) {
if (singletonAdapter == null) {
// create the JFaceNodeAdapter
@@ -162,7 +166,8 @@
}
}
- public void release() {
+ @Override
+ public synchronized void release() {
// deregister from CMDocumentManager events
if ((cmDocumentManager != null) && (fCMDocumentManagerListener != null)) {
cmDocumentManager.removeListener(fCMDocumentManagerListener);
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeLabelProvider.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeLabelProvider.java
index 107559f..bd55eec 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeLabelProvider.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/JFaceNodeLabelProvider.java
@@ -49,6 +49,7 @@
*
* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
*/
+ @Override
public Image getImage(Object element) {
IJFaceNodeAdapter adapter = getAdapter(element);
if (adapter != null)
@@ -61,6 +62,7 @@
*
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
IJFaceNodeAdapter adapter = getAdapter(element);
if (adapter != null)
@@ -74,6 +76,7 @@
* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
* java.lang.String)
*/
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/RefreshStructureJob.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/RefreshStructureJob.java
index f8adf4e..4f434de 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/RefreshStructureJob.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/RefreshStructureJob.java
@@ -136,6 +136,7 @@
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.Job#canceling()
*/
+ @Override
protected void canceling() {
fUpdates.clear();
fUpdateViewers.clear();
@@ -326,6 +327,7 @@
schedule(UPDATE_DELAY);
}
+ @Override
protected IStatus run(IProgressMonitor monitor) {
IStatus status = Status.OK_STATUS;
try {
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XMLNodeActionManager.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XMLNodeActionManager.java
index 072120f..5972c59 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XMLNodeActionManager.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XMLNodeActionManager.java
@@ -27,6 +27,7 @@
super(model, ModelQueryUtil.getModelQuery(model), viewer);
}
+ @Override
public void reformat(Node newElement, boolean deep) {
try {
// tell the model that we are about to make a big model change
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XSLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XSLContentOutlineConfiguration.java
index ac76ec2..f108da8 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XSLContentOutlineConfiguration.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentoutline/XSLContentOutlineConfiguration.java
@@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.wst.xsl.ui.internal.contentoutline;
-import java.util.List;
-
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.IContentProvider;
@@ -22,28 +20,16 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.sse.core.utils.StringUtils;
import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateActionContributionItem;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImageHelper;
import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImages;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
import org.eclipse.wst.xsl.ui.internal.contentoutline.JFaceNodeContentProvider;
-import org.eclipse.wst.xsl.ui.internal.contentoutline.JFaceNodeLabelProvider;
import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
import org.eclipse.wst.xml.ui.views.contentoutline.AbstractXMLContentOutlineConfiguration;
import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration;
import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
/**
@@ -79,6 +65,7 @@
*
* @see org.eclipse.ui.texteditor.IUpdate#update()
*/
+ @Override
public void update() {
super.update();
fShowAttributes = isChecked();
@@ -145,6 +132,7 @@
*
* @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#createMenuContributions(org.eclipse.jface.viewers.TreeViewer)
*/
+ @Override
protected IContributionItem[] createMenuContributions(TreeViewer viewer) {
IContributionItem[] items;
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
@@ -176,6 +164,7 @@
* @param treeViewer
* the TreeViewer associated with this configuration
*/
+ @Override
protected void enableShowAttributes(boolean showAttributes, TreeViewer treeViewer) {
if (fAttributeShowingLabelProvider != null) {
fAttributeShowingLabelProvider.setShowAttributes(showAttributes);
@@ -187,6 +176,7 @@
*
* @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getContentProvider(org.eclipse.jface.viewers.TreeViewer)
*/
+ @Override
public IContentProvider getContentProvider(TreeViewer viewer) {
if (fContentProvider == null) {
fContentProvider = new JFaceNodeContentProvider();
@@ -223,6 +213,7 @@
*
* @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getLabelProvider(org.eclipse.jface.viewers.TreeViewer)
*/
+ @Override
public ILabelProvider getLabelProvider(TreeViewer viewer) {
if (fAttributeShowingLabelProvider == null) {
fAttributeShowingLabelProvider = new AttributeShowingLabelProvider(fShowAttributes);
@@ -236,6 +227,7 @@
* @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getSelection(org.eclipse.jface.viewers.TreeViewer,
* org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public ISelection getSelection(TreeViewer viewer, ISelection selection) {
ISelection filteredSelection = selection;
if (selection instanceof IStructuredSelection) {
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java
index 5755d03..ecd36ab 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java
@@ -16,41 +16,30 @@
import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
import org.eclipse.jface.text.source.Annotation;
-public class ValidationQuickAssist implements IQuickAssistProcessor
-{
- private String problemId;
+public class ValidationQuickAssist implements IQuickAssistProcessor {
- public ValidationQuickAssist()
- {
+ public ValidationQuickAssist() {
super();
}
- public boolean canAssist(IQuickAssistInvocationContext invocationContext)
- {
+ public boolean canAssist(IQuickAssistInvocationContext invocationContext) {
// TODO Auto-generated method stub
return true;
}
- public boolean canFix(Annotation annotation)
- {
+ public boolean canFix(Annotation annotation) {
// TODO Auto-generated method stub
return true;
}
- public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext invocationContext)
- {
- CompletionProposal proposal = new CompletionProposal("doug",5,10,11); //$NON-NLS-1$
- return new ICompletionProposal[]{proposal};
+ public ICompletionProposal[] computeQuickAssistProposals(
+ IQuickAssistInvocationContext invocationContext) {
+ CompletionProposal proposal = new CompletionProposal("doug", 5, 10, 11); //$NON-NLS-1$
+ return new ICompletionProposal[] { proposal };
}
- public String getErrorMessage()
- {
+ public String getErrorMessage() {
return null;
}
- public void setProblemId(String id)
- {
- this.problemId = id;
- }
-
}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/registry/AdapterFactoryProviderForXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/registry/AdapterFactoryProviderForXSL.java
index 73127f7..d0facd8 100755
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/registry/AdapterFactoryProviderForXSL.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/registry/AdapterFactoryProviderForXSL.java
@@ -38,12 +38,14 @@
/*
* @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
*/
+ @Override
public void addAdapterFactories(IStructuredModel structuredModel) {
// add the normal content based factories to model's registry
addContentBasedFactories(structuredModel);
}
+ @Override
protected void addContentBasedFactories(IStructuredModel structuredModel) {
FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
Assert
@@ -91,10 +93,12 @@
* isFor(org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler
* )
*/
+ @Override
public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
return (contentTypeDescription instanceof ModelHandlerForXSL);
}
+ @Override
public void reinitializeFactories(IStructuredModel structuredModel) {
// nothing to do, since no embedded type
}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
index 777c388..d23dd03 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
@@ -23,14 +23,12 @@
import org.eclipse.wst.validation.ValidationFramework;
import org.eclipse.wst.validation.Validator;
import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
import org.eclipse.wst.xsl.ui.internal.editor.XSLEditor;
-import org.eclipse.wst.xsl.ui.internal.quickassist.ValidationQuickAssist;
/**
* This performs the as-you-type validation for xsl files
