FIX(General cleanup of code, check style and fixing issues with the interfaces)

Author: mmarquee

docs/caching.md

@@ -5,7 +5,7 @@ There is limited support for caching, enough to demonstrate the functionality th
 The following code example shows a function that retrieves items from a window and caches the Selection pattern and Name property for each item. 
 By default, the list items are returned with a full reference, so that all current properties are still available.
 ```
-    AutomationWindow window = automation.getDesktopWindow("Form1");
+    Window window = automation.getDesktopWindow("Form1");
 
     PointerByReference condition = automation.createTrueCondition();
 

docs/calendar.md

@@ -1,6 +1,6 @@
 The Calendar control supports the Grid, Scroll, Table, Value and Selection patterns. 
 
 ```
-  AutomationCalendar calendar = applicationWindow.getCalendar(Search.getBuilder(0).build());
+  Calendar calendar = applicationWindow.getCalendar(Search.getBuilder(0).build());
   logger.info("Date is " + calendar.name());
 ```

docs/checkbox.md

@@ -2,7 +2,7 @@
 * See [Element Discovery](element-discovery.md)
 
 ```
-AutomationCheckBox check = window.getCheckBox(Search.getBuilder(0).build());
+CheckBox check = window.getCheckBox(Search.getBuilder(0).build());
 check.toggle();
 
 try {

docs/combobox.md

@@ -2,7 +2,7 @@
 * See [Element Discovery](element-discovery.md)
 
 ```
-AutomationComboBox cb1 = window.getCombobox(Search.getBuilder("AutomatedCombobox1").build());
+ComboBox cb1 = window.getCombobox(Search.getBuilder("AutomatedCombobox1").build());
 String oldTxt = cb1.text();
 cb1.setText("Replacements");
 String txt = cb1.text();

docs/developer.md

@@ -53,7 +53,7 @@ In order to get access to the automation API, an UIAutomation instance needs to
 
 ### Launching an application
 
-The AutomationApplication class provides functionality to start and attach to an application. There are 3 class methods provided to do this.
+The Application class provides functionality to start and attach to an application. There are 3 class methods provided to do this.
 
 * Launch - this will launch the application supplied, and pass in any supplied arguments
 * Attach - this will attach to an already launched application, based on the executable name
@@ -63,8 +63,8 @@ The snippet below will check whether Project1.exe is running, attaching to it if
 
 ```
   // Build the application details up, ready for launching
-  AutomationApplication application =
-    new AutomationApplication(
+  Application application =
+    new Application(
         new ElementBuilder()
                 .automation(automation)
                 .applicationPath("apps\\Project1.exe"));
@@ -85,7 +85,7 @@ The root element of the tree of automation elements is the user’s desktop.
 To get a 'desktop' window (i.e. one that appears in the Windows tasks bar), then the AutomationDesktop class provides a class function that returns a AutomationWindow object.
 
 ```
-  AutomationWindow window = automation.getDesktopWindow("Form1");
+  Window window = automation.getDesktopWindow("Form1");
   window.focus();
 ```
 
@@ -96,7 +96,7 @@ This will find (if it is there) a window that has the given title, and set focus
 Each control contained in a container (such as a window or panel) can be identified by the index of that control, sometimes (this depends on the control type), by the text associated with it, OR by the Automation Id. For example, in order to get the textbox associated with the connection window (and assuming that it is the 1st Edit box on the window), the following code will find the editbox, and change the text to be USER1.
 
 ```
-  AutomationEditBox user = window.getEditBox(Search.getBuilder(0).build());
+  EditBox user = window.getEditBox(Search.getBuilder(0).build());
   user.setText("USER1");
 ```
 
@@ -106,26 +106,27 @@ In order to click the 'OK' button associated with a given window, it can be foun
 
 ```
   // Get button by index
-  AutomationButton button1 = window.getButton(Search.getBuilder(0).build());
+  Button button1 = window.getButton(Search.getBuilder(0).build());
   button1.click();
 ```
 
 ```
   // Get button by name
-  AutomationButton button1 = window.getButton(Search.getBuilder("OK").build());
+  Button button1 = window.getButton(Search.getBuilder("OK").build());
   button1.click();
 ```
 
 ```
   // Get button by automation id
-  AutomationButton button1 = window.getButton(Search.getBuilder().automationId("btnOK").build());
+  Button button1 = window.getButton(Search.getBuilder().automationId("btnOK").build());
   button1.click();
 ```
 
 # Current supported controls
 
 The controls that have been implemented reflect the requirements for automating the applications that we are testing ourselves, so some controls have not been implemented, or only partially. The currently supported controls are ...
 
+* [Application](application.md)
 * [Button](button.md)
 * [Grids](grids.md)
 * [Ribbon](ribbon.md)

docs/document.md

@@ -2,7 +2,7 @@
 * See [Element Discovery](element-discovery.md)
 
 ```
-  AutomationDocument document = applicationWindow.getDocument(Search.getBuilder(0).build());
+  Document document = applicationWindow.getDocument(Search.getBuilder(0).build());
 
   logger.info("Document name is `" + document.name() + "`");
   logger.info("Text is " + document.getText());

docs/element-discovery.md

@@ -35,7 +35,7 @@ Note that the automation id is an 'extra' search criteria, and has to be 'chaine
 
 ```
   // Get button by automation id
-  AutomationButton button1 = window.getButtonSearch.getBuilder().automationId("AutomatedCombobox1").build());
+  Button button1 = window.getButtonSearch.getBuilder().automationId("AutomatedCombobox1").build());
   button1.click();
 ```
 
@@ -47,7 +47,7 @@ The example shows a button being located by it's index. This will be the first b
 
 ```
   // Get button by index
