JBoss Tools SVN: r34245 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 17:24:00 -0400 (Wed, 24 Aug 2011)
New Revision: 34245
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java
Log:
JBIDE-9583
https://issues.jboss.org/browse/JBIDE-9583
Obsolete class CDIProjectsSet removed.
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-24 20:09:58 UTC (rev 34244)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/CoreValidationTest.java 2011-08-24 21:24:00 UTC (rev 34245)
@@ -17,7 +17,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-import org.jboss.tools.cdi.internal.core.validation.CDIProjectSet;
+import org.jboss.tools.cdi.internal.core.validation.CDIProjectTree;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.validation.IValidator;
import org.jboss.tools.common.validation.ValidationContext;
@@ -65,7 +65,7 @@
* https://issues.jboss.org/browse/JBIDE-7946
*/
public void testAllRelatedProjectsIncluded() {
- CDIProjectSet set = new CDIProjectSet(tckProject);
+ CDIProjectTree set = new CDIProjectTree(tckProject);
assertTrue("TCKProject is not included in the set of CDI projects", set.getAllProjects().contains(tckProject));
}
14 years, 7 months
JBoss Tools SVN: r34244 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-24 16:09:58 -0400 (Wed, 24 Aug 2011)
New Revision: 34244
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9583 CDI validator doesn't validate project if it is a dependency of another not-CDI project
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-24 19:36:38 UTC (rev 34243)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-24 20:09:58 UTC (rev 34244)
@@ -212,6 +212,8 @@
}
dependencies = nature.getDefinitions().getAllDependencies();
injectionValidationFeatures = nature.getExtensionManager().getFeatures(IInjectionPointValidatorFeature.class);
+ } else {
+ CDICorePlugin.getDefault().logError("Trying to validate " + rootProject + " but there is no CDI Nature in the project.");
}
projectName = projectSet.getRootProject().getName();
sourceFolders = null;
@@ -327,7 +329,11 @@
public IStatus validateAll(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext context, ValidatorManager manager, IReporter reporter)
throws ValidationException {
init(project, validationHelper, context, manager, reporter);
-
+
+ if (cdiProject == null) {
+ return OK_STATUS;
+ }
+
displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { projectName });
Set<IFile> filesToValidate = new HashSet<IFile>();
14 years, 7 months
JBoss Tools SVN: r34243 - trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 15:36:38 -0400 (Wed, 24 Aug 2011)
New Revision: 34243
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
Log:
JBIDE-9582
https://issues.jboss.org/browse/JBIDE-9582
Removed out-of-dated code.
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 19:31:10 UTC (rev 34242)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 19:36:38 UTC (rev 34243)
@@ -45,15 +45,6 @@
assertEquals("jboss-esb-brp-broken.xml should have 4 error markers.", markerNumbers, 4);
}
- /**
- *
- * @throws Exception
- */
-// public void testMultipleDisposeParameters() throws Exception {
-// IFile file = project.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java");
-// AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.MULTIPLE_DISPOSING_PARAMETERS, 30, 30);
-// }
-
public static int getMarkersNumber(IResource resource) {
return AbstractResourceMarkerTest.getMarkersNumberByGroupName(resource, null);
}
14 years, 7 months
JBoss Tools SVN: r34242 - trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 15:31:10 -0400 (Wed, 24 Aug 2011)
New Revision: 34242
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/.classpath
Log:
JBIDE-9582
https://issues.jboss.org/browse/JBIDE-9582
Removed Java version from .classpath in test project.
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/.classpath
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/.classpath 2011-08-24 19:29:21 UTC (rev 34241)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/.classpath 2011-08-24 19:31:10 UTC (rev 34242)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0_04">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="jst.java"/>
</attributes>
14 years, 7 months
JBoss Tools SVN: r34241 - in trunk/esb/plugins/org.jboss.tools.esb.validator: src/org/jboss/tools/esb/validator and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-24 15:29:21 -0400 (Wed, 24 Aug 2011)
New Revision: 34241
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
Log:
JBIDE-9582
https://issues.jboss.org/browse/JBIDE-9582
Fixed recognizing of ESB project
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-24 19:18:17 UTC (rev 34240)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-08-24 19:29:21 UTC (rev 34241)
@@ -10,10 +10,11 @@
org.jboss.tools.esb.validator.ui
Require-Bundle: org.jboss.tools.common.ui,
org.jboss.tools.esb.core,
- org.eclipse.ui,
+ org.eclipse.ui;bundle-version="3.7.0",
org.jboss.tools.esb.project.core,
- org.eclipse.wst.validation,
- org.eclipse.jdt.ui,
- org.jboss.tools.common.validation
+ org.eclipse.wst.validation;bundle-version="1.2.300",
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.jboss.tools.common.validation,
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200"
Bundle-Version: 1.5.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
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-24 19:18:17 UTC (rev 34240)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-08-24 19:29:21 UTC (rev 34241)
@@ -16,6 +16,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.model.XModelObject;
@@ -82,6 +85,10 @@
}
public boolean shouldValidate(IProject project) {
+ if(!project.isAccessible()) {
+ return false;
+ }
+
String esbContentFolder = null;
try {
@@ -92,8 +99,14 @@
if(esbContentFolder != null) return isEnabled(project);
+
try {
- return project != null && project.isAccessible() && project.hasNature(ESBProjectConstant.ESB_PROJECT_NATURE) && isEnabled(project);
+ IFacetedProject fp = ProjectFacetsManager.create(project);
+ IProjectFacet f = ProjectFacetsManager.getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
+ if(fp != null && f != null && fp.getInstalledVersion(f) != null) {
+ return true;
+ }
+ return project.hasNature(ESBProjectConstant.ESB_PROJECT_NATURE) && isEnabled(project);
} catch (CoreException e) {
ESBValidatorPlugin.log(e);
}
@@ -155,24 +168,26 @@
//ignore
}
- if(esbContentFolder != null) {
- IFolder esbContent = project.getFolder(new Path(esbContentFolder + "/META-INF")); //$NON-NLS-1$
- if(esbContent != null && esbContent.exists()) {
- IResource[] rs = null;
- try {
- rs = esbContent.members();
- } catch (CoreException e) {
- ESBValidatorPlugin.log(e);
- }
- for (IResource r: rs) {
- if(r instanceof IFile) {
- IFile file = (IFile)r;
- String name = file.getName();
- if(!name.endsWith(XML_EXT)) continue;
- XModelObject o = EclipseResourceUtil.createObjectForResource(file);
- if(o != null && o.getModelEntity().getName().startsWith(ESBConstants.ENT_ESB_FILE)) {
- validateESBConfigFile(o, file);
- }
+ if(esbContentFolder == null) {
+ esbContentFolder = ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
+ }
+
+ IFolder esbContent = project.getFolder(new Path(esbContentFolder + "/META-INF")); //$NON-NLS-1$
+ if(esbContent != null && esbContent.exists()) {
+ IResource[] rs = null;
+ try {
+ rs = esbContent.members();
+ } catch (CoreException e) {
+ ESBValidatorPlugin.log(e);
+ }
+ for (IResource r: rs) {
+ if(r instanceof IFile) {
+ IFile file = (IFile)r;
+ String name = file.getName();
+ if(!name.endsWith(XML_EXT)) continue;
+ XModelObject o = EclipseResourceUtil.createObjectForResource(file);
+ if(o != null && o.getModelEntity().getName().startsWith(ESBConstants.ENT_ESB_FILE)) {
+ validateESBConfigFile(o, file);
}
}
}
14 years, 7 months
JBoss Tools SVN: r34240 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-24 15:18:17 -0400 (Wed, 24 Aug 2011)
New Revision: 34240
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java
Log:
code cleanup:
1. No more empty try catch blocks
2. No more early exception catch blocks
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-24 19:03:16 UTC (rev 34239)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2011-08-24 19:18:17 UTC (rev 34240)
@@ -14,11 +14,12 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.jsf.ui.JsfUIMessages;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jsf.ui.editor.check.wizards.AddJSFCapabilitiesWizard;
/**
@@ -56,7 +57,8 @@
try {
String value = !isRemember ? "yes" : "no";
Preference.SHOW_NATURE_WARNING.setValue(value);
- } catch (CoreException e) {
+ } catch (XModelException e) {
+ JsfUiPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-24 19:03:16 UTC (rev 34239)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2011-08-24 19:18:17 UTC (rev 34240)
@@ -30,6 +30,7 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.views.markers.MarkerSupportInternalUtilities;
import org.eclipse.ui.views.markers.internal.MarkerMessages;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.jsf.ui.JsfUIMessages;
import org.jboss.tools.jsf.ui.JsfUiPlugin;
@@ -121,7 +122,8 @@
try {
String value = !isRemember ? "yes" : "no";
Preference.SHOW_NATURE_WARNING.setValue(value);
- } catch (CoreException e) {
+ } catch (XModelException e) {
+ JsfUiPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-24 19:03:16 UTC (rev 34239)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2011-08-24 19:18:17 UTC (rev 34240)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbenchWindow;
@@ -28,6 +29,7 @@
import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
import org.jboss.tools.jsf.ui.JsfUIMessages;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.util.FileUtil;
import org.jboss.tools.jst.web.kb.IKbProject;
@@ -65,7 +67,6 @@
if(windows != null) for (IWorkbenchWindow window: windows) {
window.getPartService().addPartListener(partListener);
}
-
PlatformUI.getWorkbench().addWindowListener(new WindowListener());
}
@@ -111,16 +112,16 @@
IResourceDelta resourceDelta = affectedChildren[i];
if (resourceDelta.getResource() instanceof IProject) {
IProject project = (IProject) resourceDelta.getResource();
- if (resourceDelta.getKind() == IResourceDelta.ADDED) {
- processAddProject(project);
- } else if (resourceDelta.getKind() == IResourceDelta.REMOVED) {
- processRemoveProject(project);
- } else {
- try {
- updateProjectJSFPersistents(project);
- } catch (CoreException e) {
- ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e);
+ try {
+ if (resourceDelta.getKind() == IResourceDelta.ADDED) {
+ processAddProject(project);
+ } else if (resourceDelta.getKind() == IResourceDelta.REMOVED) {
+ processRemoveProject(project);
+ } else {
+ updateProjectJSFPersistents(project);
}
+ } catch (CoreException e) {
+ ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e);
}
}
}
@@ -141,13 +142,9 @@
projectsCollection.clear();
}
- private void processAddProject(IProject project) {
+ private void processAddProject(IProject project) throws CoreException {
addProject(project);
- try {
- updateProjectJSFPersistents(project);
- } catch (CoreException e) {
- ProblemReportingHelper.reportProblem(JspEditorPlugin.PLUGIN_ID, e);
- }
+ updateProjectJSFPersistents(project);
}
private void processRemoveProject(IProject project) {
@@ -159,31 +156,24 @@
IJavaElement javaElement = null;
try {
javaElement = FileUtil.searchForClass(JavaCore.create(project), SEARCH_CLASS);
- } catch (CoreException e) {
- // ignore
+ } finally {
+ if (javaElement == null) {
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
+ } else {
+ project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString());
+ }
}
- if (javaElement == null) {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.FALSE.toString());
- } else {
- project.setPersistentProperty(IS_JSF_CHECK_NEED, Boolean.TRUE.toString());
- }
}
}
- private IMarker getKBProblemMarker(IProject project) {
+ private IMarker getKBProblemMarker(IProject project) throws CoreException {
IMarker kbProblemMarker = null;
- try {
- IMarker[] markers = project.findMarkers(null, false, 1);
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- String _type = marker.getType();
- if (_type != null
- && _type.equals(KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE)) {
- kbProblemMarker = marker;
- break;
- }
+ IMarker[] markers = project.findMarkers(null, false, 1);
+ for (IMarker marker : markers ) {
+ if (KbBuilderMarker.KB_BUILDER_PROBLEM_MARKER_TYPE.equals(marker.getType())) {
+ kbProblemMarker = marker;
+ break;
}
- } catch (CoreException e) {
}
return kbProblemMarker;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java 2011-08-24 19:03:16 UTC (rev 34239)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/util/FileUtil.java 2011-08-24 19:18:17 UTC (rev 34240)
@@ -27,6 +27,7 @@
import org.eclipse.jdt.core.search.SearchParticipant;
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
/**
*
@@ -35,43 +36,38 @@
*/
public class FileUtil {
-
+
+ public final static int INITIAL_CAPACITY = 20;
+
public static IJavaElement searchForClass(IJavaProject javaProject, String className) throws JavaModelException {
-// Get the search pattern
- SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.TYPE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE);
- // Get the search scope
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject });
+ // Get the search pattern
+ SearchPattern pattern = SearchPattern.createPattern(className, IJavaSearchConstants.TYPE,
+ IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE);
+ // Get the search scope
+ IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new IJavaElement[] { javaProject });
- final List<SearchMatch> matches = new ArrayList<SearchMatch>();
- // Get the search requestor
- SearchRequestor requestor = new SearchRequestor() {
+ final List<SearchMatch> matches = new ArrayList<SearchMatch>(INITIAL_CAPACITY);
+ // Get the search requestor
+ SearchRequestor requestor = new SearchRequestor() {
public void acceptSearchMatch(SearchMatch match) throws CoreException {
matches.add(match);
}
- };
+ };
- // Search
- SearchEngine searchEngine = new SearchEngine();
- try {
- searchEngine.search(pattern, new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()}, scope, requestor, null);
- } catch (CoreException ex) {
- // Ignore
-// ExtensionsPlugin.log(ex);
- }
- for (Iterator i = matches.iterator(); i != null && i.hasNext();) {
- IJavaElement element = (IJavaElement)((SearchMatch)i.next()).getElement();
- String classQualifiedName = getQualifiedClassName(element);
- if (className.equals(classQualifiedName))
- return element;
- }
- return javaProject.findType(className, new NullProgressMonitor());
- }
-
- private static String getQualifiedClassName(IJavaElement element) {
- if(element instanceof IType) {
- return ((IType)element).getFullyQualifiedName('.');
+ // Search
+ SearchEngine searchEngine = new SearchEngine();
+ try {
+ searchEngine.search(pattern, new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() }, scope,
+ requestor, null);
+ } catch (CoreException ex) {
+ JspEditorPlugin.getPluginLog().logError(ex);
}
- return null;
- }
-
+ for (SearchMatch match : matches) {
+ IJavaElement element = (IJavaElement) match.getElement();
+ if(element instanceof IType && className.equals(((IType)element).getFullyQualifiedName('.'))) {
+ return element;
+ }
+ }
+ return javaProject.findType(className, new NullProgressMonitor());
+ }
}
14 years, 7 months
JBoss Tools SVN: r34239 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-24 15:03:16 -0400 (Wed, 24 Aug 2011)
New Revision: 34239
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeContextDefinition.java
Log:
Fixed NPE:
Caused by: java.lang.NullPointerException
at org.jboss.tools.jst.web.kb.include.IncludeContextDefinition.addTagAttribute(IncludeContextDefinition.java:170)
at org.jboss.tools.jst.web.kb.include.IncludeContextBuilder.processAttributeElement(IncludeContextBuilder.java:170)
at org.jboss.tools.jst.web.kb.include.IncludeContextBuilder.readElement(IncludeContextBuilder.java:230)
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeContextDefinition.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeContextDefinition.java 2011-08-24 18:10:57 UTC (rev 34238)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeContextDefinition.java 2011-08-24 19:03:16 UTC (rev 34239)
@@ -25,11 +25,11 @@
*/
public class IncludeContextDefinition {
private String fUri;
- private Map<String, Set<String>> fIncludeTags; // Map<TagName, Set<AttributeName>>
- private Map<String, Set<String>> fCSSTags; // Map<TagName, Set<AttributeName>>
- private Map<String, Set<String>> fJSF2CSSTags; // Map<TagName, Set<AttributeName>>
- private Map<String, Set<String>> fContexts; // Map<ContextType, Set<ContentType>>
-
+ private Map<String, Set<String>> fIncludeTags = new HashMap<String, Set<String>>(); // Map<TagName, Set<AttributeName>>
+ private Map<String, Set<String>> fCSSTags = new HashMap<String, Set<String>>(); // Map<TagName, Set<AttributeName>>
+ private Map<String, Set<String>> fJSF2CSSTags = new HashMap<String, Set<String>>(); // Map<TagName, Set<AttributeName>>
+ private Map<String, Set<String>> fContexts = new HashMap<String, Set<String>>(); // Map<ContextType, Set<ContentType>>
+
/**
* Created the IncludeContextDefinition object for the specified URI
*
@@ -87,9 +87,6 @@
* @param element
*/
private void addIncludeTag(String tagName, IConfigurationElement element) {
- if (fIncludeTags == null) {
- fIncludeTags = new HashMap<String, Set<String>>();
- }
Set<String> tagSet = fIncludeTags.get(tagName);
if (tagSet == null) {
tagSet = new HashSet<String>();
@@ -104,9 +101,6 @@
* @param element
*/
private void addCSSTag(String tagName, IConfigurationElement element) {
- if (fCSSTags == null) {
- fCSSTags = new HashMap<String, Set<String>>();
- }
Set<String> tagSet = fCSSTags.get(tagName);
if (tagSet == null) {
tagSet = new HashSet<String>();
@@ -121,9 +115,6 @@
* @param element
*/
private void addJSF2CSSTag(String tagName, IConfigurationElement element) {
- if (fJSF2CSSTags == null) {
- fJSF2CSSTags = new HashMap<String, Set<String>>();
- }
Set<String> tagSet = fJSF2CSSTags.get(tagName);
if (tagSet == null) {
tagSet = new HashSet<String>();
@@ -202,9 +193,6 @@
* @param element
*/
public void addContextType(String id, IConfigurationElement element) {
- if (fContexts == null) {
- fContexts = new HashMap<String, Set<String>>();
- }
Set<String> contextSet = fContexts.get(id);
if (contextSet == null) {
contextSet = new HashSet<String>();
@@ -249,7 +237,7 @@
* @return
*/
public String[] getIncludeTags() {
- return fIncludeTags == null ? EMPTY_CHILDREN :
+ return fIncludeTags.isEmpty() ? EMPTY_CHILDREN :
(String[])fIncludeTags.keySet().toArray(new String[fIncludeTags.size()]);
}
@@ -259,7 +247,7 @@
* @return
*/
public String[] getCSSTags() {
- return fCSSTags == null ? EMPTY_CHILDREN :
+ return fCSSTags.isEmpty() ? EMPTY_CHILDREN :
(String[])fCSSTags.keySet().toArray(new String[fCSSTags.size()]);
}
/**
@@ -268,7 +256,7 @@
* @return
*/
public String[] getJSF2CSSTags() {
- return fJSF2CSSTags == null ? EMPTY_CHILDREN :
+ return fJSF2CSSTags.isEmpty() ? EMPTY_CHILDREN :
(String[])fJSF2CSSTags.keySet().toArray(new String[fJSF2CSSTags.size()]);
}
@@ -319,13 +307,10 @@
* @return
*/
public String getContextType(String contentType) {
- if (fContexts == null)
- return null;
-
for (String contextType : fContexts.keySet()) {
if (fContexts.get(contextType).contains(contentType))
return contextType;
}
return null;
}
-}
+}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34238 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-24 14:10:57 -0400 (Wed, 24 Aug 2011)
New Revision: 34238
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-6153 (Move validation framework from JST module to common)
added common validation into richfaces feature
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2011-08-24 18:08:04 UTC (rev 34237)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2011-08-24 18:10:57 UTC (rev 34238)
@@ -18,9 +18,8 @@
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 Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, Raleigh NC 27606 USA.
</license>
-
<requires>
- <import plugin="org.jboss.tools.xulrunner.initializer" version="3.1.0" match="greaterOrEqual"/>
+ <import plugin="org.jboss.tools.xulrunner.initializer" version="3.1.0" match="greaterOrEqual"/>
</requires>
<plugin
@@ -338,5 +337,10 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.common.validation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
</feature>
14 years, 7 months
JBoss Tools SVN: r34237 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-08-24 14:08:04 -0400 (Wed, 24 Aug 2011)
New Revision: 34237
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search/MySearchableBean.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java
Log:
https://issues.jboss.org/browse/JBIDE-9473
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp 2011-08-24 18:08:04 UTC (rev 34237)
@@ -0,0 +1,16 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title>JSF Test Page</title>
+ </head>
+ <body>
+ <f:view>
+ <h1>
+ <h:outputText value="#{mySearchableBean.sFoo2()}"/>
+ <h:outputText value="#{sFoo}"/>
+ <h:outputText value="#{sFoo1}"/>
+ </h1>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/search.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search/MySearchableBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search/MySearchableBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search/MySearchableBean.java 2011-08-24 18:08:04 UTC (rev 34237)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.jbt.search;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+@Named
+public class MySearchableBean {
+
+ @Produces @Named public String sFoo;
+
+ @Produces @Named public String sFoo1() {
+ return "";
+ }
+
+ public String sFoo2() {
+ return "";
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/search/MySearchableBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-08-24 18:03:00 UTC (rev 34236)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/ELReferencesQueryParticipantTest.java 2011-08-24 18:08:04 UTC (rev 34237)
@@ -41,4 +41,47 @@
new ELReferencesQueryParticipant(),
matches);
}
+
+ public void testELReferencesQueryParticipantForType2() throws CoreException{
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure("/tck/WebContent/search.jsp", "mySearchableBean"));
+
+ QueryParticipantTestUtils.testSearchParticipant(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/search/MySearchableBean.java",
+ QueryParticipantTestUtils.TYPE_SEARCH,
+ "MySearchableBean",
+ "",
+ new ELReferencesQueryParticipant(),
+ matches);
+ }
+
+ public void testELReferencesQueryParticipantForMethod2() throws CoreException{
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure("/tck/WebContent/search.jsp", "sFoo1"));
+
+ QueryParticipantTestUtils.testSearchParticipant(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/search/MySearchableBean.java",
+ QueryParticipantTestUtils.METHOD_SEARCH,
+ "sFoo1",
+ "",
+ new ELReferencesQueryParticipant(),
+ matches);
+ }
+
+ public void testELReferencesQueryParticipantForField() throws CoreException{
+ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+
+ matches.add(new MatchStructure("/tck/WebContent/search.jsp", "sFoo"));
+
+ QueryParticipantTestUtils.testSearchParticipant(tckProject,
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/search/MySearchableBean.java",
+ QueryParticipantTestUtils.FIELD_SEARCH,
+ "sFoo",
+ "",
+ new ELReferencesQueryParticipant(),
+ matches);
+ }
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java 2011-08-24 18:03:00 UTC (rev 34236)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/ELReferencesQueryParticipant.java 2011-08-24 18:08:04 UTC (rev 34237)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -51,7 +52,7 @@
return;
ElementQuerySpecification qs = (ElementQuerySpecification)querySpecification;
- if(qs.getElement() instanceof IMethod || qs.getElement() instanceof IType){
+ if(qs.getElement() instanceof IField || qs.getElement() instanceof IMethod || qs.getElement() instanceof IType){
IFile file = (IFile)qs.getElement().getResource();
if(file == null)
return;
14 years, 7 months
JBoss Tools SVN: r34236 - in trunk/esb/tests/org.jboss.tools.esb.validator.test: src/org/jboss/tools/esb/validator/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-24 14:03:00 -0400 (Wed, 24 Aug 2011)
New Revision: 34236
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9582
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-08-24 17:43:31 UTC (rev 34235)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-08-24 18:03:00 UTC (rev 34236)
@@ -15,5 +15,6 @@
org.jboss.tools.common,
org.eclipse.ui,
org.eclipse.jdt.core,
- org.eclipse.ltk.core.refactoring
+ org.eclipse.ltk.core.refactoring,
+ org.jboss.tools.common.base.test
Export-Package: org.jboss.tools.esb.validator.test
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java 2011-08-24 17:43:31 UTC (rev 34235)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java 2011-08-24 18:03:00 UTC (rev 34236)
@@ -5,15 +5,14 @@
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.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.osgi.framework.Bundle;
@@ -24,27 +23,6 @@
protected static String WEB_CONTENT_SUFFIX = "/esbcontent";
- protected IProject project;
-
- public ESBTest() {
- project = getTestProject();
- }
-
- public IProject getTestProject() {
- if(project==null) {
- try {
- project = findTestProject();
- if(project==null || !project.exists()) {
- project = importPreparedProject("/");
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail("Can't import ESB test project: " + e.getMessage());
- }
- }
- return project;
- }
-
public static IProject findTestProject() {
return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
}
@@ -61,12 +39,11 @@
} catch (CoreException e) {
e.printStackTrace();
}
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ TestUtil._waitForValidation(project);
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
return project;
}
-
public static void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) {
for (ITextSourceReference reference : references) {
if(reference.getStartPosition()==startPosition) {
@@ -85,7 +62,4 @@
assertEquals("Wrong start position", startPosition, reference.getStartPosition());
assertEquals("Wrong length", length, reference.getLength());
}
-
- public static void cleanProject(String _resourcePath) throws Exception {
- }
}
\ No newline at end of file
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java 2011-08-24 17:43:31 UTC (rev 34235)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java 2011-08-24 18:03:00 UTC (rev 34236)
@@ -30,13 +30,12 @@
@Override
protected void setUp() throws Exception {
- project = ESBTest.findTestProject();
+ project = ESBTest.importPreparedProject("/");
}
@Override
protected void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
project.delete(true, true, null);
JobUtils.waitForIdle();
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 17:43:31 UTC (rev 34235)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 18:03:00 UTC (rev 34236)
@@ -11,9 +11,9 @@
package org.jboss.tools.esb.validator.test;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.jboss.tools.esb.validator.ESBValidatorMessages;
-import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -21,20 +21,13 @@
*/
public class ValidationTest extends ESBTest {
- public void test0() throws Exception {
- JobUtils.waitForIdle();
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
-
- }
- }
/**
* FTP Listener cannot reference FS Channel.
*
* @throws Exception
*/
public void testIncompatibleChannelReference() throws Exception {
+ IProject project = ESBTest.findTestProject();
IFile file = project.getFile("esbcontent/META-INF/jboss-esb-01.xml");
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.LISTENER_REFERENCES_INCOMPATIBLE_CHANNEL, 13);
int markerNumbers = getMarkersNumber(file);
@@ -42,6 +35,7 @@
}
public void testBusenessRulesProcessor() throws Exception {
+ IProject project = ESBTest.findTestProject();
IFile file = project.getFile("esbcontent/META-INF/jboss-esb-brp-broken.xml"); //$NON-NLS-1$
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_SET_FOR_RULE_LANGUAGE, 52);
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_AUDIT_TYPE_AND_INTERVAL, 34);
@@ -63,5 +57,4 @@
public static int getMarkersNumber(IResource resource) {
return AbstractResourceMarkerTest.getMarkersNumberByGroupName(resource, null);
}
-
}
\ No newline at end of file
14 years, 7 months