Author: scabanovich Date: 2011-12-08 20:10:26 -0500 (Thu, 08 Dec 2011) New Revision: 37141 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleChildForm.java 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/forms/AnyElementForm.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java Log: JBIDE-10220 https://issues.jboss.org/browse/JBIDE-10220 Static instance for WhiteSettings is declared. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleChildForm.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleChildForm.java 2011-12-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleChildForm.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -30,7 +30,7 @@ private XModelObject xmo; // private XModel model; - private IWidgetSettings settings = new WhiteSettings(); + private IWidgetSettings settings = WhiteSettings.getWhite(); private TableStructuredEditor tableEditor; private XChildrenTableStructuredAdapter tableAdapter; 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-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SamplePropertyForm.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -40,7 +40,7 @@ private boolean isGreedy = false; public SamplePropertyForm() { - settings = new WhiteSettings(); + settings = WhiteSettings.getWhite(); support = new SampleXAttributeSupport(settings); support.addPropertyChangeListener(this); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2011-12-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/AnyElementForm.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -46,7 +46,7 @@ private XTable tableEditor = new XTable(); TableProviderImpl tableProvider = new TableProviderImpl(); CommandBar bar = new CommandBar(); - private IWidgetSettings settings = new WhiteSettings(); + private IWidgetSettings settings = WhiteSettings.getWhite(); public AnyElementForm() { this.setCollapsable(Boolean.TRUE.booleanValue()); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormPage.java 2011-12-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/DefaultFormPage.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -97,7 +97,7 @@ } public Control createControl(Composite parent) { - settings = new WhiteSettings(); + settings = WhiteSettings.getWhite(); titleFont = settings.getFont("Label.Font.Title"); //$NON-NLS-1$ Composite composite = new Composite(parent, SWT.NONE); settings.setupControl(composite); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java 2011-12-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormData.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -60,7 +60,7 @@ * @param actions */ public FormData(String header, String description, String entityName, IFormAttributeData[] attributes, String[] entities, IFormActionData[] actions) { - this(header, description, entityName, attributes, entities, actions, null, new WhiteSettings()); + this(header, description, entityName, attributes, entities, actions, null, WhiteSettings.getWhite()); } /** @@ -72,7 +72,7 @@ * @param actions */ public FormData(String header, String description, IFormAttributeData[] attributes, String[] entities, IFormActionData[] actions) { - this(header, description, null, attributes, entities, actions, null, new WhiteSettings()); + this(header, description, null, attributes, entities, actions, null, WhiteSettings.getWhite()); } /** @@ -82,7 +82,7 @@ * @param forms */ public FormData(String entityName, String[] entities, IFormData[] forms) { - this(null, null, entityName, null, entities, null, forms, new WhiteSettings()); + this(null, null, entityName, null, entities, null, forms, WhiteSettings.getWhite()); } /** @@ -93,7 +93,7 @@ * @param attributes */ public FormData(String header, String description, String entityName, IFormAttributeData[] attributes) { - this(header, description, entityName, attributes, null, null, null, new WhiteSettings()); + this(header, description, entityName, attributes, null, null, null, WhiteSettings.getWhite()); } /** @@ -103,7 +103,7 @@ * @param attributes */ public FormData(String header, String description, IFormAttributeData[] attributes) { - this(header, description, null, attributes, null, null, null, new WhiteSettings()); + this(header, description, null, attributes, null, null, null, WhiteSettings.getWhite()); } /** Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java 2011-12-09 01:05:42 UTC (rev 37140) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/WhiteSettings.java 2011-12-09 01:10:26 UTC (rev 37141) @@ -12,7 +12,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -22,6 +21,15 @@ public class WhiteSettings extends DefaultSettings { + private static WhiteSettings whiteSettings; + + public static IWidgetSettings getWhite() { + if(whiteSettings == null) { + whiteSettings = new WhiteSettings(); + } + return whiteSettings; + } + private Color listBorderColor; private Color separatorColor; @@ -31,7 +39,7 @@ private FormToolkit toolkit = null; - public WhiteSettings() { + private WhiteSettings() { super(); }