-  AutomationButton button1 = window.getButton(Search.getBuilder(0).build());
+  Button button1 = window.getButton(Search.getBuilder(0).build());
   button1.click();
 ```
 
@@ -58,29 +58,29 @@ Each element also has a more specific find API, allowing specific functions to f
 ## Index
 ```
   // Get button by index
-  AutomationButton button1 = window.getButton(0);
+  Button button1 = window.getButton(0);
   button1.click();
 ```
 
 ## Name
 ```
   // Get button by name
-  AutomationButton button1 = window.getButton("Button1");
+  Button button1 = window.getButton("Button1");
   button1.click();
 ```
 
 ## AutomationId
 ```
   // Get button by automationId
-  AutomationButton button1 = window.getButtonByAutomationId("ButtonId");
+  Button button1 = window.getButtonByAutomationId("ButtonId");
   button1.click();
 ```
 
 ## Regex pattern
 
 ```
   // Get button by regex pattern
-  AutomationButton button1 = window.getButton(Pattern.compile("myN.*"));
+  Button button1 = window.getButton(Pattern.compile("myN.*"));
   button1.click();
 ```
 

docs/excel.md

@@ -1,22 +1,22 @@
 Assuming that the application has already been started, the following code shows how to get data out of cells. 
 
 ```            
-AutomationWindow window = application.getWindow("Book1 - Excel");
-logger.info(window.name());
+ Window window = application.getWindow("Book1 - Excel");
+ logger.info(window.name());
 
-AutomationPanel panelX = window.getPanelByClassName(0, "XLDESK");
-logger.info(panelX.name());
-logger.info(panelX.getClassName());
+ Panel panelX = window.getPanelByClassName(0, "XLDESK");
+ logger.info(panelX.name());
+ logger.info(panelX.getClassName());
 
-AutomationTab tab = panelX.getTab(Search.getBuilder(0).build());
-logger.info(tab.name());
-AutomationDataGrid grid = tab.getDataGrid(Search.getBuilder(0).build());
-logger.info(grid.name());
+ Tab tab = panelX.getTab(Search.getBuilder(0).build());
+ logger.info(tab.name());
+ DataGrid grid = tab.getDataGrid(Search.getBuilder(0).build());
+ logger.info(grid.name());
 
-// Get some data
-AutomationDataGridCell cell = grid.getItem(0,0);
-logger.info(cell.name());
-logger.info(cell.value());
+ // Get some data
+ DataGridCell cell = grid.getItem(0,0);
+ logger.info(cell.name());
+ logger.info(cell.value());
 ```
 
 NOTE: The call to getPanelByClassName is only available post release 0.3.10

docs/explorer.md

@@ -1,29 +1,29 @@
 The Windows Explorer application has a complex user interface, and the examples below only show some of the possible interactions that are available.
 
 ```
-  AutomationWindow window = automation.getDesktopWindow("File Explorer");
+  Window window = automation.getDesktopWindow("File Explorer");
   window.focus();
 
   // Get the ribbon, work our way down and click the "Preview Button"
