[jbosstools-commits] JBoss Tools SVN: r4269 - in trunk: jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form and 1 other directory.

Author: mareshkau Date: 2007-10-16 13:41:10 -0400 (Tue, 16 Oct 2007) New Revision: 4269 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java Log: http://jira.jboss.com/jira/browse/JBIDE-1092 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java 2007-10-16 17:31:53 UTC (rev 4268) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/CheckBoxCellEditorEx.java 2007-10-16 17:41:10 UTC (rev 4269) @@ -11,12 +11,13 @@ package org.jboss.tools.common.model.ui.attribute.editor; import org.eclipse.swt.custom.CCombo; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class CheckBoxCellEditorEx extends ComboBoxCellEditorEx { - protected CCombo comboBox; + protected Combo comboBox; protected Composite parent; protected String trueValue = "true"; @@ -27,7 +28,7 @@ } protected Control createControl(Composite parent) { - this.comboBox = (CCombo)super.createControl(parent); + this.comboBox = (Combo)super.createControl(parent); return this.comboBox; } protected void doSetValue(Object value) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java 2007-10-16 17:31:53 UTC (rev 4268) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxCellEditorEx.java 2007-10-16 17:41:10 UTC (rev 4269) @@ -15,7 +15,6 @@ import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyAdapter; @@ -26,6 +25,7 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -37,7 +37,7 @@ */ public class ComboBoxCellEditorEx extends CellEditor { - private CCombo combo; + private Combo combo; private String[] items = new String[0]; private Object value = null; private int selection; @@ -75,7 +75,7 @@ } protected Control createControl(Composite parent) { - combo = new CCombo(parent, getStyle()); + combo = new Combo(parent, getStyle()); combo.setItems(items); combo.setFont(parent.getFont()); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2007-10-16 17:31:53 UTC (rev 4268) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ComboBoxFieldEditor.java 2007-10-16 17:41:10 UTC (rev 4269) @@ -24,7 +24,6 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.FocusAdapter; @@ -38,6 +37,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; @@ -64,7 +64,7 @@ public static int UNLIMITED = -1; private int textLimit = UNLIMITED; private int widthInChars = UNLIMITED; - private CCombo comboField; + private Combo comboField; private String[] tags = new String[0]; // private int style = SWT.NONE; private static final int defaultStyle = SWT.BORDER; @@ -91,11 +91,11 @@ createControl(parent); } - protected CCombo getComboField() { + protected Combo getComboField() { return comboField; } - protected CCombo getComboControl() { + protected Combo getComboControl() { return comboField; } @@ -155,7 +155,7 @@ return 2; } - protected CCombo getComboControl(Composite parent) { + protected Combo getComboControl(Composite parent) { if (comboField == null) { int style = getSettings().getStyle("Combo.Style"); Color bg = getSettings().getColor("Combo.Background"); @@ -168,10 +168,10 @@ if (border!=null) { BorderedControl borderedControl = new BorderedControl(parent, SWT.NONE, border); - comboField = new CCombo(borderedControl, style); + comboField = new Combo(borderedControl, style); comboField.setBackground(bg); } else { - comboField = new CCombo(parent, style); + comboField = new Combo(parent, style); } comboField.setFont(font); comboField.setForeground(fg); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2007-10-16 17:31:53 UTC (rev 4268) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/ManagedBeanPropertyForm.java 2007-10-16 17:41:10 UTC (rev 4269) @@ -22,11 +22,11 @@ import org.jboss.tools.common.model.ui.attribute.editor.PropertyEditor; import org.jboss.tools.common.model.ui.attribute.editor.StringButtonFieldEditorEx; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; @@ -268,7 +268,7 @@ class ComboField { private Label vklabel; - private CCombo combo; + private Combo combo; public void createControls(Composite composite) { vklabel = new Label(composite, SWT.NONE); @@ -277,7 +277,7 @@ settings.setupControl(vklabel); BorderedControl border = new BorderedControl(composite, SWT.NONE, settings.getBorder("Combo.Border")); - combo = new CCombo(border, SWT.FLAT | SWT.READ_ONLY); + combo = new Combo(border, SWT.FLAT | SWT.READ_ONLY); combo.setItems(TAGS); combo.setText(getSelectedValueKind()); combo.setBackground(settings.getColor("Combo.Background"));