From f6e7d795f9eff4076c48da0a289a84c66e6f08e4 Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Fri, 17 Aug 2012 16:16:20 -0500
Subject: [PATCH] Issue #666 fix collaboration message compose problems with
 ncp keybindings

Former-commit-id: 25b00010e17cb41048145aa23ee2670d8c9f3552 [formerly 3f0b2e474cf9ec76e2551b159a45cfc84856675d] [formerly 8e971abbd82198505b69bedcc10f0068cc3f602a [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 8e971abbd82198505b69bedcc10f0068cc3f602a
Former-commit-id: 2c5cfe6d98fbfcaaf35abd1853c7f12e6784bb1f
---
 ncep/gov.noaa.nws.ncep.ui.nctextui/plugin.xml |  9 ++++
 ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml     | 10 +++-
 ncep/gov.noaa.nws.ncep.viz.tools/plugin.xml   | 52 +++++++++----------
 .../plugin.xml                                | 14 +++++
 .../plugin.xml                                |  4 +-
 5 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/ncep/gov.noaa.nws.ncep.ui.nctextui/plugin.xml b/ncep/gov.noaa.nws.ncep.ui.nctextui/plugin.xml
index 58cf7de478..7bd40cb6b2 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nctextui/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.ui.nctextui/plugin.xml
@@ -52,6 +52,15 @@
             id="gov.noaa.nws.ncep.ui.NCTEXTUI"
             name="NCTEXT"/>
    </extension>
+   <extension
+         point="com.raytheon.uf.viz.core.classContext">
+         <classContext
+            class="gov.noaa.nws.ncep.ui.nctextui.palette.NctextuiPaletteWindow">
+             <contextId
+                   id="gov.noaa.nws.ncep.viz.ui.display.NCMapContext">
+             </contextId>
+         </classContext>
+   </extension>
    <!--
    <extension
        point="org.eclipse.ui.menus">
diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml b/ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml
index c21dda2acc..60eca78c5a 100644
--- a/ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.ui.pgen/plugin.xml
@@ -3214,5 +3214,13 @@
 	         extensionFilter=".xml,.tbl,.png,.txt,.xsl,.xlt,.xslt">
        </path>
     </extension>
-
+   <extension
+         point="com.raytheon.uf.viz.core.classContext">
+         <classContext
+            class="gov.noaa.nws.ncep.ui.pgen.palette.PgenPaletteWindow">
+             <contextId
+                   id="gov.noaa.nws.ncep.viz.ui.display.NCMapContext">
+             </contextId>
+         </classContext>
+   </extension>
 </plugin>
diff --git a/ncep/gov.noaa.nws.ncep.viz.tools/plugin.xml b/ncep/gov.noaa.nws.ncep.viz.tools/plugin.xml
index dc1218e0d2..cc1e66479b 100644
--- a/ncep/gov.noaa.nws.ncep.viz.tools/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.tools/plugin.xml
@@ -264,27 +264,27 @@
             <!-- Turn off Raytheon's keybinding in the National Centers context-->
             <key
             commandId=""
-            contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+            contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
             schemeId="com.raytheon.viz.ui.awips.scheme"
             sequence="BACKSPACE">
           </key>
           <key
             commandId=""
-            contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+            contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
             schemeId="com.raytheon.viz.ui.awips.scheme"
             sequence="F12">
          </key>          
          <!-- Turn off the default keybinding in the National Centers context-->
          <key
                 commandId=""
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
                 sequence="F10">
          </key>         
 
          <key
                 commandId=""
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
                 sequence="F12">
          </key>
@@ -320,7 +320,7 @@
                       Hot keys <Shift + F1> through <Shift + F10> activate tabs 11 through 20 respectively-->
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F1">
                           <parameter id="keyNum" value="1"/>
@@ -328,7 +328,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F2">
                           <parameter id="keyNum" value="2"/>
@@ -336,7 +336,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F3">
                           <parameter id="keyNum" value="3"/>
@@ -344,7 +344,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F4">
                           <parameter id="keyNum" value="4"/>
@@ -352,7 +352,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F5">
                           <parameter id="keyNum" value="5"/>
@@ -360,7 +360,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F6">
                           <parameter id="keyNum" value="6"/>
@@ -368,7 +368,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F7">
                           <parameter id="keyNum" value="7"/>
@@ -376,7 +376,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F8">
                           <parameter id="keyNum" value="8"/>
@@ -384,7 +384,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F9">
                           <parameter id="keyNum" value="9"/>
@@ -392,14 +392,14 @@
 
          <key
                 commandId=""
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
                 sequence="F10">
          </key>
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="F10">
                           <parameter id="keyNum" value="10"/>
@@ -407,7 +407,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F1">
                           <parameter id="keyNum" value="11"/>
@@ -415,7 +415,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F2">
                           <parameter id="keyNum" value="12"/>
@@ -423,7 +423,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F3">
                           <parameter id="keyNum" value="13"/>
@@ -431,7 +431,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F4">
                           <parameter id="keyNum" value="14"/>
@@ -439,7 +439,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F5">
                           <parameter id="keyNum" value="15"/>
@@ -447,7 +447,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F6">
                           <parameter id="keyNum" value="16"/>
@@ -455,7 +455,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F7">
                           <parameter id="keyNum" value="17"/>
@@ -463,7 +463,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F8">
                           <parameter id="keyNum" value="18"/>
@@ -471,7 +471,7 @@
          
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F9">
                           <parameter id="keyNum" value="19"/>
@@ -479,7 +479,7 @@
 
          <key
                 commandId="gov.noaa.nws.ncep.viz.tools.hotKeys.tabNavigation"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="M2+F10">
                           <parameter id="keyNum" value="20"/>
@@ -495,7 +495,7 @@
          <!-- its easter egg time --> 
          <key
                 commandId="gov.noaa.nws.ncep.viz.ui.ncInventoryControl"
-                contextId="gov.noaa.nws.ncep.viz.ui.display.NCMapContext"
+                contextId="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
                 schemeId="com.raytheon.viz.ui.awips.scheme"
                 sequence="ALT+I">
          </key> 
diff --git a/ncep/gov.noaa.nws.ncep.viz.ui.display/plugin.xml b/ncep/gov.noaa.nws.ncep.viz.ui.display/plugin.xml
index f1ad6e0ac3..c64c48ccfb 100644
--- a/ncep/gov.noaa.nws.ncep.viz.ui.display/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.ui.display/plugin.xml
@@ -21,7 +21,21 @@
                     description="The Natl Centers Product Genaration Context"
                     id="gov.noaa.nws.ncep.ui.pgen.pgenContext"
                     name="Natl Centers PGEN Context">
+           </context>
+           <context 
+                    description="The Natl Centers Perspective Context"
+                    id="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext"
+                    name="Natl Centers Perspective Context">
            </context>           
+   </extension>
+   <extension
+         point="com.raytheon.uf.viz.core.classContext">
+         <classContext
+            class="gov.noaa.nws.ncep.viz.ui.display.NCMapEditor">
+             <contextId
+                   id="gov.noaa.nws.ncep.viz.ui.display.NCMapContext">
+             </contextId>
+         </classContext>
    </extension>
     <!--
     <extension
diff --git a/ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml b/ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
index 08445e5058..a4ba7517f6 100644
--- a/ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
@@ -930,13 +930,13 @@
   		
    </extension>
       
-      <!--Definition of the NCMapContext -->
+      <!--Definition of the NCPerspectiveContext -->
    <extension
          point="com.raytheon.uf.viz.core.classContext">
          <classContext
             class="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveManager">
              <contextId
-                   id="gov.noaa.nws.ncep.viz.ui.display.NCMapContext">
+                   id="gov.noaa.nws.ncep.viz.ui.perspectives.NCPerspectiveContext">
              </contextId>
          </classContext>
    </extension>