[jbosstools-commits] JBoss Tools SVN: r44116 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2012-09-28 12:34:36 -0400 (Fri, 28 Sep 2012)
New Revision: 44116

Modified:
   trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java
Log:
https://issues.jboss.org/browse/JBIDE-12595 Disabling JAX-RS validator doesn't affect resources validation
https://issues.jboss.org/browse/JBIDE-12741 CDI (and other JBT common validators) is disabled for workspace if you disable it for project


Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java	2012-09-28 16:09:27 UTC (rev 44115)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java	2012-09-28 16:34:36 UTC (rev 44116)
@@ -109,15 +109,15 @@
 		}
 		String value = p.get(ENABLE_BLOCK_PREFERENCE_NAME, null);
 		if(value!=null) {
-			return ENABLE.equals(value);
+			return ENABLE.equals(value) || p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
 		}
 		p = getInstancePreferences();
 		value = p == null ? null : p.get(ENABLE_BLOCK_PREFERENCE_NAME, null);
 		if(value!=null) {
-			return ENABLE.equals(value);
+			return ENABLE.equals(value) || p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
 		}
 		p = getDefaultPreferences();
-		return ENABLE.equals(value);
+		return ENABLE.equals(p.get(ENABLE_BLOCK_PREFERENCE_NAME, null)) || p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
 	}
 
 	public String getBuilderOrderPreference(IProject project) {