-  AutomationRibbonBar ribbon = window.getRibbonBar();
-  AutomationRibbonCommandBar commandBar = ribbon.getRibbonCommandBar();
-  AutomationRibbonWorkPane pane = commandBar.getRibbonWorkPane();
+  RibbonBar ribbon = window.getRibbonBar();
+  RibbonCommandBar commandBar = ribbon.getRibbonCommandBar();
+  RibbonWorkPane pane = commandBar.getRibbonWorkPane();
   logger.info("First work pane is " + pane.name());
 
-  AutomationNUIPane uiPane = pane.getNUIPane(Search.getBuilder(0).build());
+  NUIPane uiPane = pane.getNUIPane(Search.getBuilder(0).build());
   logger.info("First NUIPane is " + uiPane.name());
 
-  AutomationNetUIHWND uiHWND = uiPane.getNetUIHWND(Search.getBuilder(0).build());
+  NetUIHWND uiHWND = uiPane.getNetUIHWND(Search.getBuilder(0).build());
 
-  AutomationButton btn = uiHWND.getButton("Minimise the Ribbon");
+  Button btn = uiHWND.getButton("Minimise the Ribbon");
 
-  AutomationTab tab = uiHWND.getTab(Search.getBuilder(0).build());
+  Tab tab = uiHWND.getTab(Search.getBuilder(0).build());
   tab.selectTabPage("View");
 
-  AutomationPanel panel = uiHWND.getPanel(Search.getBuilder("Lower Ribbon").build());
-  AutomationToolBar panes = panel.getToolBar("Panes");
+  Panel panel = uiHWND.getPanel(Search.getBuilder("Lower Ribbon").build());
+  ToolBar panes = panel.getToolBar("Panes");
 
   panes.getButton("Preview pane").click();
