[jbosstools-commits] JBoss Tools SVN: r42472 - in trunk: cdi/plugins/org.jboss.tools.cdi.ui/META-INF and 2 other directories.

Author: dazarov Date: 2012-07-09 14:58:07 -0400 (Mon, 09 Jul 2012) New Revision: 42472 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/CDIValidationErrorManager.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 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/ValidationErrorManager.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java Log: Make Quick Fix "Configure Problem Severity" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12232 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-07-09 18:18:04 UTC (rev 42471) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-07-09 18:58:07 UTC (rev 42472) @@ -280,7 +280,6 @@ IReporter reporter) { super.init(rootProject, validationHelper, context, manager, reporter); setAsYouTypeValidation(false); - setMessageIdQuickFixAttributeName(MESSAGE_ID_ATTRIBUTE_NAME); projectTree = validationHelper.getValidationContextManager().getValidatingProjectTree(this); projectSet = projectTree.getBrunches().get(rootProject); rootCdiProject = null; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2012-07-09 18:18:04 UTC (rev 42471) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2012-07-09 18:58:07 UTC (rev 42472) @@ -17,8 +17,6 @@ abstract public class CDIValidationErrorManager extends KBValidator { - public static final String MESSAGE_ID_ATTRIBUTE_NAME = "CDI_message_id"; //$NON-NLS-1$ - public static final int ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID = 1; public static final int ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID = 2; public static final int ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID = 3; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2012-07-09 18:18:04 UTC (rev 42471) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2012-07-09 18:58:07 UTC (rev 42472) @@ -43,7 +43,8 @@ org.eclipse.wst.common.frameworks;bundle-version="1.2.100", org.eclipse.jst.jsf.ui;bundle-version="1.3.2", org.eclipse.jst.jsf.core;bundle-version="1.3.5", - org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.100" + org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.100", + org.jboss.tools.common.validation Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %Bundle-Vendor.0 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-07-09 18:18:04 UTC (rev 42471) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-07-09 18:58:07 UTC (rev 42472) @@ -118,7 +118,7 @@ public IMessage addMesssage(IResource target, ITextSourceReference location, String preferenceKey, String textMessage, Integer quickFixId) { IMessage message = addMesssage(target, -1, location, preferenceKey, textMessage, null); if(message!=null) { - message.setAttribute(messageIdQuickFixAttributeName, quickFixId); + message.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, quickFixId); } return message; } @@ -139,7 +139,7 @@ public IMessage addMesssage(IResource target, int offset, int length, String preferenceKey, String messageText, String[] messageArguments, int quickFixId) { IMessage message = addMesssage(target, -1, offset, length, preferenceKey, messageText, messageArguments); if(message!=null) { - message.setAttribute(messageIdQuickFixAttributeName, quickFixId); + message.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, quickFixId); } return message; } Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-09 18:18:04 UTC (rev 42471) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-09 18:58:07 UTC (rev 42472) @@ -52,6 +52,7 @@ public static final String PREFERENCE_KEY_ATTRIBUTE_NAME = "preference_key"; //$NON-NLS-1$ public static final String PREFERENCE_PAGE_ID_NAME = "preference_page_id"; //$NON-NLS-1$ public static final String SUPPRESS_WARNINGS_ENABLED_ATTRIBUTE = "sup_warn_ena"; //$NON-NLS-1$ + public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Message_id"; //$NON-NLS-1$ protected IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$ @@ -66,7 +67,7 @@ protected IDocument document; protected Set<IFile> dirtyFiles; - protected String messageIdQuickFixAttributeName; + /** * Constructor @@ -74,13 +75,13 @@ public ValidationErrorManager() { } - /** - * @param messageIdQuickFixAttributeName the messageIdQuickFixAttributeName to set - */ - public void setMessageIdQuickFixAttributeName( - String messageIdQuickFixAttributeName) { - this.messageIdQuickFixAttributeName = messageIdQuickFixAttributeName; - } +// /** +// * @param messageIdQuickFixAttributeName the messageIdQuickFixAttributeName to set +// */ +// public void setMessageIdQuickFixAttributeName( +// String messageIdQuickFixAttributeName) { +// this.messageIdQuickFixAttributeName = messageIdQuickFixAttributeName; +// } /* * (non-Javadoc) @@ -387,7 +388,7 @@ IMarker marker = addError(message, preferenceKey, messageArguments, length, offset, target); try { if(marker!=null) { - marker.setAttribute(messageIdQuickFixAttributeName, new Integer(messageId)); + marker.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, new Integer(messageId)); } } catch(CoreException e) { CommonPlugin.getDefault().logError(e); @@ -475,7 +476,7 @@ IMarker marker = addError(message, preferenceKey, location, target); try { if(marker!=null) { - marker.setAttribute(messageIdQuickFixAttributeName, new Integer(messageId)); + marker.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, new Integer(messageId)); } } catch(CoreException e) { CommonPlugin.getDefault().logError(e); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2012-07-09 18:18:04 UTC (rev 42471) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2012-07-09 18:58:07 UTC (rev 42472) @@ -89,8 +89,6 @@ public static final String ID = "org.jboss.tools.seam.core.CoreValidator"; //$NON-NLS-1$ public static final String PROBLEM_TYPE = "org.jboss.tools.seam.core.seamproblem"; //$NON-NLS-1$ - public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Seam_message_id"; //$NON-NLS-1$ - public static final int NONUNIQUE_COMPONENT_NAME_MESSAGE_ID = 1; public static final int DUPLICATE_REMOVE_MESSAGE_ID = 2; public static final int DUPLICATE_DESTROY_MESSAGE_ID = 3;