Author: dmaliarevich Date: 2012-03-29 09:21:18 -0400 (Thu, 29 Mar 2012) New Revision: 39916 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml Log: https://issues.jboss.org/browse/JBIDE-11302 - <visibleWhen> section in o.j.t.jst.jsp plugin.xml was updated. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-29 12:10:25 UTC (rev 39915) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2012-03-29 13:21:18 UTC (rev 39916) @@ -381,7 +381,30 @@ id="org.jboss.tools.jst.jsp.toolbars.i18" tooltip="%Externalize.Selected.Property"> <visibleWhen checkEnabled="false"> - <reference definitionId="org.jboss.tools.ui.vpe.editor"/> + <or> + <and> + <with variable="org.eclipse.core.runtime.Platform"> + <test property="org.eclipse.core.runtime.isBundleInstalled" + args="org.jboss.tools.vpe" forcePluginActivation="true"/> + </with> + <reference definitionId="org.jboss.tools.ui.vpe.editor"/> + </and> + <and> + <not> + <with variable="org.eclipse.core.runtime.Platform"> + <test property="org.eclipse.core.runtime.isBundleInstalled" + args="org.jboss.tools.vpe" forcePluginActivation="true"/> + </with> + </not> + <with variable="activeEditorId"> + <or> + <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/> + </or> + </with> + </and> + </or> </visibleWhen> </command> <command @@ -391,7 +414,30 @@ style="toggle" tooltip="%Toggle.Selection.Bar"> <visibleWhen checkEnabled="false"> - <reference definitionId="org.jboss.tools.ui.vpe.editor"/> + <or> + <and> + <with variable="org.eclipse.core.runtime.Platform"> + <test property="org.eclipse.core.runtime.isBundleInstalled" + args="org.jboss.tools.vpe" forcePluginActivation="true"/> + </with> + <reference definitionId="org.jboss.tools.ui.vpe.editor"/> + </and> + <and> + <not> + <with variable="org.eclipse.core.runtime.Platform"> + <test property="org.eclipse.core.runtime.isBundleInstalled" + args="org.jboss.tools.vpe" forcePluginActivation="true"/> + </with> + </not> + <with variable="activeEditorId"> + <or> + <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/> + </or> + </with> + </and> + </or> </visibleWhen> </command> </toolbar> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-29 12:10:25 UTC (rev 39915) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-03-29 13:21:18 UTC (rev 39916) @@ -135,23 +135,16 @@ <extension point="org.eclipse.core.expressions.definitions"> <definition id="org.jboss.tools.ui.vpe.editor"> <and> - <or> <with variable="activeEditorId"> - <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> - </with> - <with variable="activeEditorId"> - <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> - </with> - <with variable="activeEditorId"> - <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/> - </with> - </or> - <with - variable="selection"> - <test - property="org.jboss.tools.vpe.showiconsonmaintoolbar"> - </test> - </with> + <or> + <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/> + <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/> + </or> + </with> + <with variable="selection"> + <test property="org.jboss.tools.vpe.showiconsonmaintoolbar" /> + </with> </and> </definition> </extension>