-  AutomationSplitButton split = panes.getSplitButton(Search.getBuilder(""Navigation pane").build());
+  SplitButton split = panes.getSplitButton(Search.getBuilder(""Navigation pane").build());
   split.click();
 ```

docs/grids.md

@@ -3,8 +3,8 @@
 
 ## WFP
 ```
-  AutomationDataGrid grid = window.getDataGrid(Search.getBuilder(0).build());
-  AutomationDataGridCell cell = grid.getItem(0,0);
+  DataGrid grid = window.getDataGrid(Search.getBuilder(0).build());
+  DataGridCell cell = grid.getItem(0,0);
   String itemName = item.name();
 ```
 
@@ -13,8 +13,8 @@
 The [DelphiUIAutomation](https://github.com/markhumphreysjhc/DelphiUIAutomation) project introduced some Delphi controls that implement IUIAutomation providers, allowing them to be accessed by automation. The TAutomatedStringGrid is one of these, as the base Delphi (as of XE5 at least) control does not implement the Grid or Table interfaces and so is opaque to automation. In order to get the element associated with the specific TAutomationStringGrid, then this is done in the following manner.
 
 ```
-  AutomationDataGrid grid = window.getDataGrid(Search.getBuilder(0).className("TAutomationStringGrid").build());
-  AutomationDataGridCell item = grid.getItem(0,0);
+  DataGrid grid = window.getDataGrid(Search.getBuilder(0).className("TAutomationStringGrid").build());
+  DataGridCell item = grid.getItem(0,0);
   String itemName = item.name();
 ```
 

docs/hyperlink.md

@@ -2,6 +2,6 @@
 * See [Element Discovery](element-discovery.md)
 
 ```
-  AutomationHyperlink link = window.getHyperlink(Search.getBuilder(0).build());
+  Hyperlink link = window.getHyperlink(Search.getBuilder(0).build());
   link.click();
 ```

docs/maskedit.md

@@ -7,7 +7,7 @@ There does not seem to be an equivalent WPF control.
 
 ```
   try {
-    AutomationMaskedEdit me0 = window.getMaskedEdit(Search.getBuilder("AutomatedMaskEdit1").build());
+    MaskedEdit me0 = window.getMaskedEdit(Search.getBuilder("AutomatedMaskEdit1").build());
 
     // Get the current value
     String value = me0.getValue();

docs/menus.md

@@ -8,7 +8,7 @@ The example below shows the current (as of 25/04/2016) support for 2 level menus
 
 ```
   try {
-    AutomationMenuItem exit = menu.getMenuItem("File", "Exit");
+    MenuItem exit = menu.getMenuItem("File", "Exit");
     exit.click();
   } catch (ElementNotFoundException ex) {
     ..
@@ -18,10 +18,10 @@ The example below shows the current (as of 25/04/2016) support for 2 level menus
 ### WPF Menus
 
 ```
-  AutomationMainMenu mainMenu = window.getMenu(0);
+  MainMenu mainMenu = window.getMenu(0);
 
   // Get the first menu item (i.e. "File")
-  AutomationMenuItem file = mainMenu.getItems().get(0);
+  MenuItem file = mainMenu.getItems().get(0);
   file.expand();
 
   // A short wait for the expand to work
@@ -32,7 +32,7 @@ The example below shows the current (as of 25/04/2016) support for 2 level menus
   }
 
   // Look for a specific menu item (in this case 'exit' is the 4th entry)
-  AutomationMenuItem exit = file.getItems().get(3);
+  MenuItem exit = file.getItems().get(3);
 
   exit.click();
 ```
@@ -53,6 +53,6 @@ A popup menu is just another menu, and can be accessed in the same manner. In th
   }
 
   // Should be able to get the popup menu here
-  AutomationMenu popup = window.getMenu(0)
+  Menu popup = window.getMenu(0)
   
 ```

docs/notepad.md

@@ -1,12 +1,12 @@
 Notepad is quite a simple application, and the following code is adapted from the demo program.
 
 ```
-  application = automation.launchOrAttach("notepad.exe");
+  Application application = automation.launchOrAttach("notepad.exe");
      
   // Wait for the process to start
   application.waitForInputIdle(5000);
    
-  AutomationWindow window = automation.getDesktopWindow("Untitled - Notepad");
+  Window window = automation.getDesktopWindow("Untitled - Notepad");
   String name = window.name();
   logger.info(name);
 
@@ -15,7 +15,7 @@ Notepad is quite a simple application, and the following code is adapted from th
 
   logger.info("Modal = " + window.isModal());
 
-  AutomationEditBox edit = window.getEditBox(Search.getBuilder(0).build());
+  EditBox edit = window.getEditBox(Search.getBuilder(0).build());
 
   edit.setValue("This is a test of automation");
 
@@ -25,13 +25,13 @@ Notepad is quite a simple application, and the following code is adapted from th
   this.rest();
 
   // Interact with menus
-  AutomationMainMenu menu = window.getMainMenu();
+  MainMenu menu = window.getMainMenu();
     
-  AutomationMenuItem exit = menu.getMenuItem("File", "Exit");
+  MenuItem exit = menu.getMenuItem("File", "Exit");
   exit.click();
            
-  AutomationWindow popup = window.getWindow("Notepad");
-  AutomationButton btn = popup.getButton("Don't Save");
+  Window popup = window.getWindow("Notepad");
+  Button btn = popup.getButton("Don't Save");
 
   btn.click();
 

docs/powerpoint.md

@@ -3,21 +3,21 @@ Powerpoint has a control hierarchy, and uses 'Slides' which are Custom controls.
 ![UISpy for Powerpoint](images/powerpoint.png)
 
 ```
-  AutomationWindow window = application.getWindow("This is text.pptx - PowerPoint");
+  Window window = application.getWindow("This is text.pptx - PowerPoint");
   logger.info(window.name());
 
-  AutomationPanel panelX = window.getPanel(Search.getBuilder().className("MDIClient").build());
+  Panel panelX = window.getPanel(Search.getBuilder().className("MDIClient").build());
   logger.info(panelX.name());
   logger.info(panelX.getClassName());
 
-  AutomationPanel panel1 = panelX.getPanel(Search.getBuilder("PowerPoint Edit View - [This is text.pptx]").build());
+  Panel panel1 = panelX.getPanel(Search.getBuilder("PowerPoint Edit View - [This is text.pptx]").build());
   logger.info(panelX.name());
-  AutomationPanel panel2 = panel1.getPanel(Search.getBuilder("Slide").build();
+  Panel panel2 = panel1.getPanel(Search.getBuilder("Slide").build();
   logger.info(panel2.name());
-  AutomationPowerpointSlide slide = panel2.getPowerpointSlide(Search.getBuilder("Slide 1 - This is text").build());
+  PowerpointSlide slide = panel2.getPowerpointSlide(Search.getBuilder("Slide 1 - This is text").build());
   logger.info(slide.name());
 
   // Oddly enough this is an image control, and has text in it's selection
-  AutomationImage image = slide.getImage((Search.getBuilder("Title TextBox").build());
+  Image image = slide.getImage((Search.getBuilder("Title TextBox").build());
 ```