Google GitGoogle Git
Sign in
eclipse/sourceediting/webtools.sourceediting/7517d7ea532ca352bfd591650ed54e8298ade9ab^!/.
commit
7517d7ea532ca352bfd591650ed54e8298ade9ab
[log]
author
Nick Sandonato <nsandona@us.ibm.com>
Mon Nov 26 14:54:21 2012 -0500
committer
Nick Sandonato <nsandona@us.ibm.com>
Mon Nov 26 14:55:24 2012 -0500
tree
2792f2ebc33388bb3054cd95a98db26785cd2bde
parent
b4b9e9988df4dfe362bf9beb483e83c77aaddf4a [diff]
[394221] unnecessary testing of handlers state because activeWhen/enabledWhen/visibleWhen are duplicates

diff --git a/bundles/org.eclipse.jst.jsp.ui/plugin.xml b/bundles/org.eclipse.jst.jsp.ui/plugin.xml
index 2244e3c..0b4d634 100644
--- a/bundles/org.eclipse.jst.jsp.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/plugin.xml

@@ -850,11 +850,6 @@
                     definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
              	</reference>
              </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.jst.jsp.ui.internal.java.refactoring.MoveElementHandler"
@@ -864,11 +859,6 @@
                     definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
              	</reference>
              </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.jst.jsp.ui.internal.handlers.JSPFindOccurrencesHandler"
@@ -878,11 +868,6 @@
                     definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
              	</reference>
              </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
        </handler>
 	</extension>
 	
@@ -1040,14 +1025,10 @@
 	    <menuContribution locationURI="menu:refactorMenuId">
 	       <separator name="jspRefactorBegin" visible="false"></separator>
 	       <command commandId="org.eclipse.jst.jsp.ui.refactor.rename" id="RenameElement" label="%command.jsp.refactor.rename.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
+			   <visibleWhen checkEnabled="true" />
 	       </command>
 	       <command commandId="org.eclipse.jst.jsp.ui.refactor.move" id="MoveElement" label="%command.jsp.refactor.move.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
+			   <visibleWhen checkEnabled="true" />
 	       </command>
 	       <separator name="jspRefactorBegin" visible="false"></separator>
 		</menuContribution>
@@ -1055,14 +1036,10 @@
 			locationURI="popup:refactorPopupMenuId">
 			<separator name="jspRefactorBegin" visible="false"></separator>
 			<command commandId="org.eclipse.jst.jsp.ui.refactor.rename" id="RenameElement" label="%command.jsp.refactor.rename.name" style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
+				<visibleWhen checkEnabled="true" />
 			</command>
 			<command commandId="org.eclipse.jst.jsp.ui.refactor.move" id="MoveElement" label="%command.jsp.refactor.move.name" style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.jsp.ui.jspSourceContributions.definition"></reference>
-				</visibleWhen>
+				<visibleWhen checkEnabled="true" />
 			</command>
 			<separator name="jspRefactorBegin" visible="false"></separator>
 		</menuContribution>
@@ -1076,9 +1053,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.jsp.ui.jspContentType.definition"></reference>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.jsp.ui.jspContentType.definition"></reference>
-			</enabledWhen>
 		</handler>
 	</extension>
 	

diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
index 8207631..4af0509 100644
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.css.ui/plugin.xml

@@ -284,9 +284,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
 		</handler>
 		<handler
 			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectEnclosingHandler"
@@ -294,9 +291,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
 		</handler>
 		<handler
 			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectNextHandler"
@@ -304,9 +298,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
 		</handler>
 		<handler
 			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectPreviousHandler"
@@ -314,9 +305,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
 		</handler>
 		<!-- TODO Use the handler from SSE or XML's declaration -->
 		<handler
@@ -325,9 +313,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
 		</handler>
 	</extension>
 
@@ -600,9 +585,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.css.ui.cssContentType.definition"></reference>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssContentType.definition"></reference>
-			</enabledWhen>
 		</handler>
 	</extension>
 	

diff --git a/bundles/org.eclipse.wst.html.ui/plugin.xml b/bundles/org.eclipse.wst.html.ui/plugin.xml
index 65a6b04..1461078 100644
--- a/bundles/org.eclipse.wst.html.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.html.ui/plugin.xml

