Author: scabanovich Date: 2011-12-14 20:44:48 -0500 (Wed, 14 Dec 2011) New Revision: 37341 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SamplePropertyForm.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ActionButtonControl.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorDialog.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialogs/DialogFormPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java Log: JBIDE-10225 https://issues.jboss.org/browse/JBIDE-10225 DefaultSettings single instance is reused. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SamplePropertyForm.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SamplePropertyForm.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SamplePropertyForm.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -132,7 +132,7 @@ } public IWidgetSettings getSettings() { - if (settings == null) settings = new DefaultSettings(); + if (settings == null) settings = DefaultSettings.getDefault(); return settings; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ActionButtonControl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ActionButtonControl.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ActionButtonControl.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -41,7 +41,7 @@ private ArrayList<ButtonWrapper> buttons; private IPropertyEditor propertyEditor; private IActionProvider actionProvider; - private IWidgetSettings settings = new DefaultSettings(); + private IWidgetSettings settings = DefaultSettings.getDefault(); public void setPropertyEditor(IPropertyEditor propertyEditor) { this.propertyEditor = propertyEditor; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorDialog.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorDialog.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorDialog.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -75,7 +75,7 @@ protected void createFieldEditor(Composite parent) { editor = propertyEditor.getFieldEditor(parent); - editor.setSettings(new DefaultSettings()); + editor.setSettings(DefaultSettings.getDefault()); int cn = editor.getNumberOfControls(); if(cn > 2) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/PropertyEditorFactory.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -29,7 +29,6 @@ public static final String ATTRIBUTE_EDITOR_EXT_POINT = "org.jboss.tools.common.model.ui.attributeEditor"; //$NON-NLS-1$ private static Map<String,Class<?>> classes = new HashMap<String,Class<?>>(); - private static IWidgetSettings settings = new DefaultSettings(); public PropertyEditorFactory() {} @@ -42,7 +41,7 @@ } private static PropertyEditor createPropertyEditor(Object adapter, XAttribute attribute, boolean required) { - return createPropertyEditor(adapter, attribute, required, settings); + return createPropertyEditor(adapter, attribute, required, DefaultSettings.getDefault()); } public static PropertyEditor createPropertyEditor(Object adapter, XAttribute attribute, XModelObject modelObject, IWidgetSettings settings) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialogs/DialogFormPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialogs/DialogFormPage.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dialogs/DialogFormPage.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -23,7 +23,7 @@ public class DialogFormPage extends DialogPage { private IForm form; - private IWidgetSettings settings = new DefaultSettings(); + private IWidgetSettings settings = DefaultSettings.getDefault(); public DialogFormPage() { super(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2011-12-15 01:44:08 UTC (rev 37340) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2011-12-15 01:44:48 UTC (rev 37341) @@ -174,7 +174,7 @@ put("Table.Font", defaultFont); //$NON-NLS-1$ } - public DefaultSettings() { + protected DefaultSettings() { initColors(); initFonts(); initCursors();