Attachment 182900 Details for Bug 329997 – Apply to wst.validation and wst.validation.ui

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Apply to wst.validation and wst.validation.ui

Bug329997-patch.txt (text/plain), 13.48 KB, created by Keith Chong

on 2010-11-11 09:34:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Chong

Created: 2010-11-11 09:34:04 EST

Size: 13.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.validation
>Index: vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 DisabledValidatorManager.java
>--- vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java	26 Jan 2009 13:56:50 -0000	1.1.2.2
>+++ vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java	23 Oct 2010 20:24:25 -0000
>@@ -1,3 +1,14 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008, 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
> package org.eclipse.wst.validation.internal;
> 
> import java.util.Collections;
>@@ -32,6 +43,7 @@
> 	
> 	private DisabledValidatorManager(){
> 		ValPrefManagerProject.addListener(this);
>+        ValPrefManagerGlobal.getDefault().addListener(this);
> 	}
> 	
> 	/*
>@@ -39,6 +51,7 @@
> 	 */
> 	public void dispose(){
> 		ValPrefManagerProject.removeListener(this);
>+        ValPrefManagerGlobal.getDefault().removeListener(this);
> 	}
> 
> 	public Set<Validator> getDisabledValidatorsFor(IResource resource) {
>Index: vf2/org/eclipse/wst/validation/internal/ValManager.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java,v
>retrieving revision 1.29.2.14.2.2
>diff -u -r1.29.2.14.2.2 ValManager.java
>--- vf2/org/eclipse/wst/validation/internal/ValManager.java	5 Mar 2010 02:52:11 -0000	1.29.2.14.2.2
>+++ vf2/org/eclipse/wst/validation/internal/ValManager.java	23 Oct 2010 20:24:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2009 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -447,9 +447,9 @@
> 	 */
> 	public boolean isDisabled(IProject project){
> 		GlobalPreferences gp = getGlobalPreferences();
>-		if (!gp.getOverride() || project == null)return gp.getDisableAllValidation();
>+		if (mustUseGlobalValidators(project))return gp.getDisableAllValidation();
> 		
>-		ProjectPreferences pp = _projectPreferences.get(project);
>+		ProjectPreferences pp = getProjectPreferences(project);
> 		if (pp == null)return gp.getDisableAllValidation();
> 		return pp.getSuspend();		
> 	}
>Index: vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java,v
>retrieving revision 1.1
>diff -u -r1.1 FullBuildJob.java
>--- vf2/org/eclipse/wst/validation/internal/FullBuildJob.java	8 Apr 2008 21:13:00 -0000	1.1
>+++ vf2/org/eclipse/wst/validation/internal/FullBuildJob.java	23 Oct 2010 20:24:25 -0000
>@@ -1,3 +1,14 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008, 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
> package org.eclipse.wst.validation.internal;
> 
> import org.eclipse.core.resources.IncrementalProjectBuilder;
>Index: validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java,v
>retrieving revision 1.27.2.7
>diff -u -r1.27.2.7 ValidationBuilder.java
>--- validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java	26 Jan 2009 13:56:52 -0000	1.27.2.7
>+++ validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java	23 Oct 2010 20:24:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2009 IBM Corporation and others.
>+ * Copyright (c) 2001, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -19,6 +19,7 @@
> import java.util.Set;
> 
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceDelta;
> import org.eclipse.core.resources.IncrementalProjectBuilder;
> import org.eclipse.core.runtime.CoreException;
>@@ -27,6 +28,7 @@
> import org.eclipse.wst.validation.ValidationFramework;
> import org.eclipse.wst.validation.internal.ConfigurationManager;
> import org.eclipse.wst.validation.internal.InternalValidatorManager;
>+import org.eclipse.wst.validation.internal.MarkerManager;
> import org.eclipse.wst.validation.internal.ProjectConfiguration;
> import org.eclipse.wst.validation.internal.ResourceConstants;
> import org.eclipse.wst.validation.internal.ResourceHandler;
>@@ -151,7 +153,10 @@
> 		// won't they have builders of their own.
> 		IProject[] referenced = getAllReferencedProjects(project, null);
> 		if (ValidationFramework.getDefault().isSuspended(project) || 
>-			ValManager.getDefault().isDisabled(project))return referenced;
>+			ValManager.getDefault().isDisabled(project)) {
>+		  MarkerManager.getDefault().deleteMarkers(project, System.currentTimeMillis(), IResource.DEPTH_INFINITE);
>+		  return referenced;
>+		}
> 
> 		try {
> 			newBuild(kind, monitor);
>Index: vf2/org/eclipse/wst/validation/internal/ProjectReValidationJob.java
>===================================================================
>RCS file: vf2/org/eclipse/wst/validation/internal/ProjectReValidationJob.java
>diff -N vf2/org/eclipse/wst/validation/internal/ProjectReValidationJob.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ vf2/org/eclipse/wst/validation/internal/ProjectReValidationJob.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,43 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are 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:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.wst.validation.internal;
>+
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IncrementalProjectBuilder;
>+import org.eclipse.core.resources.WorkspaceJob;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
>+
>+public class ProjectReValidationJob extends WorkspaceJob {
>+    
>+    private final IProject project;
>+
>+    public ProjectReValidationJob(IProject project){
>+        super(ValMessages.JobName);
>+        this.project = project;
>+    }
>+
>+    @Override
>+    public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
>+        try {
>+            project.build(IncrementalProjectBuilder.FULL_BUILD, ValidationPlugin.VALIDATION_BUILDER_ID, null, monitor);
>+        }
>+        catch (Exception e){
>+            return new Status(IStatus.ERROR,ValidationPlugin.PLUGIN_ID, e.toString(), e);
>+        }
>+        return Status.OK_STATUS;
>+    }
>+
>+}
>#P org.eclipse.wst.validation.ui
>Index: vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java,v
>retrieving revision 1.9
>diff -u -r1.9 ValUIMessages.java
>--- vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java	14 May 2008 14:17:35 -0000	1.9
>+++ vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java	23 Oct 2010 20:24:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -109,6 +109,7 @@
> 	
> 	public static String RebuildTitle;
> 	public static String RebuildMsg;
>+    public static String RevalidateProjectMsg;
> 	
> 		
> 	static {
>Index: property_files/org/eclipse/wst/validation/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties,v
>retrieving revision 1.12
>diff -u -r1.12 messages.properties
>--- property_files/org/eclipse/wst/validation/ui/internal/messages.properties	14 May 2008 14:17:36 -0000	1.12
>+++ property_files/org/eclipse/wst/validation/ui/internal/messages.properties	23 Oct 2010 20:24:26 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2001, 2008 IBM Corporation and others.
>+# Copyright (c) 2001, 2010 IBM Corporation and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -150,7 +150,8 @@
> FrMsgSev=Select the severity level for the following problems
> 
> RebuildTitle=Validation Settings Changed
>-RebuildMsg=The validation settings have changed. A full rebuild is required for the changes to take effect. Do the full build now?
>+RebuildMsg=The workspace validation settings have changed. A full rebuild is required for the changes to take effect. Do the full build now?
>+RevalidateProjectMsg=The project validation settings have changed. A full project re-validation is required for the changes to take effect. Do the full re-validation now?
> 
> #
> # End Validation Builder Framework UI Strings
>Index: vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java,v
>retrieving revision 1.11.2.6
>diff -u -r1.11.2.6 ValidationPropertyPage.java
>--- vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java	26 Jan 2009 13:56:41 -0000	1.11.2.6
>+++ vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java	23 Oct 2010 20:24:26 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2008 IBM Corporation and others.
>+ * Copyright (c) 2001, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -62,6 +62,7 @@
> import org.eclipse.wst.validation.Validator;
> import org.eclipse.wst.validation.internal.ConfigurationManager;
> import org.eclipse.wst.validation.internal.GlobalConfiguration;
>+import org.eclipse.wst.validation.internal.ProjectReValidationJob;
> import org.eclipse.wst.validation.internal.ProjectConfiguration;
> import org.eclipse.wst.validation.internal.ValManager;
> import org.eclipse.wst.validation.internal.ValPrefManagerProject;
>@@ -664,6 +665,14 @@
> 			ProjectPreferences pp = new ProjectPreferences(project, _override.getSelection(), _suspend.getSelection(), null);
> 			ValPrefManagerProject vpm = new ValPrefManagerProject(project);
> 			vpm.savePreferences(pp, _validators);
>+			
>+            if (_changes > 0 && !pp.getSuspend() && 
>+                MessageDialog.openQuestion(_shell, ValUIMessages.RebuildTitle, ValUIMessages.RevalidateProjectMsg)){
>+                
>+                ProjectReValidationJob pbj = new ProjectReValidationJob(project);
>+                pbj.schedule();
>+            }
>+            
> 			return true;
> 		}
>

Flags:

ccc: iplog+

Actions: View | Diff

Attachments on bug 329997: 182900