JBoss Tools SVN: r42899 - in trunk: common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-08-07 20:55:06 -0400 (Tue, 07 Aug 2012)
New Revision: 42899
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2012-08-08 00:18:53 UTC (rev 42898)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2012-08-08 00:55:06 UTC (rev 42899)
@@ -296,7 +296,6 @@
} catch(CoreException e) {
CDICorePlugin.getDefault().logError(e);
}
-
}
private void addLinkedResourcesForUnknownType(IFile beansXml, String typeName) {
@@ -432,10 +431,12 @@
private abstract class AbstractTypeValidator implements TypeValidator {
+ @Override
public String getTypeElementName() {
return "class"; //$NON-NLS-1$
}
+ @Override
public String validateType(CDICoreValidator.CDIValidationContext context, IType type) throws JavaModelException {
if(!validateKindOfType(type)) {
return getIllegalTypeErrorMessage();
@@ -477,35 +478,43 @@
private class AlternativeClassValidator extends AbstractTypeValidator {
+ @Override
public boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type) {
IClassBean classBean = context.getCdiProject().getBeanClass(type);
return classBean!=null && classBean.isAlternative();
}
+ @Override
public String getParrentElementname() {
return "alternatives"; //$NON-NLS-1$
}
+ @Override
public String getEmptyTypeErrorMessage() {
return CDIValidationMessages.EMPTY_ALTERNATIVE_BEAN_CLASS_NAME;
}
-
+
+ @Override
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME;
}
-
+
+ @Override
public int getUnknownTypeErrorMessageId() {
return CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID;
}
+ @Override
public String getIllegalTypeErrorMessage() {
return CDIValidationMessages.ILLEGAL_ALTERNATIVE_BEAN_CLASS;
}
+ @Override
public int getIllegalTypeErrorMessageId() {
return CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID;
}
+ @Override
public String getDuplicateTypeErrorMessage() {
return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE;
}
@@ -518,6 +527,7 @@
private class AlternativeStereotypeValidator extends AbstractTypeValidator {
+ @Override
public boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type) {
IStereotype stereotype = context.getCdiProject().getStereotype(type);
return stereotype!=null && stereotype.isAlternative();
@@ -533,30 +543,37 @@
return "stereotype"; //$NON-NLS-1$
}
+ @Override
public String getParrentElementname() {
return "alternatives"; //$NON-NLS-1$
}
+ @Override
public String getEmptyTypeErrorMessage() {
return CDIValidationMessages.EMPTY_ALTERNATIVE_ANNOTATION_NAME;
}
+ @Override
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME;
}
+ @Override
public int getUnknownTypeErrorMessageId() {
return CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID;
}
+ @Override
public String getIllegalTypeErrorMessage() {
return CDIValidationMessages.ILLEGAL_ALTERNATIVE_ANNOTATION;
}
+ @Override
public int getIllegalTypeErrorMessageId() {
return CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_ANNOTATION_ID;
}
+ @Override
public String getDuplicateTypeErrorMessage() {
return CDIValidationMessages.DUPLICATE_ALTERNATIVE_TYPE;
}
@@ -569,35 +586,43 @@
private class DecoratorTypeValidator extends AbstractTypeValidator {
+ @Override
public boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type) {
IClassBean classBean = context.getCdiProject().getBeanClass(type);
return classBean instanceof IDecorator;
}
+ @Override
public String getParrentElementname() {
return "decorators"; //$NON-NLS-1$
}
+ @Override
public String getEmptyTypeErrorMessage() {
return CDIValidationMessages.EMPTY_DECORATOR_BEAN_CLASS_NAME;
}
-
+
+ @Override
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_DECORATOR_BEAN_CLASS_NAME;
}
-
+
+ @Override
public int getUnknownTypeErrorMessageId() {
return CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID;
}
+ @Override
public String getIllegalTypeErrorMessage() {
return CDIValidationMessages.ILLEGAL_DECORATOR_BEAN_CLASS;
}
+ @Override
public int getIllegalTypeErrorMessageId() {
return CDIValidationErrorManager.ILLEGAL_DECORATOR_BEAN_CLASS_ID;
}
+ @Override
public String getDuplicateTypeErrorMessage() {
return CDIValidationMessages.DUPLICATE_DECORATOR_CLASS;
}
@@ -610,35 +635,43 @@
private class InterceptorTypeValidator extends AbstractTypeValidator {
+ @Override
public boolean validateSourceType(CDICoreValidator.CDIValidationContext context, IType type) {
IClassBean classBean = context.getCdiProject().getBeanClass(type);
return classBean instanceof IInterceptor;
}
+ @Override
public String getParrentElementname() {
return "interceptors"; //$NON-NLS-1$
}
+ @Override
public String getEmptyTypeErrorMessage() {
return CDIValidationMessages.EMPTY_INTERCEPTOR_CLASS_NAME;
}
-
+
+ @Override
public String getUnknownTypeErrorMessage() {
return CDIValidationMessages.UNKNOWN_INTERCEPTOR_CLASS_NAME;
}
-
+
+ @Override
public int getUnknownTypeErrorMessageId() {
return CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID;
}
+ @Override
public String getIllegalTypeErrorMessage() {
return CDIValidationMessages.ILLEGAL_INTERCEPTOR_CLASS;
}
+ @Override
public int getIllegalTypeErrorMessageId() {
return CDIValidationErrorManager.ILLEGAL_INTERCEPTOR_CLASS_ID;
}
+ @Override
public String getDuplicateTypeErrorMessage() {
return CDIValidationMessages.DUPLICATE_INTERCEPTOR_CLASS;
}
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java 2012-08-08 00:18:53 UTC (rev 42898)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseUIUtil.java 2012-08-08 00:55:06 UTC (rev 42899)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.common.util;
-import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -31,7 +30,8 @@
private static class SafeRunnableForActivePage extends SafeRunnable {
- public ITextEditor activeEditor;
+ public ITextEditor activeTextEditor;
+ public IEditorPart activeEditor;
/*
* (non-Javadoc)
@@ -44,14 +44,14 @@
if (window != null) {
IWorkbenchPage page = window.getActivePage();
if (page != null) {
- IEditorPart editor = page.getActiveEditor();
- if (editor instanceof IEditorWrapper) {
- editor = ((IEditorWrapper) editor).getEditor();
+ activeEditor = page.getActiveEditor();
+ if (activeEditor instanceof IEditorWrapper) {
+ activeEditor = ((IEditorWrapper) activeEditor).getEditor();
}
- if (editor instanceof ITextEditor) {
- activeEditor = (ITextEditor) editor;
+ if (activeEditor instanceof ITextEditor) {
+ activeTextEditor = (ITextEditor) activeEditor;
} else {
- activeEditor = editor == null ? null : (ITextEditor)editor.getAdapter(ITextEditor.class);
+ activeTextEditor = activeEditor == null ? null : (ITextEditor)activeEditor.getAdapter(ITextEditor.class);
}
}
}
@@ -66,6 +66,16 @@
}
}
+ public static boolean isActiveEditorDirty() {
+ SafeRunnableForActivePage sr = new SafeRunnableForActivePage();
+ SafeRunnable.run(sr);
+ IEditorPart editor = sr.activeEditor;
+ if(editor!=null) {
+ return editor.isDirty();
+ }
+ return false;
+ }
+
/**
* Returns the active text editor.
* @return
@@ -73,7 +83,7 @@
public static ITextEditor getActiveEditor() {
SafeRunnableForActivePage sr = new SafeRunnableForActivePage();
SafeRunnable.run(sr);
- return sr.activeEditor;
+ return sr.activeTextEditor;
}
/**
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java 2012-08-08 00:18:53 UTC (rev 42898)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/multipage/DefaultMultipageEditor.java 2012-08-08 00:55:06 UTC (rev 42899)
@@ -36,10 +36,11 @@
}
public boolean isDirty() {
- XModelObject o = getModelObject();
- if((o != null && o.isModified()) ||
- (textEditor != null && textEditor.isModified())) return true;
- return false;
+ return super.isDirty();
+// XModelObject o = getModelObject();
+// if((o != null && o.isModified()) ||
+// (textEditor != null && textEditor.isModified())) return true;
+// return false;
}
protected void setNormalMode() {
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-08-08 00:18:53 UTC (rev 42898)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-08-08 00:55:06 UTC (rev 42899)
@@ -86,35 +86,37 @@
static void removeMessages() {
UIJob job = new UIJob("Removing as-you-type JBT validation problems") {
public IStatus runInUIThread(IProgressMonitor monitor) {
- ITextEditor e = EclipseUIUtil.getActiveEditor();
- if(e!=null && !e.isDirty()) {
- IEditorInput input = e.getEditorInput();
- IDocumentProvider dp = e.getDocumentProvider();
- IDocument doc = dp.getDocument(input);
- boolean ok = false;
- synchronized (reporters) {
- ok = reporters.contains(doc);
- }
- if(ok) {
- IAnnotationModel model = dp.getAnnotationModel(input);
- if(model instanceof AbstractMarkerAnnotationModel) {
- AbstractMarkerAnnotationModel anModel = ((AbstractMarkerAnnotationModel)model);
- synchronized (anModel.getLockObject()) {
- Iterator iterator = anModel.getAnnotationIterator();
- while (iterator.hasNext()) {
- Object o = iterator.next();
- if(o instanceof TemporaryAnnotation) {
- TemporaryAnnotation annotation = (TemporaryAnnotation)o;
- Map attributes = annotation.getAttributes();
- if(attributes!=null && attributes.get(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE)!=null) {
+ if(!EclipseUIUtil.isActiveEditorDirty()) {
+ ITextEditor e = EclipseUIUtil.getActiveEditor();
+ if(e!=null) {
+ IEditorInput input = e.getEditorInput();
+ IDocumentProvider dp = e.getDocumentProvider();
+ IDocument doc = dp.getDocument(input);
+ boolean ok = false;
+ synchronized (reporters) {
+ ok = reporters.contains(doc);
+ }
+ if(ok) {
+ IAnnotationModel model = dp.getAnnotationModel(input);
+ if(model instanceof AbstractMarkerAnnotationModel) {
+ AbstractMarkerAnnotationModel anModel = ((AbstractMarkerAnnotationModel)model);
+ synchronized (anModel.getLockObject()) {
+ Iterator iterator = anModel.getAnnotationIterator();
+ while (iterator.hasNext()) {
+ Object o = iterator.next();
+ if(o instanceof TemporaryAnnotation) {
+ TemporaryAnnotation annotation = (TemporaryAnnotation)o;
+ Map attributes = annotation.getAttributes();
+ if(attributes!=null && attributes.get(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE)!=null) {
+ anModel.removeAnnotation(annotation);
+ }
+ } else if(o instanceof DisabledAnnotation) {
+ DisabledAnnotation annotation = (DisabledAnnotation)o;
anModel.removeAnnotation(annotation);
+ } else if(o instanceof TempJavaProblemAnnotation) {
+ TempJavaProblemAnnotation annotation = (TempJavaProblemAnnotation)o;
+ anModel.removeAnnotation(annotation);
}
- } else if(o instanceof DisabledAnnotation) {
- DisabledAnnotation annotation = (DisabledAnnotation)o;
- anModel.removeAnnotation(annotation);
- } else if(o instanceof TempJavaProblemAnnotation) {
- TempJavaProblemAnnotation annotation = (TempJavaProblemAnnotation)o;
- anModel.removeAnnotation(annotation);
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-08-08 00:18:53 UTC (rev 42898)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-08-08 00:55:06 UTC (rev 42899)
@@ -212,8 +212,8 @@
protected void disableProblemAnnotations(final ITextSourceReference reference) {
UIJob job = new UIJob("As-you-type JBT validation. Disabling the marker annotations.") {
public IStatus runInUIThread(IProgressMonitor monitor) {
- ITextEditor e = EclipseUIUtil.getActiveEditor();
- if(e!=null && e.isDirty()) {
+ if(EclipseUIUtil.isActiveEditorDirty()) {
+ ITextEditor e = EclipseUIUtil.getActiveEditor();
IEditorInput input = e.getEditorInput();
IDocumentProvider dp = e.getDocumentProvider();
if(document == dp.getDocument(input)) {
13 years, 8 months
JBoss Tools SVN: r42896 - tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-08-07 19:20:39 -0400 (Tue, 07 Aug 2012)
New Revision: 42896
Modified:
tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
Log:
Fixed connectors
Modified: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
===================================================================
--- tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 23:15:05 UTC (rev 42895)
+++ tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 23:20:39 UTC (rev 42896)
@@ -111,9 +111,7 @@
name="JBoss BPEL Editor"
description="BPEL Editor, examples and cheatsheets"
id="com.jboss.jbds.bpel.feature">
- <iu id="com.jboss.jbds.bpel.feature"/>
<iu id="org.jboss.tools.bpel.feature"/>
- <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
<icon
image32="images/jbds_bpel_32.png">
</icon>
@@ -209,7 +207,6 @@
description="JBoss Tools for jBPM 3, BPMN Converter, Runtime Detection"
id="org.jboss.tools.jbpm.common.feature">
<iu id="org.jboss.tools.jbpm.common.feature"/>
- <iu id="org.jboss.tools.flow.common.feature"/>
<iu id="org.jboss.tools.jbpm.convert.feature"/>
<iu id="org.jboss.tools.jbpm3.feature"/>
<iu id="org.jboss.tools.runtime.jbpm.detector.feature"/>
13 years, 8 months
JBoss Tools SVN: r42895 - in trunk: common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-08-07 19:15:05 -0400 (Tue, 07 Aug 2012)
New Revision: 42895
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IAsYouTypeValidator.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-12405 As-you-type validation works slow when many strings are being added
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 2012-08-07 22:54:42 UTC (rev 42894)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-08-07 23:15:05 UTC (rev 42895)
@@ -12,6 +12,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -105,6 +106,7 @@
import org.jboss.tools.common.validation.EditorValidationContext;
import org.jboss.tools.common.validation.IJavaElementValidator;
import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IStringValidator;
import org.jboss.tools.common.validation.IValidatingProjectSet;
import org.jboss.tools.common.validation.IValidatingProjectTree;
import org.jboss.tools.common.validation.ValidationUtil;
@@ -114,7 +116,7 @@
/**
* @author Alexey Kazakov
*/
-public class CDICoreValidator extends CDIValidationErrorManager implements IJavaElementValidator {
+public class CDICoreValidator extends CDIValidationErrorManager implements IJavaElementValidator, IStringValidator {
public static final String ID = "org.jboss.tools.cdi.core.CoreValidator"; //$NON-NLS-1$
public static final String PROBLEM_TYPE = "org.jboss.tools.cdi.core.cdiproblem"; //$NON-NLS-1$
public static final String PREFERENCE_PAGE_ID = "org.jboss.tools.cdi.ui.preferences.CDIValidatorPreferencePage"; //$NON-NLS-1$
@@ -488,7 +490,7 @@
* @see org.jboss.tools.common.validation.IAsYouTypeValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.core.resources.IProject, org.eclipse.jface.text.IRegion, org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter, org.jboss.tools.common.validation.EditorValidationContext, org.jboss.tools.common.validation.IProjectValidationContext, org.eclipse.core.resources.IFile)
*/
@Override
- public void validate(IValidator validatorManager, IProject rootProject, IRegion dirtyRegion, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, final IFile file) {
+ public void validate(IValidator validatorManager, IProject rootProject, Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, final IFile file) {
ContextValidationHelper validationHelper = new ContextValidationHelper();
validationHelper.setProject(rootProject);
validationHelper.setValidationContextManager(validationContext);
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-08-07 22:54:42 UTC (rev 42894)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-08-07 23:15:05 UTC (rev 42895)
@@ -10,9 +10,12 @@
******************************************************************************/
package org.jboss.tools.common.validation;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -154,13 +157,13 @@
return true;
}
- private void validate(Set<? extends IAsYouTypeValidator> validators, IRegion dirtyRegion, IValidationContext helper, IReporter reporter) {
+ private void validate(Set<? extends IAsYouTypeValidator> validators, Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter) {
count++;
for (IAsYouTypeValidator validator : validators) {
IProject rootProject = rootProjects.get(validator);
IValidatingProjectSet projectBrunch = context.getValidatingProjectTree(validator).getBrunches().get(rootProject);
if(projectBrunch!=null) {
- validator.validate(this, rootProject, dirtyRegion, helper, reporter, context, projectBrunch.getRootContext(), file);
+ validator.validate(this, rootProject, dirtyRegions, helper, reporter, context, projectBrunch.getRootContext(), file);
}
}
}
@@ -172,11 +175,11 @@
* @param helper
* @param reporter
*/
- public void validateString(IRegion dirtyRegion, IValidationContext helper, IReporter reporter) {
+ public void validateString(Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter) {
if(!init(helper, reporter)) {
return;
}
- validate(context.getStringValidators(), dirtyRegion, helper, reporter);
+ validate(context.getStringValidators(), dirtyRegions, helper, reporter);
}
/**
@@ -186,11 +189,11 @@
* @param helper
* @param reporter
*/
- public void validateJavaElement(IRegion dirtyRegion, IValidationContext helper, IReporter reporter) {
+ public void validateJavaElement(Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter) {
if(!init(helper, reporter)) {
return;
}
- validate(context.getJavaElementValidators(), dirtyRegion, helper, reporter);
+ validate(context.getJavaElementValidators(), dirtyRegions, helper, reporter);
}
/*
@@ -204,7 +207,9 @@
init(helper, reporter);
count++;
} else {
- validateString(dirtyRegion, helper, reporter);
+ List<IRegion> regions = new ArrayList<IRegion>();
+ regions.add(dirtyRegion);
+ validateString(regions, helper, reporter);
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IAsYouTypeValidator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IAsYouTypeValidator.java 2012-08-07 22:54:42 UTC (rev 42894)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/IAsYouTypeValidator.java 2012-08-07 23:15:05 UTC (rev 42895)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.common.validation;
+import java.util.Collection;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IRegion;
@@ -34,5 +36,5 @@
* @param projectContext
* @param file
*/
- void validate(IValidator validatorManager, IProject rootProject, IRegion dirtyRegion, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, IFile file);
+ void validate(IValidator validatorManager, IProject rootProject, Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, IFile file);
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-08-07 22:54:42 UTC (rev 42894)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-08-07 23:15:05 UTC (rev 42895)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.validation.java;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -28,6 +29,7 @@
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentExtension4;
import org.eclipse.jface.text.IDocumentRewriteSessionListener;
+import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.jface.text.Position;
@@ -427,7 +429,10 @@
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
- fValidatorManager.validateString(partition, fHelper, fReporter);
+ // TODO
+ List<IRegion> regions = new ArrayList<IRegion>();
+ regions.add(partition);
+ fValidatorManager.validateString(regions, fHelper, fReporter);
}
if (isJavaElementValidationRequired()) {
@@ -436,8 +441,11 @@
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
+ //TODO
fReporter.clearAlwaysRemoveAnnotations();
- fValidatorManager.validateJavaElement(new Region(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess), fHelper, fReporter);
+ List<IRegion> regions = new ArrayList<IRegion>();
+ regions.add(new Region(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess));
+ fValidatorManager.validateJavaElement(regions, fHelper, fReporter);
}
}
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 2012-08-07 22:54:42 UTC (rev 42894)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-08-07 23:15:05 UTC (rev 42895)
@@ -11,6 +11,7 @@
package org.jboss.tools.jst.web.kb.internal.validation;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -248,17 +249,25 @@
/*
* (non-Javadoc)
- * @see org.jboss.tools.common.validation.IAsYouTypeValidator#validate(org.eclipse.core.resources.IProject, org.eclipse.jface.text.IRegion, org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter, org.jboss.tools.common.validation.EditorValidationContext, org.eclipse.core.resources.IFile)
+ * @see org.jboss.tools.common.validation.IAsYouTypeValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.core.resources.IProject, java.util.Collection, org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter, org.jboss.tools.common.validation.EditorValidationContext, org.jboss.tools.common.validation.IProjectValidationContext, org.eclipse.core.resources.IFile)
*/
@Override
- public void validate(IValidator validatorManager, IProject rootProject, IRegion dirtyRegion, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, IFile file) {
+ public void validate(IValidator validatorManager, IProject rootProject, Collection<IRegion> dirtyRegions, IValidationContext helper, IReporter reporter, EditorValidationContext validationContext, IProjectValidationContext projectContext, IFile file) {
init(rootProject, null, projectContext, validatorManager, reporter);
setAsYouTypeValidation(true);
this.document = validationContext.getDocument();
ELContext elContext = PageContextFactory.createPageContext(validationContext.getDocument(), true);
elContext.setDirty(true);
- Set<ELReference> references = elContext.getELReferences(dirtyRegion);
-
+ Set<ELReference> references = null;
+ if(dirtyRegions.size()==1) {
+ references = elContext.getELReferences(dirtyRegions.iterator().next());
+ } else {
+ ELReference[] ref = elContext.getELReferences();
+ references = new HashSet<ELReference>(ref.length);
+ for (ELReference elReference : ref) {
+ references.add(elReference);
+ }
+ }
for (ELReference elReference : references) {
validateEL(elReference, true, elContext);
}
13 years, 8 months
JBoss Tools SVN: r42894 - branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-08-07 18:54:42 -0400 (Tue, 07 Aug 2012)
New Revision: 42894
Modified:
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
Log:
Fixed connectors
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 21:51:42 UTC (rev 42893)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 22:54:42 UTC (rev 42894)
@@ -111,9 +111,7 @@
name="JBoss BPEL Editor"
description="BPEL Editor, examples and cheatsheets"
id="com.jboss.jbds.bpel.feature">
- <iu id="com.jboss.jbds.bpel.feature"/>
<iu id="org.jboss.tools.bpel.feature"/>
- <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
<icon
image32="images/jbds_bpel_32.png">
</icon>
@@ -209,7 +207,6 @@
description="JBoss Tools for jBPM 3, BPMN Converter, Runtime Detection"
id="org.jboss.tools.jbpm.common.feature">
<iu id="org.jboss.tools.jbpm.common.feature"/>
- <iu id="org.jboss.tools.flow.common.feature"/>
<iu id="org.jboss.tools.jbpm.convert.feature"/>
<iu id="org.jboss.tools.jbpm3.feature"/>
<iu id="org.jboss.tools.runtime.jbpm.detector.feature"/>
13 years, 8 months
JBoss Tools SVN: r42893 - in tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-08-07 17:51:42 -0400 (Tue, 07 Aug 2012)
New Revision: 42893
Added:
tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
Modified:
tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
Log:
Added Savara and SwitchYard to SOA central plugin
Added: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
===================================================================
(Binary files differ)
Property changes on: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
===================================================================
(Binary files differ)
Property changes on: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
===================================================================
--- tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 21:00:06 UTC (rev 42892)
+++ tags/soatools-3.3.0.GA/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 21:51:42 UTC (rev 42893)
@@ -101,26 +101,45 @@
-->
<!-- JBT only -->
- <connectorDescriptor
- categoryId="com.jboss.jbds.central.discovery.soatooling"
- groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
- kind="task"
- license="Free, EPL"
- provider="JBoss by Red Hat"
- siteUrl="%jboss.soa.update.url"
- name="JBoss BPEL Editor"
- description="BPEL Editor, examples and cheatsheets"
- id="com.jboss.jbds.bpel.feature">
- <iu id="com.jboss.jbds.bpel.feature"/>
- <iu id="org.jboss.tools.bpel.feature"/>
- <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
- <icon
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss BPEL Editor"
+ description="BPEL Editor, examples and cheatsheets"
+ id="com.jboss.jbds.bpel.feature">
+ <iu id="com.jboss.jbds.bpel.feature"/>
+ <iu id="org.jboss.tools.bpel.feature"/>
+ <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
+ <icon
image32="images/jbds_bpel_32.png">
- </icon>
- <overview
+ </icon>
+ <overview
url="http://devstudio.jboss.com/">
- </overview>
- </connectorDescriptor>
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss Savara Editor"
+ description="JBoss Savara Editor"
+ id="org.savara.tools.feature">
+ <iu id="org.savara.tools.feature"/>
+ <iu id="org.savara.tools.incubator.feature"/>
+ <icon
+ image32="images/jbds_savara_32.png">
+ </icon>
+ <overview
+ url="http://devstudio.jboss.com/">
+ </overview>
+ </connectorDescriptor>
<connectorDescriptor
categoryId="com.jboss.jbds.central.discovery.soatooling"
groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
@@ -203,25 +222,44 @@
</overview>
</connectorDescriptor>
- <connectorDescriptor
- categoryId="com.jboss.jbds.central.discovery.soatooling"
- groupId="com.jboss.jbds.central.discovery.soatooling.emt"
- kind="task"
- license="Free, EPL"
- provider="JBoss by Red Hat"
- siteUrl="%jboss.soa.update.url"
- name="JBoss ESB Tools"
- description="JBoss ESB Tools, Runtime Detection"
- id="org.jboss.tools.esb.feature">
- <iu id="org.jboss.tools.esb.feature"/>
- <iu id="org.jboss.tools.runtime.esb.detector.feature"/>
- <icon
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.emt"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss ESB Tools"
+ description="JBoss ESB Tools, Runtime Detection"
+ id="org.jboss.tools.esb.feature">
+ <iu id="org.jboss.tools.esb.feature"/>
+ <iu id="org.jboss.tools.runtime.esb.detector.feature"/>
+ <icon
image32="images/jbds_esb_32.png">
- </icon>
- <overview
+ </icon>
+ <overview
url="http://devstudio.jboss.com/">
- </overview>
- </connectorDescriptor>
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.emt"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss SwitchYard Tools"
+ description="JBoss SwitchYard Tools"
+ id="org.switchyard.tools.feature">
+ <iu id="org.switchyard.tools.feature"/>
+ <iu id="org.switchyard.tools.editor.feature"/>
+ <icon
+ image32="images/jbds_switchyard_32.png">
+ </icon>
+ <overview
+ url="http://devstudio.jboss.com/">
+ </overview>
+ </connectorDescriptor>
<connectorDescriptor
categoryId="com.jboss.jbds.central.discovery.soatooling"
groupId="com.jboss.jbds.central.discovery.soatooling.emt"
13 years, 8 months
JBoss Tools SVN: r42892 - in branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-08-07 17:00:06 -0400 (Tue, 07 Aug 2012)
New Revision: 42892
Added:
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
Modified:
branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
Log:
Added Savara and SwitchYard to SOA central plugin
Added: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_savara_32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/images/jbds_switchyard_32.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 19:52:13 UTC (rev 42891)
+++ branches/jbosstools-3.3.x/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.xml 2012-08-07 21:00:06 UTC (rev 42892)
@@ -101,26 +101,45 @@
-->
<!-- JBT only -->
- <connectorDescriptor
- categoryId="com.jboss.jbds.central.discovery.soatooling"
- groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
- kind="task"
- license="Free, EPL"
- provider="JBoss by Red Hat"
- siteUrl="%jboss.soa.update.url"
- name="JBoss BPEL Editor"
- description="BPEL Editor, examples and cheatsheets"
- id="com.jboss.jbds.bpel.feature">
- <iu id="com.jboss.jbds.bpel.feature"/>
- <iu id="org.jboss.tools.bpel.feature"/>
- <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
- <icon
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss BPEL Editor"
+ description="BPEL Editor, examples and cheatsheets"
+ id="com.jboss.jbds.bpel.feature">
+ <iu id="com.jboss.jbds.bpel.feature"/>
+ <iu id="org.jboss.tools.bpel.feature"/>
+ <iu id="org.eclipse.bpel.apache.ode.runtime.feature"/>
+ <icon
image32="images/jbds_bpel_32.png">
- </icon>
- <overview
+ </icon>
+ <overview
url="http://devstudio.jboss.com/">
- </overview>
- </connectorDescriptor>
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss Savara Editor"
+ description="JBoss Savara Editor"
+ id="org.savara.tools.feature">
+ <iu id="org.savara.tools.feature"/>
+ <iu id="org.savara.tools.incubator.feature"/>
+ <icon
+ image32="images/jbds_savara_32.png">
+ </icon>
+ <overview
+ url="http://devstudio.jboss.com/">
+ </overview>
+ </connectorDescriptor>
<connectorDescriptor
categoryId="com.jboss.jbds.central.discovery.soatooling"
groupId="com.jboss.jbds.central.discovery.soatooling.bdgj"
@@ -203,25 +222,44 @@
</overview>
</connectorDescriptor>
- <connectorDescriptor
- categoryId="com.jboss.jbds.central.discovery.soatooling"
- groupId="com.jboss.jbds.central.discovery.soatooling.emt"
- kind="task"
- license="Free, EPL"
- provider="JBoss by Red Hat"
- siteUrl="%jboss.soa.update.url"
- name="JBoss ESB Tools"
- description="JBoss ESB Tools, Runtime Detection"
- id="org.jboss.tools.esb.feature">
- <iu id="org.jboss.tools.esb.feature"/>
- <iu id="org.jboss.tools.runtime.esb.detector.feature"/>
- <icon
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.emt"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss ESB Tools"
+ description="JBoss ESB Tools, Runtime Detection"
+ id="org.jboss.tools.esb.feature">
+ <iu id="org.jboss.tools.esb.feature"/>
+ <iu id="org.jboss.tools.runtime.esb.detector.feature"/>
+ <icon
image32="images/jbds_esb_32.png">
- </icon>
- <overview
+ </icon>
+ <overview
url="http://devstudio.jboss.com/">
- </overview>
- </connectorDescriptor>
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="com.jboss.jbds.central.discovery.soatooling"
+ groupId="com.jboss.jbds.central.discovery.soatooling.emt"
+ kind="task"
+ license="Free, EPL"
+ provider="JBoss by Red Hat"
+ siteUrl="%jboss.soa.update.url"
+ name="JBoss SwitchYard Tools"
+ description="JBoss SwitchYard Tools"
+ id="org.switchyard.tools.feature">
+ <iu id="org.switchyard.tools.feature"/>
+ <iu id="org.switchyard.tools.editor.feature"/>
+ <icon
+ image32="images/jbds_switchyard_32.png">
+ </icon>
+ <overview
+ url="http://devstudio.jboss.com/">
+ </overview>
+ </connectorDescriptor>
<connectorDescriptor
categoryId="com.jboss.jbds.central.discovery.soatooling"
groupId="com.jboss.jbds.central.discovery.soatooling.emt"
13 years, 8 months
JBoss Tools SVN: r42890 - trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-08-07 15:39:42 -0400 (Tue, 07 Aug 2012)
New Revision: 42890
Modified:
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
Log:
Add methods to not report exceptions in Eclipse log as test failure.
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2012-08-07 17:07:08 UTC (rev 42889)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2012-08-07 19:39:42 UTC (rev 42890)
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
@@ -35,6 +36,7 @@
protected SWTJBTBot bot = new SWTJBTBot();
private static int sleepTime = 1000;
private Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
+ private HashSet<String> ignoredExceptionsFromEclipseLog = new HashSet<String>();
/*
* (non-Javadoc) This static block read properties from
* org.jboss.tools.ui.bot.test/resources/SWTBot.properties file and set up
@@ -77,6 +79,12 @@
throwable = new Throwable(status.getMessage() + " in " //$NON-NLS-1$
+ status.getPlugin());
}
+ else {
+ // Check if exception has to be ignored
+ if (ignoredExceptionsFromEclipseLog.contains(throwable.getClass().getCanonicalName())){
+ throwable = null;
+ }
+ }
setException(throwable);
break;
default:
@@ -388,4 +396,26 @@
(areThereNoErrors ? "" : errors[0].getText()),
areThereNoErrors);
}
+ /**
+ * Adds exceptionFullClassName to ignored exception from eclipse log
+ * exceptionFullClassName exception will not make test failing
+ * @param exceptionFullClassName
+ */
+ protected void addIgnoredExceptionFromEclipseLog(String exceptionFullClassName){
+ ignoredExceptionsFromEclipseLog.add(exceptionFullClassName);
+ }
+ /**
+ * Removes exceptionFullClassName from ignored exception from eclipse log
+ * exceptionFullClassName exception will make test failing
+ * @param exceptionFullClassName
+ */
+ protected void removeIgnoredExceptionFromEclipseLog(String exceptionFullClassName){
+ ignoredExceptionsFromEclipseLog.remove(exceptionFullClassName);
+ }
+ /**
+ * Removes all ignored exceptions
+ */
+ protected void eraseIgnoredExceptionsFromEclipseLog(){
+ ignoredExceptionsFromEclipseLog.clear();
+ }
}
13 years, 8 months