[jbosstools-commits] JBoss Tools SVN: r42934 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2012-08-08 14:22:53 -0400 (Wed, 08 Aug 2012)
New Revision: 42934

Modified:
   trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-12392 - vpe refresh was bind for F5 only when VPE is active

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml	2012-08-08 15:56:33 UTC (rev 42933)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml	2012-08-08 18:22:53 UTC (rev 42934)
@@ -33,13 +33,11 @@
             name="%PreferencePage_ElVariables">
       </page>
    	</extension>
-   	<extension
-       	point="org.eclipse.ui.contexts">
-    	<context
-          description="%vpe.editor.binding.context.description"
-          id="org.jboss.tools.vpe.editorContext"
-          name="%editor.binding.context.name"
-          parentId="org.eclipse.ui.textEditorScope">
+   	<extension point="org.eclipse.ui.contexts">
+    	<context  id="org.jboss.tools.vpe.editorContext"
+    		parentId="org.eclipse.ui.textEditorScope"
+    		name="%editor.binding.context.name" 
+    		description="%vpe.editor.binding.context.description">
     	</context>
     </extension>
     <extension id="org.jboss.tools.vpe.commands" point="org.eclipse.ui.commands">
@@ -123,10 +121,6 @@
 			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
 			contextId="org.jboss.tools.vpe.editorContext"
 			sequence="M1+R"/>
-		<key commandId="org.jboss.tools.vpe.commands.refreshCommand"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-			contextId="org.jboss.tools.vpe.editorContext"
-			sequence="F5"/>
 	</extension>
   <extension
         point="org.jboss.tools.jst.jsp.visulaEditorImplementations"  id="org.jboss.tools.vpe.editor.VpeEditorPartFactory">
@@ -147,6 +141,15 @@
                 	</with>
 			</and>
 			</definition>
+			<definition id="org.jboss.tools.ui.vpe.editor.inView">
+         		<with variable="activePartId">
+         		<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>
+      		</definition>
 		</extension>
    <extension
         point="org.eclipse.ui.menus">
@@ -305,8 +308,25 @@
              commandId="org.jboss.tools.vpe.commands.preferencesCommand"/>
        <handler
              class="org.jboss.tools.vpe.handlers.RefreshHandler"
-             commandId="org.jboss.tools.vpe.commands.refreshCommand"/>
+             commandId="org.jboss.tools.vpe.commands.refreshCommand">
+             <activeWhen>
+            	<reference definitionId="org.jboss.tools.ui.vpe.editor.inView">
+            	</reference>
+         </activeWhen>
+         </handler>
+       <!-- 
+       Bind VPE refresh handler for eclipse's File Refresh (F5) command
+       When the focus is in VPE
+       -->
        <handler
+             class="org.jboss.tools.vpe.handlers.RefreshHandler" 
+             commandId="org.eclipse.ui.file.refresh">
+             <activeWhen>
+            	<reference definitionId="org.jboss.tools.ui.vpe.editor.inView">
+            	</reference>
+         </activeWhen>
+         </handler>
+       <handler
              class="org.jboss.tools.vpe.handlers.PageDesignOptionsHandler"
              commandId="org.jboss.tools.vpe.commands.pageDesignOptionsCommand"/>
        <handler

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java	2012-08-08 15:56:33 UTC (rev 42933)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java	2012-08-08 18:22:53 UTC (rev 42934)
@@ -52,8 +52,17 @@
     public static String A4J_URI = "http://richfaces.org/a4j"; //$NON-NLS-1$
     public static String FACELETS_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
     
+    /**
+     * Flag for correct JSF components
+     */
      public static String FACET_JSF_TAG = "FACET-JSF-TAG"; //$NON-NLS-1$
+     /**
+      * Flag for RF, FACELETS, A4J tags
+      */
      public static String FACET_ODD_TAGS = "FACET-ODD-TAGS"; //$NON-NLS-1$
+     /**
+      * Flag for plain HTML tags and text nodes
+      */
      public static String FACET_HTML_TAGS = "FACET-HTML-TAGS"; //$NON-NLS-1$
 
 	private static final String ACCESSIBILITY_SERVICE_CONTRACT_ID = "@mozilla.org/accessibilityService;1"; //$NON-NLS-1$