[139151] Schema editor design page not keyboard navigable

6 files changed, 36 insertions, 17 deletions

diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java
index 25f0b63800..678e0719ef 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java
@@ -27,7 +27,7 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
 import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaAdapter;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardNavigationEditPolicy;
+import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.HeadingFigure;
 import org.eclipse.wst.xsd.ui.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
 import org.eclipse.wst.xsd.ui.internal.design.layouts.FillLayout;
@@ -209,7 +209,7 @@ public class XSDSchemaEditPart extends BaseEditPart
       } 
       else if (editPart == this)
       {       
-        if (direction == KeyBoardNavigationEditPolicy.IN_TO_FIRST_CHILD)
+        if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
         {
           result = ((CategoryRowEditPart)getChildren().get(0)).doGetRelativeEditPart(editPart, direction);        
         }          
@@ -283,14 +283,14 @@ public class XSDSchemaEditPart extends BaseEditPart
     {
       if (editPart instanceof CategoryEditPart)
       {
-        if (direction == KeyBoardNavigationEditPolicy.OUT_TO_PARENT)
+        if (direction == KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT)
         {
           return getParent();
         }  
       }  
       else if (editPart instanceof XSDSchemaEditPart)
       {
-        if (direction == KeyBoardNavigationEditPolicy.IN_TO_FIRST_CHILD)
+        if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
         {
           return (EditPart)getChildren().get(0);
         }  
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java
index a6a7de7ea4..72f06d937b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java
@@ -20,7 +20,7 @@ import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardNavigationEditPolicy;
+import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
 
 /**
  * This key handler is designed to be re-used by both the WSDL and XSD editor
@@ -47,11 +47,11 @@ public class BaseGraphicalViewerKeyHandler extends GraphicalViewerKeyHandler
         break;
       }
       case SWT.ARROW_UP : {
-        direction = isAltDown ? KeyBoardNavigationEditPolicy.OUT_TO_PARENT : PositionConstants.NORTH;
+        direction = isAltDown ? KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT : PositionConstants.NORTH;
         break;
       }
       case SWT.ARROW_DOWN : {
-        direction = isAltDown ? KeyBoardNavigationEditPolicy.IN_TO_FIRST_CHILD : PositionConstants.SOUTH;       
+        direction = isAltDown ? KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD : PositionConstants.SOUTH;       
         break;
       }
     }
@@ -59,7 +59,7 @@ public class BaseGraphicalViewerKeyHandler extends GraphicalViewerKeyHandler
     if (direction != -1)
     {
       GraphicalEditPart focusEditPart = getFocusEditPart();
-      KeyBoardNavigationEditPolicy policy = (KeyBoardNavigationEditPolicy)focusEditPart.getEditPolicy(KeyBoardNavigationEditPolicy.KEY);
+      KeyBoardAccessibilityEditPolicy policy = (KeyBoardAccessibilityEditPolicy)focusEditPart.getEditPolicy(KeyBoardAccessibilityEditPolicy.KEY);
       if (policy != null)          
       {
         EditPart target = policy.getRelativeEditPart(focusEditPart, direction);
@@ -70,15 +70,30 @@ public class BaseGraphicalViewerKeyHandler extends GraphicalViewerKeyHandler
         }          
       }         
     }
+    
     switch (event.keyCode)
     {
       case SWT.PAGE_DOWN :
+      {  
         if (scrollPage(event, PositionConstants.SOUTH))
           return true;
-        break;
+      }  
       case SWT.PAGE_UP :
+      {  
         if (scrollPage(event, PositionConstants.NORTH))
           return true;
+      }  
+      case SWT.F2:
+      case 13:
+      {
+        GraphicalEditPart focusEditPart = getFocusEditPart();     
+        KeyBoardAccessibilityEditPolicy policy = (KeyBoardAccessibilityEditPolicy)focusEditPart.getEditPolicy(KeyBoardAccessibilityEditPolicy.KEY);
+        if (policy != null)
+        {
+          policy.performDirectEdit(focusEditPart);
+        }      
+        return true;
+      }          
     }
     return super.keyPressed(event);
   }
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java
index 708c1a88eb..85949f3955 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java
@@ -27,7 +27,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardNavigationEditPolicy;
+import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFigureFactory;
 import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
 import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
@@ -184,7 +184,7 @@ public abstract class BaseEditPart extends AbstractGraphicalEditPart implements
   
   protected void createEditPolicies()
   {
-    installEditPolicy(KeyBoardNavigationEditPolicy.KEY, new KeyBoardNavigationEditPolicy()
+    installEditPolicy(KeyBoardAccessibilityEditPolicy.KEY, new KeyBoardAccessibilityEditPolicy()
     {      
       public EditPart getRelativeEditPart(EditPart editPart, int direction)
       {
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java
index e0388592a8..5854ba1be7 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java
@@ -17,7 +17,7 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Annotation;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardNavigationEditPolicy;
+import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adt.design.figures.ICompartmentFigure;
 import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
 
@@ -49,7 +49,7 @@ public class CompartmentEditPart extends BaseEditPart // implements
     EditPart result = null;   
     if (getChildren().contains(editPart))
     {  
-      if (direction == KeyBoardNavigationEditPolicy.OUT_TO_PARENT)
+      if (direction == KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT)
       {
         Compartment compartment = (Compartment)getModel();
         for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java
index 2bbc203337..db1f68c0b5 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java
@@ -32,7 +32,7 @@ import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardNavigationEditPolicy;
+import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
 import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
 import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
 import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
@@ -75,7 +75,7 @@ public class StructureEditPart extends BaseTypeConnectingEditPart implements INa
   public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
   {
     EditPart result = null;               
-    if (direction == KeyBoardNavigationEditPolicy.IN_TO_FIRST_CHILD)
+    if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
     {          
       for (Iterator i = getChildren().iterator(); i.hasNext();)
       {            
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardNavigationEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardAccessibilityEditPolicy.java
index d80b2c1028..3105c07fce 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardNavigationEditPolicy.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardAccessibilityEditPolicy.java
@@ -4,13 +4,17 @@ import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
 
-public class KeyBoardNavigationEditPolicy extends GraphicalEditPolicy
+public class KeyBoardAccessibilityEditPolicy extends GraphicalEditPolicy
 {
-  public static String KEY = "KeyBoardNavigationEditPolicy";
+  public static String KEY = "KeyBoardAccessibilityEditPolicy";
   
   public static int OUT_TO_PARENT = PositionConstants.ALWAYS_LEFT;
   public static int IN_TO_FIRST_CHILD = PositionConstants.ALWAYS_RIGHT;
       
+  public void performDirectEdit(EditPart editPart)
+  {
+  }
+  
   public EditPart getRelativeEditPart(EditPart editPart, int direction)
   {
     return null;