[jbosstools-commits] JBoss Tools SVN: r44107 - in trunk: cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 15 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Sep 27 20:13:45 EDT 2012
Author: akazakov
Date: 2012-09-27 20:13:40 -0400 (Thu, 27 Sep 2012)
New Revision: 44107
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java
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/SeverityPreferencePage.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferenceInitializer.java
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferenceInitializer.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/ELPreferenceInitializer.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBValidationConfigurationBlock.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/ELValidatorConfigurationBlock.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/WebXMLConfigurationBlock.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLPreferenceInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/StrutsConfigConfigurationBlock.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsPreferenceInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/preferences/JaxrsPreferenceInitializer.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlock.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/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -28,7 +28,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext)DefaultScope.INSTANCE).getNode(CDICorePlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
defaultPreferences.put(SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, CDIPreferences.ERROR);
for (String name : CDIPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.ERROR);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -29,6 +29,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: CDIConfigurationBlockDescriptionProvider.getInstance().getSections()) {
s.collectKeys(keys);
}
@@ -37,6 +38,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(CDICorePlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(CDICorePlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
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 00:04:20 UTC (rev 44106)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/preferences/SeverityPreferences.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -45,7 +45,7 @@
*/
public abstract class SeverityPreferences {
- public static final String ENABLE_BLOCK_PREFERENCE_NAME = "enableBlock"; //$NON-NLS-1$
+ public static final String ENABLE_BLOCK_PREFERENCE_NAME = CommonCorePlugin.PLUGIN_ID + ".validator.enableBlock"; //$NON-NLS-1$
public static final String MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME = CommonCorePlugin.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 = CommonCorePlugin.PLUGIN_ID + ".validator.problem.wrongBuilderOrder"; //$NON-NLS-1$
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 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -21,17 +21,20 @@
import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
import org.eclipse.jdt.internal.ui.preferences.PreferencesMessages;
import org.eclipse.jdt.internal.ui.preferences.ScrolledPageContent;
-import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
+import org.eclipse.jface.dialogs.ControlEnableState;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.layout.PixelConverter;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -84,6 +87,9 @@
protected PixelConverter fPixelConverter;
protected FilteredPreferenceTree fFilteredPrefTree;
+
+ private ControlEnableState mainBlockEnableState;
+
/**
* Text control retrieved from fFilteredPrefTree.
*/
@@ -91,10 +97,12 @@
protected IWorkbenchPreferenceContainer container;
+ protected Button enableCheckBox;
+
public SeverityConfigurationBlock(IStatusChangeListener context,
IProject project, Key[] allKeys,
IWorkbenchPreferenceContainer container) {
- super(context, project, allKeys, container);
+ super(context, project, allKeys, container);
this.container = container;
}
@@ -124,7 +132,7 @@
addMaxNumberOfMarkersField(c);
}
addWrongBuilderOrderField(c);
-
+
Control[] currentControls = folder.getChildren();
fFilteredPrefTree = new FilteredPreferenceTree(this, folder, getCommonDescription());
@@ -171,6 +179,7 @@
excomposite.setClient(inner);
return inner;
}
+
protected void createSection(PreferenceTreeNode parent, SectionDescription section, Composite composite, int nColumns, int defaultIndent) {
String label = section.getLabel();
@@ -178,7 +187,7 @@
PreferenceTreeNode treeSection = fFilteredPrefTree.addExpandableComposite(composite, label, nColumns, twistieKey, parent, false);
ExpandableComposite excomposite = getExpandableComposite(twistieKey);
Composite inner = createInnerComposite(excomposite, nColumns, composite.getFont());
-
+
for (SectionDescription s: section.getSections()) {
createSection(treeSection, s, inner, nColumns, defaultIndent);
}
@@ -189,6 +198,24 @@
}
}
+ @Override
+ public void performDefaults() {
+ super.performDefaults();
+ updateMainPreferenceContent();
+ }
+
+ protected Button addEnableField(Composite composite) {
+ Button checkBox = addCheckBox(composite, SeverityPreferencesMessages.ENABLE_VALIDATION, getEnableBlockKey(), enableDisableValues, 0);
+ checkBox.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ updateMainPreferenceContent();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ return checkBox;
+ }
+
protected void addMaxNumberOfMarkersField(Composite composite) {
Text text = addTextField(composite, SeverityPreferencesMessages.MAX_NUMBER_OF_MARKERS, getMaxNumberOfProblemsKey(), 0, 0);
GridData gd = (GridData) text.getLayoutData();
@@ -224,6 +251,8 @@
return status;
}
+ abstract protected Key getEnableBlockKey();
+
abstract protected Key getMaxNumberOfProblemsKey();
/**
@@ -235,6 +264,8 @@
return null;
}
+ private Composite commonComposite;
+
@Override
protected Control createContents(Composite parent) {
fPixelConverter = new PixelConverter(parent);
@@ -247,16 +278,33 @@
layout.marginWidth = 0;
mainComp.setLayout(layout);
- Composite commonComposite = createStyleTabContent(mainComp);
+ enableCheckBox = addEnableField(mainComp);
+
+ commonComposite = createStyleTabContent(mainComp);
GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
gridData.heightHint = convertHeightInCharsToPixels(parent,20);
commonComposite.setLayoutData(gridData);
validateSettings(null, null, null);
+ updateMainPreferenceContent();
+
return mainComp;
}
+ protected void updateMainPreferenceContent() {
+ if (enableCheckBox.getSelection()) {
+ if (mainBlockEnableState != null) {
+ mainBlockEnableState.restore();
+ mainBlockEnableState= null;
+ }
+ } else {
+ if (mainBlockEnableState == null) {
+ mainBlockEnableState= ControlEnableState.disable(commonComposite);
+ }
+ }
+ }
+
private int convertHeightInCharsToPixels(Control control,int chars) {
Font font = control.getFont();
GC gc = new GC(font.getDevice());
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -12,26 +12,15 @@
package org.jboss.tools.common.ui.preferences;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage;
-import org.eclipse.jface.dialogs.ControlEnableState;
-import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.eclipse.ui.preferences.IWorkingCopyManager;
-import org.eclipse.ui.preferences.WorkingCopyManager;
-import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.OptionDescription;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
@@ -40,8 +29,6 @@
*/
public abstract class SeverityPreferencePage extends PropertyAndPreferencePage {
- private ControlEnableState mainBlockEnableState;
- private Button checkBox;
protected Control severityConfigurationBlock;
protected SeverityConfigurationBlock fConfigurationBlock;
@@ -60,55 +47,8 @@
root.setLayout(gridLayout);
root.setLayoutData(gd);
- checkBox = new Button(root, SWT.CHECK);
- checkBox.setFont(JFaceResources.getDialogFont());
- checkBox.setText(SeverityPreferencesMessages.ENABLE_VALIDATION);
-
severityConfigurationBlock = getConfigurationBlock().createContents(root);
- IScopeContext[] lookupOrder;
- IProject project = getProject();
- if (project != null) {
- lookupOrder = new IScopeContext[] {
- new ProjectScope(project),
- InstanceScope.INSTANCE,
- DefaultScope.INSTANCE
- };
- } else {
- lookupOrder = new IScopeContext[] {
- InstanceScope.INSTANCE,
- DefaultScope.INSTANCE
- };
- }
- final IScopeContext context = lookupOrder[0];
- IWorkbenchPreferenceContainer container = getConfigurationBlock().getContainer();
-
- final IWorkingCopyManager manager;
- if (container == null) {
- manager = new WorkingCopyManager();
- } else {
- manager = container.getWorkingCopyManager();
- }
- String value = getStoredValue(lookupOrder, manager, getConfigurationBlock().getQualifier(), SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
- boolean enabled = value==null?true:Boolean.parseBoolean(value);
-
-// checkBox.setSelection(getPreferenceStore().getBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME));
- checkBox.setSelection(enabled);
-
- gridLayout = new GridLayout(1, false);
- severityConfigurationBlock.setLayoutData(gd);
-
- checkBox.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- enableMainPreferenceContent(checkBox.getSelection());
-// getPreferenceStore().setValue(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, checkBox.getSelection());
- setStoredValue(context, Boolean.toString(checkBox.getSelection()), manager, getConfigurationBlock().getQualifier(), SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- enableMainPreferenceContent(checkBox.getSelection());
-
return root;
}
@@ -142,19 +82,6 @@
}
}
- protected void enableMainPreferenceContent(boolean enable) {
- if (enable) {
- if (mainBlockEnableState != null) {
- mainBlockEnableState.restore();
- mainBlockEnableState= null;
- }
- } else {
- if (mainBlockEnableState == null) {
- mainBlockEnableState= ControlEnableState.disable(severityConfigurationBlock);
- }
- }
- }
-
@Override
protected boolean hasProjectSpecificOptions(IProject project) {
return getConfigurationBlock().hasProjectSpecificOptions(project);
@@ -187,8 +114,6 @@
*/
@Override
protected void performDefaults() {
- checkBox.setSelection(true);
- enableMainPreferenceContent(true);
super.performDefaults();
if (getConfigurationBlock() != null) {
getConfigurationBlock().performDefaults();
@@ -203,7 +128,6 @@
if (getConfigurationBlock() != null && !getConfigurationBlock().performOk()) {
return false;
}
- updateEnableBlock();
return super.performOk();
}
@@ -215,17 +139,8 @@
if (getConfigurationBlock() != null) {
getConfigurationBlock().performApply();
}
- updateEnableBlock();
}
- private void updateEnableBlock() {
- boolean oldValue = getPreferenceStore().getBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
- boolean newValue = checkBox.getSelection();
- if(oldValue != newValue) {
- getPreferenceStore().setValue(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, newValue);
- }
- }
-
public String getLabel(String preferenceId){
for(SectionDescription section : getAllSections()){
String label = getLabel(section, preferenceId);
@@ -269,4 +184,4 @@
public String getFilterText() {
return getConfigurationBlock().getFilterControl().getText();
}
-}
+}
\ No newline at end of file
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferenceInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -27,7 +27,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(ESBValidatorPlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
for (String name : ESBPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.ERROR);
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ui/ESBConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -61,6 +61,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -68,6 +69,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(ESBValidatorPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(ESBValidatorPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferenceInitializer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/JSFSeverityPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -28,7 +28,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) DefaultScope.INSTANCE).getNode(JSFModelPlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
defaultPreferences.put(SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, JSFSeverityPreferences.ERROR);
for (String name : JSFSeverityPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.WARNING);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -18,7 +18,6 @@
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock;
-import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.web.validation.JSFSeverityPreferences;
@@ -159,6 +158,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -167,41 +167,48 @@
return keys.toArray(new Key[0]);
}
- private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
+ protected final static Key ENABLE_BLOCK_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
- @Override
- protected Key getMaxNumberOfProblemsKey() {
- return MAX_NUMBER_OF_PROBLEMS_KEY;
- }
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
- private static final Key WRONG_BUILDER_ORDER_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME);
+ private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
- protected Key getWrongBuilderOrderKey() {
- return WRONG_BUILDER_ORDER_KEY;
- }
+ @Override
+ protected Key getMaxNumberOfProblemsKey() {
+ return MAX_NUMBER_OF_PROBLEMS_KEY;
+ }
- public JSFValidationConfigurationBlock(IStatusChangeListener context,
- IProject project, IWorkbenchPreferenceContainer container) {
- super(context, project, getKeys(), container);
- }
+ private static final Key WRONG_BUILDER_ORDER_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME);
- @Override
- protected SectionDescription[] getAllSections() {
- return ALL_SECTIONS;
- }
+ protected Key getWrongBuilderOrderKey() {
+ return WRONG_BUILDER_ORDER_KEY;
+ }
- @Override
- protected String getCommonDescription() {
- return JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_common_description;
- }
+ public JSFValidationConfigurationBlock(IStatusChangeListener context,
+ IProject project, IWorkbenchPreferenceContainer container) {
+ super(context, project, getKeys(), container);
+ }
- @Override
- protected IDialogSettings getDialogSettings() {
- return JSFModelPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION_NAME);
- }
+ @Override
+ protected SectionDescription[] getAllSections() {
+ return ALL_SECTIONS;
+ }
- @Override
- protected String getQualifier() {
- return JSFModelPlugin.PLUGIN_ID;
- }
- }
\ No newline at end of file
+ @Override
+ protected String getCommonDescription() {
+ return JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_common_description;
+ }
+
+ @Override
+ protected IDialogSettings getDialogSettings() {
+ return JSFModelPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION_NAME);
+ }
+
+ @Override
+ protected String getQualifier() {
+ return JSFModelPlugin.PLUGIN_ID;
+ }
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLPreferenceInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/WebXMLPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -28,7 +28,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(WebModelPlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
for (String name : WebXMLPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.WARNING);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/ELPreferenceInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/ELPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/ELPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -30,7 +30,7 @@
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(WebKbPlugin.PLUGIN_ID);
//EL Preferences
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
defaultPreferences.put(SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, ELSeverityPreferences.ERROR);
for (String name : ELSeverityPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, ELSeverityPreferences.ERROR);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBValidationConfigurationBlock.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBValidationConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/KBValidationConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -16,6 +16,7 @@
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
+import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -41,13 +42,21 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(WebKbPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
@Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
+ @Override
protected Key getMaxNumberOfProblemsKey() {
return null;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/ELValidatorConfigurationBlock.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/ELValidatorConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/ELValidatorConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -15,25 +15,17 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
-import org.eclipse.jdt.internal.ui.preferences.ScrolledPageContent;
-import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock;
-import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.OptionDescription;
-import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock.SectionDescription;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
@@ -68,6 +60,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -78,6 +71,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(WebKbPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(WebKbPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/WebXMLConfigurationBlock.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/WebXMLConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/internal/preferences/WebXMLConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
@@ -74,6 +75,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -81,6 +83,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(WebModelPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(WebModelPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
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 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -29,7 +29,7 @@
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(SeamCorePlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
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.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamValidatorConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -14,13 +14,11 @@
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.jboss.tools.common.preferences.SeverityPreferences;
import org.jboss.tools.common.ui.preferences.SeverityConfigurationBlock;
-import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
@@ -139,6 +137,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -147,6 +146,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(SeamCorePlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(SeamCorePlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsPreferenceInitializer.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -28,7 +28,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(StrutsModelPlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
for (String name : StrutsPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.WARNING);
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/StrutsConfigConfigurationBlock.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/StrutsConfigConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/preferences/StrutsConfigConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -61,6 +61,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: ALL_SECTIONS) {
s.collectKeys(keys);
}
@@ -68,6 +69,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(StrutsModelPlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(StrutsModelPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/preferences/JaxrsPreferenceInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/preferences/JaxrsPreferenceInitializer.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/preferences/JaxrsPreferenceInitializer.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -29,7 +29,7 @@
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences defaultPreferences = ((IScopeContext)DefaultScope.INSTANCE).getNode(JBossJaxrsCorePlugin.PLUGIN_ID);
- defaultPreferences.putBoolean(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, true);
+ defaultPreferences.put(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, SeverityPreferences.ENABLE);
defaultPreferences.put(SeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, JaxrsPreferences.ERROR);
for (String name : JaxrsPreferences.SEVERITY_OPTION_NAMES) {
defaultPreferences.put(name, SeverityPreferences.ERROR);
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlock.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlock.java 2012-09-28 00:04:20 UTC (rev 44106)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlock.java 2012-09-28 00:13:40 UTC (rev 44107)
@@ -31,6 +31,7 @@
private static Key[] getKeys() {
ArrayList<Key> keys = new ArrayList<Key>();
+ keys.add(ENABLE_BLOCK_KEY);
for (SectionDescription s: JaxrsValidatorConfigurationBlockDescriptionProvider.getInstance().getSections()) {
s.collectKeys(keys);
}
@@ -39,6 +40,13 @@
return keys.toArray(new Key[0]);
}
+ protected final static Key ENABLE_BLOCK_KEY = getKey(JBossJaxrsCorePlugin.PLUGIN_ID, SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME);
+
+ @Override
+ protected Key getEnableBlockKey() {
+ return ENABLE_BLOCK_KEY;
+ }
+
private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(JBossJaxrsCorePlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);
@Override
More information about the jbosstools-commits
mailing list