JBoss Tools SVN: r31696 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects: naturesCheckTest and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:44:19 -0400 (Tue, 31 May 2011)
New Revision: 31696
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/test_jsf_project/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-05-31 21:42:38 UTC (rev 31695)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckKBTest/.project 2011-05-31 21:44:19 UTC (rev 31696)
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-05-31 21:42:38 UTC (rev 31695)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/naturesCheckTest/.project 2011-05-31 21:44:19 UTC (rev 31696)
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/test_jsf_project/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/test_jsf_project/.project 2011-05-31 21:42:38 UTC (rev 31695)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/test_jsf_project/.project 2011-05-31 21:44:19 UTC (rev 31696)
@@ -21,17 +21,17 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31695 - trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:42:38 -0400 (Tue, 31 May 2011)
New Revision: 31695
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project 2011-05-31 21:41:48 UTC (rev 31694)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/projects/Test/.project 2011-05-31 21:42:38 UTC (rev 31695)
@@ -21,12 +21,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31694 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:41:48 -0400 (Tue, 31 May 2011)
New Revision: 31694
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2011-05-31 21:41:18 UTC (rev 31693)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2011-05-31 21:41:48 UTC (rev 31694)
@@ -21,17 +21,17 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31693 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:41:18 -0400 (Tue, 31 May 2011)
New Revision: 31693
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project 2011-05-31 21:39:52 UTC (rev 31692)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project 2011-05-31 21:41:18 UTC (rev 31693)
@@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31692 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/validation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:39:52 -0400 (Tue, 31 May 2011)
New Revision: 31692
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
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/templates/ejb/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2011-05-31 21:37:18 UTC (rev 31691)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2011-05-31 21:39:52 UTC (rev 31692)
@@ -30,6 +30,7 @@
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(SeamCorePlugin.PLUGIN_ID);
defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, SeamPreferences.ERROR);
for (String name : SeamPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeamPreferences.ERROR);
}
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 2011-05-31 21:37:18 UTC (rev 31691)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-05-31 21:39:52 UTC (rev 31692)
@@ -46,6 +46,7 @@
import org.jboss.tools.jst.web.kb.internal.validation.SimpleValidatingProjectTree;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
import org.jboss.tools.jst.web.kb.validation.IProjectValidationContext;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
@@ -189,13 +190,21 @@
*/
public boolean shouldValidate(IProject project) {
try {
- return project!=null && project.isAccessible() && project.hasNature(ISeamProject.NATURE_ID) && isPreferencesEnabled(project);
+ return project != null
+ && project.isAccessible()
+ && project.hasNature(ISeamProject.NATURE_ID)
+ && validateBuilderOrder(project)
+ && isPreferencesEnabled(project);
} catch (CoreException e) {
SeamCorePlugin.getDefault().logError(e);
}
return false;
}
+ private boolean validateBuilderOrder(IProject project) throws CoreException {
+ return ValidatorManager.validateBuilderOrder(project, getBuilderId(), getId(), SeamPreferences.getInstance());
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager#init(org.eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, org.eclipse.wst.validation.internal.provisional.core.IReporter, org.jboss.tools.jst.web.kb.validation.IValidationContext)
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project 2011-05-31 21:37:18 UTC (rev 31691)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project 2011-05-31 21:39:52 UTC (rev 31692)
@@ -16,7 +16,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -26,7 +26,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31691 - trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 17:37:18 -0400 (Tue, 31 May 2011)
New Revision: 31691
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess/.project
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess/.project 2011-05-31 21:14:05 UTC (rev 31690)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess/.project 2011-05-31 21:37:18 UTC (rev 31691)
@@ -16,17 +16,17 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.tools.seam.core.seambuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
13 years, 7 months
JBoss Tools SVN: r31690 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-31 17:14:05 -0400 (Tue, 31 May 2011)
New Revision: 31690
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
add missing hamcrest plugins
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/jbds.target 2011-05-31 21:14:05 UTC (rev 31690)
@@ -22,7 +22,9 @@
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
-
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<!-- CVS -->
<unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7RCE5EVF5"/>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-31 21:14:05 UTC (rev 31690)
@@ -36,6 +36,9 @@
<iu id="org.apache.commons.codec" version=""/>
<iu id="org.hamcrest" version=""/>
<iu id="org.hamcrest.core" version=""/>
+<iu id="org.hamcrest.text" version=""/>
+<iu id="org.hamcrest.library" version=""/>
+<iu id="org.hamcrest.integration" version=""/>
<iu id="org.eclipse.cvs.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/multiple.target 2011-05-31 21:14:05 UTC (rev 31690)
@@ -47,6 +47,9 @@
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-31 21:14:05 UTC (rev 31690)
@@ -51,6 +51,9 @@
<iu id="org.apache.commons.codec" version=""/>
<iu id="org.hamcrest" version=""/>
<iu id="org.hamcrest.core" version=""/>
+<iu id="org.hamcrest.text" version=""/>
+<iu id="org.hamcrest.library" version=""/>
+<iu id="org.hamcrest.integration" version=""/>
<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/unified.target 2011-05-31 21:14:05 UTC (rev 31690)
@@ -47,6 +47,9 @@
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-31 20:37:05 UTC (rev 31689)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-31 21:14:05 UTC (rev 31690)
@@ -51,6 +51,9 @@
<iu id="org.apache.commons.codec" version=""/>
<iu id="org.hamcrest" version=""/>
<iu id="org.hamcrest.core" version=""/>
+<iu id="org.hamcrest.library" version=""/>
+<iu id="org.hamcrest.integration" version=""/>
+<iu id="org.eclipse.cvs.feature.group" version=""/>
<iu id="org.eclipse.graphiti.feature.feature.group" version=""/>
<iu id="org.eclipse.emf.workspace.feature.group" version=""/>
<iu id="org.eclipse.emf.validation.feature.group" version=""/>
13 years, 7 months
JBoss Tools SVN: r31689 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 16:37:05 -0400 (Tue, 31 May 2011)
New Revision: 31689
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.properties
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2011-05-31 20:31:34 UTC (rev 31688)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2011-05-31 20:37:05 UTC (rev 31689)
@@ -98,6 +98,8 @@
addMaxNumberOfMarkersField(composite);
+ addWrongBuilderOrderField(composite);
+
GridLayout layout= new GridLayout(nColumns, false);
layout.marginHeight= 0;
layout.marginWidth= 0;
@@ -142,6 +144,12 @@
text.setTextLimit(6);
}
+ protected void addWrongBuilderOrderField(Composite composite) {
+ if(getWrongBuilderOrderKey() != null) {
+ addComboBox(composite, SeverityPreferencesMessages.WRONG_BUILDER_ORDER, getWrongBuilderOrderKey(), errorWarningIgnore, errorWarningIgnoreLabels, 0);
+ }
+ }
+
private IStatus validateMaxNumberProblems() {
String number = getValue(getMaxNumberOfProblemsKey());
StatusInfo status= new StatusInfo();
@@ -162,6 +170,15 @@
abstract protected Key getMaxNumberOfProblemsKey();
+ /**
+ * Returns Key object for preference controlling builders order if it is relevant.
+ * If builders order is not relevant, returns null.
+ * @return unique key or null
+ */
+ protected Key getWrongBuilderOrderKey() {
+ return null;
+ }
+
@Override
protected Control createContents(Composite parent) {
fPixelConverter = new PixelConverter(parent);
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.java 2011-05-31 20:31:34 UTC (rev 31688)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.java 2011-05-31 20:37:05 UTC (rev 31689)
@@ -29,6 +29,7 @@
public static String VALIDATOR_CONFIGURATION_BLOCK_WARNING;
public static String ENABLE_VALIDATION;
public static String MAX_NUMBER_OF_MARKERS;
+ public static String WRONG_BUILDER_ORDER;
static {
NLS.initializeMessages(BUNDLE_NAME, SeverityPreferencesMessages.class);
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.properties 2011-05-31 20:31:34 UTC (rev 31688)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencesMessages.properties 2011-05-31 20:37:05 UTC (rev 31689)
@@ -20,4 +20,5 @@
ENABLE_VALIDATION=Enable validation
-MAX_NUMBER_OF_MARKERS=Maximum number of problems reported per file:
\ No newline at end of file
+MAX_NUMBER_OF_MARKERS=Maximum number of problems reported per file:
+WRONG_BUILDER_ORDER=Wrong order of project builders:
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r31688 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-31 16:31:34 -0400 (Tue, 31 May 2011)
New Revision: 31688
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java
Log:
JBIDE-9028
https://issues.jboss.org/browse/JBIDE-9028
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java 2011-05-31 19:54:14 UTC (rev 31687)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/preferences/SeverityPreferences.java 2011-05-31 20:31:34 UTC (rev 31688)
@@ -48,6 +48,7 @@
public static final String ENABLE_BLOCK_PREFERENCE_NAME = "enableBlock"; //$NON-NLS-1$
public static final String MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME = CommonPlugin.PLUGIN_ID + ".validator.problem.markersBlock"; //$NON-NLS-1$
public static final int DEFAULT_MAX_NUMBER_OF_MARKERS_PER_FILE = 20;
+ public static final String WRONG_BUILDER_ORDER_PREFERENCE_NAME = CommonPlugin.PLUGIN_ID + ".validator.problem.wrongBuilderOrder"; //$NON-NLS-1$
public static final String ERROR = "error"; //$NON-NLS-1$
public static final String WARNING = "warning"; //$NON-NLS-1$
@@ -119,6 +120,24 @@
return p.getBoolean(ENABLE_BLOCK_PREFERENCE_NAME, false);
}
+ public String getBuilderOrderPreference(IProject project) {
+ IEclipsePreferences p = getProjectPreferences(project);
+ if(p == null) {
+ return null;
+ }
+ String value = p.get(WRONG_BUILDER_ORDER_PREFERENCE_NAME, null);
+ if(value != null) {
+ return value;
+ }
+ p = getInstancePreferences();
+ value = p == null ? null : p.get(WRONG_BUILDER_ORDER_PREFERENCE_NAME, null);
+ if(value != null) {
+ return value;
+ }
+ p = getDefaultPreferences();
+ return p.get(WRONG_BUILDER_ORDER_PREFERENCE_NAME, null);
+ }
+
public String getInstancePreference(String key) {
IEclipsePreferences p = getInstancePreferences();
String value = p == null ? null : p.get(key, null);
13 years, 7 months
JBoss Tools SVN: r31687 - in trunk/cdi/plugins: org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-31 15:54:14 -0400 (Tue, 31 May 2011)
New Revision: 31687
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java
Log:
https://issues.jboss.org/browse/JBIDE-8674
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.core.extension;
-import org.eclipse.core.runtime.IAdaptable;
-
/**
* This object represents CDI runtime extension in JBoss Tools CDI model.
* It is not necessarily one to one mapping between CDI runtime extension implementation classes
@@ -30,4 +28,4 @@
*/
public interface ICDIExtension {
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/IDefinitionContextExtension.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.core.extension;
-import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IDefinitionContext;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/feature/IProcessAnnotatedTypeFeature.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.core.extension.feature;
-
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
@@ -24,11 +23,11 @@
/**
* Method is called after CDI builder loaded type definitions and before they are
- * used to build beans. Client may change type definitions and there members or veto them.
+ * used to build beans. Client may change type definitions or their members or veto them.
*
* @param typeDefinition
* @param context
*/
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context);
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -20,6 +20,7 @@
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.SourceRange;
+import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.core.IRootDefinitionContext;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
@@ -53,6 +54,7 @@
return isVetoed;
}
+ @Override
public AbstractTypeDefinition getTypeDefinition() {
return this;
}
@@ -139,13 +141,11 @@
try {
init();
} catch (CoreException e) {
- //ignore
+ CDICorePlugin.getDefault().logError(e);
}
}
-
+
return map.get(superTypeName);
}
-
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -130,19 +130,23 @@
return copy;
}
+ @Override
protected void doApplyWorkingCopy() {
messageLoggers = ((LoggerDefinitionContext)workingCopy).messageLoggers;
messageBundles = ((LoggerDefinitionContext)workingCopy).messageBundles;
}
+ @Override
public void clean() {
messageLoggers.clear();
messageBundles.clear();
}
+ @Override
public void clean(IPath path) {
}
+ @Override
public void clean(String typeName) {
messageLoggers.remove(typeName);
messageBundles.remove(typeName);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -118,17 +118,19 @@
return copy;
}
+ @Override
protected void doApplyWorkingCopy() {
services = ((ServiceHandlerDefinitionContext)workingCopy).services;
serviceAnnotations = ((ServiceHandlerDefinitionContext)workingCopy).serviceAnnotations;
}
-
+ @Override
public void clean() {
services.clear();
serviceAnnotations.clear();
}
+ @Override
public void clean(String typeName) {
services.remove(typeName);
serviceAnnotations.remove(typeName);
@@ -143,18 +145,17 @@
public Map<String, TypeDefinition> getServices() {
return services;
}
-
+
+ @Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
if(annotation.isAnnotationPresent(CDISeamSolderConstants.SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME)) {
annotation.setExtendedKind(CDISeamSolderConstants.SERVICE_ANNOTATION_KIND);
serviceAnnotations.add(annotation.getType().getFullyQualifiedName());
}
}
-
+
public boolean isServiceAnnotation(IType type) {
return (type != null && serviceAnnotations.contains(type.getFullyQualifiedName()));
}
-
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/definition/InterfaceDefinition.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -12,7 +12,6 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
-import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -36,16 +36,19 @@
return copy;
}
+ @Override
protected void doApplyWorkingCopy() {
genericConfiguartions = ((GenericBeanDefinitionContext)workingCopy).genericConfiguartions;
//
}
+ @Override
public void clean() {
genericConfiguartions.clear();
//
}
+ @Override
public void clean(String typeName) {
genericConfiguartions.remove(typeName);
for (GenericConfiguration c: genericConfiguartions.values()) {
@@ -54,6 +57,7 @@
//
}
+ @Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
if(annotation.isAnnotationPresent(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
annotation.setExtendedKind(CDISeamSolderConstants.GENERIC_ANNOTATION_KIND);
@@ -78,5 +82,4 @@
}
return result;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -24,6 +24,7 @@
public GenericBeanProducerField() {}
+ @Override
public IScope getScope() {
IScope result = null;
if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
@@ -39,5 +40,4 @@
}
return result;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -24,6 +24,7 @@
public GenericBeanProducerMethod() {}
+ @Override
public IScope getScope() {
IScope result = null;
if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
@@ -39,5 +40,4 @@
}
return result;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-05-31 18:48:48 UTC (rev 31686)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-05-31 19:54:14 UTC (rev 31687)
@@ -32,10 +32,12 @@
public GenericClassBean() {}
+ @Override
protected ProducerMethod newProducerMethod(MethodDefinition m) {
return new GenericBeanProducerMethod();
}
+ @Override
protected ProducerField newProducerField(FieldDefinition f) {
return new GenericBeanProducerField();
}
@@ -56,6 +58,7 @@
return null;
}
+ @Override
protected void computeScope() {
if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
IBean generic = getGenericProducerBean();
@@ -67,5 +70,4 @@
super.computeScope();
}
}
-
-}
+}
\ No newline at end of file
13 years, 7 months