Author: snjeza Date: 2008-08-29 07:49:07 -0400 (Fri, 29 Aug 2008) New Revision: 9959 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java Log: JBIDE-2302, JBIDE-2573, JBIDE-2355, JBIDE-2407 - Key binding issues in Ganymede Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-08-29 11:04:38 UTC (rev 9958) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-08-29 11:49:07 UTC (rev 9959) @@ -837,6 +837,7 @@ } protected void pageChange(int newPageIndex) { + deactivateSite(false, false); selectedPageIndex = newPageIndex; Control control = getControl(newPageIndex); if (control != null) { @@ -854,6 +855,7 @@ if(postponedTextSelection.selected != null) { Display.getDefault().asyncExec(postponedTextSelection); } + activateSite(); } protected void updateSelectionProvider() { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java 2008-08-29 11:04:38 UTC (rev 9958) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropUtils.java 2008-08-29 11:49:07 UTC (rev 9959) @@ -117,6 +117,12 @@ } } catch (KbException ex) { ModelUIPlugin.getPluginLog().logError(ex); + } catch (InstantiationException ex) { + ModelUIPlugin.getPluginLog().logError(ex); + } catch (IllegalAccessException ex) { + ModelUIPlugin.getPluginLog().logError(ex); + } catch (ClassNotFoundException ex) { + ModelUIPlugin.getPluginLog().logError(ex); } if(attributes==null)return new AttributeDescriptorValue[0]; List<AttributeDescriptorValue> attributesValues = new ArrayList<AttributeDescriptorValue>(); @@ -146,6 +152,12 @@ tagInfo = wtpKbConnector.getTagInformation("/"+(tagPrefix==TagProposal.EMPTY_PREFIX?"":tagPrefix+":")+tagName); } catch (KbException ex) { ModelUIPlugin.getPluginLog().logError(ex); + } catch (InstantiationException ex) { + ModelUIPlugin.getPluginLog().logError(ex); + } catch (IllegalAccessException ex) { + ModelUIPlugin.getPluginLog().logError(ex); + } catch (ClassNotFoundException ex) { + ModelUIPlugin.getPluginLog().logError(ex); } return tagInfo; }