[jbosstools-commits] JBoss Tools SVN: r29824 - in branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: propertieseditor and 1 other directory.

Author: scabanovich Date: 2011-03-16 13:31:21 -0400 (Wed, 16 Mar 2011) New Revision: 29824 Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: JBIDE-8596 https://issues.jboss.org/browse/JBIDE-8596 Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 17:22:27 UTC (rev 29823) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/XChildrenEditor.java 2011-03-16 17:31:21 UTC (rev 29824) @@ -380,6 +380,7 @@ public void drop(Properties p) { XModelObject draggedObject = (XModelObject)p.get("draggedObject"); //$NON-NLS-1$ if(draggedObject == null) return; + xtable.getViewer().cancelEditing(); update(); xtable.getViewer().setSelection(new StructuredSelection(draggedObject)); } Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 17:22:27 UTC (rev 29823) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2011-03-16 17:31:21 UTC (rev 29824) @@ -27,11 +27,16 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextOperationTarget; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; @@ -44,6 +49,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IFileEditorInput; @@ -60,6 +66,7 @@ import org.jboss.tools.common.meta.action.XAction; import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.ModelUIPlugin; @@ -193,6 +200,19 @@ menu.setViewer(xtable.getViewer()); xtable.getViewer().getTable().addMouseListener(menu); getControl().addMouseListener(menu); + xtable.getViewer().setColumnProperties(new String[]{"name", "value"}); + xtable.getViewer().setCellModifier(new PCellModifier()); + xtable.getViewer().setCellEditors(new CellEditor[]{new TextCellEditor(xtable.getTable()),new TextCellEditor(xtable.getTable())}); + xtable.getTable().addKeyListener(new KeyAdapter() { + public void keyPressed(KeyEvent e) { + if(e.keyCode == 13) { + if(xtable.getViewer().isCellEditorActive()) { + return; + } + if(bar.isEnabled(EDIT)) action(EDIT); + } + } + }); return panel; } @@ -559,6 +579,47 @@ } } +class PCellModifier implements ICellModifier { + + public boolean canModify(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.isAttributeEditable(property); + } + } + return false; + } + + public Object getValue(Object element, String property) { + if(element instanceof XModelObject) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + return o.getAttributeValue(property); + } + } + return null; + } + + public void modify(Object element, String property, Object value) { + if(element instanceof TableItem) { + TableItem t = (TableItem)element; + element = t.getData(); + } + if(element instanceof XModelObject && value != null) { + XModelObject o = (XModelObject)element; + if(o.getModelEntity().getAttribute(property) != null) { + try { + o.getModel().editObjectAttribute(o, property, value.toString()); + } catch (XModelException e) { + ModelUIPlugin.getDefault().logError(e); + } + } + } + } + +} + class FPTableHelper extends AbstractTableHelper implements PropertyChangeListener { PropertiesEditor pe; String nameFilter = ""; //$NON-NLS-1$