JBoss Tools SVN: r34255 - tags/jbosstools-3.2.1.Final/birt/docs.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-24 19:42:22 -0400 (Wed, 24 Aug 2011)
New Revision: 34255
Removed:
tags/jbosstools-3.2.1.Final/birt/docs/en-US/
tags/jbosstools-3.2.1.Final/birt/docs/pom.xml
tags/jbosstools-3.2.1.Final/birt/docs/publican.cfg
Log:
removing to bring out updated 4.1 book for tagging
Deleted: tags/jbosstools-3.2.1.Final/birt/docs/pom.xml
===================================================================
--- tags/jbosstools-3.2.1.Final/birt/docs/pom.xml 2011-08-24 23:41:31 UTC (rev 34254)
+++ tags/jbosstools-3.2.1.Final/birt/docs/pom.xml 2011-08-24 23:42:22 UTC (rev 34255)
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools</groupId>
- <artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
- <packaging>jdocbook</packaging>
- <name>${bookname}-(${translation})</name>
-
- <properties>
- <translation>en-US</translation>
- <docname>Birt_Reference_Guide</docname>
- <bookname>Birt Reference Guide</bookname>
- </properties>
-
- <profiles>
-
- <!-- mvn compile -->
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.4</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <useRelativeImageUris>true</useRelativeImageUris>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- mvn compile -Phtml -->
- <profile>
- <id>html</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- mvn compile -Phtml-single -->
- <profile>
- <id>html-single</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- mvn compile -Ppdf -->
- <profile>
- <id>pdf</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${docname}.pdf</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- mvn compile -Peclipse -->
- <profile>
- <id>eclipse</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
- <extensions>true</extensions>
- <configuration>
- <formats>
- <format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.3.3</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.jboss.pressgang</groupId>
- <artifactId>pressgang-xslt</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.1</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <!-- <sourceDocumentName>${docname}.xml</sourceDocumentName> -->
- <sourceDocumentName>master.xml</sourceDocumentName>
- <masterTranslation>en-US</masterTranslation>
- <imageResource>
- <directory>${project.basedir}/en-US</directory>
- <includes>
- <include>images/**/*</include>
- </includes>
- </imageResource>
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>${pdf.name}</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <docbookVersion>1.72.0</docbookVersion>
- <localeSeparator>-</localeSeparator>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
Deleted: tags/jbosstools-3.2.1.Final/birt/docs/publican.cfg
===================================================================
--- tags/jbosstools-3.2.1.Final/birt/docs/publican.cfg 2011-08-24 23:41:31 UTC (rev 34254)
+++ tags/jbosstools-3.2.1.Final/birt/docs/publican.cfg 2011-08-24 23:42:22 UTC (rev 34255)
@@ -1,8 +0,0 @@
-# Config::Simple 4.59
-# Fri Nov 27 08:57:18 2009
-
-xml_lang: en-US
-type: Book
-brand: JBoss
-#condition: jbosstools
-condition: jbds
14 years, 7 months
JBoss Tools SVN: r34254 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-24 19:41:31 -0400 (Wed, 24 Aug 2011)
New Revision: 34254
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IELValidationDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-9584 CDI/JSF/Seam validation synchronization improvements
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IELValidationDelegate.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IELValidationDelegate.java 2011-08-24 23:40:18 UTC (rev 34253)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IELValidationDelegate.java 2011-08-24 23:41:31 UTC (rev 34254)
@@ -15,6 +15,9 @@
/**
* Represents a delegate which is used be EL validator to collect all the
* projects which should be validated by EL validator.
+ * One particular delegate is created during initialization of corresponding extension and saved in a static field.
+ * A few validation threads may use the same delegate in the same time.
+ * So it's developer's responsibility to make an implementation of IELValidationDelegate thread-safe.
*
* @author Alexey Kazakov
*/
14 years, 7 months
JBoss Tools SVN: r34253 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-24 19:40:18 -0400 (Wed, 24 Aug 2011)
New Revision: 34253
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
Log:
copyright date is updated to 2011
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2011-08-24 23:22:57 UTC (rev 34252)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2011-08-24 23:40:18 UTC (rev 34253)
@@ -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-2011 Mozilla and others
+copyright=Copyright (C) 2007-2010 Mozilla and others
############### end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
14 years, 7 months
JBoss Tools SVN: r34252 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-24 19:22:57 -0400 (Wed, 24 Aug 2011)
New Revision: 34252
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationContext.java
Log:
https://issues.jboss.org/browse/JBIDE-9584 CDI/JSF/Seam validation synchronization improvements
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationContext.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationContext.java 2011-08-24 23:10:19 UTC (rev 34251)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationContext.java 2011-08-24 23:22:57 UTC (rev 34252)
@@ -34,7 +34,7 @@
private ValidationResourceRegister validationResourceRegister;
private Map<IValidator, IValidatingProjectTree> projectTree = new HashMap<IValidator, IValidatingProjectTree>();
- private static List<IValidator> ALL_VALIDATORS;
+ private static List<IConfigurationElement> ALL_VALIDATORS;
private List<IValidator> validators = new ArrayList<IValidator>();
private Map<IValidator, Set<IProject>> validatedProjects = new HashMap<IValidator, Set<IProject>>();
@@ -48,8 +48,7 @@
validationResourceRegister = null;
if(ALL_VALIDATORS == null) {
// Load all the validators
- ALL_VALIDATORS = new ArrayList<IValidator>();
- List<IValidator> dependentValidators = new ArrayList<IValidator>();
+ ALL_VALIDATORS = new ArrayList<IConfigurationElement>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = registry.getExtensionPoint(IValidator.EXTENSION_POINT_ID);
if (extensionPoint != null) {
@@ -58,26 +57,32 @@
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) {
- CommonPlugin.getDefault().logError(e);
- }
+ ALL_VALIDATORS.add(elements[j]);
}
}
}
- // We should add all the dependent validators (e.g. EL validator) to the very end of the list.
- ALL_VALIDATORS.addAll(dependentValidators);
}
+ List<IValidator> dependentValidators = new ArrayList<IValidator>();
+ List<IValidator> allValidators = new ArrayList<IValidator>();
+ for (IConfigurationElement element : ALL_VALIDATORS) {
+ try {
+ IValidator validator = (IValidator)element.createExecutableExtension("class"); //$NON-NLS-1$
+ String dependent = element.getAttribute("dependent"); //$NON-NLS-1$
+ if(Boolean.parseBoolean(dependent)) {
+ dependentValidators.add(validator);
+ } else {
+ allValidators.add(validator);
+ }
+ } catch (CoreException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ }
+ // We should add all the dependent validators (e.g. EL validator) to the very end of the list.
+ allValidators.addAll(dependentValidators);
+
// Init context for given project.
- for (IValidator validator : ALL_VALIDATORS) {
+ for (IValidator validator : allValidators) {
if(validator.shouldValidate(project)) {
IValidatingProjectTree prTree = validator.getValidatingProjects(project);
if(prTree!=null) {
14 years, 7 months
JBoss Tools SVN: r34251 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 19:10:19 -0400 (Wed, 24 Aug 2011)
New Revision: 34251
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Log:
JBIDE-9583
https://issues.jboss.org/browse/JBIDE-9583
Updating dependencies of CDI projects at enabling/disabling cdi capabilities on a project.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-08-24 23:09:50 UTC (rev 34250)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-08-24 23:10:19 UTC (rev 34251)
@@ -17,6 +17,7 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
@@ -31,6 +32,7 @@
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.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
/**
@@ -319,6 +321,26 @@
assertFalse(producerType.equals(injectionType));
}
+ public void testSwitchingCDICapabilities() throws CoreException {
+ CDICoreNature n1 = CDICorePlugin.getCDI(project1, true);
+ CDICoreNature n2 = CDICorePlugin.getCDI(project2, true);
+ CDICoreNature n3 = CDICorePlugin.getCDI(project3, true);
+ assertTrue(n1.getDependentProjects().contains(n2));
+ assertTrue(n3.getCDIProjects().contains(n2));
+
+ CDIUtil.disableCDI(project2);
+ JobUtils.waitForIdle();
+ assertTrue(n1.getDependentProjects().isEmpty());
+ assertTrue(n3.getCDIProjects().isEmpty());
+
+ CDIUtil.enableCDI(project2, false, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ n2 = CDICorePlugin.getCDI(project2, true);
+ assertTrue(n1.getDependentProjects().contains(n2));
+ assertTrue(n3.getCDIProjects().contains(n2));
+
+ }
+
public void testCleanDependentProject() throws CoreException, IOException {
ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
14 years, 7 months
JBoss Tools SVN: r34250 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 19:09:50 -0400 (Wed, 24 Aug 2011)
New Revision: 34250
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/CDIUtil.java
Log:
JBIDE-9583
https://issues.jboss.org/browse/JBIDE-9583
Updating dependencies of CDI projects at enabling/disabling cdi capabilities on a project.
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-24 23:07:29 UTC (rev 34249)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-24 23:09:50 UTC (rev 34250)
@@ -83,6 +83,14 @@
public void deconfigure() throws CoreException {
removeFromBuildSpec(CDICoreBuilder.BUILDER_ID);
+ CDICoreNature[] ds = dependsOn.toArray(new CDICoreNature[0]);
+ for (CDICoreNature d: ds) {
+ removeCDIProject(d);
+ }
+ CDICoreNature[] us = usedBy.toArray(new CDICoreNature[0]);
+ for (CDICoreNature u: us) {
+ u.removeCDIProject(this);
+ }
}
public IProject getProject() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-08-24 23:07:29 UTC (rev 34249)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-08-24 23:09:50 UTC (rev 34250)
@@ -102,6 +102,14 @@
}
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
}
+
+ IProject[] ps = project.getWorkspace().getRoot().getProjects();
+ for (IProject p: ps) {
+ CDICoreNature n = CDICorePlugin.getCDI(p, false);
+ if(n != null && n.isStorageResolved()) {
+ n.getClassPath().validateProjectDependencies();
+ }
+ }
} catch (CoreException e) {
CDICorePlugin.getDefault().logError(e);
}
14 years, 7 months
JBoss Tools SVN: r34249 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-24 19:07:29 -0400 (Wed, 24 Aug 2011)
New Revision: 34249
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
code cleanup:
1. Removed null check that never works
2. Static variable initialization moved from constructor to static initialization block
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-24 22:52:40 UTC (rev 34248)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2011-08-24 23:07:29 UTC (rev 34249)
@@ -29,6 +29,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
+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.el.core.ELReference;
@@ -72,6 +73,27 @@
private static final String EXTENSION_POINT_ID = "org.jboss.tools.jst.web.kb.elValidationDelegate"; //$NON-NLS-1$
private static Set<IELValidationDelegate> DELEGATES;
+ static {
+ DELEGATES = new HashSet<IELValidationDelegate>();
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IExtensionPoint extensionPoint = registry.getExtensionPoint(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 {
+ IELValidationDelegate delegate = (IELValidationDelegate) elements[j]
+ .createExecutableExtension("class"); //$NON-NLS-1$
+ DELEGATES.add(delegate);
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ }
+ }
+ }
+ }
+ }
private ELResolver[] resolvers;
protected ELParserFactory mainFactory;
@@ -80,26 +102,6 @@
private boolean validateVars = true;
public ELValidator() {
- if(DELEGATES==null) {
- DELEGATES = new HashSet<IELValidationDelegate>();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint(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 {
- IELValidationDelegate delegate = (IELValidationDelegate)elements[j].createExecutableExtension("class"); //$NON-NLS-1$
- DELEGATES.add(delegate);
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- }
- }
- }
- }
- }
}
/*
@@ -166,7 +168,7 @@
Set<IPath> unnamedResources = validationContext.getUnnamedElResources();
for (IPath path : unnamedResources) {
IFile file = wsRoot.getFile(path);
- if(file!=null && file.isAccessible() && notValidatedYet(file)) {
+ if(file.isAccessible() && notValidatedYet(file)) {
filesToValidate.add(file);
}
}
@@ -180,7 +182,7 @@
int i=0;
for (ELReference el : els) {
IResource resource = el.getResource();
- if(resource!=null && resource.isAccessible() && !filesToValidate.contains(resource) && notValidatedYet(resource)) {
+ if(resource.isAccessible() && !filesToValidate.contains(resource) && notValidatedYet(resource)) {
// Don't re-validate more than 1000 ELs.
if(i++>1000) {
break;
@@ -247,7 +249,7 @@
if(!references[i].getSyntaxErrors().isEmpty()) {
for (SyntaxError error: references[i].getSyntaxErrors()) {
markers++;
- addError(ELValidationMessages.EL_SYNTAX_ERROR, ELSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, references[i].getLineNumber(), 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
+ addError(ELValidationMessages.EL_SYNTAX_ERROR, ELSeverityPreferences.EL_SYNTAX_ERROR, new String[]{error.getProblem()}, references[i].getLineNumber(), 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
}
}
if(markers<getMaxNumberOfMarkersPerFile(file.getProject())) {
@@ -268,7 +270,6 @@
}
private void validateELExpression(ELReference elReference, ELExpression el) {
- if(el == null) return;
List<ELInvocationExpression> es = el.getInvocations();
for (ELInvocationExpression token: es) {
validateElOperand(elReference, token);
14 years, 7 months
JBoss Tools SVN: r34248 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-24 18:52:40 -0400 (Wed, 24 Aug 2011)
New Revision: 34248
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
Log:
code cleanup:
1. Empty if else blocks removed
2. Null checks removed
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-08-24 21:57:03 UTC (rev 34247)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2011-08-24 22:52:40 UTC (rev 34248)
@@ -141,17 +141,12 @@
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 {
- //
+ IResource newTarget = target;
+ if(location.getResource() != null && location.getResource().exists() && !location.getResource().equals(target)) {
+ newTarget = location.getResource();
}
return addError(message, preferenceKey, messageArguments, 0, location
- .getLength(), location.getStartPosition(), target);
+ .getLength(), location.getStartPosition(), newTarget);
}
/*
@@ -372,9 +367,6 @@
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) {
14 years, 7 months
JBoss Tools SVN: r34247 - tags/jbosstools-3.2.1.Final/birt/docs/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-24 17:57:03 -0400 (Wed, 24 Aug 2011)
New Revision: 34247
Modified:
tags/jbosstools-3.2.1.Final/birt/docs/en-US/master.xml
Log:
tagging out for JBDS 4.1
Modified: tags/jbosstools-3.2.1.Final/birt/docs/en-US/master.xml
===================================================================
--- tags/jbosstools-3.2.1.Final/birt/docs/en-US/master.xml 2011-08-24 21:24:19 UTC (rev 34246)
+++ tags/jbosstools-3.2.1.Final/birt/docs/en-US/master.xml 2011-08-24 21:57:03 UTC (rev 34247)
@@ -53,15 +53,13 @@
<copyright>
- <year>2008</year>
- <year>2009</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.1.1.GA
+ Version: 3.2.1.GA
</releaseinfo>
14 years, 7 months
JBoss Tools SVN: r34246 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 17:24:19 -0400 (Wed, 24 Aug 2011)
New Revision: 34246
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java
Log:
JBIDE-9583
https://issues.jboss.org/browse/JBIDE-9583
Obsolete class CDIProjectSet removed.
Deleted: 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-24 21:24:00 UTC (rev 34245)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java 2011-08-24 21:24:19 UTC (rev 34246)
@@ -1,89 +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.cdi.internal.core.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-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;
-
-/**
- * @author Alexey Kazakov
- */
-public class CDIProjectSet extends ValidatingProjectSet {
-
- private ICDIProject rootCdiProject;
-
- /**
- * @param project
- */
- public CDIProjectSet(IProject project) {
- allProjects = new HashSet<IProject>();
- allProjects.add(project);
- CDICoreNature sp = CDICorePlugin.getCDI(project, false);
- if(sp!=null) {
- addIncludedProjects(sp);
- CDICoreNature rootCdiNature = addIncludingProjects(sp);
- rootCdiProject = rootCdiNature.getDelegate();
- rootProject = rootCdiNature.getProject();
-
- if(rootProject!=null && rootProject.isAccessible()) {
- IKbProject kbProject = KbProjectFactory.getKbProject(rootProject, false);
- if(kbProject!=null) {
- rootContext = kbProject.getValidationContext();
- } else {
- KbProject.checkKBBuilderInstalled(rootProject);
- rootContext = rootCdiNature.getValidationContext();
- }
- }
- }
- }
-
- private CDICoreNature addIncludingProjects(CDICoreNature project) {
- Set<CDICoreNature> dependentProjects = project.getDependentProjects();
- for (CDICoreNature nature : dependentProjects) {
- if(allProjects.contains(nature.getProject())) {
- return project;
- }
- if(!nature.getProject().isAccessible()) continue;
- allProjects.add(nature.getProject());
- return addIncludingProjects(nature);
- }
- return project;
- }
-
- private void addIncludedProjects(CDICoreNature project) {
- Set<CDICoreNature> includedCdiProjects = project.getCDIProjects();
- for (CDICoreNature cdiCoreNature : includedCdiProjects) {
- IProject includedProject = cdiCoreNature.getProject();
- if(!allProjects.contains(includedProject)) {
- allProjects.add(includedProject);
- addIncludedProjects(cdiCoreNature);
- }
- }
- }
-
- public void setRootCdiProject(ICDIProject rootCdiProject) {
- this.rootCdiProject = rootCdiProject;
- }
-
- public ICDIProject getRootCdiProject() {
- return rootCdiProject;
- }
-}
\ No newline at end of file
14 years, 7 months