diff options
| author | rsrinivasan | 2009-08-27 06:39:39 +0000 |
|---|---|---|
| committer | rsrinivasan | 2009-08-27 06:39:39 +0000 |
| commit | 95a9a7e94218fd9548059a11eebe4d1516742d6a (patch) | |
| tree | 4a5bde1be4ec0c72c3cda2b641a5456b8ce55547 | |
| parent | b7311ae2ea3174febd0d1fdf5eebb1fc9a013c90 (diff) | |
| download | webtools.jsf-95a9a7e94218fd9548059a11eebe4d1516742d6a.tar.gz webtools.jsf-95a9a7e94218fd9548059a11eebe4d1516742d6a.tar.xz webtools.jsf-95a9a7e94218fd9548059a11eebe4d1516742d6a.zip | |
bug 173381, 212887
2 files changed, 7 insertions, 1 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java index 15b1970ec..02b3c8e89 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java @@ -55,6 +55,7 @@ import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.gef.ui.actions.EditorPartAction; import org.eclipse.gef.ui.actions.SaveAction; import org.eclipse.gef.ui.actions.UpdateAction; +import org.eclipse.gef.ui.views.palette.PaletteView; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.IDocument; @@ -1145,6 +1146,10 @@ public class FacesConfigEditor extends FormEditor implements && contributor instanceof FacesConfigActionBarContributor) { ((FacesConfigActionBarContributor) contributor) .setActivePage(activeEditor); + PaletteView paletteView = (PaletteView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PaletteView.ID); + if(paletteView != null) { + paletteView.partActivated(activeEditor); + } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java index 60550172e..a7cc144e6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java @@ -316,7 +316,8 @@ public class AddEditManagedPropertyDialog extends Dialog { valueField.getTextControl(null, parent).setEditable(false); valueField.setEnabled(true); } else { - valueObject = ""; //$NON-NLS-1$ + + valueObject = valueField.getText(); //Bug 173831 valueField.getTextControl(null, parent).setEditable(true); valueField.setEnabled(true); } |