June 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r42167 - trunk/documentation/jboss-tools-docs.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-21 21:30:05 -0400 (Thu, 21 Jun 2012) New Revision: 42167 Modified: trunk/documentation/jboss-tools-docs/pom.xml Log: updated for new doc set Modified: trunk/documentation/jboss-tools-docs/pom.xml =================================================================== --- trunk/documentation/jboss-tools-docs/pom.xml 2012-06-22 00:49:14 UTC (rev 42166) +++ trunk/documentation/jboss-tools-docs/pom.xml 2012-06-22 01:30:05 UTC (rev 42167) @@ -11,32 +11,23 @@ <name>All_Userguides</name> <modules> -  <module>../guides/GettingStartedGuide</module> <module>../guides/Beginners_Guide</module> <module>../../cdi/docs/reference</module> <module>../../as/docs/reference</module> <module>../../openshift/docs/reference</module> <module>../../hibernatetools/docs/reference</module> - <module>../../jbpm/docs/reference</module> <module>../../jsf/docs/userguide</module> <module>../../jsf/docs/jsf_tools_ref_guide</module> <module>../../jsf/docs/jsf_tools_tutorial</module> <module>../../seam/docs/reference</module> - <module>../../seam/docs/tutorial</module> - <module>../../struts/docs/struts_tools_ref_guide</module> - <module>../../struts/docs/struts_tools_tutorial</module> - <module>../../esb/docs/esb_ref_guide</module> + <module>../../seam/docs/tutorial</module> <module>../../struts/docs/struts_tools_ref_guide</module> <module>../../struts/docs/struts_tools_tutorial</module> <module>../../ws/docs/restful_reference</module> <module>../../ws/docs/soap_reference</module> <module>../../portlet/docs/reference</module> <module>../../birt/docs</module> - <module>../../drools/docs/reference</module> - <module>../../drools/docs/guvnor_ref</module> <module>../../maven/docs/reference</module> - <module>../../jbpm/docs/converter_ref</module> <module>../../jmx/docs/reference</module> - <module>../../bpel/docs/reference</module> <module>../../modeshape/docs/ModeShape_Tools_Reference_Guide</module> <module>index</module> </modules> @@ -73,11 +64,8 @@ <fileset> <directory>${pom.basedir}/target/docbook/publish/en-US/</directory> <includes> -  <include>html/org/</include> -  <include>html_single/org/</include> -  <include>eclipse/org/</include> </includes> <followSymlinks>false</followSymlinks>

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42166 - 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: 2012-06-21 20:49:14 -0400 (Thu, 21 Jun 2012) New Revision: 42166 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-10611 As-you-type CDI validation 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-06-22 00:48:46 UTC (rev 42165) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-06-22 00:49:14 UTC (rev 42166) @@ -2624,8 +2624,12 @@ return BUNDLE_NAME; } - protected boolean alwaysCleanAnnotations() { + /* + * (non-Javadoc) + * @see org.jboss.tools.common.validation.TempMarkerManager#shouldCleanAllAnnotations() + */ + @Override + protected boolean shouldCleanAllAnnotations() { return true; } - } \ No newline at end of file

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42165 - in trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation: java and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-06-21 20:48:46 -0400 (Thu, 21 Jun 2012) New Revision: 42165 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/java/JavaDirtyRegionProcessor.java Log: https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation 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-06-22 00:33:59 UTC (rev 42164) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-22 00:48:46 UTC (rev 42165) @@ -161,7 +161,7 @@ CommonPlugin.getDefault().logError(e); } } - IMessage message = addMesssage(validationManager, alwaysCleanAnnotations(), this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName()); + IMessage message = addMesssage(validationManager, shouldCleanAllAnnotations(), this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName()); String preferencePageId = getPreferencePageId(); if(preferencePageId != null && preferenceKey != null){ @@ -172,22 +172,28 @@ return message; } - protected boolean alwaysCleanAnnotations() { + /** + * Returns true if all the annotations belonged to this validator of entire document should be removed before start this validator again. + * If "false" then only annotations of the changed region should be removed. + * Returns "false" by default but subclasses are free to override this method. + * @return + */ + protected boolean shouldCleanAllAnnotations() { return false; } public static final String AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE = "org.jboss.tools.common.validation.asyoutype"; - public static final String CLEAN_ALWAYS_ATTRIBUTE = "org.jboss.tools.common.validation.cleanAlways"; + public static final String CLEAN_ALL_ANNOTATIONS_ATTRIBUTE = "org.jboss.tools.common.validation.cleanAllAnnotaions"; - private static IMessage addMesssage(IValidator validator, boolean cleanAlways, IReporter reporter, int offset, int length, IResource target, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) { + private static IMessage addMesssage(IValidator validator, boolean cleanAllAnnotaions, IReporter reporter, int offset, int length, IResource target, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) { Message message = new ValidationMessage(severity, messageArguments!=null?MessageFormat.format(textMessage, messageArguments):textMessage, target); message.setOffset(offset); message.setLength(length); message.setLineNo(lineNumber); message.setBundleName(bundleName); message.setAttribute(AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE); - if(cleanAlways) { - message.setAttribute(CLEAN_ALWAYS_ATTRIBUTE, Boolean.TRUE); + if(cleanAllAnnotaions) { + message.setAttribute(CLEAN_ALL_ANNOTATIONS_ATTRIBUTE, Boolean.TRUE); } reporter.addMessage(validator, message); return message; 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-06-22 00:33:59 UTC (rev 42164) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-22 00:48:46 UTC (rev 42165) @@ -59,8 +59,10 @@ @SuppressWarnings("restriction") final class JavaDirtyRegionProcessor extends DirtyRegionProcessor { - static Position ALWAYS_CLEARED = new Position(100000); + // TODO Slava what is that? + static final Position ALWAYS_CLEARED = new Position(100000); + private ITextEditor fEditor; private IDocument fDocument; private IValidationContext fHelper; @@ -168,11 +170,11 @@ } } - public void addAnnotation(Annotation annotation, Position position, boolean cleanAlways) { + public void addAnnotation(Annotation annotation, Position position, boolean cleanAllAnnotations) { if (isCancelled()) { return; } - fAnnotations.put(annotation, cleanAlways ? ALWAYS_CLEARED : position); + fAnnotations.put(annotation, cleanAllAnnotations ? ALWAYS_CLEARED : position); fAnnotationModel.addAnnotation(annotation, position); } @@ -186,13 +188,13 @@ IEditorInput editorInput= fEditor.getEditorInput(); if (editorInput != null) { - boolean cleanAlways = Boolean.TRUE.equals(message.getAttribute(TempMarkerManager.CLEAN_ALWAYS_ATTRIBUTE)); + boolean cleanAllAnnotations = Boolean.TRUE.equals(message.getAttribute(TempMarkerManager.CLEAN_ALL_ANNOTATIONS_ATTRIBUTE)); Position position = new Position(valMessage.getOffset(), valMessage.getLength()); CoreELProblem problem= new CoreELProblem(valMessage, editorInput.getName()); if (fCompilationUnit != null) { ProblemAnnotation problemAnnotation = new ProblemAnnotation(problem, fCompilationUnit); - addAnnotation(problemAnnotation, position, cleanAlways); + addAnnotation(problemAnnotation, position, cleanAllAnnotations); } } }

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42164 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-06-21 20:33:59 -0400 (Thu, 21 Jun 2012) New Revision: 42164 Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java Log: JBIDE-10611 https://issues.jboss.org/browse/JBIDE-10611 For CDI validator all annotations should be removed, because all document will be revalidated. 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-06-22 00:30:48 UTC (rev 42163) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-06-22 00:33:59 UTC (rev 42164) @@ -161,7 +161,7 @@ CommonPlugin.getDefault().logError(e); } } - IMessage message = addMesssage(validationManager, this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName()); + IMessage message = addMesssage(validationManager, alwaysCleanAnnotations(), this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName()); String preferencePageId = getPreferencePageId(); if(preferencePageId != null && preferenceKey != null){ @@ -172,15 +172,23 @@ return message; } + protected boolean alwaysCleanAnnotations() { + return false; + } + public static final String AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE = "org.jboss.tools.common.validation.asyoutype"; + public static final String CLEAN_ALWAYS_ATTRIBUTE = "org.jboss.tools.common.validation.cleanAlways"; - private static IMessage addMesssage(IValidator validator, IReporter reporter, int offset, int length, IResource target, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) { + private static IMessage addMesssage(IValidator validator, boolean cleanAlways, IReporter reporter, int offset, int length, IResource target, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) { Message message = new ValidationMessage(severity, messageArguments!=null?MessageFormat.format(textMessage, messageArguments):textMessage, target); message.setOffset(offset); message.setLength(length); message.setLineNo(lineNumber); message.setBundleName(bundleName); message.setAttribute(AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE); + if(cleanAlways) { + message.setAttribute(CLEAN_ALWAYS_ATTRIBUTE, Boolean.TRUE); + } reporter.addMessage(validator, message); return message; }

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42163 - 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: 2012-06-21 20:30:48 -0400 (Thu, 21 Jun 2012) New Revision: 42163 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: JBIDE-10611 https://issues.jboss.org/browse/JBIDE-10611 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-06-22 00:29:49 UTC (rev 42162) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-06-22 00:30:48 UTC (rev 42163) @@ -726,7 +726,6 @@ * • the two beans have the same EL name and the name is not resolvable, or */ Set<IBean> beans = context.getCdiProject().getBeans(name, true); - System.out.println("-->" + (beans.size()>1 && beans.contains(bean))); if(beans.size()>1 && beans.contains(bean)) { ITextSourceReference reference = bean.getNameLocation(true); Set<String> names = new HashSet<String>();

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42162 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-06-21 20:29:49 -0400 (Thu, 21 Jun 2012) New Revision: 42162 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java Log: JBIDE-10611 https://issues.jboss.org/browse/JBIDE-10611 Compute members immediately - or as-you-type model will have updated values. Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2012-06-22 00:28:45 UTC (rev 42161) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/impl/AnnotationDeclaration.java 2012-06-22 00:29:49 UTC (rev 42162) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.java.impl; +import java.util.HashMap; +import java.util.Map; + import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.Flags; @@ -34,11 +37,23 @@ */ public class AnnotationDeclaration implements IAnnotationDeclaration { protected IJavaAnnotation annotation; + protected Map<String, Object> values; public AnnotationDeclaration() {} public void setDeclaration(IJavaAnnotation annotation) { this.annotation = annotation; + IMemberValuePair[] pairs = getMemberValuePairs(); + if(pairs.length > 0) { + values = new HashMap<String, Object>(); + for (IMemberValuePair pair: pairs) { + String name = pair.getMemberName(); + Object value = resolveMemberValue(pair); + if(value != null) { + values.put(name, value); + } + } + } } public IJavaAnnotation getDeclaration() { @@ -55,13 +70,13 @@ public Object getMemberValue(String name) { if(name == null) name = "value"; //$NON-NLS-1$ - IMemberValuePair[] pairs = getMemberValuePairs(); - for (IMemberValuePair pair: pairs) { - if(name.equals(pair.getMemberName())) { - return resolveMemberValue(pair); - } - } - return null; +// IMemberValuePair[] pairs = getMemberValuePairs(); +// for (IMemberValuePair pair: pairs) { +// if(name.equals(pair.getMemberName())) { +// return resolveMemberValue(pair); +// } +// } + return values == null ? null : values.get(name); } public IMember getParentMember() {

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42161 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: validation and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-06-21 20:28:45 -0400 (Thu, 21 Jun 2012) New Revision: 42161 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: JBIDE-10611 https://issues.jboss.org/browse/JBIDE-10611 Named beans in as-you-type cdi model. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2012-06-22 00:18:29 UTC (rev 42160) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2012-06-22 00:28:45 UTC (rev 42161) @@ -31,6 +31,7 @@ protected void copyTo(AnnotationDeclaration other) { other.project = project; other.annotation = annotation; + other.values = values; } public void setProject(CDICoreNature project) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-06-22 00:18:29 UTC (rev 42160) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-06-22 00:28:45 UTC (rev 42161) @@ -128,9 +128,58 @@ synchronized(this) { p.allBeans.addAll(allBeans); } - p.allBeans.removeAll(getBeans(file.getFullPath())); + Set<IBean> oldBeans = getBeans(file.getFullPath()); + p.allBeans.removeAll(oldBeans); p.allBeans.addAll(beans); + Set<IBean> oldNamedBeans = null; + for (IBean b: oldBeans) { + if(b.getName() != null) { + if(oldNamedBeans == null) oldNamedBeans = new HashSet<IBean>(); + oldNamedBeans.add(b); + } + } + Set<IBean> newNamedBeans = null; + for (IBean b: beans) { + if(b.getName() != null) { + if(newNamedBeans == null) newNamedBeans = new HashSet<IBean>(); + newNamedBeans.add(b); + } + } + if(newNamedBeans != null || oldNamedBeans != null) { + p.namedBeans = new HashSet<IBean>(); + p.beansByName = new HashMap<String, Set<IBean>>(); + synchronized(this) { + p.namedBeans.addAll(namedBeans); + if(oldNamedBeans != null) p.namedBeans.removeAll(oldNamedBeans); + if(newNamedBeans != null) p.namedBeans.addAll(newNamedBeans); + for (String n: beansByName.keySet()) { + Set<IBean> bs = new HashSet<IBean>(beansByName.get(n)); + p.beansByName.put(n, bs); + } + if(oldNamedBeans != null) { + for (IBean b: oldNamedBeans) { + String n = b.getName(); + Set<IBean> bs = p.beansByName.get(n); + if(bs != null && bs.contains(b)) { + bs.remove(b); + } + } + } + if(newNamedBeans != null) { + for (IBean b: newNamedBeans) { + String n = b.getName(); + Set<IBean> bs = p.beansByName.get(n); + if(bs == null) { + bs = new HashSet<IBean>(); + p.beansByName.put(n, bs); + } + bs.add(b); + } + } + } + } + return p; } 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-06-22 00:18:29 UTC (rev 42160) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-06-22 00:28:45 UTC (rev 42161) @@ -726,6 +726,7 @@ * • the two beans have the same EL name and the name is not resolvable, or */ Set<IBean> beans = context.getCdiProject().getBeans(name, true); + System.out.println("-->" + (beans.size()>1 && beans.contains(bean))); if(beans.size()>1 && beans.contains(bean)) { ITextSourceReference reference = bean.getNameLocation(true); Set<String> names = new HashSet<String>(); @@ -2623,4 +2624,9 @@ protected String getMessageBundleName() { return BUNDLE_NAME; } + + protected boolean alwaysCleanAnnotations() { + return true; + } + } \ No newline at end of file

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42160 - in trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation: java and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-06-21 20:18:29 -0400 (Thu, 21 Jun 2012) New Revision: 42160 Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/ProjectValidationContext.java trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java Log: JBIDE-10611 https://issues.jboss.org/browse/JBIDE-10611 For CDI validator all annotations should be removed, because all document will be revalidated. Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/ProjectValidationContext.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/ProjectValidationContext.java 2012-06-21 22:55:19 UTC (rev 42159) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/ProjectValidationContext.java 2012-06-22 00:18:29 UTC (rev 42160) @@ -39,6 +39,8 @@ private ValidationResourceRegister validationResourceRegister; + public ProjectValidationContext() {} + public LinkCollection getCoreLinks(String validatorId) { LinkCollection linkCollection = coreLinks.get(validatorId); if(linkCollection==null) { 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-06-21 22:55:19 UTC (rev 42159) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-22 00:18:29 UTC (rev 42160) @@ -47,6 +47,7 @@ import org.jboss.tools.common.log.LogHelper; import org.jboss.tools.common.validation.AsYouTypeValidatorManager; import org.jboss.tools.common.validation.CommonValidationPlugin; +import org.jboss.tools.common.validation.TempMarkerManager; import org.jboss.tools.common.validation.ValidationMessage; /** @@ -58,6 +59,8 @@ @SuppressWarnings("restriction") final class JavaDirtyRegionProcessor extends DirtyRegionProcessor { + static Position ALWAYS_CLEARED = new Position(100000); + private ITextEditor fEditor; private IDocument fDocument; private IValidationContext fHelper; @@ -156,21 +159,20 @@ Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]); for (Annotation annotation : annotations) { Position position = fAnnotations.get(annotation); - if (position.getOffset() >= start && - position.getOffset() < end) { + if (position == ALWAYS_CLEARED || (position.getOffset() >= start && + position.getOffset() < end)) { // remove annotation from managed annotations map as well as from the model fAnnotations.remove(annotation); getAnnotationModel().removeAnnotation(annotation); } } } - - public void addAnnotation(Annotation annotation, Position position) { + + public void addAnnotation(Annotation annotation, Position position, boolean cleanAlways) { if (isCancelled()) { return; } - - fAnnotations.put(annotation, position); + fAnnotations.put(annotation, cleanAlways ? ALWAYS_CLEARED : position); fAnnotationModel.addAnnotation(annotation, position); } @@ -184,12 +186,13 @@ IEditorInput editorInput= fEditor.getEditorInput(); if (editorInput != null) { + boolean cleanAlways = Boolean.TRUE.equals(message.getAttribute(TempMarkerManager.CLEAN_ALWAYS_ATTRIBUTE)); Position position = new Position(valMessage.getOffset(), valMessage.getLength()); CoreELProblem problem= new CoreELProblem(valMessage, editorInput.getName()); if (fCompilationUnit != null) { ProblemAnnotation problemAnnotation = new ProblemAnnotation(problem, fCompilationUnit); - addAnnotation(problemAnnotation, position); + addAnnotation(problemAnnotation, position, cleanAlways); } } }

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42159 - in branches/jbosstools-3.3.x/openshift/docs/reference: en-US and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-21 18:55:19 -0400 (Thu, 21 Jun 2012) New Revision: 42159 Modified: branches/jbosstools-3.3.x/openshift/docs/reference/en-US/master.xml branches/jbosstools-3.3.x/openshift/docs/reference/pom.xml Log: updated maven build Modified: branches/jbosstools-3.3.x/openshift/docs/reference/en-US/master.xml =================================================================== --- branches/jbosstools-3.3.x/openshift/docs/reference/en-US/master.xml 2012-06-21 22:51:01 UTC (rev 42158) +++ branches/jbosstools-3.3.x/openshift/docs/reference/en-US/master.xml 2012-06-21 22:55:19 UTC (rev 42159) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" -"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" - -[<!ENTITY Preface SYSTEM "Preface.xml"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.docbook.org/xml/4.3/docbookx.dtd" +[ <!ENTITY Introduction SYSTEM "Introduction.xml"> <!ENTITY Creating_Express_Application SYSTEM "Creating_an_OpenShift_Express_Application.xml"> -<!ENTITY Viewing_Remote_Console SYSTEM "Viewing_the_remote_console.xml"> +<!ENTITY Import_Existing_Application SYSTEM "Import_existing_application.xml"> <!ENTITY Modify_Existing_Application SYSTEM "Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml"> -<!ENTITY Revision_History SYSTEM "Revision_History.xml"> +<!ENTITY Port_Forwarding SYSTEM "Port_forwarding.xml"> +<!ENTITY Debugging SYSTEM "Debugging.xml"> +<!ENTITY Deleting_Applications_Domains SYSTEM "Deleting_applications_and_domains.xml"> ]> <book> @@ -32,28 +33,21 @@ </author> <copyright> - <year>2011</year> + <year>2012</year> <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> Version: 3.3.0.GA </releaseinfo> - - - </bookinfo> <toc/> -  - &Introduction; + &Introduction; &Creating_Express_Application; - &Viewing_Remote_Console; + &Import_Existing_Application; &Modify_Existing_Application; - &Revision_History; + &Port_Forwarding; + &Debugging; + &Deleting_Applications_Domains; </book> Modified: branches/jbosstools-3.3.x/openshift/docs/reference/pom.xml =================================================================== --- branches/jbosstools-3.3.x/openshift/docs/reference/pom.xml 2012-06-21 22:51:01 UTC (rev 42158) +++ branches/jbosstools-3.3.x/openshift/docs/reference/pom.xml 2012-06-21 22:55:19 UTC (rev 42159) @@ -10,8 +10,8 @@ <properties> <translation>en-US</translation> - <docname>OpenShift_Reference_Guide</docname> - <bookname>OpenShift Reference Guide</bookname> + <docname>OpenShift_Tools_Reference_Guide</docname> + <bookname>OpenShift Tools Reference Guide</bookname> </properties> <profiles> @@ -30,11 +30,6 @@ <version>2.3.4</version> <extensions>true</extensions> <configuration> - <profiling> - <enabled>true</enabled> - <attributeName>condition</attributeName> - <attributeValue>jbt</attributeValue> - </profiling> <formats> <format> <formatName>pdf</formatName>

12 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r42158 - in trunk/openshift/docs/reference: en-US and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-06-21 18:51:01 -0400 (Thu, 21 Jun 2012) New Revision: 42158 Modified: trunk/openshift/docs/reference/en-US/Author_Group.xml trunk/openshift/docs/reference/en-US/Book_Info.xml trunk/openshift/docs/reference/en-US/Preface.xml trunk/openshift/docs/reference/en-US/master.xml trunk/openshift/docs/reference/pom.xml Log: updated maven build Modified: trunk/openshift/docs/reference/en-US/Author_Group.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Author_Group.xml 2012-06-21 21:04:09 UTC (rev 42157) +++ trunk/openshift/docs/reference/en-US/Author_Group.xml 2012-06-21 22:51:01 UTC (rev 42158) @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -]> + <authorgroup> <author> <firstname>Isaac</firstname> Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-21 21:04:09 UTC (rev 42157) +++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-06-21 22:51:01 UTC (rev 42158) @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -]> + <bookinfo id="book-OpenShift_Tools_Reference_Guide-OpenShift_Tools_Reference_Guide"> <title>OpenShift Tools Reference Guide</title> <subtitle> Modified: trunk/openshift/docs/reference/en-US/Preface.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Preface.xml 2012-06-21 21:04:09 UTC (rev 42157) +++ trunk/openshift/docs/reference/en-US/Preface.xml 2012-06-21 22:51:01 UTC (rev 42158) @@ -1,8 +1,5 @@ <?xml version='1.0' encoding='utf-8' ?> - + <preface id="pref-OpenSift_Tools_Reference_Guide-Preface"> <title>Preface</title> <para> Modified: trunk/openshift/docs/reference/en-US/master.xml =================================================================== --- trunk/openshift/docs/reference/en-US/master.xml 2012-06-21 21:04:09 UTC (rev 42157) +++ trunk/openshift/docs/reference/en-US/master.xml 2012-06-21 22:51:01 UTC (rev 42158) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" -"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" - -[<!ENTITY Preface SYSTEM "Preface.xml"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.docbook.org/xml/4.3/docbookx.dtd" +[ <!ENTITY Introduction SYSTEM "Introduction.xml"> <!ENTITY Creating_Express_Application SYSTEM "Creating_an_OpenShift_Express_Application.xml"> -<!ENTITY Viewing_Remote_Console SYSTEM "Viewing_the_remote_console.xml"> +<!ENTITY Import_Existing_Application SYSTEM "Import_existing_application.xml"> <!ENTITY Modify_Existing_Application SYSTEM "Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml"> -<!ENTITY Revision_History SYSTEM "Revision_History.xml"> +<!ENTITY Port_Forwarding SYSTEM "Port_forwarding.xml"> +<!ENTITY Debugging SYSTEM "Debugging.xml"> +<!ENTITY Deleting_Applications_Domains SYSTEM "Deleting_applications_and_domains.xml"> ]> <book> @@ -32,28 +33,21 @@ </author> <copyright> - <year>2011</year> + <year>2012</year> <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> Version: 3.3.0.GA </releaseinfo> - - - </bookinfo> <toc/> -  - &Introduction; + &Introduction; &Creating_Express_Application; - &Viewing_Remote_Console; + &Import_Existing_Application; &Modify_Existing_Application; - &Revision_History; + &Port_Forwarding; + &Debugging; + &Deleting_Applications_Domains; </book> Modified: trunk/openshift/docs/reference/pom.xml =================================================================== --- trunk/openshift/docs/reference/pom.xml 2012-06-21 21:04:09 UTC (rev 42157) +++ trunk/openshift/docs/reference/pom.xml 2012-06-21 22:51:01 UTC (rev 42158) @@ -10,8 +10,8 @@ <properties> <translation>en-US</translation> - <docname>OpenShift_Reference_Guide</docname> - <bookname>OpenShift Reference Guide</bookname> + <docname>OpenShift_Tools_Reference_Guide</docname> + <bookname>OpenShift Tools Reference Guide</bookname> </properties> <profiles> @@ -30,11 +30,6 @@ <version>2.3.4</version> <extensions>true</extensions> <configuration> - <profiling> - <enabled>true</enabled> - <attributeName>condition</attributeName> - <attributeValue>jbt</attributeValue> - </profiling> <formats> <format> <formatName>pdf</formatName>

12 years, 6 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2012