[jbosstools-commits] JBoss Tools SVN: r41556 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed May 30 18:39:58 EDT 2012
Author: dazarov
Date: 2012-05-30 18:39:57 -0400 (Wed, 30 May 2012)
New Revision: 41556
Removed:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java
Log:
Make Quick fix for problem markers "Unknown tag" work on temporary WTP annotations https://issues.jboss.org/browse/JBIDE-10958
Deleted: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2012-05-30 22:38:55 UTC (rev 41555)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/MarkerAnnotationInfo.java 2012-05-30 22:39:57 UTC (rev 41556)
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.text.xml;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.jface.text.quickassist.IQuickFixableAnnotation;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
-import org.eclipse.wst.sse.ui.StructuredTextInvocationContext;
-import org.eclipse.wst.sse.ui.internal.correction.QuickFixRegistry;
-import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
-
-public class MarkerAnnotationInfo {
- public final List<AnnotationInfo> infos;
- public final ISourceViewer viewer;
-
- public MarkerAnnotationInfo(List<AnnotationInfo> infos, ISourceViewer textViewer) {
- this.infos = infos;
- this.viewer = textViewer;
- }
-
- public List<ICompletionProposal> getCompletionProposals(AnnotationInfo info) {
-
- if(info.isTop())
- return getMarkerProposals(info);
- else
- return getProposals(info);
-
- }
-
- public List<ICompletionProposal> getMarkerProposals(AnnotationInfo info) {
- SimpleMarkerAnnotation annotation = (SimpleMarkerAnnotation)info.annotation;
-
- ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
-
- IMarker marker = annotation.getMarker();
- IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker);
- for (IMarkerResolution resolution : resolutions) {
- proposals.add(new QuickFixProposal(resolution, marker));
- }
-
- return proposals;
- }
-
- public List<ICompletionProposal> getProposals(AnnotationInfo info) {
- TemporaryAnnotation annotation = (TemporaryAnnotation)info.annotation;
-
- List<ICompletionProposal> allProposals = new ArrayList<ICompletionProposal>();
- List<IQuickAssistProcessor> processors = new ArrayList<IQuickAssistProcessor>();
- if (canFix(annotation)) {
- Object o = annotation.getAdditionalFixInfo();
- if (o instanceof IQuickAssistProcessor) {
- processors.add((IQuickAssistProcessor)o);
- }
-
- // get all relevant quick fixes for this annotation
- QuickFixRegistry registry = QuickFixRegistry.getInstance();
- processors.addAll(Arrays.asList(registry.getQuickFixProcessors(annotation)));
-
- // set up context
- Map attributes = null;
- attributes = annotation.getAttributes();
- StructuredTextInvocationContext sseContext = new StructuredTextInvocationContext(viewer, info.position.getOffset(), info.position.getLength(), attributes);
-
- // call each processor
- for (int i = 0; i < processors.size(); ++i) {
- List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
- collectProposals((IQuickAssistProcessor) processors.get(i), annotation, sseContext, proposals);
-
- if (proposals.size() > 0) {
- allProposals.addAll(proposals);
- }
- }
-
- }
-
- return allProposals;
- }
-
- private void collectProposals(IQuickAssistProcessor processor, Annotation annotation, IQuickAssistInvocationContext invocationContext, List<ICompletionProposal> proposalsList) {
- ICompletionProposal[] proposals = processor.computeQuickAssistProposals(invocationContext);
- if (proposals != null && proposals.length > 0) {
- proposalsList.addAll(Arrays.asList(proposals));
- }
- }
-
- public boolean canFix(Annotation annotation) {
- if (annotation instanceof IQuickFixableAnnotation) {
- if (((IQuickFixableAnnotation) annotation).isQuickFixableStateSet()) {
- return ((IQuickFixableAnnotation) annotation).isQuickFixable();
- }
- }
- return false;
- }
-
- public static class AnnotationInfo {
- public Annotation annotation;
- public Position position;
-
- public AnnotationInfo(Annotation annotation, Position position){
- this.annotation = annotation;
- this.position = position;
- }
-
- public boolean isTop(){
- return annotation instanceof SimpleMarkerAnnotation;
- }
- }
-
- @Override
- public String toString() {
- return null;
- }
-}
\ No newline at end of file
Deleted: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java 2012-05-30 22:38:55 UTC (rev 41555)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/QuickFixProposal.java 2012-05-30 22:39:57 UTC (rev 41556)
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.text.xml;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolution2;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-public class QuickFixProposal implements ICompletionProposal{
- private IMarkerResolution resolution;
- private IMarker marker;
-
- public QuickFixProposal(IMarkerResolution resolution, IMarker marker){
- this.resolution = resolution;
- this.marker = marker;
- }
-
- public void apply(IDocument document) {
- resolution.run(marker);
- }
-
- public Point getSelection(IDocument document) {
- return null;
- }
-
- public String getAdditionalProposalInfo() {
- if (resolution instanceof IMarkerResolution2)
- return ((IMarkerResolution2) resolution).getDescription();
-
- return (String)marker.getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
- }
-
- public String getDisplayString() {
- return resolution.getLabel();
- }
-
- public Image getImage() {
- if (resolution instanceof IMarkerResolution2)
- return ((IMarkerResolution2)resolution).getImage();
- return null;
- }
-
- public IContextInformation getContextInformation() {
- return null;
- }
-}
More information about the jbosstools-commits
mailing list