@@ -493,11 +493,6 @@
                     definitionId="org.eclipse.wst.html.ui.htmlSourceContributions.definition">
              	</reference>
              </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.html.ui.htmlSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.html.ui.internal.handlers.HTMLFindOccurrencesHandler"
@@ -507,11 +502,6 @@
                     definitionId="org.eclipse.wst.html.ui.occurrences">
              	</reference>
              </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.html.ui.occurrences">
-             	</reference>
-             </enabledWhen>
        </handler>
        
 	</extension>
@@ -587,9 +577,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.html.ui.htmlContentType.definition"></reference>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.html.ui.htmlContentType.definition"></reference>
-			</enabledWhen>
 		</handler>
 	</extension>
 

diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 721f81a..1c17790 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml

@@ -851,14 +851,10 @@
 -->		
 	       <separator name="goToSiblingsBegin" visible="true"></separator>
 	       <command commandId="org.eclipse.wst.xml.ui.nextSibling" id="GoToNextSibling" label="%ActionDefinition.nextSibling.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.navigation"></reference>
-				</visibleWhen>
+			   <visibleWhen checkEnabled="true" />
 	       </command>
 	       <command commandId="org.eclipse.wst.xml.ui.previousSibling" id="GoToPreviousSibling" label="%ActionDefinition.previousSibling.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.navigation"></reference>
-				</visibleWhen>
+			   <visibleWhen checkEnabled="true" />
 	       </command>
 	       <separator name="goToSiblingsEnd" visible="false"></separator>
 		</menuContribution>
@@ -1001,24 +997,14 @@
                  id="ToggleGrammarConstraints"
                  style="push"
                  tooltip="%Constraints_name">
-	           <visibleWhen
-	                 checkEnabled="false">
-	              <reference
-	                    definitionId="org.eclipse.wst.xml.ui.grammar">
-	              </reference>
-	           </visibleWhen>
+	           <visibleWhen checkEnabled="true" />
            </command>
            <command
                  commandId="org.eclipse.wst.xml.ui.reload.dependencies"
                  icon="icons/full/etool16/rldgrmr.gif"
                  id="ReloadDependencies"
                  style="push">
-	           <visibleWhen
-	                 checkEnabled="false">
-	              <reference
-	                    definitionId="org.eclipse.wst.xml.ui.dependencies">
-	              </reference>
-	           </visibleWhen>
+	           <visibleWhen checkEnabled="true" />
            </command>
         </toolbar>
      </menuContribution>
@@ -1157,9 +1143,6 @@
           <activeWhen>
 			 <reference definitionId="org.eclipse.wst.xml.ui.cleanup"/>
           </activeWhen>
-          <enabledWhen>
-             <reference definitionId="org.eclipse.wst.xml.ui.cleanup"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectEnclosingXMLHandler"
@@ -1167,9 +1150,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectNextXMLHandler"
@@ -1177,9 +1157,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectPreviousXMLHandler"
@@ -1187,9 +1164,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.sse.ui.internal.handlers.StructuredSelectHistoryHandler"
@@ -1197,9 +1171,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.XMLFindOccurencesHandler"
@@ -1207,9 +1178,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.occurrences"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.occurrences"/>
-          </enabledWhen>
        </handler>
 <!--
        <handler
@@ -1229,9 +1197,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.PreviousSiblingNavigationHandler"
@@ -1239,9 +1204,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.ReloadDependenciesHandler"
@@ -1249,9 +1211,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.dependencies"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.dependencies"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.handlers.ToggleEditModeHandler"
@@ -1259,9 +1218,6 @@
           <activeWhen>
               <reference definitionId="org.eclipse.wst.xml.ui.grammar"/>
           </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.grammar"/>
-          </enabledWhen>
        </handler>
        <handler
              class="org.eclipse.wst.xml.ui.internal.wizards.NewXMLHandler"
@@ -1487,9 +1443,6 @@
 			<activeWhen>
 				<reference definitionId="org.eclipse.wst.xml.ui.xmlContentType.definition"></reference>
 			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.xml.ui.xmlContentType.definition"></reference>
-			</enabledWhen>
 		</handler>
 	</extension>