Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 174685 Details for
Bug 320322
[validation] JSP source validators running even when respective batch validators have been turned off
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Fix Patch - Update 1
320322_source_val_enablment.txt (text/plain), 5.08 KB, created by
Ian Tewksbury
on 2010-07-19 18:11:03 EDT
(
hide
)
Description:
Fix Patch - Update 1
Filename:
MIME Type:
Creator:
Ian Tewksbury
Created:
2010-07-19 18:11:03 EDT
Size:
5.08 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.wst.sse.ui >Index: src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java >=================================================================== >RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java,v >retrieving revision 1.31.6.2 >diff -u -r1.31.6.2 ValidatorStrategy.java >--- src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java 4 Jun 2010 03:46:27 -0000 1.31.6.2 >+++ src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java 19 Jul 2010 22:10:22 -0000 >@@ -35,6 +35,7 @@ > import org.eclipse.jface.text.source.ISourceViewer; > import org.eclipse.wst.sse.core.StructuredModelManager; > import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; >+import org.eclipse.wst.sse.core.utils.StringUtils; > import org.eclipse.wst.sse.ui.internal.IReleasable; > import org.eclipse.wst.sse.ui.internal.reconcile.DocumentAdapter; > import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey; >@@ -153,10 +154,15 @@ > public void reconcile(ITypedRegion tr, DirtyRegion dr) { > /* > * Abort if no workspace file is known (new validation framework does >- * not support that scenario) or no validators have been specified >+ * not support that scenario) or no validators have been specified or >+ * validation has been disabled > */ >- if (isCanceled() || fMetaData.isEmpty()) >+ IFile file = getFile(); >+ if (isCanceled() || fMetaData.isEmpty() || (file != null && ( >+ ValidationFramework.getDefault().isSuspended(file.getProject()) || >+ ValidationFramework.getDefault().getProjectSettings(file.getProject()).getSuspend()))) { > return; >+ } > > IDocument doc = getDocument(); > // for external files, this can be null >@@ -180,19 +186,23 @@ > * validators. > */ > Set disabledValsByClass = new HashSet(20); >- IFile file = getFile(); > if (file != null) { > if (ValidationFramework.getDefault().isSuspended() || ValidationFramework.getDefault().isSuspended(file.getProject())) > return; > >+ ValidationFramework.getDefault().getDisabledValidatorsFor(file); >+ > for (Iterator it = ValidationFramework.getDefault().getDisabledValidatorsFor(file).iterator(); it.hasNext();) { > Validator v = (Validator) it.next(); > Validator.V1 v1 = v.asV1Validator(); > if (v1 != null) > disabledValsByClass.add(v1.getId()); > // not a V1 validator >- else if (v.getSourceId() != null) >- disabledValsBySourceId.add(v.getSourceId()); >+ else if (v.getSourceId() != null) { >+ //could be more then one sourceid per batch validator >+ String[] sourceIDs = StringUtils.unpack(v.getSourceId()); >+ disabledValsBySourceId.addAll(Arrays.asList(sourceIDs)); >+ } > } > } > >@@ -211,6 +221,7 @@ > * preferences before attempting to create/use it > */ > if (!disabledValsBySourceId.contains(vmd.getValidatorId()) && !disabledValsByClass.contains(vmd.getValidatorClass())) { >+ System.out.println(vmd.getValidatorId()); > int validatorScope = vmd.getValidatorScope(); > ReconcileStepForValidator validatorStep = null; > // get step for partition type >@@ -241,6 +252,8 @@ > } > } > >+ System.out.println("---"); >+ > TemporaryAnnotation[] annotationsToRemove = getAnnotationsToRemove(dr, stepsRanOnThisDirtyRegion); > if (annotationsToRemove.length + annotationsToAdd.size() > 0) > smartProcess(annotationsToRemove, (IReconcileResult[]) annotationsToAdd.toArray(new IReconcileResult[annotationsToAdd.size()])); >#P org.eclipse.jst.jsp.core >Index: plugin.xml >=================================================================== >RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.jst.jsp.core/plugin.xml,v >retrieving revision 1.46 >diff -u -r1.46 plugin.xml >--- plugin.xml 29 May 2008 00:07:03 -0000 1.46 >+++ plugin.xml 19 Jul 2010 22:10:22 -0000 >@@ -186,7 +186,8 @@ > class="org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator" > manual="true" > version="1" >- markerId="org.eclipse.jst.jsp.core.validationMarker"> >+ markerId="org.eclipse.jst.jsp.core.validationMarker" >+ sourceid="org.eclipse.jst.jsp.jspelsourcevalidator, org.eclipse.jst.jsp.ui.internal.validation.jspactionvalidator, org.eclipse.jst.jsp.tldsourcevalidator, org.eclipse.jst.jsp.jspsourcevalidator"> > <include> > <rules> > <projectNature id="org.eclipse.jdt.core.javanature"/> >@@ -238,7 +239,8 @@ > class="org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator" > manual="true" > version="1" >- markerId="org.eclipse.jst.jsp.core.validationMarker"> >+ markerId="org.eclipse.jst.jsp.core.validationMarker" >+ sourceid="org.eclipse.jst.jsp.ui.internal.validation.markupvalidator, org.eclipse.jst.jsp.ui.internal.validation.htmlsyntaxvalidator"> > <include> > <rules> > <contentType id="org.eclipse.jst.jsp.core.jspsource"/>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 320322
:
174673
|
174685
|
174938