JBoss Tools SVN: r34175 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-23 13:45:45 -0400 (Tue, 23 Aug 2011)
New Revision: 34175
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/KbELReference.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidatorContext.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProjectValidationContext.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/SimpleValidatingProjectTree.java
Log:
https://issues.jboss.org/browse/JBIDE-6153
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionLogger.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionLogger.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core.test.tck.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ILogListener;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.KBValidationException;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidationExceptionLogger implements ILogListener {
-
- private Map<String, Set<IStatus>> exceptions = new HashMap<String, Set<IStatus>>();
-
- public ValidationExceptionLogger() {
- Platform.addLogListener(this);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String)
- */
- public void logging(IStatus status, String plugin) {
- String id = status.getPlugin();
- if(id==null) {
- id = plugin;
- }
- Set<IStatus> statuses = exceptions.get(id);
- if(statuses==null) {
- statuses = new HashSet<IStatus>();
- exceptions.put(id, statuses);
- }
- statuses.add(status);
- }
-
- public boolean hasExceptions() {
- return !getExceptions().isEmpty();
- }
-
- public Set<IStatus> getExceptions() {
- Set<IStatus> result = new HashSet<IStatus>();
- Set<IStatus> statuses = exceptions.get(WebKbPlugin.PLUGIN_ID);
- if(statuses!=null) {
- for (IStatus status : statuses) {
- Throwable exception = status.getException();
- if(exception instanceof KBValidationException) {
- result.add(status);
- }
- }
- }
- return result;
- }
-}
\ No newline at end of file
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core.test.tck.validation;
-
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.KBValidationException;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidationExceptionTest extends TestCase {
-
- private static ValidationExceptionLogger LOGGER;
-
- public static ValidationExceptionLogger initLogger() {
- LOGGER = new ValidationExceptionLogger();
- return LOGGER;
- }
-
- public void testExceptions() {
- Set<IStatus> exceptions = LOGGER.getExceptions();
- StringBuffer error = new StringBuffer("The following exceptions were thrown during project validation:");
- for (IStatus status : exceptions) {
- Throwable cause = status.getException().getCause();
- error.append("\r\n").append(status.toString()).append(": ").append(cause.toString()).append(": ").append(cause.getStackTrace()[0].toString());
- }
- assertTrue(error.toString(), exceptions.isEmpty());
- }
-
- public void testLogger() {
- WebKbPlugin.getDefault().logError(new KBValidationException("Test exception", null));
- Set<IStatus> exceptions = LOGGER.getExceptions();
- assertEquals(1, exceptions.size());
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/KbELReference.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/KbELReference.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/KbELReference.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.el;
-
-import org.jboss.tools.common.el.core.ELReference;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
-
-/**
- * @author Alexey Kazakov
- */
-public class KbELReference extends ELReference {
-
- /* (non-Javadoc)
- * @see org.jboss.tools.common.el.core.ELReference#getMarkerGroupId()
- */
- @Override
- protected String getMarkerGroupId() {
- return IValidator.MARKED_RESOURCE_MESSAGE_GROUP;
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidatorContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidatorContext.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidatorContext.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.jboss.tools.common.el.core.ELReference;
-import org.jboss.tools.common.xml.XMLUtilities;
-import org.jboss.tools.jst.web.kb.el.KbELReference;
-import org.w3c.dom.Element;
-
-/**
- * @author Alexey Kazakov
- */
-public class ELValidatorContext extends LinkCollection {
-
- private Map<String, Set<ELReference>> elsByVariableName = new HashMap<String, Set<ELReference>>();
- private Map<ELReference, Set<String>> variableNamesByEl = new HashMap<ELReference, Set<String>>();
- private Map<IPath, Set<ELReference>> elsByResource = new HashMap<IPath, Set<ELReference>>();
-
- public ELValidatorContext(String id) {
- super(id);
- }
-
- /**
- * Save link between EL and variable name.
- * @param variableName
- * @param el
- */
- public synchronized void addLinkedEl(String variableName, ELReference el) {
- Set<ELReference> linkedEls = elsByVariableName.get(variableName);
- if(linkedEls==null) {
- // create set of linked ELs with variable name.
- linkedEls = new HashSet<ELReference>();
- elsByVariableName.put(variableName, linkedEls);
- }
- // save linked ELs.
- // don't save links if there are more than 500 ELs for the var name.
- if(linkedEls.size()<500) {
- if(linkedEls.add(el)) {
- modifications++;
- }
- // Save link between EL and variable names.
- Set<String> variableNames = variableNamesByEl.get(el);
- if(variableNames==null) {
- variableNames = new HashSet<String>();
- variableNamesByEl.put(el, variableNames);
- }
- if(variableNames.add(variableName)) {
- modifications++;
- }
- }
-
- // Save link between EL and resource.
- Set<ELReference> els = elsByResource.get(el.getPath());
- if(els==null) {
- els = new HashSet<ELReference>();
- elsByResource.put(el.getPath(), els);
- }
- if(els.add(el)) {
- modifications++;
- }
- }
-
- public synchronized void removeLinkedEls(Set<IFile> resorces) {
- for (IFile file : resorces) {
- removeLinkedEls(file);
- }
- }
-
- public synchronized void removeLinkedEls(IFile resource) {
- Set<ELReference> els = elsByResource.get(resource.getFullPath());
- if(els!=null) {
- if(elsByResource.remove(resource.getFullPath()) != null) {
- modifications++;
- }
- for (ELReference el : els) {
- Set<String> names = variableNamesByEl.get(el);
- if(names!=null) {
- String[] nameStrins = names.toArray(new String[0]);
- for (int i = 0; i < nameStrins.length; i++) {
- removeLinkedEl(nameStrins[i], el);
- }
- }
- }
- }
- }
-
- /**
- * Removes link between EL and variable name.
- * @param name
- * @param el
- */
- public synchronized void removeLinkedEl(String name, ELReference el) {
- Set<ELReference> linkedEls = elsByVariableName.get(name);
- if(linkedEls!=null) {
- if(linkedEls.remove(el)) {
- modifications++;
- }
- }
- if(linkedEls.isEmpty()) {
- elsByVariableName.remove(name);
- }
-
- // Remove link between EL and variable names.
- Set<String> variableNames = variableNamesByEl.get(el);
- if(variableNames!=null) {
- if(variableNames.remove(name)) {
- modifications++;
- }
- }
- if(variableNames.isEmpty()) {
- variableNamesByEl.remove(el);
- }
- }
-
- /**
- * Return ELs with given variable name
- * @param variableName
- * @return
- */
- public synchronized Set<ELReference> getElsByVariableName(String variableName) {
- return elsByVariableName.get(variableName);
- }
-
- /**
- * @param names
- * @return
- */
- public synchronized Set<ELReference> getElsByVariableNames(Set<String> names) {
- Set<ELReference> result = new HashSet<ELReference>();
- for(String name : names) {
- Set<ELReference> els = getElsByVariableName(name);
- if(els!=null) {
- result.addAll(els);
- }
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.internal.validation.LinkCollection#clearAll()
- */
- @Override
- public synchronized void clearAll() {
- super.clearAll();
- elsByVariableName.clear();
- variableNamesByEl.clear();
- elsByResource.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.internal.validation.LinkCollection#store(org.w3c.dom.Element)
- */
- @Override
- public synchronized void store(Element root) {
- super.store(root);
- Set<String> variables = elsByVariableName.keySet();
- for (String name: variables) {
- Set<ELReference> els = elsByVariableName.get(name);
- if(els == null) {
- continue;
- }
- for (ELReference el: els) {
- Element linkedEl = XMLUtilities.createElement(root, "linked-el"); //$NON-NLS-1$
- linkedEl.setAttribute("name", name); //$NON-NLS-1$
- el.store(linkedEl);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.internal.validation.LinkCollection#load(org.w3c.dom.Element)
- */
- @Override
- public synchronized void load(Element root) {
- super.load(root);
- if(root == null) {
- return;
- }
- Element[] linkedEls = XMLUtilities.getChildren(root, "linked-el"); //$NON-NLS-1$
- if(linkedEls != null) {
- for (int i = 0; i < linkedEls.length; i++) {
- String name = linkedEls[i].getAttribute("name"); //$NON-NLS-1$
- if(name == null || name.trim().length() == 0) {
- continue;
- }
- ELReference el = new KbELReference();
- el.load(linkedEls[i]);
- el.setNeedToInitMarkers(true);
- addLinkedEl(name, el);
- }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProjectValidationContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProjectValidationContext.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProjectValidationContext.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,310 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.jboss.tools.common.el.core.ELReference;
-import org.jboss.tools.common.xml.XMLUtilities;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.w3c.dom.Element;
-
-/**
- * Contains information for validators that must be saved between
- * validation invoking.
- * @author Alexey Kazakov
- */
-public class ProjectValidationContext implements IProjectValidationContext {
-
- // We should load/save these collections between eclipse sessions.
- private Map<String, LinkCollection> coreLinks = new HashMap<String, LinkCollection>();
- private ELValidatorContext elLinks = new ELValidatorContext("jboss.el"); //$NON-NLS-1$
-
- private Map<String, Set<String>> oldVariableNamesForELValidation = new HashMap<String, Set<String>>();
-
- private ValidationResourceRegister validationResourceRegister;
-
- public LinkCollection getCoreLinks(String validatorId) {
- LinkCollection linkCollection = coreLinks.get(validatorId);
- if(linkCollection==null) {
- linkCollection = new LinkCollection(validatorId);
- coreLinks.put(validatorId, linkCollection);
- }
- return linkCollection;
- }
-
- private Set<String> getOldVariableNamesForELValidation(String validatorId) {
- Set<String> linkCollection = oldVariableNamesForELValidation.get(validatorId);
- if(linkCollection==null) {
- linkCollection = new HashSet<String>();
- oldVariableNamesForELValidation.put(validatorId, linkCollection);
- }
- return linkCollection;
- }
-
- private Set<String> getIds() {
- Set<String> ids = new HashSet<String>();
- ids.addAll(coreLinks.keySet());
- ids.addAll(oldVariableNamesForELValidation.keySet());
- return ids;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#addLinkedCoreResource(java.lang.String, org.eclipse.core.runtime.IPath, boolean)
- */
- public void addLinkedCoreResource(String validatorId, String variableName, IPath linkedResourcePath, boolean declaration) {
- getCoreLinks(validatorId).addLinkedResource(variableName, linkedResourcePath, declaration);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeLinkedCoreResource(java.lang.String, org.eclipse.core.runtime.IPath)
- */
- public void removeLinkedCoreResource(String validatorId, String name, IPath linkedResourcePath) {
- getCoreLinks(validatorId).removeLinkedResource(name, linkedResourcePath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeLinkedCoreResources(java.util.Set)
- */
- public void removeLinkedCoreResources(String validatorId, Set<IPath> resources) {
- getCoreLinks(validatorId).removeLinkedResources(resources);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeLinkedCoreResource(org.eclipse.core.runtime.IPath)
- */
- public void removeLinkedCoreResource(String validatorId, IPath resource) {
- getCoreLinks(validatorId).removeLinkedResource(resource);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getCoreResourcesByVariableName(java.lang.String, boolean)
- */
- public Set<IPath> getCoreResourcesByVariableName(String validatorId, String variableName, boolean declaration) {
- return getCoreLinks(validatorId).getResourcesByVariableName(variableName, declaration);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getVariableNamesByCoreResource(org.eclipse.core.runtime.IPath, boolean)
- */
- public Set<String> getVariableNamesByCoreResource(String validatorId, IPath fullPath, boolean declaration) {
- return getCoreLinks(validatorId).getVariableNamesByResource(fullPath, declaration);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#addUnnamedCoreResource(org.eclipse.core.runtime.IPath)
- */
- public void addUnnamedCoreResource(String validatorId, IPath fullPath) {
- getCoreLinks(validatorId).addUnnamedResource(fullPath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getUnnamedCoreResources()
- */
- public Set<IPath> getUnnamedCoreResources(String validatorId) {
- return getCoreLinks(validatorId).getUnnamedResources();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeUnnamedCoreResource(org.eclipse.core.runtime.IPath)
- */
- public void removeUnnamedCoreResource(String validatorId, IPath fullPath) {
- getCoreLinks(validatorId).removeUnnamedResource(fullPath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getUnnamedElResources()
- */
- public Set<IPath> getUnnamedElResources() {
- return elLinks.getUnnamedResources();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeUnnamedElResource(org.eclipse.core.runtime.IPath)
- */
- public void removeUnnamedElResource(IPath fullPath) {
- elLinks.removeUnnamedResource(fullPath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#addVariableNameForELValidation(java.lang.String)
- */
- public void addVariableNameForELValidation(String validatorId, String name) {
- getOldVariableNamesForELValidation(validatorId).add(name);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeLinkedEls(java.util.Set)
- */
- public void removeLinkedEls(Set<IFile> resorces) {
- elLinks.removeLinkedEls(resorces);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getElsForValidation(java.util.Set, boolean)
- */
- public Set<ELReference> getElsForValidation(Set<IFile> changedFiles, boolean onlyChangedVariables) {
- Set<ELReference> result = new HashSet<ELReference>();
- for (String id : getIds()) {
- Set<String> oldVariableNamesForELValidation = getOldVariableNamesForELValidation(id);
- // Collect all ELs which use new variables names
- for(IResource resource : changedFiles) {
- Set<String> newNames = getVariableNamesByCoreResource(id, resource.getFullPath(), true);
- if(newNames!=null) {
- for (String newName : newNames) {
- if(!onlyChangedVariables || (oldVariableNamesForELValidation!=null && !oldVariableNamesForELValidation.contains(newName))) {
- Set<ELReference> els = elLinks.getElsByVariableName(newName);
- if(els!=null) {
- result.addAll(els);
- }
- }
- }
- }
- if(oldVariableNamesForELValidation!=null) {
- for (String oldName :oldVariableNamesForELValidation) {
- if(!onlyChangedVariables || newNames==null || !newNames.contains(oldName)) {
- Set<ELReference> els = elLinks.getElsByVariableName(oldName);
- if(els!=null) {
- result.addAll(els);
- }
- }
- }
- }
- }
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#clearAll()
- */
- public void clearAll() {
- for (LinkCollection links : coreLinks.values()) {
- links.clearAll();
- }
- coreLinks.clear();
- elLinks.clearAll();
- oldVariableNamesForELValidation.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#clearOldVariableNameForElValidation()
- */
- public void clearOldVariableNameForElValidation() {
- oldVariableNamesForELValidation.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#addLinkedEl(java.lang.String, org.jboss.tools.jst.web.kb.validation.ELReference)
- */
- public void addLinkedEl(String variableName, ELReference el) {
- elLinks.addLinkedEl(variableName, el);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#removeLinkedEl(java.lang.String, org.jboss.tools.jst.web.kb.validation.ELReference)
- */
- public void removeLinkedEl(String name, ELReference el) {
- elLinks.removeLinkedEl(name, el);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getElsByVariableName(java.lang.String)
- */
- public Set<ELReference> getElsByVariableName(String variableName) {
- return elLinks.getElsByVariableName(variableName);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#store(org.w3c.dom.Element)
- */
- public void store(Element root) {
- Element validation = XMLUtilities.createElement(root, "validation"); //$NON-NLS-1$
- for (LinkCollection links : coreLinks.values()) {
- Element core = XMLUtilities.createElement(validation, "core"); //$NON-NLS-1$
- core.setAttribute("validator-id", links.getId()); //$NON-NLS-1$
- links.store(core);
- }
- Element el = XMLUtilities.createElement(validation, "el"); //$NON-NLS-1$
- elLinks.store(el);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#load(org.w3c.dom.Element)
- */
- public void load(Element root) {
- Element validation = XMLUtilities.getUniqueChild(root, "validation"); //$NON-NLS-1$
- if(validation == null) return;
- Element[] cores = XMLUtilities.getChildren(validation, "core"); //$NON-NLS-1$
- for (Element core : cores) {
- String id = core.getAttribute("validator-id"); //$NON-NLS-1$
- if(id!=null && id.trim().length()>0) {
- getCoreLinks(id).load(core);
- }
- }
- Element[] els = XMLUtilities.getChildren(validation, "el"); //$NON-NLS-1$
- for (Element el : els) {
- elLinks.load(el);
- }
- }
-
- public int getModificationsSinceLastStore() {
- int result = 0;
- for (LinkCollection links : coreLinks.values()) {
- result = result + links.getModificationsSinceLastStore();
- }
- result = result + elLinks.getModificationsSinceLastStore();
- return result;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IProjectValidationContext#setValidationResourceRegister(org.jboss.tools.jst.web.kb.internal.validation.ValidationResourceRegister)
- */
- public void setValidationResourceRegister(ValidationResourceRegister validationResourceRegister) {
- this.validationResourceRegister = validationResourceRegister;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IProjectValidationContext#getValidationResourceRegister()
- */
- public ValidationResourceRegister getValidationResourceRegister() {
- return validationResourceRegister;
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/SimpleValidatingProjectTree.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/SimpleValidatingProjectTree.java 2011-08-23 17:34:09 UTC (rev 34174)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/SimpleValidatingProjectTree.java 2011-08-23 17:45:45 UTC (rev 34175)
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-
-/**
- * Represents a validating project tree with the only brunch.
- * @author Alexey Kazakov
- */
-public class SimpleValidatingProjectTree implements IValidatingProjectTree, IValidatingProjectSet {
-
- private Map<IProject, IValidatingProjectSet> brunches = new HashMap<IProject, IValidatingProjectSet>();
- private IValidatingProjectSet brunch;
- private Set<IProject> validatingProjects = new HashSet<IProject>();
-
- public SimpleValidatingProjectTree(IProject project) {
- addProject(project);
- }
-
- public SimpleValidatingProjectTree(IValidatingProjectSet brunch) {
- this.brunch = brunch;
- brunches.put(brunch.getRootProject(), brunch);
- validatingProjects.add(brunch.getRootProject());
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree#getBrunches()
- */
- public Map<IProject, IValidatingProjectSet> getBrunches() {
- return brunches;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getRootProject()
- */
- public IProject getRootProject() {
- return brunch.getRootProject();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getAllProjests()
- */
- public Set<IProject> getAllProjects() {
- return brunch.getAllProjects();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getRootContext()
- */
- public IProjectValidationContext getRootContext() {
- return brunch.getRootContext();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree#addProject(org.eclipse.core.resources.IProject)
- */
- public void addProject(IProject project) {
- if(project!=null && !validatingProjects.contains(project)) {
- Set<IProject> allProjects = new HashSet<IProject>();
- allProjects.add(project);
- brunch = new ValidatingProjectSet(project, allProjects, new ProjectValidationContext());
- brunches.put(brunch.getRootProject(), brunch);
- validatingProjects.add(project);
- }
- }
-}
\ No newline at end of file
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34174 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/META-INF and 62 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-23 13:34:09 -0400 (Tue, 23 Aug 2011)
New Revision: 34174
Added:
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionLogger.java
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationProjectTestSetup.java
Removed:
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ValidationProjectTestSetup.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/LinkCollection.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProblemMessage.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatingProjectSet.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationContext.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationResourceRegister.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTestSetup.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
trunk/common/features/org.jboss.tools.common.feature/feature.xml
trunk/common/plugins/org.jboss.tools.common.base.test/.classpath
trunk/common/plugins/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java
trunk/common/tests/pom.xml
trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.validator/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidationErrorManager.java
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFELValidationDelegate.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/BuilderOrderResolutionGenerator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidationMessages.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/KBValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/KBValidationTest.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/TestValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectPropertyValidatorWrapper.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java
Log:
https://issues.jboss.org/browse/JBIDE-6153
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -24,7 +24,8 @@
org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.apache.ant;bundle-version="1.7.1",
- org.jboss.tools.jst.web
+ org.jboss.tools.jst.web,
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -131,7 +131,7 @@
</extension>
<extension id="cdiproblem" name="%KBProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.jboss.tools.jst.web.kb.kbproblemmarker">
+ <super type="org.jboss.tools.common.validation.JBTValidationProblem">
</super>
<persistent value="true">
</persistent>
@@ -139,7 +139,7 @@
<extension
id="CoreValidator"
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.cdi.internal.core.validation.CDICoreValidator"
name="%CDICoreValidator"
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -42,9 +42,9 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.EclipseJavaUtil;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
import org.w3c.dom.Element;
public class CDICoreNature implements IProjectNature {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -94,12 +94,13 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.INodeReference;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.ValidationUtil;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.ValidationUtil;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
/**
* @author Alexey Kazakov
@@ -188,7 +189,7 @@
}
private boolean validateBuilderOrder(IProject project) throws CoreException {
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), CDIPreferences.getInstance());
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getId(), CDIPreferences.getInstance());
}
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIELValidationDelegate.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,11 +15,10 @@
import org.jboss.tools.cdi.core.CDICoreBuilder;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.jst.web.kb.internal.validation.ELValidator;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.IELValidationDelegate;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.jst.web.kb.validation.IELValidationDelegate;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
/**
* @author Alexey Kazakov
@@ -51,7 +50,7 @@
private boolean validateBuilderOrder(IProject project) throws CoreException {
//It's EL, hence EL preferences, not CDI preferences.
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getID(), ELSeverityPreferences.getInstance()); //$NON-NLS-1$
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getID(), ELSeverityPreferences.getInstance()); //$NON-NLS-1$
}
public String getID() {
@@ -61,5 +60,4 @@
public String getBuilderId() {
return CDICoreBuilder.BUILDER_ID;
}
-
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -18,10 +18,10 @@
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.internal.KbProject;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -18,13 +18,13 @@
import org.eclipse.core.resources.IProject;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.internal.KbProject;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
/**
* Represents a tree of dependent CDI projects.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -24,7 +24,8 @@
org.eclipse.equinox.preferences;bundle-version="3.4.0",
org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.apache.ant;bundle-version="1.7.1"
+ org.apache.ant;bundle-version="1.7.1",
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -24,7 +24,8 @@
org.eclipse.equinox.preferences;bundle-version="3.4.0",
org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.apache.ant;bundle-version="1.7.1"
+ org.apache.ant;bundle-version="1.7.1",
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -21,7 +21,9 @@
org.jboss.tools.cdi.xml,
org.eclipse.jst.standard.schemas,
org.eclipse.wst.validation;bundle-version="1.2.0",
- org.eclipse.wst.common.frameworks;bundle-version="1.2.0"
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
+ org.jboss.tools.common.validation,
+ org.jboss.tools.common.base.test
Export-Package: org.jboss.tools.cdi.core.test,
org.jboss.tools.cdi.core.test.extension,
org.jboss.tools.cdi.core.test.tck,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -58,7 +58,7 @@
import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest;
import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest;
import org.jboss.tools.cdi.core.test.tck.validation.IncrementalValidationTest;
-import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -18,7 +18,7 @@
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -35,14 +35,14 @@
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.java.impl.JavaAnnotation;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -21,9 +21,10 @@
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.ide.IDE;
import org.jboss.tools.cdi.core.preferences.CDIPreferences;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -65,7 +66,7 @@
}
private IMarker[] getBuilderOrderMarkers() throws CoreException {
- return project.findMarkers(ValidatorManager.ORDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO);
+ return project.findMarkers(KBValidator.ORDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO);
}
public void testWrongBuildOrderPreference() throws CoreException {
@@ -98,7 +99,7 @@
public void testBuilderOrderResolution() throws CoreException {
checkResolution(project,
- ValidatorManager.ORDER_PROBLEM_MARKER_TYPE,
+ KBValidator.ORDER_PROBLEM_MARKER_TYPE,
"org.jboss.tools.jst.web.kb.internal.validation.BuilderOrderResolution");
}
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -19,11 +19,11 @@
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.internal.core.validation.CDIProjectSet;
import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.jst.web.kb.internal.validation.LinkCollection;
-import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationContext;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationContext;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.LinkCollection;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -19,7 +19,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -16,7 +16,7 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -14,7 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,7 +13,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -14,8 +14,8 @@
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationContext;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -23,6 +23,7 @@
org.jboss.tools.cdi.seam.solder.core,
org.eclipse.jst.standard.schemas,
org.jboss.tools.jst.jsp.test,
- org.eclipse.wst.validation
+ org.eclipse.wst.validation,
+ org.jboss.tools.common.base.test
Export-Package: org.jboss.tools.cdi.seam.config.core.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
-import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
/**
* @author Viacheslav Kabanovich
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -23,8 +23,8 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferences;
import org.jboss.tools.cdi.seam.config.core.validation.SeamConfigValidationMessages;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,12 +15,12 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
-import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest;
import org.jboss.tools.cdi.seam.core.test.international.BundleModelTest;
import org.jboss.tools.cdi.seam.core.test.international.SeamResourceBundlesTest;
import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTest;
import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTestSetup;
import org.jboss.tools.cdi.seam.core.test.servlet.SeamServletValidationTest;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamCoreTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.cdi.seam.core.test.SeamCoreTestSetup;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.ResourcesUtils;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -14,7 +14,7 @@
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.test.DependentProjectTest;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.ResourcesUtils;
public class SeamPersistenceTest extends TestCase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -14,4 +14,6 @@
org.jboss.tools.cdi.core,
org.jboss.tools.jst.jsp.base.test,
org.eclipse.wst.validation,
- org.jboss.tools.cdi.core.test
+ org.jboss.tools.cdi.core.test,
+ org.jboss.tools.common.validation,
+ org.jboss.tools.common.base.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
-import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
/**
* @author Alexey Kazakov
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTestSetup.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/SeamFacesValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -20,8 +20,8 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -22,6 +22,7 @@
org.jboss.tools.cdi.xml,
org.eclipse.jst.standard.schemas,
org.jboss.tools.jst.jsp.test,
- org.eclipse.wst.validation
+ org.eclipse.wst.validation,
+ org.jboss.tools.common.base.test
Export-Package: org.jboss.tools.cdi.seam.solder.core.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
-import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
/**
* @author Viacheslav Kabanovich
*/
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -17,7 +17,7 @@
import org.eclipse.core.runtime.Path;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -29,5 +29,6 @@
org.jboss.tools.common.el.core;bundle-version="3.3.0",
org.jboss.tools.jst.web.kb,
org.eclipse.wst.validation;bundle-version="1.2.300",
- org.jboss.tools.jst.web.kb.test
+ org.jboss.tools.jst.web.kb.test,
+ org.jboss.tools.common.validation
Export-Package: org.jboss.tools.cdi.ui.test
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/TCKUITest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -17,11 +17,11 @@
import org.jboss.tools.cdi.core.test.tck.TCKTest.XmlFileFilter;
import org.jboss.tools.cdi.core.test.tck.validation.CoreValidationTest;
import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -41,9 +41,9 @@
import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution;
import org.jboss.tools.cdi.ui.marker.TestableResolutionWithRefactoringProcessor;
import org.jboss.tools.cdi.ui.test.TCKUITest;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
/**
* @author Daniel Azarov
Modified: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -65,6 +65,12 @@
version="0.0.0"/>
<plugin
+ id="org.jboss.tools.common.validation.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
id="org.jboss.tools.common.verification.test"
download-size="0"
install-size="0"
Modified: trunk/common/features/org.jboss.tools.common.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.feature/feature.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/features/org.jboss.tools.common.feature/feature.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -41,6 +41,12 @@
version="0.0.0"/>
<plugin
+ id="org.jboss.tools.common.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
id="org.jboss.tools.common.resref.core"
download-size="0"
install-size="0"
Modified: trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/plugins/org.jboss.tools.common/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -8,27 +8,28 @@
Export-Package: org.jboss.tools.common,
org.jboss.tools.common.java,
org.jboss.tools.common.java.impl,
+ org.jboss.tools.common.jobs,
org.jboss.tools.common.log,
org.jboss.tools.common.preferences,
org.jboss.tools.common.reporting,
org.jboss.tools.common.text,
org.jboss.tools.common.util,
- org.jboss.tools.common.jobs,
org.jboss.tools.common.xml,
org.jboss.tools.common.zip
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.wst.xml.core;visibility:=reexport;bundle-version="1.1.600",
+ org.eclipse.wst.xml.core;bundle-version="1.1.600";visibility:=reexport,
org.eclipse.jface;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.wst.common.uriresolver;visibility:=reexport;bundle-version="1.1.401",
+ org.eclipse.wst.common.uriresolver;bundle-version="1.1.401";visibility:=reexport,
org.eclipse.core.net;bundle-version="1.2.100",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
org.eclipse.jface.text;bundle-version="3.7.0",
- org.apache.commons.httpclient;bundle-version="3.1.0"
+ org.apache.commons.httpclient;bundle-version="3.1.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/CommonPlugin.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -28,7 +28,6 @@
protected static CommonPlugin instance;
private static String environment;
-
public CommonPlugin() {
super();
instance = this;
@@ -106,7 +105,6 @@
return environment;
}
-
/**
* Returns the shared instance
*
@@ -122,4 +120,4 @@
public static IPluginLog getPluginLog() {
return getDefault();
}
-}
+}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/.classpath
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/.classpath 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/.classpath 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -7,7 +7,8 @@
Bundle-SymbolicName: org.jboss.tools.common.base.test;singleton:=true
Bundle-Localization: plugin
Export-Package: org.jboss.tools.common.base.test,
- org.jboss.tools.common.base.test.contentassist
+ org.jboss.tools.common.base.test.contentassist,
+ org.jboss.tools.common.base.test.validation
Require-Bundle: org.jboss.tools.common,
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0",
@@ -25,7 +26,10 @@
org.jboss.tools.tests,
org.jboss.tools.common.text.xml,
org.jboss.tools.common.text.ext,
- org.eclipse.ui.ide;bundle-version="3.7.0"
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.jboss.tools.common.validation,
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.100"
Bundle-Version: 3.3.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Copied: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java (from rev 34096, trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -0,0 +1,123 @@
+package org.jboss.tools.common.base.test.validation;
+
+import java.lang.reflect.InvocationTargetException;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
+import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.test.util.JobUtils;
+
+public class TestUtil {
+
+ /**
+ * Wait for validation to be completed.
+ * Usage:
+ * ValidatorManager.setStatus("Any status but ValidatorManager.SLEEPING");
+ * ... // do some work here which will make Eclipse build the project
+ * TestUtil.waitForValidation(project);
+ * @throws CoreException
+ */
+ public static void _waitForValidation(IProject project) throws CoreException{
+
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+ ValidationFramework.getDefault().suspendAllValidation(false);
+ try {
+ new EnabledValidatorsOperation(project,false){
+ public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
+ try {
+ // In order to check whether or not the monitor has been canceled, the monitor must not be null.
+ if (progressMonitor == null)return;
+ IProject project = getProject();
+ if (ValidationFramework.getDefault().isSuspended(project))return;
+ if (ValManager.getDefault().isDisabled(project))return;
+
+ if (!areValidatorsEnabled()) {
+ // save some processing time...
+ return;
+ }
+
+ final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor) {
+ public void addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator, org.eclipse.wst.validation.internal.provisional.core.IMessage message) {
+ super.addMessage(validator, message);
+ System.out.println(message);
+ };
+ };
+
+ try {
+ // Periodically check if the user has canceled the operation
+ checkCanceled(reporter);
+ preValidate(reporter);
+ validate(reporter);
+ } catch (CoreException e) {
+ ValidationPlugin.getPlugin().handleException(e);
+ }
+ } finally {
+ }
+ }
+ }.run(new NullProgressMonitor());
+ } finally {
+ ValidationFramework.getDefault().suspendAllValidation(true);
+ }
+ }
+
+ public static void validate(IResource resource) throws CoreException {
+ validate(resource.getProject(), new IResource[] {resource});
+ }
+
+ public static void validate(IProject project, IResource[] resources) throws CoreException {
+ ValidationFramework.getDefault().suspendAllValidation(true);
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+ ValidationFramework.getDefault().suspendAllValidation(false);
+ try {
+ new IncrimantalValidatorOperation(project, resources).run(new NullProgressMonitor());
+// new EnabledIncrementalValidatorsOperation(project, resources).run(new NullProgressMonitor());
+// new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor());
+ } catch (OperationCanceledException e) {
+ e.printStackTrace();
+ TestCase.fail(e.getMessage());
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ TestCase.fail(e.getMessage());
+ } finally {
+ ValidationFramework.getDefault().suspendAllValidation(true);
+ }
+ }
+
+ private static class IncrimantalValidatorOperation extends ValidatorSubsetOperation {
+ public IncrimantalValidatorOperation(IProject project, Object[] changedResources) throws InvocationTargetException {
+ super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
+ ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+ setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+ setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
+ }
+ }
+
+ public static boolean waitForValidation() throws CoreException{
+ for (int i = 0; i < 50; i++) {
+ if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {
+ return true;
+ }
+ JobUtils.delay(100);
+ JobUtils.waitForIdle();
+ }
+ return false;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionLogger.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionLogger.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionLogger.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.base.test.validation;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.common.validation.JBTValidationException;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ValidationExceptionLogger implements ILogListener {
+
+ private Set<IStatus> exceptions = new HashSet<IStatus>();
+
+ public ValidationExceptionLogger() {
+ Platform.addLogListener(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String)
+ */
+ public void logging(IStatus status, String plugin) {
+ exceptions.add(status);
+ }
+
+ public boolean hasExceptions() {
+ return !getExceptions().isEmpty();
+ }
+
+ public Set<IStatus> getExceptions() {
+ Set<IStatus> result = new HashSet<IStatus>();
+ for (IStatus status : exceptions) {
+ Throwable exception = status.getException();
+ if(exception instanceof JBTValidationException) {
+ result.add(status);
+ }
+ }
+ return result;
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.base.test.validation;
+
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.common.validation.CommonValidationPlugin;
+import org.jboss.tools.common.validation.JBTValidationException;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ValidationExceptionTest extends TestCase {
+
+ protected static ValidationExceptionLogger LOGGER;
+
+ public static ValidationExceptionLogger initLogger() {
+ LOGGER = new ValidationExceptionLogger();
+ return LOGGER;
+ }
+
+ public void testExceptions() throws Exception {
+ Set<IStatus> exceptions = LOGGER.getExceptions();
+ StringBuffer error = new StringBuffer("The following exceptions were thrown during project validation:");
+ for (IStatus status : exceptions) {
+ Throwable cause = status.getException().getCause();
+ error.append("\r\n").append(status.toString()).append(":");
+ if(cause!=null) {
+ error.append(cause.toString()).append(":");
+ if(cause.getStackTrace()!=null && cause.getStackTrace().length>0) {
+ error.append(cause.getStackTrace()[0].toString());
+ }
+ }
+ }
+ assertTrue(error.toString(), exceptions.isEmpty());
+ }
+
+ public void testLogger() {
+ CommonValidationPlugin.getDefault().logError(new JBTValidationException("Test logger", null));
+ Set<IStatus> exceptions = LOGGER.getExceptions();
+ assertEquals(1, exceptions.size());
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationProjectTestSetup.java (from rev 34096, trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ValidationProjectTestSetup.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationProjectTestSetup.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationProjectTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.base.test.validation;
+
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class ValidationProjectTestSetup extends ProjectImportTestSetup {
+
+ public ValidationProjectTestSetup(Test test, String bundleName, String projectPath, String projectName) {
+ super(test,bundleName, projectPath, projectName);
+ }
+
+ public ValidationProjectTestSetup(Test test, String bundleName, String[] projectPaths, String[] projectNames) {
+ super(test, bundleName, projectPaths, projectNames);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.model.util.test.XProjectImportTestSetUp#setUp()
+ */
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ for (IProject project : projects) {
+ TestUtil._waitForValidation(project);
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationProjectTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -12,7 +12,9 @@
org.jboss.tools.common.el.core.model,
org.jboss.tools.common.el.core.parser,
org.jboss.tools.common.el.core.resolver,
+ org.jboss.tools.common.el.internal.core.model,
org.jboss.tools.common.el.internal.core.parser,
+ org.jboss.tools.common.el.internal.core.parser.rule,
org.jboss.tools.common.el.internal.core.parser.token
Bundle-Activator: org.jboss.tools.common.el.core.ELCorePlugin
Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0",
Modified: trunk/common/tests/pom.xml
===================================================================
--- trunk/common/tests/pom.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/common/tests/pom.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,7 +15,7 @@
<module>org.jboss.tools.common.model.test</module>
<module>org.jboss.tools.common.model.ui.test</module>
<module>org.jboss.tools.common.test</module>
- <!-- module>org.jboss.tools.common.validation.test</module -->
+ <module>org.jboss.tools.common.validation.test</module>
<module>org.jboss.tools.common.verification.test</module>
<module>org.jboss.tools.common.verification.ui.test</module>
</modules>
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -9,11 +9,11 @@
Export-Package: org.jboss.tools.esb.validator,
org.jboss.tools.esb.validator.ui
Require-Bundle: org.jboss.tools.common.ui,
- org.jboss.tools.jst.web.kb,
org.jboss.tools.esb.core,
org.eclipse.ui,
org.jboss.tools.esb.project.core,
org.eclipse.wst.validation,
- org.eclipse.jdt.ui
+ org.eclipse.jdt.ui,
+ org.jboss.tools.common.validation
Bundle-Version: 1.5.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -7,14 +7,14 @@
</extension>
<extension id="esbproblem" name="%KBProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.jboss.tools.jst.web.kb.kbproblemmarker">
+ <super type="org.jboss.tools.common.validation.JBTValidationProblem">
</super>
<persistent value="true">
</persistent>
</extension>
<extension
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.esb.validator.ESBCoreValidator"
name="%ESBCoreValidator"
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -23,20 +23,20 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.PositionHolder;
import org.jboss.tools.common.text.ITextSourceReference;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
+import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.esb.core.ESBProjectConstant;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.model.ESBConstants;
import org.jboss.tools.esb.core.model.converters.ConverterConstants;
import org.jboss.tools.esb.core.model.impl.BusinessRulesProcessor;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
-import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
import org.w3c.dom.Element;
public class ESBCoreValidator extends ESBValidationErrorManager implements IValidator {
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidationErrorManager.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidationErrorManager.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBValidationErrorManager.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -11,7 +11,7 @@
package org.jboss.tools.esb.validator;
import org.eclipse.core.resources.IProject;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.ValidationErrorManager;
abstract public class ESBValidationErrorManager extends ValidationErrorManager {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -65,8 +65,9 @@
org.eclipse.ltk.ui.refactoring;bundle-version="3.5.100",
org.eclipse.core.expressions;bundle-version="3.4.200",
org.jboss.tools.common.text.ext;bundle-version="3.1.0",
- org.eclipse.jst.jsp.ui;visibility:=reexport;bundle-version="1.1.600",
- org.jboss.tools.jst.jsp;bundle-version="3.2.0"
+ org.eclipse.jst.jsp.ui;bundle-version="1.1.600";visibility:=reexport,
+ org.jboss.tools.jst.jsp;bundle-version="3.2.0",
+ org.jboss.tools.common.validation
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -492,7 +492,7 @@
</extension>
<extension id="compositeproblem" name="%ComponentCompositeProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.jboss.tools.jst.web.kb.kbproblemmarker">
+ <super type="org.jboss.tools.common.validation.JBTValidationProblem">
</super>
<persistent value="true">
</persistent>
@@ -500,7 +500,7 @@
<extension
id="CompositeComponentValidator"
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.jsf.web.validation.composite.CompositeComponentValidator"
name="%ComponentCompositeValidator"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFELValidationDelegate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFELValidationDelegate.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFELValidationDelegate.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -11,10 +11,10 @@
package org.jboss.tools.jsf.web.validation;
import org.eclipse.core.resources.IProject;
+import org.jboss.tools.common.validation.IELValidationDelegate;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
-import org.jboss.tools.jst.web.kb.validation.IELValidationDelegate;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
/**
* @author Alexey Kazakov
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/composite/CompositeComponentValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -33,6 +33,10 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.jboss.tools.common.el.core.resolver.ELContext;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.validation.JSFSeverityPreferences;
@@ -41,15 +45,12 @@
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.internal.KbBuilder;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.kb.internal.validation.WebValidator;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ICompositeTagLibrary;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -320,7 +321,7 @@
}
private boolean validateBuilderOrder(IProject project) throws CoreException {
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), JSFSeverityPreferences.getInstance());
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getId(), JSFSeverityPreferences.getInstance());
}
/*
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -44,7 +44,9 @@
org.eclipse.jst.jee.ejb,
org.eclipse.jst.jee.web,
org.eclipse.jst.jsf.common,
- org.jboss.tools.jst.web.kb.test
+ org.jboss.tools.jst.web.kb.test,
+ org.jboss.tools.common.validation,
+ org.jboss.tools.common.base.test
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -26,11 +26,11 @@
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jsf.jsf2.bean.el.JSF2ElResolver;
import org.jboss.tools.jsf.jsf2.bean.model.IJSF2ManagedBean;
import org.jboss.tools.jsf.jsf2.bean.model.IJSF2Project;
import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,6 +15,7 @@
import junit.framework.TestSuite;
import org.eclipse.jdt.internal.core.JavaModelManager;
+import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup;
import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest;
import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test;
import org.jboss.tools.jsf.test.project.facet.JSFFacetOnExistingProjectTest;
@@ -26,7 +27,6 @@
import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest;
import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest;
import org.jboss.tools.jsf.test.validation.WebContentTest;
-import org.jboss.tools.jst.jsp.test.ValidationProjectTestSetup;
import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfAllTests {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -18,17 +18,17 @@
import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidator;
-import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
public class ELValidatorTest extends AbstractResourceMarkerTest{
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/WebContentTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -16,7 +16,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -6,7 +6,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IMarkerResolution;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,6 +15,7 @@
import junit.framework.TestSuite;
import org.eclipse.wst.validation.ValidationFramework;
+import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup;
import org.jboss.tools.jsf.jsp.ca.test.CAForCompositeComponentTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest;
@@ -35,7 +36,6 @@
import org.jboss.tools.jsf.jsp.ca.test.JspElFunctionsTest;
import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest;
import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest;
-import org.jboss.tools.jst.jsp.test.ValidationProjectTestSetup;
import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfUiAllTests {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -9,19 +9,19 @@
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.wst.sse.core;bundle-version="1.1.600",
org.eclipse.wst.sse.ui;bundle-version="1.3.0",
- org.jboss.tools.common.text.ext;bundle-version="3.2.0",
- org.jboss.tools.jst.jsp;bundle-version="3.2.0",
- org.jboss.tools.tests;bundle-version="3.1.0",
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.tests,
org.jboss.tools.common.base.test,
org.eclipse.jface.text;bundle-version="3.7.0",
org.junit;bundle-version="3.8.2",
- org.jboss.tools.jst.web;bundle-version="3.2.0",
+ org.jboss.tools.jst.web,
org.eclipse.ui.ide;bundle-version="3.7.0",
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web.kb,
org.eclipse.wst.validation;bundle-version="1.2.300",
- org.eclipse.wst.common.frameworks;bundle-version="1.2.100"
+ org.eclipse.wst.common.frameworks;bundle-version="1.2.100",
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.jboss.tools.jst.jsp.test,
- org.jboss.tools.jst.jsp.test.ca
+Export-Package: org.jboss.tools.jst.jsp.test.ca
Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,123 +0,0 @@
-package org.jboss.tools.jst.jsp.test;
-
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.FilterUtil;
-import org.eclipse.wst.validation.internal.InternalValidatorManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.RegistryConstants;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.test.util.JobUtils;
-
-public class TestUtil {
-
- /**
- * Wait for validation to be completed.
- * Usage:
- * ValidatorManager.setStatus("Any status but ValidatorManager.SLEEPING");
- * ... // do some work here which will make Eclipse build the project
- * TestUtil.waitForValidation(project);
- * @throws CoreException
- */
- public static void _waitForValidation(IProject project) throws CoreException{
-
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- ValidationFramework.getDefault().suspendAllValidation(false);
- try {
- new EnabledValidatorsOperation(project,false){
- public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
- try {
- // In order to check whether or not the monitor has been canceled, the monitor must not be null.
- if (progressMonitor == null)return;
- IProject project = getProject();
- if (ValidationFramework.getDefault().isSuspended(project))return;
- if (ValManager.getDefault().isDisabled(project))return;
-
- if (!areValidatorsEnabled()) {
- // save some processing time...
- return;
- }
-
- final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor) {
- public void addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator, org.eclipse.wst.validation.internal.provisional.core.IMessage message) {
- super.addMessage(validator, message);
- System.out.println(message);
- };
- };
-
- try {
- // Periodically check if the user has canceled the operation
- checkCanceled(reporter);
- preValidate(reporter);
- validate(reporter);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- } finally {
- }
- }
- }.run(new NullProgressMonitor());
- } finally {
- ValidationFramework.getDefault().suspendAllValidation(true);
- }
- }
-
- public static void validate(IResource resource) throws CoreException {
- validate(resource.getProject(), new IResource[] {resource});
- }
-
- public static void validate(IProject project, IResource[] resources) throws CoreException {
- ValidationFramework.getDefault().suspendAllValidation(true);
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- ValidationFramework.getDefault().suspendAllValidation(false);
- try {
- new IncrimantalValidatorOperation(project, resources).run(new NullProgressMonitor());
-// new EnabledIncrementalValidatorsOperation(project, resources).run(new NullProgressMonitor());
-// new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor());
- } catch (OperationCanceledException e) {
- e.printStackTrace();
- TestCase.fail(e.getMessage());
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- TestCase.fail(e.getMessage());
- } finally {
- ValidationFramework.getDefault().suspendAllValidation(true);
- }
- }
-
- private static class IncrimantalValidatorOperation extends ValidatorSubsetOperation {
- public IncrimantalValidatorOperation(IProject project, Object[] changedResources) throws InvocationTargetException {
- super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
- setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
- }
- }
-
- public static boolean waitForValidation() throws CoreException{
- for (int i = 0; i < 50; i++) {
- if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {
- return true;
- }
- JobUtils.delay(100);
- JobUtils.waitForIdle();
- }
- return false;
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ValidationProjectTestSetup.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ValidationProjectTestSetup.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ValidationProjectTestSetup.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.jsp.test;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IProject;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidationProjectTestSetup extends ProjectImportTestSetup {
-
- public ValidationProjectTestSetup(Test test, String bundleName, String projectPath, String projectName) {
- super(test,bundleName, projectPath, projectName);
- }
-
- public ValidationProjectTestSetup(Test test, String bundleName, String[] projectPaths, String[] projectNames) {
- super(test, bundleName, projectPaths, projectNames);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.common.model.util.test.XProjectImportTestSetUp#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- for (IProject project : projects) {
- TestUtil._waitForValidation(project);
- }
- }
-}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -18,7 +18,6 @@
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -36,9 +35,6 @@
import org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin;
import org.osgi.framework.BundleContext;
-/**
- *
- */
public class WebModelPlugin extends BaseUIPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.jst.web"; //$NON-NLS-1$
@@ -231,29 +227,4 @@
System.arraycopy(commands, 0, cmds, 0, commands.length);
return cmds;
}
-
- public static boolean makeBuilderLast(IProject project, String builderId) throws CoreException {
- IProjectDescription d = project.getDescription();
- ICommand[] bs = d.getBuildSpec();
- ICommand v = null;
- boolean updated = false;
- for (int i = 0; i < bs.length; i++) {
- if(builderId.equals(bs[i].getBuilderName())) {
- v = bs[i];
- }
- if(v != null) {
- if(i + 1 < bs.length) {
- bs[i] = bs[i + 1];
- updated = true;
- } else if(updated) {
- bs[i] = v;
- }
- }
- }
- if(updated) {
- d.setBuildSpec(bs);
- project.setDescription(d, IProject.FORCE, new NullProgressMonitor());
- }
- return updated;
- }
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -20,14 +20,15 @@
org.eclipse.wst.xml.ui;bundle-version="1.1.200",
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.eclipse.wst.validation;bundle-version="1.2.300",
- org.eclipse.ui.editors;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.ui.editors;bundle-version="3.7.0";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.wst.css.core;bundle-version="1.1.500",
org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.common.el.ui,
org.jboss.tools.common.ui,
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
- org.eclipse.jst.j2ee;bundle-version="1.1.500"
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
@@ -44,7 +45,6 @@
org.jboss.tools.jst.web.kb.internal.validation,
org.jboss.tools.jst.web.kb.preferences,
org.jboss.tools.jst.web.kb.refactoring,
- org.jboss.tools.jst.web.kb.taglib,
- org.jboss.tools.jst.web.kb.validation
+ org.jboss.tools.jst.web.kb.taglib
Bundle-ClassPath: .
Import-Package: org.eclipse.search.ui.text
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -3,7 +3,6 @@
<plugin>
<extension-point id="tagLib" name="Kb Custom Tag Lib" schema="schema/tagLib.exsd"/>
<extension-point id="KbIncludeContext" name="Kb Include Context Buillder" schema="schema/include.exsd" />
- <extension-point id="validator" name="KB Validator" schema="schema/validator.exsd"/>
<extension-point id="elValidationDelegate" name="EL Validation Delegate" schema="schema/elValidationDelegate.exsd"/>
<extension-point id="KbRequire" name="KB Builder Requirement" schema="schema/KbRequire.exsd"/>
<extension-point id="elProjectSet" name="EL Project Set" schema="schema/elProjectSet.exsd"/>
@@ -148,13 +147,6 @@
</attribute>
</extension>
- <extension id="kbproblemmarker" name="%KBProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.wst.validation.problemmarker">
- </super>
- <persistent value="true">
- </persistent>
- </extension>
-
<extension point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
markerType="org.jboss.tools.jst.web.kb.kbBuilderProblemMarker"
@@ -168,77 +160,12 @@
class="org.jboss.tools.jst.web.kb.internal.validation.BuilderOrderResolutionGenerator"/>
</extension>
- <extension
- point="org.eclipse.wst.validation.validator"
- id="cd"
- name="JBoss KB Project Validator">
- <validator>
- <runStrategy project="true"/>
- <projectNature id="org.eclipse.jdt.core.javanature" />
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"/>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.xml"/>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.xhtml"/>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jsp">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jspf">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jsf">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jsv">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jtpl">
- </filter>
- <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
- <contentTypeBinding contentTypeId="org.jboss.tools.jst.jsp.jspincludesource"/>
- <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspfragmentsource"/>
- <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.tagsource"/>
- <markerId
- markerIdValue="KbValidationProblem">
- </markerId>
- <helper
- class="org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper">
- </helper>
- <run
- class="org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager"
- incremental="true"
- fullBuild="true"
- />
- </validator>
- </extension>
-
- <extension
- id="KbValidationProblem"
- name="Kb Validation Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.wst.validation.problemmarker"/>
- <attribute name="kind"/>
- <persistent
- value="true">
- </persistent>
- </extension>
-
<extension point="org.eclipse.core.runtime.preferences">
<initializer class="org.jboss.tools.jst.web.kb.preferences.ELPreferenceInitializer"/>
</extension>
<extension id="elproblem" name="%KBProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.jboss.tools.jst.web.kb.kbproblemmarker">
+ <super type="org.jboss.tools.common.validation.JBTValidationProblem">
</super>
<persistent value="true">
</persistent>
@@ -249,7 +176,7 @@
<extension
id="ELValidator"
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.jst.web.kb.internal.validation.ELValidator"
id="org.jboss.tools.jst.web.kb.ELValidator"
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IKbProject.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -12,8 +12,8 @@
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
/**
*
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -25,8 +25,6 @@
public static String WRONG_BUILDER_ORDER;
public static String CHANGE_BUILDER_ORDER;
- public static String VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL;
- public static String VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL;
public static String KBNATURE_NOT_FOUND;
public static String KBBUILDER_NOT_FOUND;
public static String KBNATURE_SEPARATOR;
@@ -38,8 +36,4 @@
public static String KBPROBLEM_DEPENDS_ON_JAVA_MANY;
public static String ENABLE_KB_ON_SINGLE;
public static String ENABLE_KB_ON_MANY;
-
- public static String ILLEGAL_CONTENTTYPE;
-
- public static String EXCEPTION_DURING_CREATING_MARKER;
- }
\ No newline at end of file
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.properties 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,9 +1,6 @@
WRONG_BUILDER_ORDER={1} cannot run on project {0} because Validation Builder precedes {2}.
CHANGE_BUILDER_ORDER=Change Order of Builders.
-VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL=Linked resource path must not be null\!
-VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL=Variable name must not be null\!
-
KBNATURE_NOT_FOUND=Nature
KBBUILDER_NOT_FOUND=Builder
KBNATURE_SEPARATOR=,
@@ -15,8 +12,4 @@
KBPROBLEM_DEPENDS_ON_JAVA_SINGLE= JBoss Tools Knowledge Base problem: Nature is not installed on required Java project {0}. Use Quick Fix to include artifacts declared in that project into Content Assistant and Validation.
KBPROBLEM_DEPENDS_ON_JAVA_MANY= JBoss Tools Knowledge Base problem: Nature is not installed on required Java projects {0}. Use Quick Fix to include artifacts declared in these projects into Content Assistant and Validation.
ENABLE_KB_ON_SINGLE=Enable Knowledge Base capabilities on project {0}
-ENABLE_KB_ON_MANY=Enable Knowledge Base capabilities on projects {0}
-
-ILLEGAL_CONTENTTYPE=Unknown contentType argument value: {0}
-
-EXCEPTION_DURING_CREATING_MARKER=Exception occurred during creating marker for validation error on ''{0}''
+ENABLE_KB_ON_MANY=Enable Knowledge Base capabilities on projects {0}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -89,7 +89,7 @@
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.common.util.EclipseUIUtil;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.jst.web.kb.el.KbELReference;
+import org.jboss.tools.common.validation.ValidationELReference;
import org.jboss.tools.jst.web.kb.include.IncludeContextBuilder;
import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl;
import org.jboss.tools.jst.web.kb.internal.JspContextImpl;
@@ -263,7 +263,7 @@
List<SyntaxError> errors = model.getSyntaxErrors();
for (ELInstance instance : model.getInstances()) {
for(ELInvocationExpression ie : instance.getExpression().getInvocations()){
- ELReference elReference = new KbELReference();
+ ELReference elReference = new ValidationELReference();
elReference.setResource(file);
elReference.setEl(new ELExpression[]{ie});
elReference.setLength(ie.getLength());
@@ -312,7 +312,7 @@
ELModel model = parser.parse(value);
List<ELInstance> is = model.getInstances();
- ELReference elReference = new KbELReference();
+ ELReference elReference = new ValidationELReference();
try {
elReference.setLineNumber(document.getLineOfOffset(startEl));
} catch (BadLocationException e) {
@@ -578,7 +578,7 @@
ELModel model = parser.parse(text);
List<ELInstance> is = model.getInstances();
- ELReference elReference = new KbELReference();
+ ELReference elReference = new ValidationELReference();
elReference.setResource(context.getResource());
elReference.setEl(is);
elReference.setLength(text.length());
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -37,6 +37,8 @@
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
@@ -51,12 +53,10 @@
import org.jboss.tools.jst.web.kb.internal.taglib.TLDLibrary;
import org.jboss.tools.jst.web.kb.internal.taglib.composite.CompositeTagLibrary;
import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
-import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
import org.jboss.tools.jst.web.kb.require.KbRequireBuilder;
import org.jboss.tools.jst.web.kb.require.KbRequireDefinition;
import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
import org.w3c.dom.Element;
/**
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/BuilderOrderResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/BuilderOrderResolutionGenerator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/BuilderOrderResolutionGenerator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -20,28 +20,28 @@
import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.IMarkerResolutionGenerator2;
import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.jboss.tools.jst.web.WebModelPlugin;
+import org.jboss.tools.common.CommonPlugin;
+import org.jboss.tools.common.validation.CommonValidationPlugin;
import org.jboss.tools.jst.web.kb.KbMessages;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
public class BuilderOrderResolutionGenerator implements IMarkerResolutionGenerator2 {
public IMarkerResolution[] getResolutions(IMarker marker) {
try {
- if(ValidatorManager.ORDER_PROBLEM_MARKER_TYPE.equals(marker.getType())) {
+ if(KBValidator.ORDER_PROBLEM_MARKER_TYPE.equals(marker.getType())) {
return new IMarkerResolution[]{new BuilderOrderResolution()};
}
} catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
+ CommonPlugin.getDefault().logError(e);
}
return new IMarkerResolution[0];
}
public boolean hasResolutions(IMarker marker) {
try {
- return ValidatorManager.ORDER_PROBLEM_MARKER_TYPE.equals(marker.getType());
+ return KBValidator.ORDER_PROBLEM_MARKER_TYPE.equals(marker.getType());
} catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
+ CommonPlugin.getDefault().logError(e);
}
return false;
}
@@ -57,13 +57,12 @@
public void run(IMarker marker) {
IProject project = marker.getResource().getProject();
try {
- if(WebModelPlugin.makeBuilderLast(project, ValidationPlugin.VALIDATION_BUILDER_ID)) {
+ if(CommonValidationPlugin.makeBuilderLast(project, ValidationPlugin.VALIDATION_BUILDER_ID)) {
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
}
} catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
+ CommonPlugin.getDefault().logError(e);
}
-
}
public String getDescription() {
@@ -73,5 +72,4 @@
public Image getImage() {
return null;
}
-
-}
+}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ui.editors.text.TextFileDocumentProvider;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidationContextManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
-
-/**
- * Helper for Validators that use Validator Context.
- * @author Alexey Kazakov
- */
-public class ContextValidationHelper extends WorkbenchContext {
-
- protected IValidationContextManager validationContextManager;
- protected TextFileDocumentProvider documentProvider = new TextFileDocumentProvider();
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.operations.WorkbenchContext#initialize()
- */
- @Override
- public void initialize() {
- super.initialize();
- cleanup();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.operations.WorkbenchContext#deleting()
- */
- @Override
- public void deleting() {
- super.deleting();
- cleanup();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.operations.WorkbenchContext#cleanup(org.eclipse.wst.validation.internal.operations.WorkbenchReporter)
- */
- @Override
- public void cleanup(WorkbenchReporter reporter) {
- super.cleanup(reporter);
- cleanup();
- }
-
- public void cleanup() {
- if(validationContextManager!=null) {
- validationContextManager.setValidationResourceRegister(null);
- }
- validationContextManager = null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.operations.WorkbenchContext#registerResource(org.eclipse.core.resources.IResource)
- */
- @Override
- public void registerResource(IResource resource) {
- if(resource instanceof IFile) {
- IFile file = (IFile)resource;
- if(validationContextManager == null) {
- validationContextManager = new ValidationContext(file.getProject());
- } else if(validationContextManager.isObsolete()) {
- validationContextManager.init(file.getProject()); // https://issues.jboss.org/browse/JBIDE-8726
- }
- validationContextManager.addProject(file.getProject());
- if(!file.exists()) {
- validationContextManager.addRemovedFile(file);
- } else {
- validationContextManager.registerFile(file);
- }
- }
- }
-
- /**
- * @return Set of changed resources
- */
- public Set<IFile> getChangedFiles() {
- Set<IFile> result = new HashSet<IFile>();
- String[] uris = getURIs();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- Set<IProject> projects = getAllProjects();
- for (int i = 0; i < uris.length; i++) {
- IFile currentFile = root.getFile(new Path(uris[i]));
- if(projects.contains(currentFile.getProject())) {
- result.add(currentFile);
- }
- }
- Set<IFile> removedFiles = getValidationContextManager().getRemovedFiles();
- for (IFile file : removedFiles) {
- if(projects.contains(file.getProject())) {
- result.add(file);
- }
- }
- return result;
- }
-
- public Set<IFile> getProjectSetRegisteredFiles() {
- Set<IFile> result = new HashSet<IFile>();
- Set<IFile> files = getValidationContextManager().getRegisteredFiles();
- Set<IProject> projects = getAllProjects();
- for (IFile file : files) {
- if(projects.contains(file.getProject())) {
- result.add(file);
- }
- }
- return result;
- }
-
- private Set<IProject> getAllProjects() {
- IProject project = getProject();
- if(!project.isAccessible()) {
- return Collections.emptySet();
- }
-
- List<IValidator> validators = getValidationContextManager().getValidators();
- Set<IProject> projects = new HashSet<IProject>();
- for (IValidator validator : validators) {
- IValidatingProjectTree tree = validator.getValidatingProjects(project);
- if(tree == null) {
- WebKbPlugin.getDefault().logError(new IllegalStateException(MessageFormat.format(ELValidationMessages.ERR_ILLIGAL_VALIDATION_STATE,validator,getProject(),getProject().exists()))); //$NON-NLS-1$
- } else {
- projects.addAll(tree.getAllProjects());
- }
- }
- return projects;
- }
-
- public IValidationContextManager getValidationContextManager() {
- return getValidationContextManager(true);
- }
-
- public IValidationContextManager getValidationContextManager(boolean initialize) {
- if(!initialize) {
- return validationContextManager;
- }
- if(validationContextManager==null) {
- validationContextManager = new ValidationContext(getProject());
- }
- return validationContextManager;
- }
-
- public void setValidationContextManager(IValidationContextManager context) {
- validationContextManager = context;
- }
-
- public TextFileDocumentProvider getDocumentProvider() {
- return documentProvider;
- }
-}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidationMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidationMessages.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidationMessages.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -15,8 +15,6 @@
public static String EL_VALIDATOR_ERROR_VALIDATING;
public static String EL_VALIDATOR_SETTER;
public static String EL_VALIDATOR_GETTER;
-
- public static String ERR_ILLIGAL_VALIDATION_STATE;
static {
NLS.initializeMessages(BUNDLE_NAME, ELValidationMessages.class);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -50,13 +50,15 @@
import org.jboss.tools.common.el.core.resolver.SimpleELContext;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IELValidationDelegate;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.KbBuilder;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.jst.web.kb.validation.IELValidationDelegate;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
/**
* EL Validator
@@ -476,7 +478,7 @@
}
private boolean validateBuilderOrder(IProject project) throws CoreException {
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), ELSeverityPreferences.getInstance());
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getId(), ELSeverityPreferences.getInstance());
}
/*
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/KBValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/KBValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/KBValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,14 +13,28 @@
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.KbMessages;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
/**
* @author Alexey Kazakov
@@ -49,4 +63,101 @@
}
return new SimpleValidatingProjectTree(project);
}
+
+ public static final String ORDER_PROBLEM_MARKER_TYPE = "org.jboss.tools.jst.web.kb.builderOrderProblem"; //$NON-NLS-1$
+ private static String ATTR_BUILDER = "builder"; //$NON-NLS-1$
+ private static String ATTR_VALIDATOR = "validator"; //$NON-NLS-1$
+
+ /**
+ * Helper method to be called by IValidator implementations.
+ * It implements common logic:
+ * 1. Checks if builderId follows Validation Builder.
+ * 2. Checks severity preference associated with this builder.
+ * 3. Creates, updates or deletes error/warning marker on project
+ * taking into account builders order and severity preference.
+ *
+ * @param project
+ * @param builderId
+ * @param validatorId
+ * @param preferences
+ * @return
+ * @throws CoreException
+ */
+ public static boolean validateBuilderOrder(IProject project, String builderId, String validatorId, SeverityPreferences preferences) throws CoreException {
+ int severity = getSeverity(preferences.getBuilderOrderPreference(project));
+ boolean isCorrect = isCorrectOrder(project, builderId);
+ IMarker marker = findBuilderOrderMarker(project, builderId, validatorId);
+ if(isCorrect || severity <= IMarker.SEVERITY_INFO) {
+ if(marker != null) {
+ ResourcesPlugin.getWorkspace().deleteMarkers(new IMarker[]{marker});
+ }
+ } else {
+ if(marker != null) {
+ if(marker.getAttribute(IMarker.SEVERITY, -1) != severity) {
+ marker.setAttribute(IMarker.SEVERITY, severity);
+ }
+ } else {
+ marker = project.createMarker(ORDER_PROBLEM_MARKER_TYPE);
+ marker.setAttribute(ATTR_BUILDER, builderId);
+ marker.setAttribute(IMarker.SEVERITY, severity);
+ String message = NLS.bind(KbMessages.WRONG_BUILDER_ORDER, new String[]{project.getName(), findValidatorName(validatorId), findBuilderName(builderId)});
+ marker.setAttribute(IMarker.MESSAGE, message);
+ marker.setAttribute(ATTR_VALIDATOR, validatorId);
+ }
+ }
+ return isCorrect || severity <= IMarker.SEVERITY_INFO;
+ }
+
+ private static boolean isCorrectOrder(IProject project, String builderId) throws CoreException {
+ ICommand[] cs = project.getDescription().getBuildSpec();
+ boolean validationFound = false;
+ for (ICommand c: cs) {
+ String name = c.getBuilderName();
+ if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(name)) {
+ validationFound = true;
+ } else if(builderId.equals(name)) {
+ return !validationFound;
+ }
+ }
+ return true;
+ }
+
+ private static IMarker findBuilderOrderMarker(IProject project, String builderId, String validatorId) throws CoreException {
+ IMarker result = null;
+ IMarker[] ms = project.findMarkers(ORDER_PROBLEM_MARKER_TYPE, false, IResource.DEPTH_ZERO);
+ for (IMarker m: ms) {
+ if(builderId.equals(m.getAttribute(ATTR_BUILDER, null))
+ && validatorId.equals(m.getAttribute(ATTR_VALIDATOR))) {
+ result = m;
+ }
+ }
+ return result;
+ }
+
+ private static String findBuilderName(String builderId) {
+ IExtension ext = Platform.getExtensionRegistry().getExtension(builderId);
+ return (ext != null && ext.getLabel() != null) ? ext.getLabel() : builderId;
+ }
+
+ private static String findValidatorName(String validatorId) {
+ IExtension ext = Platform.getExtensionRegistry().getExtension(validatorId);
+ if(ext != null) {
+ IConfigurationElement[] es = ext.getConfigurationElements();
+ if(es.length > 0) {
+ String name = es[0].getAttribute("name"); //$NON-NLS-1$
+ if(name != null) {
+ return name;
+ }
+ }
+ }
+ return validatorId;
+ }
+
+ private static int getSeverity(String severityPreferenceValue) {
+ return (SeverityPreferences.IGNORE.equals(severityPreferenceValue))
+ ? IMarker.SEVERITY_INFO
+ : (SeverityPreferences.WARNING.equals(severityPreferenceValue))
+ ? IMarker.SEVERITY_WARNING
+ : IMarker.SEVERITY_ERROR;
+ }
}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/LinkCollection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/LinkCollection.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/LinkCollection.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.jboss.tools.common.xml.XMLUtilities;
-import org.jboss.tools.jst.web.kb.KbMessages;
-import org.w3c.dom.Element;
-
-/**
- * @author Alexey Kazakov
- */
-public class LinkCollection {
- protected Map<String, Set<IPath>> resourcesByVariableName = new HashMap<String, Set<IPath>>();
- protected Map<IPath, Set<String>> variableNamesByResource = new HashMap<IPath, Set<String>>();
- protected Map<String, Set<IPath>> resourcesByDeclaringVariableName = new HashMap<String, Set<IPath>>();
- protected Map<IPath, Set<String>> declaringVariableNamesByResource = new HashMap<IPath, Set<String>>();
- protected Set<IPath> unnamedResources = new HashSet<IPath>();
- private String id;
-
- public LinkCollection(String id) {
- this.id = id;
- }
-
- protected int modifications = 0;
-
- /**
- * Save link between resource and variable name.
- * It's needed for incremental validation because we must save all linked resources of changed java file.
- */
- public void addLinkedResource(String variableName, IPath linkedResourcePath, boolean declaration) {
- if(linkedResourcePath==null) {
- throw new IllegalArgumentException(KbMessages.VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL);
- }
- if(variableName==null) {
- throw new IllegalArgumentException(KbMessages.VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL);
- }
-
- synchronized(this) {
- Set<IPath> linkedResources = resourcesByVariableName.get(variableName);
- if(linkedResources==null) {
- // create set of linked resources with variable name.
- linkedResources = new HashSet<IPath>();
- resourcesByVariableName.put(variableName, linkedResources);
- }
- // save linked resources.
- if(linkedResources.add(linkedResourcePath)) {
- modifications++;
- }
- }
-
- // Save link between resource and variable names. It's needed if variable name changes in resource file.
- Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
- if(variableNames==null) {
- variableNames = new HashSet<String>();
- variableNamesByResource.put(linkedResourcePath, variableNames);
- }
- if(variableNames.add(variableName)) {
- modifications++;
- }
-
- if(declaration) {
- synchronized(this) {
- Set<IPath> linkedResources = resourcesByDeclaringVariableName.get(variableName);
- if(linkedResources==null) {
- // create set of linked resources with declaring variable name.
- linkedResources = new HashSet<IPath>();
- resourcesByDeclaringVariableName.put(variableName, linkedResources);
- }
- // save linked resources.
- if(linkedResources.add(linkedResourcePath)) {
- modifications++;
- }
- }
-
- // Save link between resource and declaring variable names. It's needed if variable name changes in resource file.
- variableNames = declaringVariableNamesByResource.get(linkedResourcePath);
- if(variableNames==null) {
- variableNames = new HashSet<String>();
- declaringVariableNamesByResource.put(linkedResourcePath, variableNames);
- }
- if(variableNames.add(variableName)) {
- modifications++;
- }
- }
- }
-
- /**
- * Removes link between resource and variable name.
- * @param oldVariableName
- * @param linkedResourcePath
- */
- public void removeLinkedResource(String name, IPath linkedResourcePath) {
- synchronized(this) {
- Set<IPath> linkedResources = resourcesByVariableName.get(name);
- if(linkedResources!=null) {
- // remove linked resource.
- if(linkedResources.remove(linkedResourcePath)) {
- modifications++;
- }
- }
- if(linkedResources.isEmpty()) {
- resourcesByVariableName.remove(name);
- }
- }
- // Remove link between resource and declaring variable names.
- Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
- if(variableNames!=null) {
- if(variableNames.remove(name)) {
- modifications++;
- }
- }
- if(variableNames.isEmpty()) {
- variableNamesByResource.remove(linkedResourcePath);
- }
- synchronized(this) {
- Set<IPath> linkedResources = resourcesByDeclaringVariableName.get(name);
- if(linkedResources!=null) {
- // remove linked resource.
- if(linkedResources.remove(linkedResourcePath)) {
- modifications++;
- }
- }
- if(linkedResources.isEmpty()) {
- resourcesByDeclaringVariableName.remove(name);
- }
- }
- // Remove link between resource and declaring variable names.
- variableNames = declaringVariableNamesByResource.get(linkedResourcePath);
- if(variableNames!=null) {
- if(variableNames.remove(name)) {
- modifications++;
- }
- }
- if(variableNames.isEmpty()) {
- declaringVariableNamesByResource.remove(linkedResourcePath);
- }
- }
-
- /**
- * Removes link between resources and variable names.
- * @param linkedResources
- */
- public void removeLinkedResources(Set<IPath> resources) {
- for (IPath resource : resources) {
- removeLinkedResource(resource);
- }
- }
-
- /**
- * Removes link between resource and variable names.
- * @param linkedResources
- */
- public synchronized void removeLinkedResource(IPath resource) {
- Set<String> resourceNames = variableNamesByResource.get(resource);
- if(resourceNames!=null) {
- for (String name : resourceNames) {
- Set<IPath> linkedResources = resourcesByVariableName.get(name);
- if(linkedResources!=null) {
- if(linkedResources.remove(resource)) {
- modifications++;
- }
- if(linkedResources.isEmpty()) {
- resourcesByVariableName.remove(name);
- }
- }
- }
- }
- if(variableNamesByResource.remove(resource) != null) {
- modifications++;
- }
-
- resourceNames = declaringVariableNamesByResource.get(resource);
- if(resourceNames!=null) {
- for (String name : resourceNames) {
- Set<IPath> linkedResources = resourcesByDeclaringVariableName.get(name);
- if(linkedResources!=null) {
- if(linkedResources.remove(resource)) {
- modifications++;
- }
- if(linkedResources.isEmpty()) {
- resourcesByDeclaringVariableName.remove(name);
- }
- }
- }
- }
- if(declaringVariableNamesByResource.remove(resource) != null) {
- modifications++;
- }
- }
-
- public Set<IPath> getResourcesByVariableName(String variableName, boolean declaration) {
- return declaration?resourcesByDeclaringVariableName.get(variableName):resourcesByVariableName.get(variableName);
- }
-
- public synchronized Set<String> getVariableNamesByResource(IPath fullPath, boolean declaration) {
- return declaration?declaringVariableNamesByResource.get(fullPath):variableNamesByResource.get(fullPath);
- }
-
- /**
- * Adds resource without any link to any context variable name.
- * @param fullPath
- */
- public void addUnnamedResource(IPath fullPath) {
- if(unnamedResources.add(fullPath)) {
- modifications++;
- }
- }
-
- /**
- * @return Set of resources without any link to any context variable name.
- * @param fullPath
- */
- public Set<IPath> getUnnamedResources() {
- return unnamedResources;
- }
-
- /**
- * Removes unnamed resource.
- * @param fullPath
- */
- public void removeUnnamedResource(IPath fullPath) {
- if(unnamedResources.remove(fullPath)) {
- modifications++;
- }
- }
-
- /**
- * Clear all references
- */
- public synchronized void clearAll() {
- resourcesByVariableName.clear();
- variableNamesByResource.clear();
- declaringVariableNamesByResource.clear();
- resourcesByDeclaringVariableName.clear();
- unnamedResources.clear();
- modifications = 0;
- }
-
- /**
- * Store the collection to XML
- * @param root
- */
- public synchronized void store(Element root) {
- Set<String> variables = resourcesByVariableName.keySet();
- for (String name: variables) {
- Set<IPath> paths = resourcesByVariableName.get(name);
- if(paths == null) continue;
- for (IPath path: paths) {
- Element linkedResource = XMLUtilities.createElement(root, "linked-resource"); //$NON-NLS-1$
- linkedResource.setAttribute("name", name); //$NON-NLS-1$
- linkedResource.setAttribute("path", path.toString()); //$NON-NLS-1$
- if(checkDeclaration(path, name)) {
- linkedResource.setAttribute("declaration", "true"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
- for (IPath unnamedPath: unnamedResources) {
- Element unnamedPathElement = XMLUtilities.createElement(root, "unnamed-path"); //$NON-NLS-1$
- unnamedPathElement.setAttribute("path", unnamedPath.toString()); //$NON-NLS-1$
- }
- modifications = 0;
- }
-
- /**
- * Load the collection from XML
- * @param root
- */
- public void load(Element root) {
- if(root == null) return;
- Element[] linkedResources = XMLUtilities.getChildren(root, "linked-resource"); //$NON-NLS-1$
- if(linkedResources != null) for (int i = 0; i < linkedResources.length; i++) {
- String name = linkedResources[i].getAttribute("name"); //$NON-NLS-1$
- if(name == null || name.trim().length() == 0) continue;
- String path = linkedResources[i].getAttribute("path"); //$NON-NLS-1$
- if(path == null || path.trim().length() == 0) continue;
- String declaration = linkedResources[i].getAttribute("declaration"); //$NON-NLS-1$
- boolean declarationFlag = "true".equals(declaration); //$NON-NLS-1$
- IPath pathObject = new Path(path);
- addLinkedResource(name, pathObject, declarationFlag);
- }
- Element[] unnamedPathElement = XMLUtilities.getChildren(root, "unnamed-path"); //$NON-NLS-1$
- if(unnamedPathElement != null) for (int i = 0; i < unnamedPathElement.length; i++) {
- String path = unnamedPathElement[i].getAttribute("path"); //$NON-NLS-1$
- IPath pathObject = new Path(path);
- addUnnamedResource(pathObject);
- }
- modifications = 0;
- }
-
- private boolean checkDeclaration(IPath resource, String variableName) {
- Set<IPath> paths = resourcesByDeclaringVariableName.get(variableName);
- if(paths!=null) {
- for (IPath path : paths) {
- if(path.equals(resource)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public int getModificationsSinceLastStore() {
- return modifications;
- }
-
- public String getId() {
- return id;
- }
-
- public boolean isEmpty() {
- return resourcesByVariableName.isEmpty() && variableNamesByResource.isEmpty() && resourcesByDeclaringVariableName.isEmpty() && declaringVariableNamesByResource.isEmpty() && unnamedResources.isEmpty();
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProblemMessage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProblemMessage.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ProblemMessage.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.Locale;
-
-import org.eclipse.wst.validation.internal.core.Message;
-
-/**
- * @author Alexey Kazakov
- */
-public class ProblemMessage extends Message {
-
- private String message;
-
- public ProblemMessage(String message, int severity, String[] params, Object targetObject, String groupName) {
- super(null, severity, null, params, targetObject, groupName);
- this.message = message;
- }
-
- public ProblemMessage(String message, int severity, String[] params) {
- super(null, severity, null, params, null);
- this.message = message;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.core.Message#getText()
- */
- @Override
- public String getText() {
- if (getParams() != null) {
- return java.text.MessageFormat.format(message, getParams());
- }
-
- return message;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.core.Message#getText(java.lang.ClassLoader)
- */
- @Override
- public String getText(ClassLoader classLoader) {
- return getText();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.core.Message#getText(java.util.Locale, java.lang.ClassLoader)
- */
- @Override
- public String getText(Locale locale, ClassLoader classLoader) {
- return getText();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.core.Message#getText(java.util.Locale)
- */
- @Override
- public String getText(Locale locale) {
- return getText();
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatingProjectSet.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatingProjectSet.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatingProjectSet.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidatingProjectSet implements IValidatingProjectSet {
-
- protected IProject rootProject;
- protected Set<IProject> allProjects;
- protected IProjectValidationContext rootContext;
-
- protected ValidatingProjectSet() {
- }
-
- /**
- * @param rootProject
- * @param allProjects
- * @param rootContext
- */
- public ValidatingProjectSet(IProject rootProject, Set<IProject> allProjects, IProjectValidationContext rootContext) {
- this.rootProject = rootProject;
- this.allProjects = allProjects;
- this.rootContext = rootContext;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getAllProjests()
- */
- public Set<IProject> getAllProjects() {
- return allProjects;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getRootContext()
- */
- public IProjectValidationContext getRootContext() {
- return rootContext;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet#getRootProject()
- */
- public IProject getRootProject() {
- return rootProject;
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationContext.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationContext.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidationContextManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidationContext implements IValidationContextManager {
-
- private ValidationResourceRegister validationResourceRegister;
- private Map<IValidator, IValidatingProjectTree> projectTree = new HashMap<IValidator, IValidatingProjectTree>();
- private static List<IValidator> ALL_VALIDATORS;
- private List<IValidator> validators = new ArrayList<IValidator>();
- private Map<IValidator, Set<IProject>> validatedProjects = new HashMap<IValidator, Set<IProject>>();
-
- public ValidationContext(IProject project) {
- init(project);
- }
-
- public void init(IProject project) {
- projectTree.clear();
- validators.clear();
- validationResourceRegister = null;
- if(ALL_VALIDATORS == null) {
- // Load all the validators
- ALL_VALIDATORS = new ArrayList<IValidator>();
- List<IValidator> dependentValidators = new ArrayList<IValidator>();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint(IValidator.EXTENSION_POINT_ID);
- if (extensionPoint != null) {
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i=0; i<extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- for(int j=0; j<elements.length; j++) {
- try {
- IValidator validator = (IValidator)elements[j].createExecutableExtension("class"); //$NON-NLS-1$
- String dependent = elements[j].getAttribute("dependent"); //$NON-NLS-1$
- if(Boolean.parseBoolean(dependent)) {
- dependentValidators.add(validator);
- } else {
- ALL_VALIDATORS.add(validator);
- }
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- }
- }
- }
- }
- // We should add all the dependent validators (e.g. EL validator) to the very end of the list.
- ALL_VALIDATORS.addAll(dependentValidators);
- }
-
- // Init context for given project.
- for (IValidator validator : ALL_VALIDATORS) {
- if(validator.shouldValidate(project)) {
- IValidatingProjectTree prTree = validator.getValidatingProjects(project);
- if(prTree!=null) {
- validators.add(validator);
- projectTree.put(validator, prTree);
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#isObsolete()
- */
- public boolean isObsolete() {
- return validationResourceRegister!=null && validationResourceRegister.isObsolete();
- }
-
- private ValidationResourceRegister getValidationResourceRegister() {
- if(validationResourceRegister==null && !projectTree.isEmpty()) {
- // Initialize the register
- for (IValidatingProjectTree tree : projectTree.values()) {
- boolean inited = false;
- if(!tree.getBrunches().isEmpty()) {
- for (IValidatingProjectSet brunch : tree.getBrunches().values()) {
- IProjectValidationContext context = brunch.getRootContext();
- ValidationResourceRegister register = context.getValidationResourceRegister();
- if(register==null) {
- if(validationResourceRegister==null) {
- validationResourceRegister = new ValidationResourceRegister();
- }
- context.setValidationResourceRegister(validationResourceRegister);
- } else {
- validationResourceRegister = register;
- inited = true;
- break;
- }
- }
- }
- if(inited) {
- break;
- }
- }
- }
- if(validationResourceRegister==null) {
- validationResourceRegister = new ValidationResourceRegister();
- }
- return validationResourceRegister;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#setValidationResourceRegister(org.jboss.tools.jst.web.kb.internal.validation.ValidationResourceRegister)
- */
- public void setValidationResourceRegister(
- ValidationResourceRegister validationResourceRegister) {
- this.validationResourceRegister = validationResourceRegister;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getValidators()
- */
- public List<IValidator> getValidators() {
- return validators;
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.validation.ISeamValidationContext#clearAll()
- */
- public void clearAll() {
- clearRegisteredFiles();
- for (IValidatingProjectTree tree : projectTree.values()) {
- for (IValidatingProjectSet brunch : tree.getBrunches().values()) {
- brunch.getRootContext().clearAll();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#clearRegisteredFiles()
- */
- public void clearRegisteredFiles() {
- getValidationResourceRegister().clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getRemovedFiles()
- */
- public Set<IFile> getRemovedFiles() {
- return getValidationResourceRegister().getRemovedFiles();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#addRemovedFile(org.eclipse.core.resources.IFile)
- */
- public void addRemovedFile(IFile file) {
- getValidationResourceRegister().addRemovedFile(file);
- for (IValidatingProjectTree tree : projectTree.values()) {
- tree.addProject(file.getProject());
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#getRegisteredFiles()
- */
- public Set<IFile> getRegisteredFiles() {
- return getValidationResourceRegister().getRegisteredFiles();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContext#registerFile(org.eclipse.core.resources.IFile)
- */
- public void registerFile(IFile file) {
- getValidationResourceRegister().registerFile(file);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#getValidatingProjectTree(org.jboss.tools.jst.web.kb.validation.IValidator)
- */
- public IValidatingProjectTree getValidatingProjectTree(IValidator validator) {
- return projectTree.get(validator);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#addProject(org.eclipse.core.resources.IProject)
- */
- public void addProject(IProject project) {
- for (IValidator validator : validators) {
- projectTree.get(validator).addProject(project);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#getRootProjects()
- */
- public Set<IProject> getRootProjects() {
- Set<IProject> roots = new HashSet<IProject>();
- for (IValidatingProjectTree tree : projectTree.values()) {
- for (IValidatingProjectSet brunch : tree.getBrunches().values()) {
- roots.add(brunch.getRootProject());
- }
- }
- return roots;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#clearAllResourceLinks()
- */
- public void clearAllResourceLinks() {
- for (IValidatingProjectTree tree : projectTree.values()) {
- for (IValidatingProjectSet brunch : tree.getBrunches().values()) {
- brunch.getRootContext().clearAll();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#addValidatedProject(org.jboss.tools.jst.web.kb.validation.IValidator, org.eclipse.core.resources.IProject)
- */
- public void addValidatedProject(IValidator validator, IProject project) {
- Set<IProject> projects = validatedProjects.get(validator);
- if(projects==null) {
- projects = new HashSet<IProject>();
- validatedProjects.put(validator, projects);
- }
- projects.add(project);
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#clearValidatedProjectsList()
- */
- public void clearValidatedProjectsList() {
- validatedProjects.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationContextManager#projectHasBeenValidated(org.jboss.tools.jst.web.kb.validation.IValidator, org.eclipse.core.resources.IProject)
- */
- public boolean projectHasBeenValidated(IValidator validator, IProject project) {
- Set<IProject> projects = validatedProjects.get(validator);
- return projects==null?false:projects.contains(project);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationErrorManager.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.editors.text.TextFileDocumentProvider;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-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.IValidator;
-import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.jst.web.kb.KbMessages;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidationErrorManager;
-
-/**
- * @author Alexey Kazakov
- */
-public abstract class ValidationErrorManager implements IValidationErrorManager {
-
- public static String DEFAULT_VALIDATION_MARKER = ValidationPlugin.PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$
- static String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$
- static String VALIDATION_MARKER_GROUP = "groupName"; //$NON-NLS-1$
-
- protected IStatus OK_STATUS = new Status(IStatus.OK,
- "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
-
- protected IValidator validationManager;
- protected ContextValidationHelper coreHelper;
- protected IReporter reporter;
- protected IProject validatingProject;
- protected String markerId;
- protected IProjectValidationContext validationContext;
- protected TextFileDocumentProvider documentProvider;
-
- private String messageIdQuickFixAttributeName;
-
- /**
- * Constructor
- */
- public ValidationErrorManager() {
- }
-
- /**
- * @param messageIdQuickFixAttributeName the messageIdQuickFixAttributeName to set
- */
- public void setMessageIdQuickFixAttributeName(
- String messageIdQuickFixAttributeName) {
- this.messageIdQuickFixAttributeName = messageIdQuickFixAttributeName;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.jst.web.kb.validation.IValidationErrorManager#init(org.eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, org.jboss.tools.jst.web.kb.validation.IProjectValidationContext, org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void init(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext validationContext, IValidator manager, IReporter reporter) {
- cleanSavedMarkers();
- setProject(project);
- setCoreHelper(validationHelper);
- setValidationManager(manager);
- setReporter(reporter);
- setValidationContext(validationContext);
- setMarkerId(org.jboss.tools.jst.web.kb.validation.IValidator.MARKED_RESOURCE_MESSAGE_GROUP);
- }
-
- public void init(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext validationContext, IValidator manager, IReporter reporter, String messageIdQuickFixAttributeName) {
- this.init(project, validationHelper, validationContext, manager, reporter);
- setMessageIdQuickFixAttributeName(messageIdQuickFixAttributeName);
- }
-
- /**
- * @param validationManager the validationManager to set
- */
- public void setValidationManager(IValidator validationManager) {
- this.validationManager = validationManager;
- }
-
- /**
- * @param coreHelper the coreHelper to set
- */
- public void setCoreHelper(ContextValidationHelper coreHelper) {
- this.coreHelper = coreHelper;
- }
-
- /**
- * @param reporter the reporter to set
- */
- public void setReporter(IReporter reporter) {
- this.reporter = reporter;
- }
-
- /**
- * @param rootProject the rootProject to set
- */
- public void setProject(IProject rootProject) {
- this.validatingProject = rootProject;
- }
-
- /**
- * @param markerId the markerId to set
- */
- public void setMarkerId(String markerId) {
- this.markerId = markerId;
- }
-
- /**
- * @param validationContext the validationContext to set
- */
- public void setValidationContext(IProjectValidationContext validationContext) {
- this.validationContext = validationContext;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String,
- * java.lang.String, java.lang.String[],
- * org.jboss.tools.seam.core.ISeamTextSourceReference,
- * org.eclipse.core.resources.IResource)
- */
- public IMarker addError(String message, String preferenceKey,
- String[] messageArguments, ITextSourceReference location,
- IResource target) {
- if(location == null) {
- //
- } else if(location.getResource() != null && location.getResource().exists()) {
- if(!location.getResource().equals(target)) {
- target = location.getResource();
- }
- } else {
- //
- }
- return addError(message, preferenceKey, messageArguments, 0, location
- .getLength(), location.getStartPosition(), target);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String,
- * java.lang.String,
- * org.jboss.tools.seam.core.ISeamTextSourceReference,
- * org.eclipse.core.resources.IResource)
- */
- public IMarker addError(String message, String preferenceKey,
- ITextSourceReference location, IResource target) {
- return addError(message, preferenceKey, new String[0], location, target);
- }
-
- /* (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String, java.lang.String, java.lang.String[], org.eclipse.core.resources.IResource)
- */
- public IMarker addError(String message, String preferenceKey,
- String[] messageArguments, IResource target) {
- return addError(message, preferenceKey, messageArguments, 0, 0, 0, target);
- }
-
- private String getMarkerId() {
- return markerId;
- }
-
- /**
- * @param project
- * @param preferenceKey
- * @return
- */
- protected abstract String getPreference(IProject project, String preferenceKey);
-
- private Set<MarkerID> markers = new HashSet<MarkerID>();
-
- private static class MarkerID {
-
- String preferenceKey;
- int length;
- int offset;
- String path;
-
- public MarkerID(String preferenceKey, int length, int offset, String path) {
- super();
- this.preferenceKey = preferenceKey;
- this.length = length;
- this.offset = offset;
- this.path = path;
- }
-
- @Override
- public int hashCode() {
- return toString().hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- return obj instanceof MarkerID && toString().equals(obj.toString());
- }
-
- @Override
- public String toString() {
- return path + ":" + preferenceKey + ":" + length + ":" + offset; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-
- /**
- * Returns true if the manager should not add a problem markers with the same location and preference key twice.
- * @return
- */
- protected boolean shouldCheckDuplicateMarkers() {
- return false;
- }
-
- protected void cleanSavedMarkers() {
- markers.clear();
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String, java.lang.String, java.lang.String[], int, int, org.eclipse.core.resources.IResource)
- */
- public IMarker addError(String message, String preferenceKey,
- String[] messageArguments, int lineNumber, int length, int offset, IResource target) {
- String preferenceValue = getPreference(target.getProject(), preferenceKey);
- IMarker marker = null;
- if (!SeverityPreferences.IGNORE.equals(preferenceValue)) {
- int severity = IMessage.HIGH_SEVERITY;
- if (SeverityPreferences.WARNING.equals(preferenceValue)) {
- severity = IMessage.NORMAL_SEVERITY;
- }
- if(shouldCheckDuplicateMarkers()) {
- MarkerID id = new MarkerID(preferenceKey, length, offset, target.getFullPath().toOSString());
- if(!markers.contains(id)) {
- marker = addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
- if(marker!=null) {
- markers.add(id);
- }
- }
- } else {
- marker = addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
- }
- }
- return marker;
- }
-
- public IMarker addError(String message, String preferenceKey,
- String[] messageArguments, int length, int offset, IResource target) {
- return addError(message, preferenceKey, messageArguments, 0, length, offset, target);
- }
-
- public TextFileDocumentProvider getDocumentProvider() {
- if(documentProvider==null) {
- if(coreHelper!=null) {
- documentProvider = coreHelper.getDocumentProvider();
- } else {
- documentProvider = new TextFileDocumentProvider();
- }
- }
- return documentProvider;
- }
-
- protected Class getMarkerOwner() {
- return this.getClass();
- }
-
- public IProjectValidationContext getValidationContext() {
- return validationContext;
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#addError(java.lang.String, int, java.lang.String[], int, int, org.eclipse.core.resources.IResource)
- */
- public IMarker addError(String message, int severity, String[] messageArguments, int lineNumber, int length, int offset, IResource target) {
- return addError(message, severity, messageArguments, lineNumber, length, offset, target, getDocumentProvider(), getMarkerId(), getMarkerOwner());
- }
-
- public static IMarker addError(String message, int severity, Object[] messageArguments, int lineNumber, int length, int offset, IResource target, TextFileDocumentProvider documentProvider, String markerId, Class markerOwner, int maxNumberOfMarkersPerFile, String markerType) {
- IMarker marker = null;
- boolean connected = false;
- try {
- if(lineNumber<1) {
- if (documentProvider != null) {
- connected = true;
- documentProvider.connect(target);
- IDocument doc = documentProvider.getDocument(target);
- if(doc != null){
- try {
- lineNumber = doc.getLineOfOffset(offset) + 1;
- } catch (BadLocationException e) {
- WebKbPlugin.getDefault().logError("Wrong offset [" + offset + "] of the problem marker [" + MessageFormat.format(message, messageArguments) + "] for resource: " + target.getFullPath().toOSString(), e); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
- }
- }
- }
- }
- marker = addTask(markerOwner.getName().intern(), target, lineNumber,
- MessageFormat.format(message, messageArguments),
- severity, null, markerId, offset, length, maxNumberOfMarkersPerFile, markerType);
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(
- NLS.bind(KbMessages.EXCEPTION_DURING_CREATING_MARKER, target.getFullPath()), e);
- } finally {
- if (documentProvider != null && connected) {
- documentProvider.disconnect(target);
- }
- }
-
- return marker;
- }
-
- /**
- * Create a problem marker and add to the marker an attribute with the message ID for QuickFix.
- *
- * @param message
- * @param preferenceKey
- * @param location
- * @param target
- * @param messageId
- * @return
- */
- public IMarker addError(String message, String preferenceKey,
- ITextSourceReference location, IResource target, int messageId) {
- IMarker marker = addError(message, preferenceKey, location, target);
- try {
- if(marker!=null) {
- marker.setAttribute(messageIdQuickFixAttributeName, new Integer(messageId));
- }
- } catch(CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- }
- return marker;
- }
-
- /**
- *
- * @param message
- * @param severity
- * @param messageArguments
- * @param length
- * @param offset
- * @param target
- * @param documentProvider
- * @param markerId
- * @param markerOwner
- * @return
- */
- public IMarker addError(String message, int severity, Object[] messageArguments, int lineNumber, int length, int offset, IResource target, TextFileDocumentProvider documentProvider, String markerId, Class markerOwner) {
- return addError(message, severity, messageArguments, lineNumber, length, offset, target, documentProvider, markerId, markerOwner, getMaxNumberOfMarkersPerFile(target.getProject()), getMarkerType());
- }
-
- abstract public int getMaxNumberOfMarkersPerFile(IProject project);
-
- public abstract String getMarkerType();
-
- private static IMarker addTask(String pluginId, IResource resource, int location,
- String message, int severityEnumValue, String targetObjectName,
- String groupName, int offset, int length, int maxNumberOfMarkersPerFile, String markerType) throws CoreException {
-
- if ((message == null) || (resource == null) || (!resource.exists())) {
- return null;
- }
- int severity = getSeverity(severityEnumValue);
-
- if(markerType==null) {
- markerType = DEFAULT_VALIDATION_MARKER;
- }
- if(maxNumberOfMarkersPerFile>0) {
- int existingMarkers = resource.findMarkers(markerType, true, IResource.DEPTH_ZERO).length;
- if(existingMarkers>maxNumberOfMarkersPerFile) {
- return null;
- }
- }
-
- IMarker item = resource.createMarker(markerType); // add a validation marker
-
- boolean offsetSet = ((offset != IMessage.OFFSET_UNSET) && (length != IMessage.OFFSET_UNSET));
- int size = (offsetSet) ? 7 : 5;
- String[] attribNames = new String[size];
- Object[] attribValues = new Object[size];
-
- attribNames[0] = VALIDATION_MARKER_OWNER;
- attribValues[0] = pluginId;
- attribNames[1] = VALIDATION_MARKER_GROUP;
- attribValues[1] = ((groupName == null) ? "" : groupName); //$NON-NLS-1$
- attribNames[2] = IMarker.MESSAGE;
- attribValues[2] = message;
- attribNames[3] = IMarker.SEVERITY;
- attribValues[3] = new Integer(severity);
-
- Integer lineNumber = Integer.valueOf(location);
- attribNames[4] = IMarker.LINE_NUMBER;
- attribValues[4] = lineNumber;
-
- if (offsetSet) {
- attribNames[5] = IMarker.CHAR_START;
- attribValues[5] = new Integer(offset);
- attribNames[6] = IMarker.CHAR_END;
- attribValues[6] = new Integer(offset + length);
- }
-
- item.setAttributes(attribNames, attribValues);
-
- return item;
- }
-
- private static int getSeverity(int severityEnumValue) {
- switch (severityEnumValue) {
- case (IMessage.HIGH_SEVERITY) : {
- return IMarker.SEVERITY_ERROR;
- }
- case (IMessage.LOW_SEVERITY) : {
- return IMarker.SEVERITY_INFO;
- }
- case (IMessage.NORMAL_SEVERITY) : {
- return IMarker.SEVERITY_WARNING;
- }
- case (IMessage.ALL_MESSAGES) :
- case (IMessage.ERROR_AND_WARNING) :
- default : {
- // assume it's a warning.
- return IMarker.SEVERITY_WARNING;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#displaySubtask(java.lang.String)
- */
- public void displaySubtask(String messageId) {
- displaySubtask(messageId, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#displaySubtask(java.lang.String,
- * java.lang.String[])
- */
- public void displaySubtask(String message, String[] messageArguments) {
- IMessage problemMessage = new ProblemMessage(message, IMessage.NORMAL_SEVERITY, messageArguments);
- reporter.displaySubtask(validationManager, problemMessage);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#removeMessagesFromResources(java.util.Set)
- */
- public void removeMessagesFromResources(Set<IResource> resources) {
- for (IResource r : resources) {
- WorkbenchReporter.removeAllMessages(r, new String[]{getMarkerOwner().getName()}, null);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.seam.internal.core.validation.IValidationErrorManager#removeAllMessagesFromResource(org.eclipse.core.resources.IResource)
- */
- public void removeAllMessagesFromResource(IResource resource) {
-// reporter.removeAllMessages(validationManager, resource);
- WorkbenchReporter.removeAllMessages(resource, new String[]{getMarkerOwner().getName()}, null);
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationResourceRegister.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationResourceRegister.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidationResourceRegister.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * @author Alexey Kazakov
- */
-public class ValidationResourceRegister {
- private Set<IFile> removedFiles = new HashSet<IFile>();
- private Set<IFile> registeredResources = new HashSet<IFile>();
- private boolean obsolete = false;
-
- public void clear() {
- synchronized (removedFiles) {
- removedFiles.clear();
- }
- synchronized (registeredResources) {
- registeredResources.clear();
- }
- obsolete = true;
- }
-
- public Set<IFile> getRemovedFiles() {
- return removedFiles;
- }
-
- public void addRemovedFile(IFile file) {
- removedFiles.add(file);
- }
-
- public Set<IFile> getRegisteredFiles() {
- Set<IFile> copy = new HashSet<IFile>();
- synchronized (registeredResources) {
- copy.addAll(registeredResources);
- }
- return copy;
- }
-
- public void registerFile(IFile file) {
- obsolete = false;
- synchronized (registeredResources) {
- registeredResources.add(file);
- }
- }
-
- /**
- * @return the obsolete
- */
- public boolean isObsolete() {
- return obsolete;
- }
-}
\ No newline at end of file
Deleted: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -1,292 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jst.web.kb.internal.validation;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-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.IValidatorJob;
-import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.jst.web.kb.KbMessages;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidationContextManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
-import org.jboss.tools.jst.web.kb.validation.KBValidationException;
-
-/**
- * This Manager invokes all dependent validators that should be invoked in one job.
- * We need this one because wst validation framework does not let us invoke
- * dependent validators in the same job.
- * @author Alexey Kazakov
- */
-public class ValidatorManager implements IValidatorJob {
-
- private static Set<IProject> validatingProjects = new HashSet<IProject>();
- public static final String SLEEPING = "Sleeping"; //$NON-NLS-1$
- public static final String RUNNING = "Running"; //$NON-NLS-1$
- private static String STATUS = SLEEPING;
-
- public ValidatorManager() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)
- */
- public ISchedulingRule getSchedulingRule(IValidationContext helper) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException {
- STATUS = RUNNING;
- try {
- ContextValidationHelper validationHelper = (ContextValidationHelper)helper;
- IProject project = validationHelper.getProject();
- if(project==null) {
- return OK_STATUS;
- }
- IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
- IStatus status = OK_STATUS;
- synchronized (validatingProjects) {
- for (IProject rootProject : rootProjects) {
- if(validatingProjects.contains(rootProject)) {
- return OK_STATUS;
- }
- validatingProjects.add(rootProject);
- }
- }
- synchronized (validatingProjects) {
- try {
- validationContextManager.clearValidatedProjectsList();
- Set<IFile> changedFiles = validationHelper.getChangedFiles();
- if(!changedFiles.isEmpty()) {
- status = validate(changedFiles, validationHelper, reporter);
- } else if(!validationContextManager.getRegisteredFiles().isEmpty()) {
- validationContextManager.clearAllResourceLinks();
- status = validateAll(validationHelper, reporter);
- }
- } finally {
- if(validationContextManager!=null) {
- validationContextManager.clearRegisteredFiles();
- }
- validationHelper.cleanup(); // See https://issues.jboss.org/browse/JBIDE-8726
- for (IProject rootProject : rootProjects) {
- validatingProjects.remove(rootProject);
- }
- }
- }
- return status;
- } catch(Exception e) {
- // We need to catch exceptions and wrap them in KBValidationException to let JUnit tests catch validation exceptions reported to eclipse log.
- WebKbPlugin.getDefault().logError(new KBValidationException(e.getMessage(), e));
- return OK_STATUS;
- } finally {
- STATUS = SLEEPING;
- }
- }
-
- public static final String ORDER_PROBLEM_MARKER_TYPE = "org.jboss.tools.jst.web.kb.builderOrderProblem"; //$NON-NLS-1$
- private static String ATTR_BUILDER = "builder"; //$NON-NLS-1$
- private static String ATTR_VALIDATOR = "validator"; //$NON-NLS-1$
-
- /**
- * Helper method to be called by IValidator implementations.
- * It implements common logic:
- * 1. Checks if builderId follows Validation Builder.
- * 2. Checks severity preference associated with this builder.
- * 3. Creates, updates or deletes error/warning marker on project
- * taking into account builders order and severity preference.
- *
- * @param project
- * @param builderId
- * @param validatorId
- * @param preferences
- * @return
- * @throws CoreException
- */
- public static boolean validateBuilderOrder(IProject project, String builderId, String validatorId, SeverityPreferences preferences) throws CoreException {
- int severity = getSeverity(preferences.getBuilderOrderPreference(project));
- boolean isCorrect = isCorrectOrder(project, builderId);
- IMarker marker = findBuilderOrderMarker(project, builderId, validatorId);
- if(isCorrect || severity <= IMarker.SEVERITY_INFO) {
- if(marker != null) {
- ResourcesPlugin.getWorkspace().deleteMarkers(new IMarker[]{marker});
- }
- } else {
- if(marker != null) {
- if(marker.getAttribute(IMarker.SEVERITY, -1) != severity) {
- marker.setAttribute(IMarker.SEVERITY, severity);
- }
- } else {
- marker = project.createMarker(ORDER_PROBLEM_MARKER_TYPE);
- marker.setAttribute(ATTR_BUILDER, builderId);
- marker.setAttribute(IMarker.SEVERITY, severity);
- String message = NLS.bind(KbMessages.WRONG_BUILDER_ORDER, new String[]{project.getName(), findValidatorName(validatorId), findBuilderName(builderId)});
- marker.setAttribute(IMarker.MESSAGE, message);
- marker.setAttribute(ATTR_VALIDATOR, validatorId);
- }
- }
- return isCorrect || severity <= IMarker.SEVERITY_INFO;
- }
-
- private static boolean isCorrectOrder(IProject project, String builderId) throws CoreException {
- ICommand[] cs = project.getDescription().getBuildSpec();
- boolean validationFound = false;
- for (ICommand c: cs) {
- String name = c.getBuilderName();
- if(ValidationPlugin.VALIDATION_BUILDER_ID.equals(name)) {
- validationFound = true;
- } else if(builderId.equals(name)) {
- return !validationFound;
- }
- }
- return true;
- }
-
- private static IMarker findBuilderOrderMarker(IProject project, String builderId, String validatorId) throws CoreException {
- IMarker result = null;
- IMarker[] ms = project.findMarkers(ORDER_PROBLEM_MARKER_TYPE, false, IResource.DEPTH_ZERO);
- for (IMarker m: ms) {
- if(builderId.equals(m.getAttribute(ATTR_BUILDER, null))
- && validatorId.equals(m.getAttribute(ATTR_VALIDATOR))) {
- result = m;
- }
- }
- return result;
- }
-
- private static String findBuilderName(String builderId) {
- IExtension ext = Platform.getExtensionRegistry().getExtension(builderId);
- return (ext != null && ext.getLabel() != null) ? ext.getLabel() : builderId;
- }
-
- private static String findValidatorName(String validatorId) {
- IExtension ext = Platform.getExtensionRegistry().getExtension(validatorId);
- if(ext != null) {
- IConfigurationElement[] es = ext.getConfigurationElements();
- if(es.length > 0) {
- String name = es[0].getAttribute("name"); //$NON-NLS-1$
- if(name != null) {
- return name;
- }
- }
- }
- return validatorId;
- }
-
- private static int getSeverity(String severityPreferenceValue) {
- return (SeverityPreferences.IGNORE.equals(severityPreferenceValue))
- ? IMarker.SEVERITY_INFO
- : (SeverityPreferences.WARNING.equals(severityPreferenceValue))
- ? IMarker.SEVERITY_WARNING
- : IMarker.SEVERITY_ERROR;
- }
-
- private IStatus validate(Set<IFile> changedFiles, ContextValidationHelper validationHelper, IReporter reporter) throws ValidationException {
- IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
- List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
- removeMarkers(changedFiles);
- for (IValidator validator : validators) {
- for (IProject rootProject : rootProjects) {
- IValidatingProjectSet projectBrunch = validationHelper.getValidationContextManager().getValidatingProjectTree(validator).getBrunches().get(rootProject);
- if(projectBrunch!=null) {
- validator.validate(changedFiles, rootProject, validationHelper, projectBrunch.getRootContext(), this, reporter);
- }
- }
- }
- return OK_STATUS;
- }
-
- private IStatus validateAll(ContextValidationHelper validationHelper, IReporter reporter) throws ValidationException {
- IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
- List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
- removeMarkers(validationHelper.getProjectSetRegisteredFiles());
- for (IValidator validator : validators) {
- for (IProject rootProject : rootProjects) {
- IValidatingProjectSet projectBrunch = validationHelper.getValidationContextManager().getValidatingProjectTree(validator).getBrunches().get(rootProject);
- if(projectBrunch!=null) {
- validator.validateAll(rootProject, validationHelper, projectBrunch.getRootContext(), this, reporter);
- }
- }
- }
- return OK_STATUS;
- }
-
- private void removeMarkers(Set<IFile> files) {
- try {
- for (IFile file : files) {
- if(file.isAccessible()) {
- file.deleteMarkers(IValidator.KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO);
- }
- }
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void cleanup(IReporter reporter) {
- reporter = null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
- */
- public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
- validateInJob(helper, reporter);
- }
-
- /**
- * This method returns a string with status message of the validator. This method is supposed to be used in unit tests.
- * @return
- */
- public static String getStatus() {
- return STATUS;
- }
-
- /**
- * This method is supposed to be used in unit tests.
- * @param status
- */
- public static void setStatus(String status) {
- STATUS = status;
- }
-}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/WebValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -16,8 +16,9 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.jst.web.WebUtils;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
/**
* @author Alexey Kazakov
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/messages.properties 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/messages.properties 2011-08-23 17:34:09 UTC (rev 34174)
@@ -20,6 +20,4 @@
EL_VALIDATOR_ERROR_VALIDATING=Error validating EL
EL_VALIDATOR_SETTER=Setter
-EL_VALIDATOR_GETTER=Getter
-
-ERR_ILLIGAL_VALIDATION_STATE=Validator has no tree "{0}" for project "{1}" Project exists = {2}
+EL_VALIDATOR_GETTER=Getter
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -19,7 +19,9 @@
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp.test,
org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.search;bundle-version="3.7.0"
+ org.eclipse.search;bundle-version="3.7.0",
+ org.jboss.tools.common.validation,
+ org.jboss.tools.common.base.test
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -3,7 +3,7 @@
<plugin>
<extension
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.jst.web.kb.test.validation.TestValidator"
id="org.jboss.tools.jst.web.kb.test.TestValidator"
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,8 +13,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup;
import org.jboss.tools.common.model.util.test.XProjectImportTestSetUp;
-import org.jboss.tools.jst.jsp.test.ValidationProjectTestSetup;
import org.jboss.tools.jst.web.kb.test.validation.BuilderOrderMarkerResolutionTest;
import org.jboss.tools.jst.web.kb.test.validation.KBValidationTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/BuilderOrderMarkerResolutionTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -20,9 +20,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.preferences.SeverityPreferences;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
import org.jboss.tools.test.util.JobUtils;
@@ -61,7 +61,7 @@
}
private IMarker[] getBuilderOrderMarkers() throws CoreException {
- return project.findMarkers(ValidatorManager.ORDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO);
+ return project.findMarkers(KBValidator.ORDER_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ZERO);
}
public void testWrongBuildOrderPreference() throws CoreException {
@@ -92,7 +92,7 @@
public void testBuilderOrderResolution() throws CoreException {
checkResolution(project,
- ValidatorManager.ORDER_PROBLEM_MARKER_TYPE,
+ KBValidator.ORDER_PROBLEM_MARKER_TYPE,
"org.jboss.tools.jst.web.kb.internal.validation.BuilderOrderResolution");
}
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/KBValidationTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/KBValidationTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/KBValidationTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,12 +13,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationResourceRegister;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidationContextManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidationContextManager;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationResourceRegister;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/TestValidator.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/TestValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/validation/TestValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -19,17 +19,17 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.internal.KbBuilder;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
/**
* @author Alexey Kazakov
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -17,7 +17,7 @@
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200",
org.eclipse.jst.jsf.core;bundle-version="1.3.3",
org.apache.ant;bundle-version="1.7.1",
- org.eclipse.wst.validation;visibility:=reexport;bundle-version="1.2.300",
+ org.eclipse.wst.validation;bundle-version="1.2.300";visibility:=reexport,
org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
org.eclipse.jst.j2ee;bundle-version="1.1.500",
org.eclipse.jface.text;bundle-version="3.7.0",
@@ -37,7 +37,8 @@
org.jboss.tools.jst.web.kb;visibility:=reexport,
org.jboss.tools.jsf,
org.eclipse.jem.util;bundle-version="2.1.2",
- org.eclipse.debug.core;bundle-version="3.7.0"
+ org.eclipse.debug.core;bundle-version="3.7.0",
+ org.jboss.tools.common.validation
Bundle-Version: 3.3.0.qualifier
Export-Package:
org.jboss.tools.seam.core,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -511,7 +511,7 @@
</extension>
<extension id="seamproblem" name="%KBProblemName" point="org.eclipse.core.resources.markers">
- <super type="org.jboss.tools.jst.web.kb.kbproblemmarker">
+ <super type="org.jboss.tools.common.validation.JBTValidationProblem">
</super>
<persistent value="true">
</persistent>
@@ -519,7 +519,7 @@
<extension
id="CoreValidator"
- point="org.jboss.tools.jst.web.kb.validator">
+ point="org.jboss.tools.common.validation.validator">
<validator
class="org.jboss.tools.seam.internal.core.validation.SeamCoreValidator"
name="%SeamCoreValidator"
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -16,7 +16,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.seam.core.event.ISeamProjectChangeListener;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -40,8 +40,8 @@
import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
import org.jboss.tools.common.xml.XMLUtilities;
-import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -39,18 +39,19 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.ITextSourceReference;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationUtil;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree;
+import org.jboss.tools.common.validation.internal.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.internal.KbProject;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
-import org.jboss.tools.jst.web.kb.validation.ValidationUtil;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.model.project.ext.store.XMLValueInfo;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
@@ -201,7 +202,7 @@
}
private boolean validateBuilderOrder(IProject project) throws CoreException {
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), SeamPreferences.getInstance());
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getId(), SeamPreferences.getInstance());
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidationDelegate.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -12,11 +12,10 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
-import org.jboss.tools.jst.web.kb.internal.validation.ELValidator;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.common.validation.IELValidationDelegate;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.jst.web.kb.internal.validation.KBValidator;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.jst.web.kb.validation.IELValidationDelegate;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCoreBuilder;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -25,6 +24,7 @@
* @author Alexey Kazakov
*/
public class SeamELValidationDelegate implements IELValidationDelegate {
+
public static final String ID = "org.jboss.tools.seam.core.SeamELValidationDelegate";
/* (non-Javadoc)
@@ -51,7 +51,7 @@
private boolean validateBuilderOrder(IProject project) throws CoreException {
//It's EL, hence EL preferences, not Seam preferences.
- return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getID(), ELSeverityPreferences.getInstance()); //$NON-NLS-1$
+ return KBValidator.validateBuilderOrder(project, getBuilderId(), getID(), ELSeverityPreferences.getInstance()); //$NON-NLS-1$
}
public String getBuilderId() {
@@ -61,5 +61,4 @@
public String getID() {
return ID;
}
-
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -42,7 +42,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.w3c.dom.Element;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -35,11 +35,11 @@
import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ProblemMessage;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidationErrorManager;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidationErrorManager;
+import org.jboss.tools.common.validation.ProblemMessage;
+import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidationErrorManager.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -11,7 +11,7 @@
package org.jboss.tools.seam.internal.core.validation;
import org.eclipse.core.resources.IProject;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.seam.core.SeamPreferences;
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-08-23 17:34:09 UTC (rev 34174)
@@ -890,7 +890,7 @@
class="org.jboss.tools.seam.ui.marker.SeamProblemMarkerResolutionGenerator"/>
<markerResolutionGenerator
class="org.jboss.tools.seam.ui.marker.SeamProblemMarkerResolutionGenerator"
- markerType="org.jboss.tools.jst.web.kb.kbproblemmarker"/>
+ markerType="org.jboss.tools.common.validation.JBTValidationProblem"/>
<markerResolutionGenerator
class="org.jboss.tools.seam.ui.marker.SeamProblemMarkerResolutionGenerator"
markerType="org.jboss.tools.seam.core.seamproblem"/>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-08-23 17:34:09 UTC (rev 34174)
@@ -30,13 +30,14 @@
org.eclipse.wst.validation.ui;bundle-version="1.2.104",
org.jboss.tools.common.el.core,
org.eclipse.jst.common.project.facet.core;bundle-version="1.4.1",
- org.jboss.tools.vpe;bundle-version="3.1.0",
- org.jboss.tools.jst.jsp;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0",
+ org.jboss.tools.vpe,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.jsf.text.ext.richfaces,
org.jboss.tools.seam.pages.xml,
org.jboss.tools.seam.xml,
org.eclipse.jst.standard.schemas,
org.eclipse.wst.standard.schemas,
- org.jboss.tools.seam.base.test;bundle-version="1.0.0"
+ org.jboss.tools.seam.base.test,
+ org.jboss.tools.common.validation
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -25,11 +25,11 @@
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.jboss.tools.common.validation.IValidator;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentMethod;
import org.jboss.tools.seam.core.ISeamProject;
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectPropertyValidatorWrapper.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectPropertyValidatorWrapper.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectPropertyValidatorWrapper.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,13 +13,13 @@
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.text.ITextSourceReference;
-import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
-import org.jboss.tools.jst.web.kb.validation.IValidationErrorManager;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidationErrorManager;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidationErrorManager;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.seam.core.SeamCoreBuilder;
import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
import org.jboss.tools.seam.internal.core.validation.SeamValidationErrorManager;
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java 2011-08-23 17:30:56 UTC (rev 34173)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java 2011-08-23 17:34:09 UTC (rev 34174)
@@ -13,10 +13,10 @@
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.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
-import org.jboss.tools.jst.web.kb.validation.IValidator;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator;
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34173 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-23 13:30:56 -0400 (Tue, 23 Aug 2011)
New Revision: 34173
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9571
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:29:58 UTC (rev 34172)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:30:56 UTC (rev 34173)
@@ -173,11 +173,11 @@
for(ELSegment segment : segments){
if(!segment.isResolved())
- continue;
+ break;
if(selection.getOffset() <= reference.getStartPosition()+segment.getSourceReference().getStartPosition() &&
- selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength()){
- if(segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment)
+ selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength() &&
+ (segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment)){
return segment;
}
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34172 - in trunk: as/features/org.jboss.ide.eclipse.as.feature and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-23 13:29:58 -0400 (Tue, 23 Aug 2011)
New Revision: 34172
Modified:
trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.properties
trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.properties
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2011)
year update for feature.xml and feature.properties files
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.properties
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -31,7 +31,7 @@
copyright=JBoss, Home of Professional Open Source\n\
Copyright JBoss by Red Hat, and individual contributors as indicated\n\
-by the @authors tag, 2006-2010. See the copyright.txt in the distribution\n\
+by the @authors tag, 2006-2011. See the copyright.txt in the distribution\n\
for a full listing of individual contributors.
license=Red Hat, Inc. licenses these features and plugins to you under \
Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.properties
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -28,4 +28,4 @@
# "description" property - description of the feature
description=Provides WTP server adapters for JBoss installations. These adapters are capable of deployment and providing classpaths for projects. Zipped or exploded deployments, JMX integration, and other extensions are included.
-copyright=JBoss, Home of Professional Open Source\nCopyright JBoss by Red Hat, and individual contributors as indicated\nby the @authors tag, 2006-2010. See the copyright.txt in the distribution\nfor a full listing of individual contributors.
+copyright=JBoss, Home of Professional Open Source\nCopyright JBoss by Red Hat, and individual contributors as indicated\nby the @authors tag, 2006-2011. See the copyright.txt in the distribution\nfor a full listing of individual contributors.
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -21,5 +21,9 @@
licenses. For precise licensing details, consult the corresponding \
source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
Raleigh NC 27606 USA.
+copyright=JBoss, Home of Professional Open Source \
+Copyright (c) 2006-2011 Red Hat, Inc., and individual contributors \
+as indicated by the @authors tag. See the copyright.txt in the distribution \
+for a full listing of individual contributors.
# END NON-TRANSLATABLE
########### end of license property ##########################################
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.feature/feature.xml 2011-08-23 17:29:58 UTC (rev 34172)
@@ -10,11 +10,7 @@
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright (c) 2006-2011 Red Hat, Inc., and individual contributors
-as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
<license url="%licenseURL">
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.properties
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -32,5 +32,5 @@
copyright=JBoss, Home of Professional Open Source\n\
Copyright JBoss by Red Hat, and individual contributors as indicated \
-by the @authors tag, 2006-2010. See the copyright.txt in the distribution \
+by the @authors tag, 2006-2011. See the copyright.txt in the distribution \
for a full listing of individual contributors.
\ No newline at end of file
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -28,7 +28,7 @@
# "description" property - description of the feature
description=Visual editing
-copyright=Copyright (c) 2007 - 2011 Exadel, Inc and Red Hat, Inc.\n\
+copyright=Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc.\n\
Distributed under license by Red Hat, Inc. All rights reserved.\n\
This program is made available under the terms of the\n\
Eclipse Public License v1.0 which accompanies this distribution,\n\
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2011-08-23 17:29:58 UTC (rev 34172)
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.test.feature" label="Tools Tests" version="3.2.0.qualifier">
+<feature
+ id="org.jboss.tools.test.feature"
+ label="Tools Tests"
+ version="3.2.0.qualifier">
- <description url="http://www.jboss.org/tools">
+ <description url="http://www.jboss.org/tools">
JBossTools unit tests feature
</description>
- <copyright>
- Copyright (c) 2007-2010 Exadel, Inc and Red Hat, Inc.
+ <copyright>
+ Copyright (c) 2007-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,
@@ -15,7 +18,7 @@
Exadel, Inc. and Red Hat, Inc. - initial API and implementation
</copyright>
- <license>
+ <license>
Red Hat, Inc. licenses these features and plugins to you under
certain open source licenses (or aggregations of such licenses), which
in a particular case may include the Eclipse Public License, the GNU
@@ -25,8 +28,22 @@
Raleigh NC 27606 USA.
</license>
- <plugin id="org.jboss.tools.tests" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.ui.bot.ext" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.ui.bot.ext.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.tools.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.ui.bot.ext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.ui.bot.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2011-08-23 17:22:47 UTC (rev 34171)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2011-08-23 17:29:58 UTC (rev 34172)
@@ -54,7 +54,7 @@
description=A feature that provides Mozilla's XULRunner as various platform-dependent plug-ins for Eclipse.
# "copyright" property - text of the "Feature Update Copyright"
-copyright=Copyright (C) 2007-2010 Mozilla and others
+copyright=Copyright (C) 2007-2011 Mozilla and others
############### end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34171 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-23 13:22:47 -0400 (Tue, 23 Aug 2011)
New Revision: 34171
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9571
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:14:54 UTC (rev 34170)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:22:47 UTC (rev 34171)
@@ -164,9 +164,6 @@
for(ELExpression operand : reference.getEl()){
for (ELResolver resolver : resolvers) {
- if (!(resolver instanceof ELCompletionEngine))
- continue;
-
ELResolution resolution = resolver.resolve(context, operand, selection.getOffset());
if(resolution == null)
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34170 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-23 13:14:54 -0400 (Tue, 23 Aug 2011)
New Revision: 34170
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9571
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:03:24 UTC (rev 34169)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/ELRefactorContributionFactory.java 2011-08-23 17:14:54 UTC (rev 34170)
@@ -156,34 +156,35 @@
if(context == null)
return null;
- ELReference[] references = context.getELReferences();
+ ELReference reference = context.getELReference(selection.getOffset());
+ if(reference == null)
+ return null;
+
ELResolver[] resolvers = context.getElResolvers();
- for(ELReference reference : references){
- for(ELExpression operand : reference.getEl()){
- for (ELResolver resolver : resolvers) {
- if (!(resolver instanceof ELCompletionEngine))
+ for(ELExpression operand : reference.getEl()){
+ for (ELResolver resolver : resolvers) {
+ if (!(resolver instanceof ELCompletionEngine))
+ continue;
+
+ ELResolution resolution = resolver.resolve(context, operand, selection.getOffset());
+
+ if(resolution == null)
+ continue;
+
+ List<ELSegment> segments = resolution.getSegments();
+
+ for(ELSegment segment : segments){
+ if(!segment.isResolved())
continue;
- ELResolution resolution = resolver.resolve(context, operand, selection.getOffset());
-
- if(resolution == null)
- continue;
-
- List<ELSegment> segments = resolution.getSegments();
-
- for(ELSegment segment : segments){
- if(!segment.isResolved())
- continue;
-
- if(selection.getOffset() <= reference.getStartPosition()+segment.getSourceReference().getStartPosition() &&
- selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength()){
- if(segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment)
- return segment;
- }
+ if(selection.getOffset() <= reference.getStartPosition()+segment.getSourceReference().getStartPosition() &&
+ selection.getOffset()+selection.getLength() >= reference.getStartPosition()+segment.getSourceReference().getStartPosition()+segment.getSourceReference().getLength()){
+ if(segment instanceof MessagePropertyELSegment || segment instanceof JavaMemberELSegment)
+ return segment;
}
+ }
- }
}
}
return null;
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34169 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-23 13:03:24 -0400 (Tue, 23 Aug 2011)
New Revision: 34169
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
Log:
added catch blocks to fail test in case of exception
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2011-08-23 17:01:50 UTC (rev 34168)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2011-08-23 17:03:24 UTC (rev 34169)
@@ -10,8 +10,11 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+import java.io.IOException;
+
import org.eclipse.core.resources.IFile;
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;
@@ -60,16 +63,15 @@
Job job = new WorkspaceJob("Test JBIDE-1479"){ //$NON-NLS-1$
- @Override
+ @Override
public IStatus runInWorkspace(IProgressMonitor monitor) {
- try {
- new FormatProcessorXML().formatFile(file);
- }catch (Throwable exception){
- /*
- * Here we test JBIDE-1479, if eclipse crashed we won't get any
- * exception, so we just ignore it's.
- */
- }
+ try {
+ new FormatProcessorXML().formatFile(file);
+ } catch (CoreException e) {
+ TestUtil.fail(e);
+ } catch (IOException e) {
+ TestUtil.fail(e);
+ }
return Status.OK_STATUS;
}
};
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34168 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-23 13:01:50 -0400 (Tue, 23 Aug 2011)
New Revision: 34168
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
Log:
fixed swtbot.properties format for server requirement
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2011-08-23 15:22:40 UTC (rev 34167)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2011-08-23 17:01:50 UTC (rev 34168)
@@ -22,7 +22,7 @@
<configuration>
<useUIThread>false</useUIThread>
<skip>${swtbot.test.skip}</skip>
- <dependencies>
+ <dependencies combine.children="append">
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.jst.server_ui.feature.feature.group</artifactId>
@@ -80,7 +80,7 @@
<property name="jboss.tools.jre.6" value="${java.home}" />
</then>
</if>
- <echo file="swtbot.properties" append="false">SERVER=JBOSS_AS,6.0,default,${requirement.build.root}/jboss-6.0.0.Final
+ <echo file="swtbot.properties" append="false">SERVER=AS,6.0,1.6,${requirement.build.root}/jboss-6.0.0.Final
JAVA=1.6,${jboss.tools.jre.6}
</echo>
</tasks>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34167 - trunk/requirements/jbpm-3.1.4.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-23 11:22:40 -0400 (Tue, 23 Aug 2011)
New Revision: 34167
Modified:
trunk/requirements/jbpm-3.1.4/build.properties
Log:
fix URL using %20 instead of \\ , and refactor because there's no such thing as jbmp
Modified: trunk/requirements/jbpm-3.1.4/build.properties
===================================================================
--- trunk/requirements/jbpm-3.1.4/build.properties 2011-08-23 12:00:56 UTC (rev 34166)
+++ trunk/requirements/jbpm-3.1.4/build.properties 2011-08-23 15:22:40 UTC (rev 34167)
@@ -1,8 +1,9 @@
-jbmp314.build.uri=http://downloads.sourceforge.net/project/jbpm/jBPM\ 3/jbpm-3.1.4
-jbmp314.build.name=jbpm-3.1.4
-jbmp314.build.archive=${jbmp314.build.name}.zip
-jbmp314.build.archive.md5=df65b5642f33676313ebe4d5b69a3fff
+#http://sourceforge.net/projects/jbpm/files/jBPM%203/jbpm-3.1.4/jbpm-3.1.4.zip/download
+jbpm314.build.uri=http://downloads.sourceforge.net/project/jbpm/jBPM%203/jbpm-3.1.4
+jbpm314.build.name=jbpm-3.1.4
+jbpm314.build.archive=${jbpm314.build.name}.zip
+jbpm314.build.archive.md5=df65b5642f33676313ebe4d5b69a3fff
-build.uri=${jbmp314.build.uri}
-build.archive=${jbmp314.build.archive}
-md5=${jbmp314.build.archive.md5}
+build.uri=${jbpm314.build.uri}
+build.archive=${jbpm314.build.archive}
+md5=${jbpm314.build.archive.md5}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34166 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-23 08:00:56 -0400 (Tue, 23 Aug 2011)
New Revision: 34166
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/CommitAndPushHandler.java
Log:
corrected erroneous static declaration of method (was: static now: instance method)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/CommitAndPushHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/CommitAndPushHandler.java 2011-08-23 11:46:46 UTC (rev 34165)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/src/org/jboss/ide/eclipse/as/egit/internal/ui/commands/CommitAndPushHandler.java 2011-08-23 12:00:56 UTC (rev 34166)
@@ -26,7 +26,7 @@
return null;
}
- private static boolean executeCommand(String commandId, ISelection selection) throws ExecutionException {
+ private boolean executeCommand(String commandId, ISelection selection) throws ExecutionException {
if (!(selection instanceof IStructuredSelection)) {
throw new ExecutionException(NLS.bind("Could not execute command \"{0}\" since there's no valid selection",
commandId));
14 years, 7 months
- 1
- 0