Author: rob.stryker(a)jboss.com Date: 2009-03-11 03:38:46 -0400 (Wed, 11 Mar 2009) New Revision: 14162 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/wizards/DefaultConnectionWizardPage.java Log: JBIDE-3991 - non-breaking changes for wtp 3.1 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2009-03-11 06:26:52 UTC (rev 14161) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2009-03-11 07:38:46 UTC (rev 14162) @@ -131,9 +131,20 @@ priority="normal" providesSaveables="true"> <triggerPoints> - <instanceof - value="org.eclipse.core.resources.IWorkspaceRoot"> - </instanceof> + <or> + <instanceof + value="org.jboss.ide.eclipse.archives.core.model.IArchiveNode"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate$DelayProxy"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate$WrappedProject"> + </instanceof> + <instanceof + value="org.eclipse.core.resources.IWorkspaceRoot"> + </instanceof> + </or> </triggerPoints> <possibleChildren> <or> @@ -157,9 +168,17 @@ name="%NavigatorContent_ProjectArchives" priority="highest"> <triggerPoints> - <instanceof - value="org.eclipse.core.resources.IProject"> - </instanceof> + <or> + <instanceof + value="org.eclipse.core.resources.IProject"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.archives.core.model.IArchiveNode"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate$DelayProxy"> + </instanceof> + </or> </triggerPoints> <possibleChildren> <or> Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2009-03-11 06:26:52 UTC (rev 14161) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2009-03-11 07:38:46 UTC (rev 14162) @@ -87,9 +87,26 @@ name="%NavigatorContent_MBeans" priority="normal"> <triggerPoints> - <instanceof - value="org.eclipse.ui.IViewPart"> - </instanceof> + <or> + <instanceof + value="org.jboss.tools.jmx.core.tree.Node"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.core.IConnectionProvider"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider$DelayProxy"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper"> + </instanceof> + <instanceof + value="org.eclipse.ui.IViewPart"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.core.IConnectionWrapper"> + </instanceof> + </or> </triggerPoints> <possibleChildren> <or> @@ -105,6 +122,9 @@ <instanceof value="org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper"> </instanceof> + <instanceof + value="org.jboss.tools.jmx.core.IConnectionWrapper"> + </instanceof> </or> </possibleChildren> </navigatorContent> Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/wizards/DefaultConnectionWizardPage.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/wizards/DefaultConnectionWizardPage.java 2009-03-11 06:26:52 UTC (rev 14161) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/wizards/DefaultConnectionWizardPage.java 2009-03-11 07:38:46 UTC (rev 14162) @@ -298,15 +298,19 @@ protected void clearMessage() { setErrorMessage(null); setPageComplete(true); - getContainer().updateMessage(); - getContainer().updateButtons(); + if( getContainer().getCurrentPage() != null ) { + getContainer().updateMessage(); + getContainer().updateButtons(); + } } protected void showError(String message) { setErrorMessage(message); setPageComplete(false); - getContainer().updateMessage(); - getContainer().updateButtons(); + if( getContainer().getCurrentPage() != null ) { + getContainer().updateMessage(); + getContainer().updateButtons(); + } } protected boolean nameTaken(String s) {