changeset 9:9a0e4fa35c48

Prepare jemmy for adoptopenjdk build and deploy Contributed-by: patrick@reini.net Reviewed-by: shurailine
author shurailine
date Wed, 30 May 2018 11:13:18 -0700
parents 2b6fc4f103a4
children 72b4d8016653
files .hgignore SWT/JemmySWT/pom.xml SWT/JemmySWT/src/org/jemmy/swt/CTabFolderWrap.java SWT/JemmySWT/src/org/jemmy/swt/ComboWrap.java SWT/JemmySWT/src/org/jemmy/swt/CompositeWrap.java SWT/JemmySWT/src/org/jemmy/swt/ControlWrap.java SWT/JemmySWT/src/org/jemmy/swt/ItemWrap.java SWT/JemmySWT/src/org/jemmy/swt/ScrollableWrap.java SWT/JemmySWT/src/org/jemmy/swt/TabFolderWrap.java SWT/JemmySWT/src/org/jemmy/swt/TextWrap.java SWT/JemmySWT/src/org/jemmy/swt/ToolBarWrap.java SWT/JemmySWT/src/org/jemmy/swt/TreeWrap.java SWT/JemmySWT/src/org/jemmy/swt/Version.java SWT/JemmySWT/src/org/jemmy/swt/jemmy.properties SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemLookup.java SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemStringsLookup.java SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemToolTipLookup.java SWT/JemmySWT/src/org/jemmy/swt/lookup/ByStringQueueLookup.java SWT/JemmySWT/src/org/jemmy/swt/lookup/ByTextControlLookup.java SWT/JemmySWT/src/org/jemmy/swt/lookup/ByToolTipItem.java SWT/JemmySWT/src/org/jemmy/swt/lookup/CoordinateLookup.java core/JemmyAWTInput/pom.xml core/JemmyAWTInput/src/org/jemmy/image/AWTImage.java core/JemmyAWTInput/src/org/jemmy/image/AverageDistanceImageComparator.java core/JemmyAWTInput/src/org/jemmy/image/ClasspathImageLoader.java core/JemmyAWTInput/src/org/jemmy/image/NaturalImageComparator.java core/JemmyAWTInput/src/org/jemmy/image/PNGDecoder.java core/JemmyAWTInput/src/org/jemmy/image/PNGEncoder.java core/JemmyAWTInput/src/org/jemmy/image/ResizeImageComparator.java core/JemmyAWTInput/src/org/jemmy/image/RoughImageComparator.java core/JemmyAWTInput/src/org/jemmy/image/RoughImageFinder.java core/JemmyAWTInput/src/org/jemmy/image/StrictImageComparator.java core/JemmyAWTInput/src/org/jemmy/image/Utils.java core/JemmyAWTInput/src/org/jemmy/input/AWTMap.java core/JemmyAWTInput/src/org/jemmy/input/ClassReference.java core/JemmyAWTInput/src/org/jemmy/input/DragImpl.java core/JemmyAWTInput/src/org/jemmy/input/KeyboardImpl.java core/JemmyAWTInput/src/org/jemmy/input/MouseImpl.java core/JemmyAWTInput/src/org/jemmy/input/RobotDriver.java core/JemmyAWTInput/src/org/jemmy/input/Version.java core/JemmyAWTInput/src/org/jemmy/input/jemmy.properties core/JemmyAWTInput/src/org/jemmy/operators/AWTScreen.java core/JemmyBrowser/pom.xml core/JemmyBrowser/src/org/jemmy/browser/SearchDialog.java core/JemmyBrowser/src/org/jemmy/browser/jemmy.properties core/JemmyCore/pom.xml core/JemmyCore/src/org/jemmy/Dimension.java core/JemmyCore/src/org/jemmy/Point.java core/JemmyCore/src/org/jemmy/Rectangle.java core/JemmyCore/src/org/jemmy/Vector.java core/JemmyCore/src/org/jemmy/Version.java core/JemmyCore/src/org/jemmy/action/AbstractExecutor.java core/JemmyCore/src/org/jemmy/action/Action.java core/JemmyCore/src/org/jemmy/action/ActionExecutor.java core/JemmyCore/src/org/jemmy/action/GetAction.java core/JemmyCore/src/org/jemmy/control/AbstractWrapper.java core/JemmyCore/src/org/jemmy/control/As.java core/JemmyCore/src/org/jemmy/control/ControlInterfaces.java core/JemmyCore/src/org/jemmy/control/ControlType.java core/JemmyCore/src/org/jemmy/control/DefaultWrapper.java core/JemmyCore/src/org/jemmy/control/FieldProperties.java core/JemmyCore/src/org/jemmy/control/LazyWrapper.java core/JemmyCore/src/org/jemmy/control/MethodProperties.java core/JemmyCore/src/org/jemmy/control/Property.java core/JemmyCore/src/org/jemmy/control/ScreenArea.java core/JemmyCore/src/org/jemmy/control/SelectorImpl.java core/JemmyCore/src/org/jemmy/control/Wrap.java core/JemmyCore/src/org/jemmy/control/Wrapper.java core/JemmyCore/src/org/jemmy/control/WrapperException.java core/JemmyCore/src/org/jemmy/control/WrapperImpl.java core/JemmyCore/src/org/jemmy/dock/DefaultParent.java core/JemmyCore/src/org/jemmy/dock/DefaultWrapper.java core/JemmyCore/src/org/jemmy/dock/Dock.java core/JemmyCore/src/org/jemmy/dock/DockInfo.java core/JemmyCore/src/org/jemmy/dock/ObjectLookup.java core/JemmyCore/src/org/jemmy/dock/Shortcut.java core/JemmyCore/src/org/jemmy/env/Environment.java core/JemmyCore/src/org/jemmy/env/TestOut.java core/JemmyCore/src/org/jemmy/env/Timeout.java core/JemmyCore/src/org/jemmy/image/Image.java core/JemmyCore/src/org/jemmy/image/ImageCapturer.java core/JemmyCore/src/org/jemmy/image/ImageComparator.java core/JemmyCore/src/org/jemmy/image/ImageLoader.java core/JemmyCore/src/org/jemmy/image/pixel/AverageDistanceComparator.java core/JemmyCore/src/org/jemmy/image/pixel/BaseCountingRasterComparator.java core/JemmyCore/src/org/jemmy/image/pixel/ColorMappingComparator.java core/JemmyCore/src/org/jemmy/image/pixel/MaxDistanceComparator.java core/JemmyCore/src/org/jemmy/image/pixel/PNGLoader.java core/JemmyCore/src/org/jemmy/image/pixel/PNGSaver.java core/JemmyCore/src/org/jemmy/image/pixel/PixelEqualityRasterComparator.java core/JemmyCore/src/org/jemmy/image/pixel/PixelImageComparator.java core/JemmyCore/src/org/jemmy/image/pixel/Raster.java core/JemmyCore/src/org/jemmy/image/pixel/RasterComparator.java core/JemmyCore/src/org/jemmy/image/pixel/ResizeComparator.java core/JemmyCore/src/org/jemmy/image/pixel/ThresholdComparator.java core/JemmyCore/src/org/jemmy/image/pixel/WriteableRaster.java core/JemmyCore/src/org/jemmy/input/AbstractCaretOwner.java core/JemmyCore/src/org/jemmy/input/CaretImpl.java core/JemmyCore/src/org/jemmy/input/CaretText.java core/JemmyCore/src/org/jemmy/input/CharBindingMap.java core/JemmyCore/src/org/jemmy/input/ClickFocus.java core/JemmyCore/src/org/jemmy/input/DefaultCharBindingMap.java core/JemmyCore/src/org/jemmy/input/KnobDragScrollerImpl.java core/JemmyCore/src/org/jemmy/input/RegexCaretDirection.java core/JemmyCore/src/org/jemmy/input/ScrollerImpl.java core/JemmyCore/src/org/jemmy/input/SelectionText.java core/JemmyCore/src/org/jemmy/input/StringMenuOwner.java core/JemmyCore/src/org/jemmy/input/StringMenuSelectableOwner.java core/JemmyCore/src/org/jemmy/input/StringPopupSelectableOwner.java core/JemmyCore/src/org/jemmy/input/TextCaret.java core/JemmyCore/src/org/jemmy/input/TextImpl.java core/JemmyCore/src/org/jemmy/input/WindowImpl.java core/JemmyCore/src/org/jemmy/interfaces/Caret.java core/JemmyCore/src/org/jemmy/interfaces/CaretOwner.java core/JemmyCore/src/org/jemmy/interfaces/ControlInterfaceFactory.java core/JemmyCore/src/org/jemmy/interfaces/Drag.java core/JemmyCore/src/org/jemmy/interfaces/Focusable.java core/JemmyCore/src/org/jemmy/interfaces/InterfaceException.java core/JemmyCore/src/org/jemmy/interfaces/IntervalSelectable.java core/JemmyCore/src/org/jemmy/interfaces/IntervalSelector.java core/JemmyCore/src/org/jemmy/interfaces/Keyboard.java core/JemmyCore/src/org/jemmy/interfaces/Label.java core/JemmyCore/src/org/jemmy/interfaces/Menu.java core/JemmyCore/src/org/jemmy/interfaces/MenuOwner.java core/JemmyCore/src/org/jemmy/interfaces/MenuSelectable.java core/JemmyCore/src/org/jemmy/interfaces/MenuSelectableOwner.java core/JemmyCore/src/org/jemmy/interfaces/Modifier.java core/JemmyCore/src/org/jemmy/interfaces/Mouse.java core/JemmyCore/src/org/jemmy/interfaces/Parent.java core/JemmyCore/src/org/jemmy/interfaces/PopupSelectableOwner.java core/JemmyCore/src/org/jemmy/interfaces/Scroll.java core/JemmyCore/src/org/jemmy/interfaces/Selectable.java core/JemmyCore/src/org/jemmy/interfaces/Selector.java core/JemmyCore/src/org/jemmy/interfaces/Showable.java core/JemmyCore/src/org/jemmy/interfaces/Text.java core/JemmyCore/src/org/jemmy/interfaces/TextInput.java core/JemmyCore/src/org/jemmy/interfaces/TypeControlInterface.java core/JemmyCore/src/org/jemmy/interfaces/Window.java core/JemmyCore/src/org/jemmy/lookup/AbstractLookup.java core/JemmyCore/src/org/jemmy/lookup/AbstractParent.java core/JemmyCore/src/org/jemmy/lookup/Any.java core/JemmyCore/src/org/jemmy/lookup/ByStringLookup.java core/JemmyCore/src/org/jemmy/lookup/CompoundLookup.java core/JemmyCore/src/org/jemmy/lookup/ControlHierarchy.java core/JemmyCore/src/org/jemmy/lookup/ControlList.java core/JemmyCore/src/org/jemmy/lookup/CoordinateLookup.java core/JemmyCore/src/org/jemmy/lookup/HierarchyLookup.java core/JemmyCore/src/org/jemmy/lookup/Lookup.java core/JemmyCore/src/org/jemmy/lookup/LookupCriteria.java core/JemmyCore/src/org/jemmy/lookup/ParentImpl.java core/JemmyCore/src/org/jemmy/lookup/PlainLookup.java core/JemmyCore/src/org/jemmy/lookup/PropLookup.java core/JemmyCore/src/org/jemmy/lookup/RelativeCoordinateLookup.java core/JemmyCore/src/org/jemmy/operators/Screen.java core/JemmyCore/src/org/jemmy/operators/ScreenRectangle.java core/JemmyCore/src/org/jemmy/resources/StringComparePolicy.java core/JemmyCore/src/org/jemmy/timing/State.java core/JemmyCore/src/org/jemmy/timing/Waiter.java pom.xml
diffstat 159 files changed, 569 insertions(+), 2119 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed May 30 11:13:18 2018 -0700
@@ -0,0 +1,4 @@
+# global excludes
+.idea/
+target/
+/*.iml
--- a/SWT/JemmySWT/pom.xml	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/pom.xml	Wed May 30 11:13:18 2018 -0700
@@ -26,12 +26,12 @@
     -->
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jemmy.v3</groupId>
-        <artifactId>Jemmy</artifactId>
-        <version>1.0</version>
+        <groupId>org.adoptopenjdk</groupId>
+        <artifactId>jemmy</artifactId>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>JemmySWT</artifactId>
+    <artifactId>jemmy-swt</artifactId>
     <packaging>jar</packaging>
     <properties>
         <swt.version>4.3</swt.version>
@@ -81,19 +81,19 @@
             <version>${swt.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jemmy.v3</groupId>
-            <artifactId>JemmyCore</artifactId>
-            <version>1.0</version>
+            <groupId>org.adoptopenjdk</groupId>
+            <artifactId>jemmy-core</artifactId>
+            <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>org.jemmy.v3</groupId>
-            <artifactId>JemmyBrowser</artifactId>
-            <version>1.0</version>
+            <groupId>org.adoptopenjdk</groupId>
+            <artifactId>jemmy-browser</artifactId>
+            <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>org.jemmy.v3</groupId>
-            <artifactId>JemmyAWTInput</artifactId>
-            <version>1.0</version>
+            <groupId>org.adoptopenjdk</groupId>
+            <artifactId>jemmy-awt-input</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>
--- a/SWT/JemmySWT/src/org/jemmy/swt/CTabFolderWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/CTabFolderWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -42,8 +42,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(CTabFolder.class)
 public class CTabFolderWrap<T extends CTabFolder> extends ControlWrap<T> implements Selectable<String> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/ComboWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/ComboWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -44,8 +44,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(Combo.class)
 public class ComboWrap<T extends Combo> extends ControlWrap<T> implements
--- a/SWT/JemmySWT/src/org/jemmy/swt/CompositeWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/CompositeWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -43,8 +43,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(Composite.class)
 public class CompositeWrap<T extends Composite> extends ControlWrap<T> implements Parent<Control> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/ControlWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/ControlWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -45,8 +45,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(org.eclipse.swt.widgets.Control.class)
 public class ControlWrap<T extends org.eclipse.swt.widgets.Control> extends Wrap<T> implements Focusable {
--- a/SWT/JemmySWT/src/org/jemmy/swt/ItemWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/ItemWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -36,8 +36,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 public class ItemWrap<T extends Item> extends Wrap<T> {
 
--- a/SWT/JemmySWT/src/org/jemmy/swt/ScrollableWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/ScrollableWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -34,7 +34,6 @@
  * Base wrapper for scrollable controls such as Table and Tree
  *
  * @author erikgreijus
- * @param <T>
  */
 @ControlType(Scrollable.class)
 public class ScrollableWrap<T extends Scrollable> extends ControlWrap<T> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/TabFolderWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/TabFolderWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -41,8 +41,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(TabFolder.class)
 public class TabFolderWrap<T extends TabFolder> extends ControlWrap<T> implements Selectable<String> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/TextWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/TextWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -37,8 +37,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(Text.class)
 public class TextWrap<T extends Text> extends ControlWrap<T> implements Focusable {
--- a/SWT/JemmySWT/src/org/jemmy/swt/ToolBarWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/ToolBarWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -41,8 +41,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(ToolBar.class)
 public class ToolBarWrap<T extends ToolBar> extends ControlWrap<T> implements Selectable<String> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/TreeWrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/TreeWrap.java	Wed May 30 11:13:18 2018 -0700
@@ -47,8 +47,8 @@
 
 /**
  *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 @ControlType(Tree.class)
 public class TreeWrap<T extends Tree> extends ScrollableWrap<T> implements KeyboardSelectable<String>, Focusable {
--- a/SWT/JemmySWT/src/org/jemmy/swt/Version.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/Version.java	Wed May 30 11:13:18 2018 -0700
@@ -32,16 +32,10 @@
 
     public static final Version VERSION = new Version();
 
-    /**
-     *
-     */
     public Version() {
         super(Version.class.getPackage().getName());
     }
-    /**
-     *
-     * @param args
-     */
+
     public static void main(String[] args) {
         System.out.println("JemmySWT version: " + VERSION.getVersion());
     }
--- a/SWT/JemmySWT/src/org/jemmy/swt/jemmy.properties	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/jemmy.properties	Wed May 30 11:13:18 2018 -0700
@@ -1,4 +1,4 @@
-version.major=0
-version.minor=9
-version.mini=6
+version.major=1
+version.minor=0
+version.mini=0
 build=${buildnumber}
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -35,9 +35,8 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
- * @param <T>
- * @author klara, erikgreijus
+ * @author shura
+ * @author erikgreijus
  */
 public class ByItemLookup<T extends Composite> extends QueueLookup<T> {
 
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemStringsLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemStringsLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -32,9 +32,7 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
  * @author erikgreijus
- * @param <T>
  */
 public class ByItemStringsLookup<T extends Item> extends QueueLookup<T> {
 
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemToolTipLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByItemToolTipLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -34,8 +34,6 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
- * @param <T>
  * @author klara
  */
 public class ByItemToolTipLookup<T extends Composite> extends QueueLookup<T> {
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByStringQueueLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByStringQueueLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -27,8 +27,6 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
- * @param <T>
  * @author klara
  */
 public abstract class ByStringQueueLookup<T> extends QueueLookup<T> {
@@ -36,36 +34,17 @@
     private final StringComparePolicy policy;
     private final String text;
 
-    /**
-     *
-     * @param text
-     */
     protected ByStringQueueLookup(String text) {
         this(text, StringComparePolicy.SUBSTRING);
     }
 
-    /**
-     *
-     * @param text
-     * @param policy
-     */
     protected ByStringQueueLookup(String text, StringComparePolicy policy) {
         this.policy = policy;
         this.text = text;
     }
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     public abstract String getText(T control);
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     public boolean doCheck(T control) {
         return policy.compare(text, getText(control));
     }
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByTextControlLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByTextControlLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -30,9 +30,8 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
- * @author klara, erikgreijus
- * @param <T>
+ * @author klara
+ * @author erikgreijus
  */
 public class ByTextControlLookup<T extends Control> extends ByStringQueueLookup<T> {
 
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByToolTipItem.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/ByToolTipItem.java	Wed May 30 11:13:18 2018 -0700
@@ -30,9 +30,8 @@
 import org.jemmy.resources.StringComparePolicy;
 
 /**
- *
- * @author klara, erikgreijus
- * @param <T>
+ * @author klara
+ * @author erikgreijus
  */
 public class ByToolTipItem<T extends Item> extends ByStringQueueLookup<T> {
 
--- a/SWT/JemmySWT/src/org/jemmy/swt/lookup/CoordinateLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/SWT/JemmySWT/src/org/jemmy/swt/lookup/CoordinateLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -31,9 +31,8 @@
 import org.jemmy.swt.ControlWrap;
 
 /**
- *
- * @author shura, erikgreijus
- * @param <T>
+ * @author shura
+ * @author erikgreijus
  */
 public class CoordinateLookup<T extends Control> extends RelativeCoordinateLookup<T> {
 
--- a/core/JemmyAWTInput/pom.xml	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/pom.xml	Wed May 30 11:13:18 2018 -0700
@@ -26,12 +26,12 @@
     -->
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jemmy.v3</groupId>
-        <artifactId>Jemmy</artifactId>
-        <version>1.0</version>
+        <groupId>org.adoptopenjdk</groupId>
+        <artifactId>jemmy</artifactId>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>JemmyAWTInput</artifactId>
+    <artifactId>jemmy-awt-input</artifactId>
     <packaging>jar</packaging>
     <properties>
         <version.file>org/jemmy/input/jemmy.properties</version.file>
@@ -39,9 +39,9 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.jemmy.v3</groupId>
-            <artifactId>JemmyCore</artifactId>
-            <version>1.0</version>
+            <groupId>org.adoptopenjdk</groupId>
+            <artifactId>jemmy-core</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
     <build>
--- a/core/JemmyAWTInput/src/org/jemmy/image/AWTImage.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/AWTImage.java	Wed May 30 11:13:18 2018 -0700
@@ -36,14 +36,10 @@
 
 
 /**
- *
  * @author shura
  */
 public class AWTImage implements Image, WriteableRaster {
 
-    /**
-     *
-     */
     public static final String OUTPUT = AWTImage.class.getName() + ".OUTPUT";
     public static final String PNG_FILE = ".png";
 
@@ -89,7 +85,7 @@
      * @see Wrap#waitImage(org.jemmy.image.Image, java.lang.String,
      * java.lang.String)
      * @see ImageComparator
-     * @param comparator
+     * @param comparator todo document
      */
     public static void setComparator(ImageComparator comparator) {
         Environment.getEnvironment().setProperty(ImageComparator.class, comparator);
@@ -103,11 +99,6 @@
 
     private BufferedImage image;
 
-    /**
-     * Creates an instance
-     *
-     * @param img
-     */
     public AWTImage(BufferedImage img) {
         this.image = img;
     }
@@ -120,7 +111,7 @@
      * Compares using current comparator.
      *
      * @see AWTImage#getComparator()
-     * @param img
+     * @param img todo document
      * @return diff image.
      */
     public Image compareTo(Image img) {
--- a/core/JemmyAWTInput/src/org/jemmy/image/AverageDistanceImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/AverageDistanceImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -42,7 +42,7 @@
     /**
      * Creates comparator with the default sensitivity value = 0.02
      * (around 5 in 0-255 color component value).
-     * @see #NaturalImageComparator(double)
+     * @see #AverageDistanceImageComparator(double)
      */
     public AverageDistanceImageComparator() {
         this(0.02);
--- a/core/JemmyAWTInput/src/org/jemmy/image/ClasspathImageLoader.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/ClasspathImageLoader.java	Wed May 30 11:13:18 2018 -0700
@@ -31,7 +31,8 @@
 /**
  * ImageLoader implementation which is able to load images through
  * a given classloader.
- * @author mrkam, shura
+ * @author mrkam
+ * @author shura
  */
 public class ClasspathImageLoader implements ImageLoader {
 
@@ -67,10 +68,6 @@
         this.classLoader = classLoader;
     }
 
-    /**
-     * TODO: Add JavaDoc
-     * @param rootPackage
-     */
     public void setRootPackage(Package rootPackage) {
         if (rootPackage != null) {
             this.packagePrefix = rootPackage.getName().replace('.', '/') + "/";
--- a/core/JemmyAWTInput/src/org/jemmy/image/NaturalImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/NaturalImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -55,9 +55,7 @@
      * Meaningful values are between 0 and approx 1.733. 0 means colors should
      * be equal to pass the comparison, 1.733 (which is more than square root
      * of 3) means that comparison will be passed even if the colors are
-     * completely different. You could also use {@linkplain
-     * #findSensitivity(java.awt.image.BufferedImage, java.awt.image.BufferedImage)
-     * findSensitivity()} method to obtain necessary sensitivity value.
+     * completely different.
      */
     public NaturalImageComparator(double sensitivity) {
         super(new MaxDistanceComparator(sensitivity));
--- a/core/JemmyAWTInput/src/org/jemmy/image/PNGDecoder.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/PNGDecoder.java	Wed May 30 11:13:18 2018 -0700
@@ -95,7 +95,7 @@
     /**
      * Decodes image from an input stream passed into constructor.
      * @return a BufferedImage object
-     * @throws IOException
+     * @throws IOException todo document
      */
     public BufferedImage decode() throws IOException {
         return decode(true);
@@ -105,7 +105,7 @@
      * Decodes image from an input stream passed into constructor.
      * @return a BufferedImage object
      * @param closeStream requests method to close the stream after the image is read
-     * @throws IOException
+     * @throws IOException todo document
      */
     public BufferedImage decode(boolean closeStream) throws IOException {
 
--- a/core/JemmyAWTInput/src/org/jemmy/image/PNGEncoder.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/PNGEncoder.java	Wed May 30 11:13:18 2018 -0700
@@ -44,12 +44,14 @@
 import java.util.zip.DeflaterOutputStream;
 import org.jemmy.control.ScreenArea;
 
-/** This class allows to encode BufferedImage into B/W, greyscale or true color PNG
+/**
+ * This class allows to encode BufferedImage into B/W, greyscale or true color PNG
  * image format with maximum compression.<br>
  * It also provides complete functionality for capturing full screen, part of
  * screen or single component, encoding and saving captured image info PNG file.
  * @author Adam Sotona
- * @version 1.0 */
+ * @version 1.0
+ */
 public class PNGEncoder extends Object {
 
     /** black and white image mode. */
@@ -63,11 +65,6 @@
     CRC32 crc;
     byte mode;
 
-    /**
-     *
-     * @param file
-     * @throws java.io.FileNotFoundException
-     */
     public PNGEncoder(File file) throws FileNotFoundException {
         this(new FileOutputStream(file));
     }
--- a/core/JemmyAWTInput/src/org/jemmy/image/ResizeImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/ResizeImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -37,31 +37,40 @@
  * Comparator that makes image sizes equal to compare them with other comparator
  * most of them work only for the images with equal dimensions.
  *
- * It is controlled by three parameters: <li>Resize Mode - defines way of
- * resizing images that are being compared. One of the following constants: <ul> <li>{@linkplain ResizeMode#NO_RESIZE NO_RESIZE},</li> <li>{@linkplain ResizeMode#PROPORTIONAL_RESIZE PROPORTIONAL_RESIZE},</li> <li>{@linkplain ResizeMode#ARBITRARY_RESIZE ARBITRARY_RESIZE}.</li></ul>
- * Default value is {@linkplain ResizeMode#PROPORTIONAL_RESIZE}.</li> <li>Resize
- * Hint - defines the way of images scaling that is specified when {@linkplain java.awt.Image#getScaledInstance(int, int, int)
- * Image.getScaledInstance()} method is invoked. One of the Image.SCALE_XXX is
- * expected. Default value is
- * {@linkplain java.awt.Image#SCALE_DEFAULT SCALE_DEFAULT}.</li> <li>Proportion
- * Distortion Threshold - defines maximum proportion distortion that is used in {@linkplain ResizeMode#PROPORTIONAL_RESIZE
- * PROPORTIONAL_RESIZE} mode to deal with cases when rounding and other problems
- * could cause sizes to be not ideally proportional.<p/>
+ * It is controlled by three parameters:
+ * <p>
+ * Resize Mode - defines way of resizing images that are being compared. One of the following constants:
+ * <ul>
+*     <li>{@linkplain ResizeMode#NO_RESIZE NO_RESIZE},</li>
+*     <li>{@linkplain ResizeMode#PROPORTIONAL_RESIZE PROPORTIONAL_RESIZE},</li>
+*     <li>{@linkplain ResizeMode#ARBITRARY_RESIZE ARBITRARY_RESIZE}.</li>
+ * </ul>
+ *
+ * Default value is {@linkplain ResizeMode#PROPORTIONAL_RESIZE}.
+ * <ul>
+ * <li>Resize Hint - defines the way of images scaling that is specified when
+ * {@linkplain java.awt.Image#getScaledInstance(int, int, int) Image.getScaledInstance()} method is invoked.
+ * One of the Image.SCALE_XXX is expected. Default value is {@linkplain java.awt.Image#SCALE_DEFAULT SCALE_DEFAULT}.</li>
+ * <li>Proportion Distortion Threshold - defines maximum proportion distortion that is used in
+ * {@linkplain ResizeMode#PROPORTIONAL_RESIZE PROPORTIONAL_RESIZE} mode to deal with cases when rounding and other
+ * problems could cause sizes to be not ideally proportional.
+ * <p>
  * Threshold value is applied in the following way: {@code Math.abs(image.getSize() * scale
  * - size) / image.getSize() > PROPORTION_DISTORTION_THRESHOLD}, where {@code image.getSize()}
  * is both image dimensions and {@code size} is target width and height (which
  * is defined as mininum of sizes of two images) and scale is the scale factor
  * that scales the particular image to fit the width and height.
- * <p/>
+ * <p>
  * Default value is 0.02 so as much as 2% of width/height could differ (around 5
  * in 0-255 color component values).</li>
+ * </ul>
  *
  * @author mrkam
  */
 public class ResizeImageComparator extends ResizeComparator {
 
     /**
-     * Indentifies output where resize details are printed. Output is disabled
+     * Identifies output where resize details are printed. Output is disabled
      * by default.
      *
      * @see Environment#getOutput(java.lang.String)
@@ -79,12 +88,8 @@
     /**
      * Resize Modes
      *
-     * @see
-     * #ResizeImageComparator(org.jemmy.image.ResizeImageComparator.ResizeMode,
-     * org.jemmy.image.ImageComparator)
-     * @see
-     * #ResizeImageComparator(org.jemmy.image.ResizeImageComparator.ResizeMode,
-     * int, double, org.jemmy.image.ImageComparator)
+     * @see ResizeImageComparator#ResizeImageComparator(ResizeMode, ImageComparator)
+     * @see ResizeImageComparator#ResizeImageComparator(ResizeMode, double, int, ImageComparator)
      */
     public static enum ResizeMode {
 
@@ -98,9 +103,7 @@
          * If images have different proportions no resize is done and original
          * images are compared.
          *
-         * @see
-         * #ResizeImageComparator(org.jemmy.image.ResizeImageComparator.ResizeMode,
-         * int, double, org.jemmy.image.ImageComparator)
+         * @see ResizeImageComparator#ResizeImageComparator(ResizeMode, ImageComparator)
          */
         PROPORTIONAL_RESIZE,
         /**
@@ -111,9 +114,12 @@
     }
 
     /**
-     * Creates ResizeImageComparator with default resize settings: <li>resize
-     * mode: {@linkplain ResizeMode#PROPORTIONAL_RESIZE ResizeMode.PROPORTIONAL_RESIZE}.</li>
-     * <li>proportion distortion threshold: 0.02.</li> <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * Creates ResizeImageComparator with default resize settings:
+     * <ul>
+     * <li>resize mode: {@linkplain ResizeMode#PROPORTIONAL_RESIZE ResizeMode.PROPORTIONAL_RESIZE}.</li>
+     * <li>proportion distortion threshold: 0.02.</li>
+     * <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * </ul>
      *
      * @param subComparator comparator to compare images after resize.
      * @see java.awt.Image#getScaledInstance(int, int, int)
@@ -129,8 +135,11 @@
 
     /**
      * Creates ResizeImageComparator with the specified resize mode and default
-     * settings for other parameters: <li>proportion distortion threshold:
-     * 0.02.</li> <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * settings for other parameters:
+     * <ul>
+     * <li>proportion distortion threshold: 0.02.</li>
+     * <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * </ul>
      *
      * @param resizeMode resize mode for this comparator.
      * @param subComparator comparator to compare images after resize.
@@ -144,9 +153,12 @@
     }
 
     /**
-     * Creates ResizeImageComparator with the following settings: <li>resize
-     * mode: {@linkplain ResizeMode#PROPORTIONAL_RESIZE ResizeMode.PROPORTIONAL_RESIZE}.</li>
-     * <li>specified proportion distortion threshold.</li> <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * Creates ResizeImageComparator with the following settings:
+     * <ul>
+     * <li>resize mode: {@linkplain ResizeMode#PROPORTIONAL_RESIZE ResizeMode.PROPORTIONAL_RESIZE}.</li>
+     * <li>specified proportion distortion threshold.</li>
+     * <li>resize hint: {@linkplain java.awt.Image#SCALE_DEFAULT Image.SCALE_DEFAULT}.</li>
+     * </ul>
      *
      * @param propDistThreshold proportion distortion threshold.
      * @param subComparator comparator to compare images after resize.
--- a/core/JemmyAWTInput/src/org/jemmy/image/RoughImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/RoughImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -29,7 +29,8 @@
 /**
  * Compares two images roughly (i.e. not all of the pixel colors should match).
  *
- * @author Alexandre Iline (alexandre.iline@sun.com), KAM <mrkam@mail.ru>
+ * @author shura
+ * @author mrkam
  */
 public class RoughImageComparator extends BufferedImageComparator {
 
--- a/core/JemmyAWTInput/src/org/jemmy/image/RoughImageFinder.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/RoughImageFinder.java	Wed May 30 11:13:18 2018 -0700
@@ -30,7 +30,7 @@
 /**
  * Performs "rough" image search.
  *
- * @author Alexandre Iline (alexandre.iline@sun.com)
+ * @author shura
  */
 public class RoughImageFinder implements ImageFinder {
     double roughness = .0;
@@ -60,7 +60,7 @@
      * @param image an image to search.
      * @param index an ordinal image location index.
      * @return Point where number of unmatching pixels less or equal to
-     * <code>image1.getWidth() * image1.getHeight() * roughness<code>
+     * <code>image1.getWidth() * image1.getHeight() * roughness</code>
      */
     public Point findImage(BufferedImage image, int index) {
         int smallWidth  = image.getWidth();
--- a/core/JemmyAWTInput/src/org/jemmy/image/StrictImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/StrictImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -29,7 +29,8 @@
 /**
  * Compares two images strictly (i.e. all the pixel colors should match).
  *
- * @author Alexandre Iline (alexandre.iline@sun.com), KAM <mrkam@mail.ru>
+ * @author shura
+ * @author mrkam
  */
 public class StrictImageComparator extends BufferedImageComparator {
 
--- a/core/JemmyAWTInput/src/org/jemmy/image/Utils.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/image/Utils.java	Wed May 30 11:13:18 2018 -0700
@@ -32,60 +32,30 @@
 
 /**
  *
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public class Utils {
 
-    /**
-     *
-     * @param r
-     * @return java.awt.Rectangle
-     */
     public static java.awt.Rectangle convert(Rectangle r) {
         return new java.awt.Rectangle(r.x, r.y, r.width, r.height);
     }
 
-    /**
-     *
-     * @param r
-     * @return org.jemmy.Rectangle
-     */
     public static Rectangle convert(java.awt.Rectangle r) {
         return new Rectangle(r.x, r.y, r.width, r.height);
     }
 
-    /**
-     *
-     * @param p
-     * @return java.awt.Point
-     */
     public static java.awt.Point convert(Point p) {
         return new java.awt.Point(p.x, p.y);
     }
 
-    /**
-     *
-     * @param p
-     * @return org.jemmy.Point
-     */
     public static Point convert(java.awt.Point p) {
         return new Point(p.x, p.y);
     }
 
-    /**
-     *
-     * @param d
-     * @return java.awt.Dimension
-     */
     public static java.awt.Dimension convert(Dimension d) {
         return new java.awt.Dimension(d.width, d.height);
     }
 
-    /**
-     *
-     * @param d
-     * @return org.jemmy.Dimension
-     */
     public static Dimension convert(java.awt.Dimension d) {
         return new Dimension(d.width, d.height);
     }
--- a/core/JemmyAWTInput/src/org/jemmy/input/AWTMap.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/AWTMap.java	Wed May 30 11:13:18 2018 -0700
@@ -43,7 +43,7 @@
 
 /**
  * Converts
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public class AWTMap {
 
@@ -129,7 +129,7 @@
 
     /**
      * TODO Provide javadoc
-     * @param button
+     * @param button todo document
      * @return One of InputEvent.VK_* constants
      * @see InputEvent
      */
@@ -141,11 +141,6 @@
         }
     }
 
-    /**
-     * TODO Provide javadoc
-     * @param modifiers
-     * @return
-     */
     public int convert(Modifier... modifiers) {
         int result = 0;
         for (Modifier modifier : modifiers) {
@@ -158,11 +153,6 @@
         return result;
     }
 
-    /**
-     * TODO Provide javadoc
-     * @param button
-     * @return
-     */
     public int convert(MouseButton button) {
         try {
             return button2int.get(button);
@@ -171,11 +161,6 @@
         }
     }
 
-    /**
-     * TODO Provide javadoc
-     * @param key
-     * @return
-     */
     public KeyboardButton convertKeyboardButton(int key) {
         KeyboardButton res = int2key.get(key);
         if (res == null) {
@@ -184,11 +169,6 @@
         return res;
     }
 
-    /**
-     * TODO Provide javadoc
-     * @param modifiers
-     * @return
-     */
     public Modifier[] convertModifiers(int modifiers) {
         List<Modifier> result = new ArrayList<Modifier>();
         for (int key : int2modifier.keySet()) {
@@ -203,11 +183,6 @@
         return result.toArray(new Modifier[result.size()]);
     }
 
-    /**
-     * TODO Provide javadoc
-     * @param button
-     * @return
-     */
     public MouseButton convertMouseButton(int button) {
         MouseButton res = int2button.get(button);
         if (res == null) {
--- a/core/JemmyAWTInput/src/org/jemmy/input/ClassReference.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/ClassReference.java	Wed May 30 11:13:18 2018 -0700
@@ -55,7 +55,7 @@
      * to access static methods and fields only.
      *
      * @param className name of class
-     * @exception ClassNotFoundException
+     * @throws ClassNotFoundException todo document
      */
     public ClassReference(String className)
             throws ClassNotFoundException {
@@ -69,8 +69,8 @@
      * with a zero-length <code>java.lang.String</code> array
      * as a parameter.
      *
-     * @exception NoSuchMethodException
-     * @exception InvocationTargetException
+     * @throws NoSuchMethodException when the method cannot be found.
+     * @throws InvocationTargetException when the invoked method throws an exception.
      */
     public void startApplication()
             throws InvocationTargetException, NoSuchMethodException {
@@ -83,8 +83,8 @@
      *
      * @param params The <code>java.lang.String</code> array to pass
      * to <code>main(java.lang.String[])</code>.
-     * @exception NoSuchMethodException
-     * @exception InvocationTargetException
+     * @throws NoSuchMethodException when the method cannot be found.
+     * @throws InvocationTargetException when the invoked method throws an exception.
      */
     public void startApplication(String[] params)
             throws InvocationTargetException, NoSuchMethodException {
@@ -111,8 +111,8 @@
      * @param method_name Name of method.
      * @param params Method parameters.
      * @param params_classes Method parameters types.
-     * @return the return value from an invocation of the Method.<BR>
-     * If <code>method_name</code> method is void, <code>null</code> is returned.<BR>
+     * @return the return value from an invocation of the Method.<br>
+     * If <code>method_name</code> method is void, <code>null</code> is returned.<br>
      * If <code>method_name</code> method returns a primitive type, then
      * return wrapper class instance.
      * @throws InvocationTargetException when the invoked method throws an exception.
--- a/core/JemmyAWTInput/src/org/jemmy/input/DragImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/DragImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -40,14 +40,10 @@
 
 
 /**
- *
  * @author shura
  */
 public class DragImpl implements Drag {
 
-    /**
-     *
-     */
     public static final int DND_POINTS = 10;
 
     static {
@@ -58,60 +54,26 @@
 
     private Wrap<?> source;
 
-    /**
-     *
-     * @param source
-     */
     public DragImpl(Wrap<?> source) {
         this.source = source;
     }
 
-    /**
-     *
-     * @param targetPoint
-     */
     public void dnd(Point targetPoint) {
         dnd(source, targetPoint);
     }
 
-    /**
-     *
-     * @param target
-     * @param targetPoint
-     */
     public void dnd(Wrap target, Point targetPoint) {
         dnd(source.getClickPoint(), target, targetPoint);
     }
 
-    /**
-     *
-     * @param point
-     * @param target
-     * @param targetPoint
-     */
     public void dnd(Point point, Wrap target, Point targetPoint) {
         dnd(point, target, targetPoint, MouseButtons.BUTTON1);
     }
 
-    /**
-     *
-     * @param point
-     * @param target
-     * @param targetPoint
-     * @param button
-     */
     public void dnd(Point point, Wrap target, Point targetPoint, MouseButton button) {
         dnd(point, target, targetPoint, button, new Modifier[]{});
     }
 
-    /**
-     *
-     * @param point
-     * @param target
-     * @param targetPoint
-     * @param button
-     * @param modifiers
-     */
     public void dnd(Point pointParam, final Wrap target, final Point targetPoint, final MouseButton button, final Modifier... modifiers) {
         final Point point = pointParam == null ? source.getClickPoint() : pointParam;
         source.getEnvironment().getExecutor().execute(target.getEnvironment(), false, new Action() {
--- a/core/JemmyAWTInput/src/org/jemmy/input/KeyboardImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/KeyboardImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -46,10 +46,7 @@
     Wrap<?> target;
     RobotDriver robotDriver;
     private boolean detached;
-    /**
-     * Constructs a KeyRobotDriver object.
-     * @param target
-     */
+
     public KeyboardImpl(Wrap<?> target) {
         //TODO: super(target.getEnvironment().getTimeout(RobotDriver.ROBOT_DELAY_TIMEOUT_NAME));
         robotDriver = new RobotDriver(target.getEnvironment());
@@ -72,20 +69,10 @@
         }
     }
 
-    /**
-     *
-     * @return Environment
-     */
     public Environment getEnvironment() {
         return env;
     }
 
-    /**
-     *
-     * @param kbdButton
-     * @param modifiers
-     * @param pushTime
-     */
     public void pushKey(final KeyboardButton kbdButton, final Modifier modifiers[], final Timeout pushTime) {
         runAction(new Action() {
             public void run(Object... parameters) {
@@ -101,11 +88,6 @@
         });
     }
 
-    /**
-     *
-     * @param keyChar
-     * @param pushTime
-     */
     @Override
     public void typeChar(char keyChar, Timeout pushTime) {
         pushKey(pushTime, map.getCharKey(keyChar), map.getCharModifiers(keyChar));
@@ -151,47 +133,28 @@
         });
     }
 
-    /**
-     *
-     * @param kbdButton
-     */
     @Override
     public void pressKey(KeyboardButton kbdButton) {
         pressKey(kbdButton, new Modifier[]{});
     }
 
-    /**
-     *
-     * @param kbdButton
-     */
+
     @Override
     public void releaseKey(KeyboardButton kbdButton) {
         releaseKey(kbdButton, new Modifier[]{});
     }
 
-    /**
-     *
-     * @param kbdButton
-     * @param modifiers
-     */
+
     @Override
     public void pushKey(KeyboardButton kbdButton, Modifier... modifiers) {
         pushKey(kbdButton, modifiers, getEnvironment().getTimeout(PUSH.getName()));
     }
 
-    /**
-     *
-     * @param kbdButton
-     */
     @Override
     public void pushKey(KeyboardButton kbdButton) {
         pushKey(kbdButton, new Modifier[]{});
     }
 
-    /**
-     *
-     * @param keyChar
-     */
     @Override
     public void typeChar(char keyChar) {
         typeChar(keyChar, getEnvironment().getTimeout(PUSH.getName()));
--- a/core/JemmyAWTInput/src/org/jemmy/input/MouseImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/MouseImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -52,10 +52,6 @@
         }
     }
 
-    /**
-     *
-     * @param target
-     */
     public MouseImpl(Wrap<?> target) {
         this.target = target;
         this.robotDriver = new RobotDriver(new Timeout("", 10));
@@ -74,28 +70,16 @@
         }
     }
 
-    /**
-     *
-     */
     @Override
     public void press() {
         press(MouseButtons.BUTTON1);
     }
 
-    /**
-     *
-     * @param button
-     */
     @Override
     public void press(MouseButton button) {
         press(button, new Modifier[]{});
     }
 
-     /**
-     *
-     * @param button
-     * @param modifiers
-     */
     @Override
     public void press(final MouseButton button, final Modifier... modifiers) {
         runAction(new Action() {
@@ -111,27 +95,15 @@
         });
     }
 
-    /**
-     *
-     */
     public void release() {
         release(MouseButtons.BUTTON1);
     }
 
-    /**
-     *
-     * @param button
-     */
     @Override
     public void release(MouseButton button) {
         release(button, new Modifier[]{});
     }
 
-    /**
-     *
-     * @param button
-     * @param modifiers
-     */
     @Override
     public void release(final MouseButton button, final Modifier... modifiers) {
         runAction(new Action() {
@@ -147,17 +119,10 @@
         });
     }
 
-    /**
-     *
-     */
     public void move() {
         move(target.getClickPoint());
     }
 
-    /**
-     *
-     * @param p
-     */
     public void move(final Point p) {
         runAction(new Action() {
 
@@ -172,24 +137,16 @@
         });
     }
 
-    /**
-     *
-     */
     public void click() {
         this.click(1);
     }
 
-    /**
-     *
-     * @param count
-     */
     public void click(int count) {
         this.click(count, null);
     }
 
     /**
-     *
-     * @param count
+     * @param count todo document
      * @param p Point to click, if null {@linkplain Wrap#getClickPoint()
      * Wrap.getClickPoint()} method is invoked to get the point to click.
      */
@@ -199,10 +156,10 @@
 
     /**
      *
-     * @param count
+     * @param count todo document
      * @param p Point to click, if null {@linkplain Wrap#getClickPoint()
      * Wrap.getClickPoint()} method is invoked to get the point to click.
-     * @param button
+     * @param button todo document
      */
     @Override
     public void click(int count, Point p, MouseButton button) {
@@ -211,11 +168,11 @@
 
     /**
      *
-     * @param count
+     * @param count todo document
      * @param p Point to click, if null {@linkplain Wrap#getClickPoint()
      * Wrap.getClickPoint()} method is invoked to get the point to click.
-     * @param button
-     * @param modifiers
+     * @param button todo document
+     * @param modifiers todo document
      */
     @Override
     public void click(final int count, final Point p, final MouseButton button, final Modifier... modifiers) {
--- a/core/JemmyAWTInput/src/org/jemmy/input/RobotDriver.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/RobotDriver.java	Wed May 30 11:13:18 2018 -0700
@@ -44,7 +44,9 @@
 
 
 /**
- * @author Alexandre Iline(alexandre.iline@sun.com), KAM <mrkam@mail.ru>
+ * @author shura
+ * @author mrkam
+ *
  */
 public class RobotDriver {
 
@@ -58,7 +60,7 @@
                 new Timeout(ROBOT_DELAY_TIMEOUT_NAME, 10));
         Environment.getEnvironment().setPropertyIfNotSet(
                 AWTRobotInputFactory.ROBOT_MOUSE_SMOOTHNESS_PROPERTY,
-                new Integer(Integer.MAX_VALUE).toString());
+                Integer.toString(Integer.MAX_VALUE));
         smoothness =  Integer.parseInt(
                 (String)Environment.getEnvironment().getProperty(
                 AWTRobotInputFactory.ROBOT_MOUSE_SMOOTHNESS_PROPERTY));
@@ -208,9 +210,9 @@
 
     /**
      * @deprecated Implementation doesn't seem to be correct as it ignores mouseButton and modifiers
-     * @param point
+     * @param point todo document
      * @param mouseButton One of MouseEvent.BUTTON*_MASK
-     * @param modifiers
+     * @param modifiers todo document
      */
     public void dragMouse(Point point, int mouseButton, int modifiers) {
         moveMouse(point);
@@ -263,9 +265,9 @@
 
     /**
      * Turns the wheel.
-     * @param p
+     * @param p todo document
      * @param amount Either positive or negative
-     * @param modifiers
+     * @param modifiers a combination of <code>InputEvent.*_MASK</code> fields.
      */
     public void turnWheel(Point p, int amount, Modifier... modifiers) {
         pressModifiers(modifiers);
--- a/core/JemmyAWTInput/src/org/jemmy/input/Version.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/Version.java	Wed May 30 11:13:18 2018 -0700
@@ -32,16 +32,10 @@
 
     public static final Version VERSION = new Version();
 
-    /**
-     *
-     */
     public Version() {
         super(Version.class.getPackage().getName());
     }
-    /**
-     *
-     * @param args
-     */
+
     public static void main(String[] args) {
         System.out.println("JemmyAWTInput version: " + VERSION.getVersion());
     }
--- a/core/JemmyAWTInput/src/org/jemmy/input/jemmy.properties	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/input/jemmy.properties	Wed May 30 11:13:18 2018 -0700
@@ -1,4 +1,4 @@
-version.major=0
-version.minor=9
-version.mini=5
+version.major=1
+version.minor=0
+version.mini=0
 build=${buildnumber}
--- a/core/JemmyAWTInput/src/org/jemmy/operators/AWTScreen.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyAWTInput/src/org/jemmy/operators/AWTScreen.java	Wed May 30 11:13:18 2018 -0700
@@ -30,22 +30,14 @@
 import org.jemmy.env.Environment;
 
 /**
- *
  * @author shura
  */
 public class AWTScreen extends Screen {
 
-    /**
-     *
-     */
     public AWTScreen() {
         this(Environment.getEnvironment());
     }
 
-    /**
-     *
-     * @param env
-     */
     public AWTScreen(Environment env) {
         super(env);
     }
--- a/core/JemmyBrowser/pom.xml	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyBrowser/pom.xml	Wed May 30 11:13:18 2018 -0700
@@ -26,12 +26,12 @@
     -->
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jemmy.v3</groupId>
-        <artifactId>Jemmy</artifactId>
-        <version>1.0</version>
+        <groupId>org.adoptopenjdk</groupId>
+        <artifactId>jemmy</artifactId>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>JemmyBrowser</artifactId>
+    <artifactId>jemmy-browser</artifactId>
     <packaging>jar</packaging>
     <properties>
         <version.file>org/jemmy/browser/jemmy.properties</version.file>
@@ -39,9 +39,9 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>org.jemmy.v3</groupId>
-            <artifactId>JemmyCore</artifactId>
-            <version>1.0</version>
+            <groupId>org.adoptopenjdk</groupId>
+            <artifactId>jemmy-core</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>
--- a/core/JemmyBrowser/src/org/jemmy/browser/SearchDialog.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyBrowser/src/org/jemmy/browser/SearchDialog.java	Wed May 30 11:13:18 2018 -0700
@@ -34,7 +34,6 @@
 public class SearchDialog extends javax.swing.JDialog {
     private boolean doSearch;
 
-    /** Creates new form SearchDialog */
     public SearchDialog(java.awt.Frame parent) {
         super(parent, true);
         initComponents();
--- a/core/JemmyBrowser/src/org/jemmy/browser/jemmy.properties	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyBrowser/src/org/jemmy/browser/jemmy.properties	Wed May 30 11:13:18 2018 -0700
@@ -1,4 +1,4 @@
-version.major=0
-version.minor=9
-version.mini=5
+version.major=1
+version.minor=0
+version.mini=0
 build=${buildnumber} 
--- a/core/JemmyCore/pom.xml	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/pom.xml	Wed May 30 11:13:18 2018 -0700
@@ -26,11 +26,11 @@
  questions.
     -->
     <parent>
-        <groupId>org.jemmy.v3</groupId>
-        <artifactId>Jemmy</artifactId>
-        <version>1.0</version>
+        <groupId>org.adoptopenjdk</groupId>
+        <artifactId>jemmy</artifactId>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>JemmyCore</artifactId>
+    <artifactId>jemmy-core</artifactId>
     <packaging>jar</packaging>
 </project>
--- a/core/JemmyCore/src/org/jemmy/Dimension.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/Dimension.java	Wed May 30 11:13:18 2018 -0700
@@ -30,7 +30,7 @@
 
 /**
  * Replacement for java.awt.Dimension
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public class Dimension implements Serializable {
 
@@ -104,7 +104,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     public double getWidth() {
         return width;
@@ -112,7 +111,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     public double getHeight() {
         return height;
@@ -164,11 +162,6 @@
         this.height = height;
     }
 
-    /**
-     * Checks whether two dimension objects have equal values.
-     * @param obj
-     * @return
-     */
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Dimension) {
--- a/core/JemmyCore/src/org/jemmy/Point.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/Point.java	Wed May 30 11:13:18 2018 -0700
@@ -31,7 +31,7 @@
 
 /**
  * Replacement for java.awt.Point
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public class Point implements Serializable{
     /**
@@ -101,7 +101,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     public int getX() {
         return x;
@@ -109,7 +108,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     public int getY() {
         return y;
@@ -128,7 +126,7 @@
     /**
      * Sets the location of the point to the specified location.
      * @param       p  a point, the new location for this point
-     * @return
+     * @return      self
      * @see         org.jemmy.Point#getLocation
      */
     public Point setLocation(Point p) {
@@ -142,7 +140,7 @@
      * Its behavior is identical with <code>move(int,&nbsp;int)</code>.
      * @param       x the X coordinate of the new location
      * @param       y the Y coordinate of the new location
-     * @return self
+     * @return      self
      * @see         org.jemmy.Point#getLocation
      * @see         org.jemmy.Point#move(int, int)
      */
@@ -203,8 +201,9 @@
     }
 
     /**
+     * Translates the current point according to the given vector.
      *
-     * @param v
+     * @param v vector by which to translate the point
      * @return self
      */
     public Point translate(Vector v) {
@@ -233,7 +232,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     @Override
     public int hashCode() {
--- a/core/JemmyCore/src/org/jemmy/Rectangle.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/Rectangle.java	Wed May 30 11:13:18 2018 -0700
@@ -31,7 +31,7 @@
 
 /**
  * Replacement for java.awt.Rectangle
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public class Rectangle implements Serializable {
 
@@ -898,7 +898,6 @@
 
     /**
      * {@inheritDoc}
-     * @return
      */
     public boolean isEmpty() {
         return (width <= 0) || (height <= 0);
@@ -930,7 +929,6 @@
 
     /**
      * {@inheritDoc }
-     * @return
      */
     @Override
     public int hashCode() {
--- a/core/JemmyCore/src/org/jemmy/Vector.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/Vector.java	Wed May 30 11:13:18 2018 -0700
@@ -34,55 +34,28 @@
     private double x;
     private double y;
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
     public Vector(double x, double y) {
         this.x = x;
         this.y = y;
     }
 
-    /**
-     *
-     * @param from
-     * @param to
-     */
     public Vector(Point from, Point to) {
         x = to.x - from.x;
         y = to.y - from.y;
     }
 
-    /**
-     *
-     * @return
-     */
     public double getX() {
         return x;
     }
 
-    /**
-     *
-     * @return
-     */
     public double getY() {
         return y;
     }
 
-    /**
-     *
-     * @return
-     */
     public double lenght() {
         return Math.sqrt(x*x + y*y);
     }
 
-    /**
-     *
-     * @param newLenght
-     * @return self
-     */
     public Vector setLenght(double newLenght) {
         double lenght = lenght();
         x = x * newLenght / lenght;
@@ -90,10 +63,6 @@
         return this;
     }
 
-    /**
-     * @param multiplier
-     * @return self
-     */
     public Vector multiply(double multiplier) {
         x*=multiplier;
         y*=multiplier;
@@ -101,8 +70,7 @@
     }
 
     /**
-     *
-     * @return a clone
+     * {@inheritDoc}
      */
     @Override
     public Vector clone() {
@@ -110,24 +78,17 @@
     }
 
     /**
-     *
-     * @return
+     * {@inheritDoc}
      */
     @Override
     public String toString() {
         return "(" + x + "," + y + ")";
     }
 
-    /**
-     * Adds another vector <code>(x1 + x2, y1 + y2)</code>
-     * @param v
-     * @return self
-     */
     public Vector add(Vector v) {
         x+=v.x;
         y+=v.y;
         return this;
     }
 
-
 }
--- a/core/JemmyCore/src/org/jemmy/Version.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/Version.java	Wed May 30 11:13:18 2018 -0700
@@ -35,9 +35,6 @@
  * @author shura
  */
 public class Version {
-    /**
-     *
-     */
     public static final Version VERSION = new Version();
 
     private int major;
@@ -45,17 +42,10 @@
     private int mini;
     private String build;
 
-    /**
-     *
-     */
     public Version() {
         this(Version.class.getPackage().getName());
     }
 
-    /**
-     *
-     * @param pkg
-     */
     public Version(String pkg) {
         try {
             Properties props = new Properties();
@@ -74,51 +64,27 @@
         }
     }
 
-    /**
-     *
-     * @return
-     */
     public int getMajor() {
         return major;
     }
 
-    /**
-     *
-     * @return
-     */
+
     public int getMini() {
         return mini;
     }
 
-    /**
-     *
-     * @return
-     */
     public int getMinor() {
         return minor;
     }
 
-    /**
-     *
-     * @return
-     */
     public String getVersion() {
         return major + "." + minor + "." + mini;
     }
 
-    /**
-     *
-     * @return
-     */
     public String getBuild() {
         return build;
     }
 
-    /**
-     *
-     * @param old
-     * @return
-     */
     public boolean newer(String old) {
         StringTokenizer tn = new StringTokenizer(old, ".");
         if(major >= Integer.parseInt(tn.nextToken())) {
@@ -131,10 +97,6 @@
         return false;
     }
 
-    /**
-     *
-     * @param args
-     */
     public static void main(String[] args) {
         System.out.println("JemmyCore version: " + VERSION.getVersion() + "." + VERSION.build);
     }
--- a/core/JemmyCore/src/org/jemmy/action/AbstractExecutor.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/action/AbstractExecutor.java	Wed May 30 11:13:18 2018 -0700
@@ -59,9 +59,6 @@
     public static final String QUEUE_ACTION_OUTPUT = "org.jemmy.action.AbstractExecutor.QUEUE_ACTION_OUTPUT";
     private ActionQueue queue;
 
-    /**
-     *
-     */
     public AbstractExecutor() {
         queue = new ActionQueue();
     }
@@ -72,21 +69,18 @@
         Environment.getEnvironment().initOutput(NON_QUEUE_ACTION_OUTPUT, TestOut.getNullOutput());
     }
 
-    /**
-     *
-     * @return
-     */
     protected int actionsInQueue() {
         return queue.actionsInQueue();
     }
 
     /**
      * {@inheritDoc }
+     *
      * Prints out what action is executed into output
      * specified by either NON_QUEUE_ACTION_OUTPUT or QUEUE_ACTION_OUTPUT
      * depending whether the action is called on queue or not. No output provided for
      * nested actions - only the top level ones are printed.
-     * @see TestOut#getOutput(java.lang.String)
+     * @see TestOut#getOutput()
      */
     public final void execute(Environment env, boolean dispatch, final Action action, Object... parameters) {
         printStrace(env, "Action: ", action);
@@ -104,11 +98,12 @@
 
     /**
      * {@inheritDoc }
+     *
      * Prints out what action is executed into output
      * specified by either NON_QUEUE_ACTION_OUTPUT or QUEUE_ACTION_OUTPUT
      * depending whether the action is called on queue or not. No output provided for
      * nested actions - only the top level ones are printed.
-     * @see TestOut#getOutput(java.lang.String)
+     * @see TestOut#getOutput()
      */
     public final void executeDetached(Environment env, boolean dispatch, final Action action, final Object... parameters) {
         printStrace(env, "Action detached: ", action);
--- a/core/JemmyCore/src/org/jemmy/action/Action.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/action/Action.java	Wed May 30 11:13:18 2018 -0700
@@ -28,7 +28,6 @@
 
 
 /**
- *
  * @author shura, KAM
  */
 public abstract class Action {
@@ -41,8 +40,7 @@
      * Executes {@linkplain #run(java.lang.Object[]) run()} method of this
      * Action, saving the duration of its execution and storing any
      * RuntimeException and Error which may occur during its work.
-     * @param parameters Parameters to pass to {@linkplain
-     * #run(java.lang.Object[]) run()} method
+     * @param parameters Parameters to pass to {@linkplain #run(java.lang.Object[]) run()} method
      * @see #getThrowable()
      * @see #failed()
      */
@@ -64,24 +62,16 @@
         }
     }
 
-    /**
-     *
-     * @return
-     */
     public long getEndTime() {
         return endTime;
     }
 
-    /**
-     *
-     * @return
-     */
     public long getStartTime() {
         return startTime;
     }
 
     /**
-     * Should be used from {@linkplain #run(java.lang.Object[]) run()) method
+     * Should be used from {@linkplain #run(java.lang.Object[]) run()} method
      * to check whether execution time is withing allowed time
      * @return true if difference between current time and start time is less
      * then allowed time; false otherwice
@@ -90,39 +80,20 @@
         return System.currentTimeMillis() - startTime < allowedTime;
     }
 
-    /**
-     *
-     * @return
-     */
     public long getAllowedTime() {
         return allowedTime;
     }
 
-    /**
-     *
-     * @param allowedTime
-     */
     public void setAllowedTime(long allowedTime) {
         this.allowedTime = allowedTime;
     }
 
-    /**
-     *
-     * @param parameters
-     */
     public abstract void run(Object... parameters) throws Exception;
 
-    /**
-     *
-     * @return
-     */
     public boolean isInterrupted() {
         return interrupted;
     }
 
-    /**
-     *
-     */
     public void interrupt() {
         this.interrupted = true;
     }
--- a/core/JemmyCore/src/org/jemmy/action/ActionExecutor.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/action/ActionExecutor.java	Wed May 30 11:13:18 2018 -0700
@@ -36,9 +36,6 @@
  */
 public interface ActionExecutor {
 
-    /**
-     *
-     */
     public static final String ACTION_EXECUTOR_PROPERTY = "action.executor";
 
     /**
@@ -69,7 +66,6 @@
     /**
      * Checks whether the current thread is already performing an action.
      * @return true if the current thread is already performing an action.
-     * @see AbstractExecutor#isDispatchThread()
      */
     public boolean isInAction();
 
--- a/core/JemmyCore/src/org/jemmy/action/GetAction.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/action/GetAction.java	Wed May 30 11:13:18 2018 -0700
@@ -30,7 +30,7 @@
 
 /**
  * An action to get some value.
- * @param <T>
+ *
  * @author shura
  */
 public abstract class GetAction<T> extends Action {
@@ -38,32 +38,17 @@
     private boolean finished = false;
     private T result = null;
 
-    /**
-     *
-     */
     public GetAction() {
     }
 
-    /**
-     *
-     * @return
-     */
     public boolean isFinished() {
         return finished;
     }
 
-    /**
-     *
-     * @return
-     */
     public T getResult() {
         return result;
     }
 
-    /**
-     *
-     * @param result
-     */
     protected void setResult(T result) {
         this.result = result;
         finished = true;
--- a/core/JemmyCore/src/org/jemmy/control/AbstractWrapper.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/AbstractWrapper.java	Wed May 30 11:13:18 2018 -0700
@@ -39,32 +39,16 @@
 
     private Environment env;
 
-    /**
-     *
-     * @param env
-     */
-    @SuppressWarnings("unchecked")
     public AbstractWrapper(Environment env) {
         this.env = env;
     }
 
-    /**
-     *
-     * @return
-     */
     public Environment getEnvironment() {
         return env;
     }
 
     protected abstract Class<Wrap> getWrapClass(Class controlClass);
 
-    /**
-     *
-     * @param <T>
-     * @param controlClass
-     * @param control
-     * @return Wrap
-     */
     public <T> Wrap<? extends T> wrap(Class<T> controlClass, T control) {
         Class cls = control.getClass();
         Class<Wrap> wrp;
@@ -91,20 +75,6 @@
         throw new WrapperException(control);
     }
 
-    /**
-     *
-     * @param <T>
-     * @param control
-     * @param controlClass
-     * @param wrapperClass
-     * @return Wrap
-     * @throws java.lang.NoSuchMethodException
-     * @throws java.lang.InstantiationException
-     * @throws java.lang.IllegalAccessException
-     * @throws java.lang.IllegalArgumentException
-     * @throws java.lang.reflect.InvocationTargetException
-     */
-    @SuppressWarnings("unchecked")
     protected <T> Wrap<? extends T> doWrap(T control, Class controlClass, Class wrapperClass) throws NoSuchMethodException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         Constructor cns = null;
         Class cls = controlClass;
--- a/core/JemmyCore/src/org/jemmy/control/As.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/As.java	Wed May 30 11:13:18 2018 -0700
@@ -45,7 +45,7 @@
      * This should point out what is the encapsulated type for
      * <code>TypeControlInterface</code>
      * @see TypeControlInterface
-     * @return
+     * @return todo document
      */
     Class value() default Void.class;
 }
--- a/core/JemmyCore/src/org/jemmy/control/ControlInterfaces.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/ControlInterfaces.java	Wed May 30 11:13:18 2018 -0700
@@ -48,6 +48,7 @@
     /**
      * List of interfaces supported by this wrap.
      * @see ControlInterface
+     * @return todo document
      */
     Class<? extends ControlInterface>[] value();
     /**
@@ -57,11 +58,13 @@
      * provide anything for a <code>ControlInterface</code> which is not a
      * <code>TypeControlInterface</code>
      * @see TypeControlInterface
+     * @return todo document
      */
     Class[] encapsulates() default {};
     /**
      * This provides names for the dock methods which would be generated. If the array
      * does not have enough elements, the method would be named as <code>"as" + value[i].getName()</code>.
+     * @return todo document
      */
     String[] name() default {};
 }
--- a/core/JemmyCore/src/org/jemmy/control/ControlType.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/ControlType.java	Wed May 30 11:13:18 2018 -0700
@@ -35,9 +35,6 @@
 @Target(ElementType.TYPE)
 @Documented
 public @interface ControlType  {
-    /**
-     *
-     * @return
-     */
+
     Class[] value();
 }
--- a/core/JemmyCore/src/org/jemmy/control/DefaultWrapper.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/DefaultWrapper.java	Wed May 30 11:13:18 2018 -0700
@@ -27,36 +27,19 @@
 import org.jemmy.env.Environment;
 
 /**
- *
  * @author shura
  */
 public class DefaultWrapper extends WrapperImpl {
 
-    /**
-     *
-     * @param env
-     * @param wrapList
-     */
-    @SuppressWarnings("unchecked")
     public DefaultWrapper(Environment env, Class<? extends Wrap>... wrapList) {
         super(env);
         addAnnotated(wrapList);
     }
 
-    /**
-     *
-     * @param env
-     */
-    @SuppressWarnings("unchecked")
     public DefaultWrapper(Environment env) {
         super(env);
     }
 
-    /**
-     *
-     * @param list
-     */
-    @SuppressWarnings("unchecked")
     public final void addAnnotated(Class<? extends Wrap>... list) {
         for (Class cn : list) {
             if (!cn.isAnnotationPresent(ControlType.class)) {
--- a/core/JemmyCore/src/org/jemmy/control/FieldProperties.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/FieldProperties.java	Wed May 30 11:13:18 2018 -0700
@@ -44,16 +44,16 @@
 @Documented
 public @interface FieldProperties {
     /**
-     * List of field names.
+     * @return list of field names.
      */
     String[] value();
     /**
-     * List of field types. In case this list is shorter, all the unmatched ones
+     * @return list of field types. In case this list is shorter, all the unmatched ones
      * from <code>value</code> are considered to be of type <code>Object</code>.
      */
     Class[] types() default {};
     /**
-     * Are the properties worth a waiter.
+     * @return are the properties worth a waiter.
      */
     boolean[] waitable() default {};
 }
--- a/core/JemmyCore/src/org/jemmy/control/LazyWrapper.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/LazyWrapper.java	Wed May 30 11:13:18 2018 -0700
@@ -40,22 +40,13 @@
 
     private final HashMap<String, String> theWrappers = new HashMap<String, String>();
     private final ClassLoader loader;
-    /**
-     *
-     * @param env
-     */
-    @SuppressWarnings("unchecked")
+
     public LazyWrapper(ClassLoader loader, Environment env) {
         super(env);
         this.loader = loader;
     }
 
-    /**
-     *
-     * @param <P>
-     * @param controlClass
-     * @param wrapperClass
-     */
+
     public <P> void add(String controlClass, String wrapperClass) {
         theWrappers.put(controlClass, wrapperClass);
     }
--- a/core/JemmyCore/src/org/jemmy/control/MethodProperties.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/MethodProperties.java	Wed May 30 11:13:18 2018 -0700
@@ -45,16 +45,16 @@
 @Documented
 public @interface MethodProperties {
     /**
-     * List of method names
+     * @return list of method names
      */
     String[] value();
     /**
-     * List of field types. In case this list is shorter, all the unmatched ones
+     * @return list of field types. In case this list is shorter, all the unmatched ones
      * from <code>value</code> are considered to be of type <code>Object</code>.
      */
     Class[] types() default {};
     /**
-     * Are the properties worth a waiter.
+     * @return are the properties worth a waiter.
      */
     boolean[] waitable() default {};
 }
--- a/core/JemmyCore/src/org/jemmy/control/Property.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/Property.java	Wed May 30 11:13:18 2018 -0700
@@ -49,7 +49,7 @@
      */
     String value();
     /**
-     * Are the properties worth a waiter.
+     * @return are the properties worth a waiter.
      */
     boolean waitable() default false;
 }
--- a/core/JemmyCore/src/org/jemmy/control/ScreenArea.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/ScreenArea.java	Wed May 30 11:13:18 2018 -0700
@@ -34,9 +34,6 @@
  * @author shura
  */
 public interface ScreenArea {
-    /**
-     *
-     * @return
-     */
+
     public abstract Rectangle getScreenBounds();
 }
--- a/core/JemmyCore/src/org/jemmy/control/SelectorImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/SelectorImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -31,9 +31,6 @@
 import org.jemmy.timing.State;
 
 /**
- *
- * @param <CONTROL>
- * @param <STATE>
  * @author shura
  */
 public class SelectorImpl<CONTROL, STATE> implements Selector<STATE> {
@@ -41,21 +38,11 @@
     Wrap<? extends CONTROL> target;
     Selectable<STATE> selectable;
 
-    /**
-     *
-     * @param target
-     * @param selectable
-     */
     public SelectorImpl(Wrap<? extends CONTROL> target, Selectable<STATE> selectable) {
         this.target = target;
         this.selectable = selectable;
     }
 
-    /**
-     *
-     * @param state
-     */
-    @SuppressWarnings("unchecked")
     public void select(final STATE state) {
         if (target.is(Showable.class)) {
             target.as(Showable.class).shower().show();
--- a/core/JemmyCore/src/org/jemmy/control/Wrap.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/Wrap.java	Wed May 30 11:13:18 2018 -0700
@@ -53,65 +53,21 @@
 @ControlInterfaces({Mouse.class, Keyboard.class, Drag.class})
 public abstract class Wrap<CONTROL extends Object> {
 
-    /**
-     *
-     */
     public static final String BOUNDS_PROP_NAME = "bounds";
-    /**
-     *
-     */
     public static final String CLICKPOINT_PROP_NAME = "clickPoint";
-    /**
-     *
-     */
     public static final String CONTROL_CLASS_PROP_NAME = "control.class";
-    /**
-     *
-     */
     public static final String CONTROL_PROP_NAME = "control";
-    /**
-     *
-     */
     public static final String INPUT_FACTORY_PROPERTY = "input.control.interface.factory";
-    /**
-     *
-     */
     public static final String IMAGE_LOADER_PROPERTY = "image.loader";
-    /**
-     *
-     */
     public static final String IMAGE_CAPTURER_PROPERTY = "image.capturer";
-    /**
-     *
-     */
     public static final String TEXT_PROP_NAME = "text";
-    /**
-     *
-     */
     public static final String POSITION_PROP_NAME = "position";
-    /**
-     *
-     */
     public static final String VALUE_PROP_NAME = "value";
-    /**
-     *
-     */
     public static final String WRAPPER_CLASS_PROP_NAME = "wrapper.class";
-    /**
-     *
-     */
     public static final String TOOLTIP_PROP_NAME = "tooltip";
-    /**
-     *
-     */
     public static final String NAME_PROP_NAME = "name";
-    /**
-     *
-     */
     public static final Timeout WAIT_STATE_TIMEOUT = new Timeout("wait.state", 1000);
-    /**
-     *
-     */
+
     public static final String OUTPUT = Wrap.class.getName() + ".OUTPUT";
     private static DefaultWrapper theWrapper = new DefaultWrapper(Environment.getEnvironment());
 
@@ -125,10 +81,6 @@
         Environment.getEnvironment().initTimeout(Keyboard.PUSH);
     }
 
-    /**
-     *
-     * @return
-     */
     public static DefaultWrapper getWrapper() {
         return theWrapper;
     }
@@ -184,7 +136,7 @@
      * Return default point to click, drag. This implementation returns the
      * center must be overriden if something different is desired.
      *
-     * @return
+     * @return the default click point
      */
     @Property(CLICKPOINT_PROP_NAME)
     public Point getClickPoint() {
@@ -207,8 +159,8 @@
      * Transforms point in local control coordinate system to screen
      * coordinates.
      *
-     * @param local
-     * @return
+     * @param local the local coordinate
+     * @return a absolute translated point
      * @see #toLocal(org.jemmy.Point)
      */
     public Point toAbsolute(Point local) {
@@ -220,7 +172,7 @@
      * Transforms point in screen coordinates to local control coordinate
      * system.
      *
-     * @param local
+     * @param local the local coordinate
      * @return coordinates which should be used for mouse operations.
      * @see #toAbsolute(org.jemmy.Point)
      */
@@ -258,7 +210,7 @@
      * Waits for a portion of image to be exact the same as the parameter.
      *
      * @see Wrap#as(java.lang.Class)
-     * @param golden
+     * @param golden the image to match against
      * @param rect A portion of control to compare.
      * @param resID ID of a result image to save in case of failure. No image
      * saved if null.
@@ -296,7 +248,7 @@
      * Waits for image to be exact the same as the parameter.
      *
      * @see Wrap#as(java.lang.Class)
-     * @param golden
+     * @param golden the image to match against
      * @param resID ID of a result image to save in case of failure. No image
      * saved if null.
      * @param diffID ID of a diff image to save in case of failure. No image
@@ -310,9 +262,9 @@
     /**
      * TODO javadoc
      *
-     * @param <V>
-     * @param state
-     * @param value
+     * @param <V> the states type
+     * @param state the state
+     * @param value the state value
      * @return last returned State value
      * @throws TimeoutExpiredException in case the wait is unsuccessful.
      */
@@ -321,10 +273,8 @@
     }
 
     /**
-     * TODO javadoc
-     *
-     * @param <V>
-     * @param state
+     * @param <V> the states type
+     * @param state the state
      * @return last returned State value
      * @throws TimeoutExpiredException in case the wait is unsuccessful.
      */
@@ -370,9 +320,10 @@
      * <code>as(java.lang.Class)</code>
      *
      * @see Wrap#is(java.lang.Class)
-     * @param <INTERFACE>
-     * @param interfaceClass
-     * @return
+     * @param <INTERFACE> the control interface
+     * @param interfaceClass the interface class
+     * @return <code>true</code> if the control is an ControlInterface,
+     *         <code>false</code> otherwise
      */
     public <INTERFACE extends ControlInterface> boolean is(Class<INTERFACE> interfaceClass) {
         if (interfaceClass.isInstance(this)) {
@@ -393,11 +344,12 @@
      * <code>as(java.lang.Class)</code>
      *
      * @see Wrap#is(java.lang.Class)
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param interfaceClass
+     * @param <TYPE> the type interface
+     * @param <INTERFACE> the control interface
+     * @param interfaceClass the interface class
      * @param type The parameter class.
-     * @return
+     * @return <code>true</code> if the control is an ControlInterface,
+     *         <code>false</code> otherwise
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> boolean is(Class<INTERFACE> interfaceClass, Class<TYPE> type) {
         if (interfaceClass.isInstance(this)) {
@@ -435,9 +387,9 @@
      * it checks
      *
      * @see Wrap#is(java.lang.Class)
-     * @param <INTERFACE>
-     * @param interfaceClass
-     * @return
+     * @param <INTERFACE> the control interface
+     * @param interfaceClass the interface class
+     * @return the control interface instance
      */
     public <INTERFACE extends ControlInterface> INTERFACE as(Class<INTERFACE> interfaceClass) {
         if (interfaceClass.isInstance(this)) {
@@ -456,11 +408,11 @@
      * Returns an implementation of interface associated with the object.
      *
      * @see Wrap#is(java.lang.Class)
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param interfaceClass
+     * @param <TYPE> the type interface
+     * @param <INTERFACE> the control interface
+     * @param interfaceClass the interface class
      * @param type The parameter class.
-     * @return
+     * @return the type control instance
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> INTERFACE as(Class<INTERFACE> interfaceClass, Class<TYPE> type) {
         if (interfaceClass.isInstance(this)) {
@@ -490,10 +442,9 @@
     private Keyboard keyboard = null;
 
     /**
-     * A shortcut to
-     * <code>as(MouseTarget.class).mouse()</code>
+     * A shortcut to <code>as(MouseTarget.class).mouse()</code>
      *
-     * @return
+     * @return the mouse target
      */
     @As(Mouse.class)
     public Mouse mouse() {
@@ -504,10 +455,9 @@
     }
 
     /**
-     * A shortcut to
-     * <code>as(MouseTarget.class).drag()</code>
+     * A shortcut to <code>as(MouseTarget.class).drag()</code>
      *
-     * @return
+     * @return the drag target
      */
     @As(Drag.class)
     public Drag drag() {
@@ -518,10 +468,9 @@
     }
 
     /**
-     * A shortcut to
-     * <code>as(KeyTarget.class).wrap()</code>
+     * A shortcut to <code>as(KeyTarget.class).wrap()</code>
      *
-     * @return
+     * @return the wrap target
      */
     @As(Keyboard.class)
     public Keyboard keyboard() {
@@ -541,10 +490,6 @@
      */
     private HashMap<String, Object> properties = new HashMap<String, Object>();
 
-    /**
-     *
-     * @return
-     */
     @Property(CONTROL_CLASS_PROP_NAME)
     public Class<?> getControlClass() {
         return getControl().getClass();
@@ -667,13 +612,12 @@
     }
 
     /**
-     * Get property of the wrapped object. Uses first available from <nl>
-     * <li>methods annotated by
-     * <code>org.jemmy.control.Property</code></li> <li>wrapped object methods
-     * listed in
-     * <code>org.jemmy.control.MethodProperties</code></li> <li>wrapped object
-     * fields listed in
-     * <code>org.jemmy.control.FieldProperties</code></li> </nl>
+     * Get property of the wrapped object. Uses first available from
+     * <ol>
+     * <li>methods annotated by <code>org.jemmy.control.Property</code></li>
+     * <li>wrapped object methods listed in <code>org.jemmy.control.MethodProperties</code></li>
+     * <li>wrapped object fields listed in <code>org.jemmy.control.FieldProperties</code></li>
+     * </ol>
      *
      * @param name property name
      * @throws JemmyException if no property found
@@ -711,10 +655,10 @@
      * Get property out of the control interface. Refer to the interface doc to
      * find out what properties are provided.
      *
-     * @param <INTERFACE>
-     * @param name
-     * @param intrfc
-     * @return
+     * @param <INTERFACE> the control interface
+     * @param name the property name
+     * @param intrfc the interface class
+     * @return the control property
      */
     public <INTERFACE extends ControlInterface> Object getProperty(String name, Class<INTERFACE> intrfc) {
         return getInterfaceProperty(intrfc, as(intrfc), name);
@@ -724,12 +668,12 @@
      * Get property out of the control interface. Refer to the interface doc to
      * find out what properties are provided.
      *
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param name
-     * @param intrfc
-     * @param type
-     * @return
+     * @param <TYPE> the type interface
+     * @param <INTERFACE> the control interface
+     * @param name the property name
+     * @param intrfc the interface class
+     * @param type The parameter class.
+     * @return the control property
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> Object getProperty(String name, Class<INTERFACE> intrfc, Class<TYPE> type) {
         return getInterfaceProperty(intrfc, as(intrfc, type), name);
@@ -762,10 +706,10 @@
      * <code>property</code> of control interface to get the specified value.
      * <code>WAIT_STATE_TIMOUT</code> timeout is used
      *
-     * @param <INTERFACE>
-     * @param property
-     * @param intrfc
-     * @param value
+     * @param <INTERFACE> the control interface
+     * @param property the property name
+     * @param intrfc the interface class
+     * @param value the new parameter value
      */
     public <INTERFACE extends ControlInterface> void waitProperty(final String property, final Class<INTERFACE> intrfc, final Object value) {
         Object instance = as(intrfc);
@@ -787,12 +731,12 @@
      * <code>property</code> of control interface to get the specified value.
      * <code>WAIT_STATE_TIMOUT</code> timeout is used
      *
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param property
-     * @param intrfc
-     * @param type
-     * @param value
+     * @param <TYPE> the type interface
+     * @param <INTERFACE> the control interface
+     * @param property the property name
+     * @param intrfc the interface class
+     * @param type the parameter class.
+     * @param value the new parameter value
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> void waitProperty(final String property, final Class<INTERFACE> intrfc, final Class<TYPE> type, final Object value) {
         getEnvironment().getWaiter(WAIT_STATE_TIMEOUT).ensureValue(value, new State<Object>() {
@@ -808,11 +752,6 @@
         });
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public boolean hasFieldProperty(String name) {
         Class<?> cls = getClass();
         do {
@@ -826,11 +765,6 @@
         return false;
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public boolean hasMethodProperty(String name) {
         Class<?> cls = getClass();
         do {
@@ -854,11 +788,6 @@
         return false;
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public Object getFieldProperty(final String name) {
         if (!hasFieldProperty(name)) {
             throw new JemmyException("No \"" + name + "\" field property specified on " + getClass().getName());
@@ -877,11 +806,6 @@
         return result;
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public Object getMethodProperty(final String name) {
         if (!hasMethodProperty(name)) {
             throw new JemmyException("No \"" + name + "\" method property specified on " + getClass().getName());
@@ -905,13 +829,6 @@
         return result;
     }
 
-    /**
-     *
-     * @param <P>
-     * @param valueClass
-     * @param name
-     * @return
-     */
     public <P> P getProperty(Class<P> valueClass, String name) {
         return valueClass.cast(getProperty(name));
     }
@@ -924,7 +841,7 @@
      * <code>FieldProperties</code> correspondingly.
      *
      * @return a map of properties
-     * @throws Runtime exception should there be an exception thrown while
+     * @throws RuntimeException should there be an exception thrown while
      * getting a property
      */
     public HashMap<String, Object> getProperties() {
--- a/core/JemmyCore/src/org/jemmy/control/Wrapper.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/Wrapper.java	Wed May 30 11:13:18 2018 -0700
@@ -30,12 +30,6 @@
  * @author shura
  */
 public interface Wrapper {
-    /**
-     *
-     * @param <T>
-     * @param controlClass
-     * @param control
-     * @return Wrap
-     */
+
     public <T> Wrap<? extends T> wrap(Class<T> controlClass, T control);
 }
--- a/core/JemmyCore/src/org/jemmy/control/WrapperException.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/WrapperException.java	Wed May 30 11:13:18 2018 -0700
@@ -33,32 +33,14 @@
  */
 public class WrapperException extends JemmyException {
 
-    /**
-     *
-     * @param <T>
-     * @param controlClass
-     * @param wrapperClass
-     * @param e
-     */
     public <T extends Wrap> WrapperException(Class controlClass, Class<T> wrapperClass, Exception e) {
         super(controlClass.getName() + " is not accepted by " + wrapperClass.getName(), e);
     }
 
-    /**
-     *
-     * @param <T>
-     * @param controlClass
-     * @param wrapperClass
-     */
     public <T extends Wrap> WrapperException(Class controlClass, Class<T> wrapperClass) {
         super(controlClass.getName() + " is not accepted by " + wrapperClass.getName());
     }
 
-    /**
-     *
-     * @param <T>
-     * @param control
-     */
     public <T extends Wrap> WrapperException(Object control) {
         super("Unable to find a wrapper", control);
     }
--- a/core/JemmyCore/src/org/jemmy/control/WrapperImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/control/WrapperImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -38,22 +38,11 @@
 
     private HashMap<Class, Class<Wrap>> theWrappers;
 
-    /**
-     *
-     * @param env
-     */
-    @SuppressWarnings("unchecked")
     public WrapperImpl(Environment env) {
         super(env);
         theWrappers = new HashMap<Class, Class<Wrap>>();
     }
 
-    /**
-     *
-     * @param <P>
-     * @param controlClass
-     * @param wrapperClass
-     */
     public <P> void add(Class controlClass, Class<Wrap> wrapperClass) {
         theWrappers.put(controlClass, wrapperClass);
         // TODO: Improve output
--- a/core/JemmyCore/src/org/jemmy/dock/DefaultParent.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/DefaultParent.java	Wed May 30 11:13:18 2018 -0700
@@ -42,7 +42,7 @@
 @Documented
 public @interface DefaultParent {
     /**
-     * Description of a parent represented by the annotated method.
+     * @return description of a parent represented by the annotated method.
      */
     String value();
 }
--- a/core/JemmyCore/src/org/jemmy/dock/DefaultWrapper.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/DefaultWrapper.java	Wed May 30 11:13:18 2018 -0700
@@ -34,7 +34,6 @@
  * do not take parent as a parameter, taking whatever is coming from this method
  * instead. An annotated method should take one parameter - class of the controls
  * to by looked for and should return parent for that type.
- * @see Parent
  * @author shura
  */
 @Target(ElementType.METHOD)
--- a/core/JemmyCore/src/org/jemmy/dock/Dock.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/Dock.java	Wed May 30 11:13:18 2018 -0700
@@ -65,12 +65,12 @@
     /**
      * Method which at the end actually get called from all dock lookup
      * constructors.
-     * @param <T>
-     * @param parent
-     * @param controlType
-     * @param index
-     * @param criteria
-     * @return
+     * @param <T> todo document
+     * @param parent todo document
+     * @param controlType todo document
+     * @param index todo document
+     * @param criteria todo document
+     * @return todo document
      */
     protected static <T> Wrap<? extends T> lookup(Parent<? super T> parent, Class<T> controlType, int index, LookupCriteria<T>... criteria) {
         Lookup<T> lookup;
@@ -94,7 +94,6 @@
     }
 
     /**
-     *
      * @return Wrap instance obtainer through lookup
      */
     public Object control() {
@@ -102,28 +101,28 @@
     }
 
     /**
-     * Shortcut to <code>wrap().mouse()</code>
+     * @return Shortcut to <code>wrap().mouse()</code>
      */
     public Mouse mouse() {
         return wrap.mouse();
     }
 
     /**
-     * Shortcut to <code>wrap().keyboard()</code>
+     * @return Shortcut to <code>wrap().keyboard()</code>
      */
     public Keyboard keyboard() {
         return wrap.keyboard();
     }
 
     /**
-     * Shortcut to <code>wrap().drag()</code>
+     * @return Shortcut to <code>wrap().drag()</code>
      */
     public Drag drag() {
         return wrap.drag();
     }
 
     /**
-     * Shortcut to <code>wrap().getScreenBounds()</code>
+     * @return Shortcut to <code>wrap().getScreenBounds()</code>
      */
     public Rectangle bounds() {
         return wrap.getScreenBounds();
@@ -135,7 +134,6 @@
     }
 
     /**
-     *
      * @return <code>wrap().getEnvironment()</code>.
      */
     public Environment environment() {
@@ -145,6 +143,10 @@
     /**
      * Loads image with <code>goldenId</code> id waits for the control to match it.
      * @see Wrap#waitImage(org.jemmy.image.Image, org.jemmy.Rectangle, java.lang.String, java.lang.String)
+     * @param goldenId todo document
+     * @param rect todo document
+     * @param resID todo document
+     * @param diffID todo document
      */
     public void waitImage(String goldenId, Rectangle rect, String resID, String diffID) {
         wrap.waitImage(environment().getImageLoader().load(goldenId), rect, resID, diffID);
@@ -158,6 +160,8 @@
      * @see #waitImage(java.lang.String, org.jemmy.Rectangle, java.lang.String, java.lang.String)
      * @see #DEFAULT_DIFF_IMAGE_SUFFIX
      * @see #DEFAULT_RESULT_IMAGE_SUFFIX
+     * @param goldenId todo document
+     * @param rect todo document
      */
     public void waitImage(String goldenId, Rectangle rect) {
         waitImage(goldenId,
@@ -169,6 +173,9 @@
     /**
      * Loads image with <code>goldenId</code> id waits for the control to match it.
      * @see Wrap#waitImage(org.jemmy.image.Image, java.lang.String, java.lang.String)
+     * @param goldenId todo document
+     * @param resID todo document
+     * @param diffID todo document
      */
     public void waitImage(String goldenId, String resID, String diffID) {
         wrap.waitImage(environment().getImageLoader().load(goldenId), resID, diffID);
@@ -182,6 +189,7 @@
      * @see #waitImage(java.lang.String, java.lang.String, java.lang.String)
      * @see #DEFAULT_DIFF_IMAGE_SUFFIX
      * @see #DEFAULT_RESULT_IMAGE_SUFFIX
+     * @param goldenId todo document
      */
     public void waitImage(String goldenId) {
         waitImage(goldenId,
--- a/core/JemmyCore/src/org/jemmy/dock/DockInfo.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/DockInfo.java	Wed May 30 11:13:18 2018 -0700
@@ -43,6 +43,7 @@
      * Desired name of the dock class, should one be generated.
      * Usually empty ("", as nulls are not allowed) in which case the calculated value
      * is taken whatever logic annotation processor decides to use.
+     * @return todo document
      */
     String name() default "";
 
@@ -50,19 +51,22 @@
      * Should there be extra constructors which take another lookup criteria - a class
      * of a desired control? That class must be a subtype of the one wrapped by the wrap
      * class annotated with this annotation.
+     * @return todo document
      */
     boolean generateSubtypeLookups() default false;
 
     /**
      * Should generated <code>wrap()</code> method return this class or
-     * <code>Wrap<? extends ...></code> and also should there be a constructor with
+     * <code>Wrap&lt;? extends ...&gt;</code> and also should there be a constructor with
      * one parameter - the wrap.
+     * @return todo document
      */
     boolean anonymous() default false;
 
     /**
      * Should the lookup constructors have <code>LookupCriteria&lt;Type&gt;...</code>
      * parameter or the <code>LookupCriteria&lt;Type&gt;</code> parameter.
+     * @return todo document
      */
     boolean multipleCriteria() default true;
 }
--- a/core/JemmyCore/src/org/jemmy/dock/ObjectLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/ObjectLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -43,7 +43,7 @@
 @Documented
 public @interface ObjectLookup {
     /**
-     * Description of the method parameters. To be used in the javadoc later.
+     * @return description of the method parameters. To be used in the javadoc later.
      */
     String value();
 }
--- a/core/JemmyCore/src/org/jemmy/dock/Shortcut.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/dock/Shortcut.java	Wed May 30 11:13:18 2018 -0700
@@ -39,7 +39,7 @@
 @Retention(RetentionPolicy.CLASS)
 public @interface Shortcut {
     /**
-     * If name is not specified, then shortcut's name will same as name of interface method
+     * @return if name is not specified, then shortcut's name will same as name of interface method
      */
     String name() default "";
 }
--- a/core/JemmyCore/src/org/jemmy/env/Environment.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/env/Environment.java	Wed May 30 11:13:18 2018 -0700
@@ -43,14 +43,9 @@
 import org.jemmy.timing.Waiter;
 
 /**
- *
  * @author shura, mrkam, erikgreijus
  */
 public class Environment {
-
-    /**
-     *
-     */
     public static final String JEMMY_PROPERTIES_FILE_PROPERTY = "jemmy.properties";
     public static final String TIMEOUTS_FILE_PROPERTY = "timeouts";
     /**
@@ -59,10 +54,6 @@
     public static final String OUTPUT = Environment.class.getName() + ".OUTPUT";
     private final static Environment env = new Environment(null);
 
-    /**
-     *
-     * @return
-     */
     public static Environment getEnvironment() {
         return env;
     }
@@ -74,10 +65,6 @@
     private HashMap<PropertyKey, Object> environment = new HashMap<PropertyKey, Object>();
     private Environment parent;
 
-    /**
-     *
-     * @param parent
-     */
     public Environment(Environment parent) {
         this.parent = parent;
         environment = new HashMap<PropertyKey, Object>();
@@ -86,25 +73,14 @@
         }
     }
 
-    /**
-     *
-     */
     public Environment() {
         this(getEnvironment());
     }
 
-    /**
-     *
-     * @return
-     */
     public Environment getParentEnvironment() {
         return parent;
     }
 
-    /**
-     *
-     * @param parent
-     */
     public void setParentEnvironment(Environment parent) {
         this.parent = parent;
     }
@@ -151,11 +127,6 @@
         }
     }
 
-    /**
-     *
-     * @param cls
-     * @return
-     */
     public List<?> get(Class cls) {
         Set<PropertyKey> all = environment.keySet();
         ArrayList<Object> result = new ArrayList<Object>();
@@ -167,19 +138,10 @@
         return result;
     }
 
-    /**
-     *
-     * @param defaultExecutor
-     * @return
-     */
     public ActionExecutor setExecutor(ActionExecutor defaultExecutor) {
         return (ActionExecutor) setProperty(ActionExecutor.class, defaultExecutor);
     }
 
-    /**
-     *
-     * @return
-     */
     public ActionExecutor getExecutor() {
         ActionExecutor res = (ActionExecutor) getProperty(ActionExecutor.class);
         if (res == null) {
@@ -225,72 +187,46 @@
     }
 
     /**
-     *
-     * @param <T>
-     * @param cls
+     * @param <T> todo document
+     * @param cls todo document
      * @param obj if null then property is removed
-     * @return
+     * @return todo document
      */
     public <T> T setProperty(Class<T> cls, T obj) {
         return setProperty(cls, null, obj);
     }
 
     /**
-     *
-     * @param <T>
-     * @param cls
+     * @param <T> todo document
+     * @param cls todo document
      * @param obj if null then property is removed
-     * @return
+     * @return todo document
      */
     public <T> T setPropertyIfNotSet(Class<T> cls, T obj) {
         return setPropertyIfNotSet(cls, null, obj);
     }
 
-    /**
-     *
-     * @param <T>
-     * @param cls
-     * @return
-     */
     public <T> T getProperty(Class<T> cls) {
         return getProperty(cls, null);
     }
 
     /**
-     *
-     * @param name
+     * @param name todo document
      * @param obj if null then property is removed
-     * @return
+     * @return todo document
      */
     public Object setProperty(String name, Object obj) {
         return setProperty(Object.class, name, obj);
     }
 
-    /**
-     *
-     * @param name
-     * @param obj
-     * @return
-     */
     public Object setPropertyIfNotSet(String name, Object obj) {
         return setPropertyIfNotSet(Object.class, name, obj);
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public Object getProperty(String name) {
         return getProperty(Object.class, name);
     }
 
-    /**
-     *
-     * @param name
-     * @param defaultValue
-     * @return
-     */
     public Object getProperty(String name, Object defaultValue) {
         return getProperty(Environment.class, name, defaultValue);
     }
@@ -322,19 +258,10 @@
         return environment.get(key);
     }
 
-    /**
-     *
-     * @param out
-     * @return
-     */
     public TestOut setOutput(TestOut out) {
         return (TestOut) setProperty(TestOut.class, out);
     }
 
-    /**
-     *
-     * @return
-     */
     public TestOut getOutput() {
         return (TestOut) getProperty(TestOut.class);
     }
@@ -344,9 +271,9 @@
      * some specific outputs. Please consult javadoc for a class in question.
      * Use <code>null</code> to unset the property.
      *
-     * @param outputName
-     * @param out
-     * @return
+     * @param outputName todo document
+     * @param out todo document
+     * @return todo document
      */
     public TestOut setOutput(String outputName, TestOut out) {
         return (TestOut) setProperty(TestOut.class, outputName, out);
@@ -355,9 +282,9 @@
     /**
      * Initializes some specific output only if it is not yet set.
      *
-     * @param outputName
-     * @param out
-     * @return
+     * @param outputName todo document
+     * @param out todo document
+     * @return todo document
      */
     public TestOut initOutput(String outputName, TestOut out) {
         TestOut res = (TestOut) getProperty(TestOut.class, outputName);
@@ -372,46 +299,26 @@
      * Get's a specific output. If nothing assigned, returns
      * <code>getOutput()</code>
      *
-     * @param outputName
-     * @return
+     * @param outputName todo document
+     * @return todo document
      */
     public TestOut getOutput(String outputName) {
         TestOut res = (TestOut) getProperty(TestOut.class, outputName);
         return (res != null) ? res : getOutput();
     }
 
-    /**
-     *
-     * @param timeout
-     * @return
-     */
     public Waiter getWaiter(Timeout timeout) {
         return getWaiter(timeout.getName());
     }
 
-    /**
-     *
-     * @param timeoutName
-     * @return
-     */
     public Waiter getWaiter(String timeoutName) {
         return new Waiter(getTimeout(timeoutName));
     }
 
-    /**
-     *
-     * @param timeout
-     * @return
-     */
     public Timeout getTimeout(Timeout timeout) {
         return getTimeout(timeout.getName());
     }
 
-    /**
-     *
-     * @param name
-     * @return
-     */
     public Timeout getTimeout(String name) {
         return (Timeout) getProperty(Timeout.class, name);
     }
@@ -462,27 +369,14 @@
         return setTimeout(new Timeout(name, value));
     }
 
-    /**
-     *
-     * @return
-     */
     public CharBindingMap getBindingMap() {
         return (CharBindingMap) getProperty(CharBindingMap.class);
     }
 
-    /**
-     *
-     * @param map
-     * @return
-     */
     public CharBindingMap setBindingMap(CharBindingMap map) {
         return (CharBindingMap) setProperty(CharBindingMap.class, map);
     }
 
-    /**
-     *
-     * @return
-     */
     public ImageLoader getImageLoader() {
         ImageLoader res = (ImageLoader) getProperty(ImageLoader.class);
         if (res == null) {
@@ -504,10 +398,6 @@
         return res;
     }
 
-    /**
-     *
-     * @return
-     */
     public ImageCapturer getImageCapturer() {
         ImageCapturer res = (ImageCapturer) getProperty(ImageCapturer.class);
         if (res == null) {
@@ -529,29 +419,15 @@
         return res;
     }
 
-    /**
-     *
-     * @param imageLoader
-     * @return
-     */
     public ImageLoader setImageLoader(ImageLoader imageLoader) {
         return (ImageLoader) setProperty(ImageLoader.class, imageLoader);
     }
 
-    /**
-     *
-     * @param imageCapturer
-     * @return
-     */
     public ImageCapturer setImageCapturer(ImageCapturer imageCapturer) {
         getOutput(OUTPUT).println("ImageCapturer set to " + imageCapturer);
         return (ImageCapturer) setProperty(ImageCapturer.class, imageCapturer);
     }
 
-    /**
-     *
-     * @return
-     */
     public ControlInterfaceFactory getInputFactory() {
         ControlInterfaceFactory res = (ControlInterfaceFactory) getProperty(ControlInterfaceFactory.class);
         if (res == null) {
@@ -572,11 +448,6 @@
         return res;
     }
 
-    /**
-     *
-     * @param factory
-     * @return
-     */
     public ControlInterfaceFactory setInputFactory(ControlInterfaceFactory factory) {
         getOutput(OUTPUT).println("Input factory set to " + factory);
         return (ControlInterfaceFactory) setProperty(ControlInterfaceFactory.class, factory);
--- a/core/JemmyCore/src/org/jemmy/env/TestOut.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/env/TestOut.java	Wed May 30 11:13:18 2018 -0700
@@ -128,7 +128,7 @@
     /**
      * Read one byte from input.
      * @return an int from input stream.
-     * @exception IOException
+     * @exception IOException todo document
      */
     public int read() throws IOException {
         if (input != null) {
@@ -141,7 +141,7 @@
     /**
      * Read a line from input.
      * @return a line from input stream.
-     * @exception IOException
+     * @exception IOException todo document
      */
     public String readln() throws IOException {
         if (buffInput != null) {
--- a/core/JemmyCore/src/org/jemmy/env/Timeout.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/env/Timeout.java	Wed May 30 11:13:18 2018 -0700
@@ -109,10 +109,6 @@
         }
     }
 
-    /**
-     *
-     * @return
-     */
     @Override
     public String toString() {
         return "Timeout [" + name + ", " + value + "]";
--- a/core/JemmyCore/src/org/jemmy/image/Image.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/Image.java	Wed May 30 11:13:18 2018 -0700
@@ -33,7 +33,7 @@
     /**
      * Compares the image with the other one.
      *
-     * @param img
+     * @param img todo document
      * @return difference of the images, null if identical
      */
     public Image compareTo(Image img);
--- a/core/JemmyCore/src/org/jemmy/image/ImageCapturer.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/ImageCapturer.java	Wed May 30 11:13:18 2018 -0700
@@ -36,9 +36,9 @@
 
     /**
      * Obtains a screen image for the control.
-     * @param control
+     * @param control todo document
      * @param rect a control area to be captured
-     * @return
+     * @return todo document
      */
     Image capture(Wrap<?> control, Rectangle rect);
 
--- a/core/JemmyCore/src/org/jemmy/image/ImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/ImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -28,7 +28,7 @@
 /**
  * Interface for all classes performing image comparison.
  *
- * @author Alexandre Iline (alexandre.iline@sun.com)
+ * @author shura
  */
 public interface ImageComparator {
 
@@ -43,7 +43,7 @@
     /**
      * A string qualifying an image comparison algorithm. To be used in logs and
      * tools.
-     * @return
+     * @return todo document
      */
     public String getID();
 }
--- a/core/JemmyCore/src/org/jemmy/image/ImageLoader.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/ImageLoader.java	Wed May 30 11:13:18 2018 -0700
@@ -35,8 +35,8 @@
      * Loads image by ID. Depending on an implementation, ID could be file name,
      * class name, image name, etc.
      * @see Image#save(java.lang.String)
-     * @param ID
-     * @return
+     * @param ID todo document
+     * @return todo document
      */
     Image load(String ID);
 
--- a/core/JemmyCore/src/org/jemmy/image/pixel/AverageDistanceComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/AverageDistanceComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -32,21 +32,11 @@
  */
 public class AverageDistanceComparator extends ThresholdComparator {
 
-    /**
-     *
-     * @param threshold
-     */
     public AverageDistanceComparator(double threshold) {
         super(0, Math.sqrt(3));
         setThreshold(threshold);
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public boolean compare(Raster image1, Raster image2) {
         Dimension size = PixelImageComparator.computeDiffSize(image1, image2);
         if (size == null) {
@@ -69,6 +59,7 @@
     public static final Raster.Component[] DISTANCE_COMPONENTS = {
         Raster.Component.RED, Raster.Component.BLUE, Raster.Component.GREEN
     };
+
     static double distance(Raster.Component[] comps1, double[] colors1, Raster.Component[] comps2, double[] colors2) {
         double res = 0;
         double diff;
@@ -80,10 +71,6 @@
         return Math.sqrt(res);
     }
 
-    /**
-     *
-     * @return
-     */
     public String getID() {
         return AverageDistanceComparator.class.getName() + ":" + getThreshold();
     }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/BaseCountingRasterComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/BaseCountingRasterComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -28,26 +28,15 @@
 import org.jemmy.Dimension;
 
 /**
- *
  * @author shura
  */
 public abstract class BaseCountingRasterComparator extends ThresholdComparator {
 
-    /**
-     *
-     * @param threshold
-     */
     public BaseCountingRasterComparator(double threshold) {
         super(0, 1);
         setThreshold(threshold);
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public boolean compare(Raster image1, Raster image2) {
         Dimension size = PixelImageComparator.computeDiffSize(image1, image2);
         if(size == null) {
@@ -70,14 +59,6 @@
         return (offPixels <= totalPixels * getThreshold());
     }
 
-    /**
-     *
-     * @param comps1
-     * @param colors1
-     * @param comps2
-     * @param colors2
-     * @return
-     */
     protected abstract boolean compare(Raster.Component[] comps1, double[] colors1, Raster.Component[] comps2, double[] colors2);
 
 }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/ColorMappingComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/ColorMappingComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -29,7 +29,6 @@
 import org.jemmy.image.pixel.Raster.Component;
 
 /**
- *
  * @author shura
  */
 public abstract class ColorMappingComparator implements RasterComparator {
@@ -38,12 +37,6 @@
     final private ColorMap right;
     private RasterComparator subComparator;
 
-    /**
-     *
-     * @param left
-     * @param right
-     * @param subComparator
-     */
     public ColorMappingComparator(ColorMap left, ColorMap right,
             RasterComparator subComparator) {
         this.subComparator = subComparator;
@@ -51,47 +44,22 @@
         this.right = right;
     }
 
-    /**
-     *
-     * @return
-     */
     public RasterComparator getSubComparator() {
         return subComparator;
     }
 
-    /**
-     *
-     * @param subComparator
-     */
     public void setSubComparator(RasterComparator subComparator) {
         this.subComparator = subComparator;
     }
 
-    /**
-     *
-     * @param both
-     * @param subComparator
-     */
     public ColorMappingComparator(ColorMap both, RasterComparator subComparator) {
         this(both, both, subComparator);
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public boolean compare(Raster image1, Raster image2) {
         return subComparator.compare(map(image1, left), map(image2, right));
     }
 
-    /**
-     *
-     * @param image
-     * @param map
-     * @return
-     */
     public WriteableRaster map(Raster image, ColorMap map) {
         WriteableRaster res = createView(image.getSize());
         double[] colors = new double[image.getSupported().length];
@@ -106,39 +74,18 @@
         return res;
     }
 
-    /**
-     *
-     * @param size
-     * @return
-     */
     protected abstract WriteableRaster createView(Dimension size);
 
-    /**
-     *
-     * @return
-     */
     public String getID() {
         return ColorMappingComparator.class.getName() + ":" +
                 left.getID() + "," + right.getID() + "(" +
                 subComparator.getID() + ")";
     }
 
-    /**
-     *
-     */
     public interface ColorMap {
 
-        /**
-         *
-         * @param components
-         * @param values
-         * @param newValues
-         */
         public void map(Component[] components, double[] values, double[] newValues);
-        /**
-         *
-         * @return
-         */
+
         public String getID();
     }
 }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/MaxDistanceComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/MaxDistanceComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -27,26 +27,15 @@
 import org.jemmy.Dimension;
 
 /**
- *
  * @author shura
  */
 public class MaxDistanceComparator extends ThresholdComparator{
 
-    /**
-     *
-     * @param threshold
-     */
     public MaxDistanceComparator(double threshold) {
         super(0, Math.sqrt(3));
         setThreshold(threshold);
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public boolean compare(Raster image1, Raster image2) {
         Dimension size = PixelImageComparator.computeDiffSize(image1, image2);
         if (size == null) {
@@ -65,10 +54,6 @@
         return distance <= getThreshold();
     }
 
-    /**
-     *
-     * @return
-     */
     public String getID() {
         return MaxDistanceComparator.class.getName() + ":" + getThreshold();
     }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/PNGLoader.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/PNGLoader.java	Wed May 30 11:13:18 2018 -0700
@@ -79,7 +79,7 @@
     /**
      * Decodes image from an input stream passed into constructor.
      * @return a BufferedImage object
-     * @throws IOException
+     * @throws IOException todo document
      */
     public Raster decode() throws IOException {
         return decode(true);
@@ -91,7 +91,7 @@
      * Decodes image from an input stream passed into constructor.
      * @return a BufferedImage object
      * @param closeStream requests method to close the stream after the image is read
-     * @throws IOException
+     * @throws IOException todo document
      */
     public Raster decode(boolean closeStream) throws IOException {
 
--- a/core/JemmyCore/src/org/jemmy/image/pixel/PNGSaver.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/PNGSaver.java	Wed May 30 11:13:18 2018 -0700
@@ -52,11 +52,6 @@
     CRC32 crc;
     byte mode;
 
-    /**
-     *
-     * @param file
-     * @throws java.io.FileNotFoundException
-     */
     public PNGSaver(File file) throws FileNotFoundException {
         this(new FileOutputStream(file));
     }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/PixelEqualityRasterComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/PixelEqualityRasterComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -29,27 +29,14 @@
 import org.jemmy.image.pixel.Raster.Component;
 
 /**
- *
  * @author shura
  */
 public class PixelEqualityRasterComparator extends BaseCountingRasterComparator {
 
-    /**
-     *
-     * @param treshold
-     */
     public PixelEqualityRasterComparator(double treshold) {
         super(treshold);
     }
 
-    /**
-     *
-     * @param comps1
-     * @param colors1
-     * @param comps2
-     * @param colors2
-     * @return
-     */
     @Override
     protected boolean compare(Raster.Component[] comps1, double[] colors1,
             Raster.Component[] comps2, double[] colors2) {
@@ -65,10 +52,6 @@
         }
     }
 
-    /**
-     *
-     * @return
-     */
     public String getID() {
         return PixelEqualityRasterComparator.class.getName() + ":" + getThreshold();
     }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/PixelImageComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/PixelImageComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -32,7 +32,6 @@
 import org.jemmy.image.pixel.Raster.Component;
 
 /**
- *
  * @author shura
  */
 public abstract class PixelImageComparator implements ImageComparator {
@@ -46,10 +45,6 @@
     private RasterComparator comparator = null;
     private Environment env = null;
 
-    /**
-     *
-     * @param comparator
-     */
     public PixelImageComparator(RasterComparator comparator) {
         this.comparator = comparator;
     }
@@ -66,12 +61,6 @@
         }
     }
 
-    /**
-     *
-     * @param one
-     * @param two
-     * @return
-     */
     public static Dimension computeDiffSize(Raster one, Raster two) {
         if (one.getSize().equals(two.getSize())) {
             return one.getSize();
@@ -90,12 +79,6 @@
         }
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public WriteableRaster computeDifference(Raster image1, Raster image2) {
         Dimension size = computeDiffSize(image1, image2);
         if (size == null) {
@@ -129,15 +112,7 @@
     private static final Component[] diffComponents = {
         Component.RED, Component.BLUE, Component.GREEN
     };
-    /**
-     *
-     * @param comps1
-     * @param colors1
-     * @param comps2
-     * @param colors2
-     * @param compsRes
-     * @param colorsRes
-     */
+
     protected void calcDiffColor(Raster.Component[] comps1, double[] colors1,
             Raster.Component[] comps2, double[] colors2, Raster.Component[] compsRes, double[] colorsRes) {
         double square1, square2;
@@ -158,34 +133,12 @@
         return getRasterComparator().getID();
     }
 
-    /**
-     *
-     * @param image
-     * @return
-     */
     protected abstract Image toImage(Raster image);
 
-    /**
-     *
-     * @param image
-     * @return
-     */
     protected abstract Raster toRaster(Image image);
 
-    /**
-     *
-     * @param r1
-     * @param r2
-     * @return
-     */
     protected abstract WriteableRaster createDiffRaster(Raster r1, Raster r2);
 
-    /**
-     *
-     * @param comps
-     * @param comp
-     * @return
-     */
     public static int arrayIndexOf(Raster.Component[] comps, Raster.Component comp) {
         for (int i = 0; i < comps.length; i++) {
             if (comp == comps[i]) {
--- a/core/JemmyCore/src/org/jemmy/image/pixel/Raster.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/Raster.java	Wed May 30 11:13:18 2018 -0700
@@ -32,47 +32,27 @@
  */
 public interface Raster {
 
-    /**
-     *
-     */
     public enum Component {
-
-        /**
-         *
-         */
         RED,
-        /**
-         *
-         */
         GREEN,
-        /**
-         *
-         */
         BLUE,
-        /**
-         *
-         */
         ALPHA;
     };
 
-    /**
-     *
-     * @return
-     */
     public Dimension getSize();
 
     /**
      * Supposed to write pixel component value in the RGBA order.
-     * @param x
-     * @param y
-     * @param colors
+     * @param x todo document
+     * @param y todo document
+     * @param colors todo document
      */
     public void getColors(int x, int y, double[] colors);
 
     /**
      * Returns a list of supported components.
      *
-     * @return
+     * @return todo document
      */
     public Component[] getSupported();
 
--- a/core/JemmyCore/src/org/jemmy/image/pixel/RasterComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/RasterComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -31,16 +31,8 @@
  * @author shura
  */
 public interface RasterComparator {
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
+
     public boolean compare(Raster image1, Raster image2);
-    /**
-     *
-     * @return
-     */
+
     public String getID();
 }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/ResizeComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/ResizeComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -29,7 +29,6 @@
 import org.jemmy.image.ImageComparator;
 
 /**
- *
  * @author shura
  */
 public abstract class ResizeComparator implements ImageComparator {
@@ -37,65 +36,29 @@
     private ImageComparator subComparator;
     private Mode mode;
 
-    /**
-     *
-     */
     public enum Mode {
-
-        /**
-         *
-         */
         LEFT,
-        /**
-         *
-         */
         RIGTH,
-        /**
-         *
-         */
         MAX
     };
 
-    /**
-     *
-     * @param subComparator
-     * @param mode
-     */
     public ResizeComparator(ImageComparator subComparator, Mode mode) {
         this.subComparator = subComparator;
         this.mode = mode;
     }
 
-    /**
-     *
-     * @param subComparator
-     */
     public ResizeComparator(ImageComparator subComparator) {
         this(subComparator, Mode.MAX);
     }
 
-    /**
-     *
-     * @return
-     */
     public ImageComparator getSubComparator() {
         return subComparator;
     }
 
-    /**
-     *
-     * @param subComparator
-     */
     public void setSubComparator(ImageComparator subComparator) {
         this.subComparator = subComparator;
     }
 
-    /**
-     *
-     * @param image1
-     * @param image2
-     * @return
-     */
     public Image compare(Image image1, Image image2) {
         if(image1 == null || image2 == null) {
             return (image1 == null) ? image2 : image1;
@@ -128,25 +91,10 @@
         return subComparator.compare(r1, r2);
     }
 
-    /**
-     *
-     * @param image
-     * @param size
-     * @return
-     */
     abstract public Image resize(Image image, Dimension size);
 
-    /**
-     *
-     * @param image
-     * @return
-     */
     abstract public Dimension getSize(Image image);
 
-    /**
-     *
-     * @return
-     */
     public String getID() {
         return ResizeComparator.class.getName() + "(" + subComparator.getID() + ")";
     }
--- a/core/JemmyCore/src/org/jemmy/image/pixel/ThresholdComparator.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/ThresholdComparator.java	Wed May 30 11:13:18 2018 -0700
@@ -39,10 +39,7 @@
         this.max = max;
     }
 
-    /**
-     *
-     * @param threshold
-     */
+
     public final void setThreshold(double threshold) {
         if (threshold < min || threshold > max) {
             throw new IllegalArgumentException("Treshold expected to be withing ("
--- a/core/JemmyCore/src/org/jemmy/image/pixel/WriteableRaster.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/image/pixel/WriteableRaster.java	Wed May 30 11:13:18 2018 -0700
@@ -25,15 +25,9 @@
 package org.jemmy.image.pixel;
 
 /**
- *
  * @author shura
  */
 public interface WriteableRaster extends Raster {
-    /**
-     *
-     * @param x
-     * @param y
-     * @param values
-     */
+
     public void setColors(int x, int y, double[] values);
 }
--- a/core/JemmyCore/src/org/jemmy/input/AbstractCaretOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/AbstractCaretOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -84,10 +84,6 @@
             return caret;
         }
 
-        /**
-         *
-         * @return
-         */
         protected double position() {
             return value;
         }
--- a/core/JemmyCore/src/org/jemmy/input/CaretImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/CaretImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -58,8 +58,7 @@
     private ArrayList<ScrollAction> actions;
 
     /**
-     *
-     * @param wrap
+     * @param wrap the control wrapper instance
      * @param caretOwner only position() is used
      */
     public CaretImpl(Wrap<?> wrap, CaretOwner caretOwner) {
@@ -68,18 +67,10 @@
         actions = new ArrayList<ScrollAction>();
     }
 
-    /**
-     *
-     * @return
-     */
     public Wrap<?> getWrap() {
         return wrap;
     }
 
-    /**
-     *
-     * @param action
-     */
     protected void addScrollAction(ScrollAction action) {
         actions.add(0, action);
     }
@@ -145,11 +136,6 @@
         private CaretOwner caret;
         private double precision;
 
-        /**
-         *
-         * @param caret
-         * @param value
-         */
         public DirectionToPosition(CaretOwner caret, double value, double precision) {
             this.value = value;
             this.caret = caret;
@@ -165,19 +151,11 @@
             return (diff == 0) ? 0 : ((diff > 0) ? 1 : -1);
         }
 
-        /**
-         *
-         * @return
-         */
         @Override
         public String toString() {
             return "value == " + position();
         }
 
-        /**
-         *
-         * @return
-         */
         protected double position() {
             return value;
         }
@@ -188,28 +166,14 @@
      */
     protected static interface ScrollAction {
 
-        /**
-         *
-         * @param direction
-         */
         public void scrollTo(int direction);
     }
 
-    /**
-     *
-     */
     protected class MouseScrollAction implements ScrollAction {
 
         Point up, down;
         KeyboardModifier[] upMods, downMods;
 
-        /**
-         *
-         * @param down
-         * @param downMods
-         * @param up
-         * @param upMods
-         */
         public MouseScrollAction(Point down, KeyboardModifier[] downMods, Point up, KeyboardModifier[] upMods) {
             this.up = up;
             this.down = down;
@@ -217,40 +181,21 @@
             this.downMods = downMods;
         }
 
-        /**
-         *
-         * @param down
-         * @param up
-         */
         public MouseScrollAction(Point down, Point up) {
             this(up, new KeyboardModifier[0], up, new KeyboardModifier[0]);
         }
 
-        /**
-         *
-         * @param direction
-         */
         public void scrollTo(int direction) {
             wrap.mouse().click(1, (direction > 0) ? up : down, MouseButtons.BUTTON1,
                     (direction > 0) ? upMods : downMods);
         }
     }
 
-    /**
-     *
-     */
     protected class KeyboardScrollAction implements ScrollAction {
 
         KeyboardButton down, up;
         KeyboardModifier[] downMods, upMods;
 
-        /**
-         *
-         * @param down
-         * @param downMods
-         * @param up
-         * @param upMods
-         */
         public KeyboardScrollAction(KeyboardButton down, KeyboardModifier[] downMods, KeyboardButton up, KeyboardModifier[] upMods) {
             this.down = down;
             this.up = up;
@@ -258,19 +203,10 @@
             this.upMods = upMods;
         }
 
-        /**
-         *
-         * @param down
-         * @param up
-         */
         public KeyboardScrollAction(KeyboardButton down, KeyboardButton up) {
             this(down, new KeyboardModifier[0], up, new KeyboardModifier[0]);
         }
 
-        /**
-         *
-         * @param direction
-         */
         public void scrollTo(int direction) {
             wrap.keyboard().pushKey((direction > 0) ? up : down,
                     (direction > 0) ? upMods : downMods);
--- a/core/JemmyCore/src/org/jemmy/input/CaretText.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/CaretText.java	Wed May 30 11:13:18 2018 -0700
@@ -45,10 +45,6 @@
     TextImpl text;
     Wrap<?> wrap;
 
-    /**
-     *
-     * @param wrap
-     */
     public CaretText(Wrap<?> wrap) {
         this.wrap = wrap;
         text = new TextImpl(wrap) {
@@ -69,10 +65,6 @@
         caret = new TextCaret(wrap, this);
     }
 
-    /**
-     *
-     * @return
-     */
     protected int getFlags() {
         return (Integer)wrap.getEnvironment().
                 getProperty(RegexCaretDirection.REGEX_FLAGS, 0);
@@ -88,9 +80,10 @@
 
     /**
      * Moves caret to a beginning/end of an <code>index</code>'th occurance of the regex.
-     * @param regex
-     * @param front
-     * @param index
+     *
+     * @param regex the regular expression to search for
+     * @param front todo document
+     * @param index todo document
      */
     public void to(String regex, boolean front, int index) {
         caret().to(new RegexCaretDirection(this, this, regex, getFlags(), front, index));
@@ -98,8 +91,9 @@
 
     /**
      * Moves caret to a beginning/end of the first occurance of the regex.
-     * @param regex
-     * @param front
+     *
+     * @param regex the regular expression to search for
+     * @param front todo document
      */
     public void to(String regex, boolean front) {
         to(regex, front, 0);
@@ -107,29 +101,18 @@
 
     /**
      * Moves caret to a beginning the first occurance of the regex.
-     * @param regex
+     *
+     * @param regex the regular expression to search for
      */
     public void to(String regex) {
         to(regex, true);
     }
 
-    /**
-     *
-     * @param left
-     * @param leftMods
-     * @param right
-     * @param rightMods
-     */
     public void addNavKeys(KeyboardButton left, KeyboardModifier[] leftMods,
             KeyboardButton right, KeyboardModifier[] rightMods) {
         caret().addNavKeys(left, leftMods, right, rightMods);
     }
 
-    /**
-     *
-     * @param left
-     * @param right
-     */
     public void addNavKeys(KeyboardButton left, KeyboardButton right) {
         addNavKeys(left, new KeyboardModifier[0], right, new KeyboardModifier[0]);
     }
--- a/core/JemmyCore/src/org/jemmy/input/CharBindingMap.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/CharBindingMap.java	Wed May 30 11:13:18 2018 -0700
@@ -36,8 +36,8 @@
  * communicate what modifiers and primary key are required to generate
  * a given symbol.
  *
- * @param <BUTTON>
- * @param <MODIFIER>
+ * @param <BUTTON> the button type
+ * @param <MODIFIER> the modifier type
  * @author Alexandre Iline (alexandre.iline@sun.com)
  */
 
--- a/core/JemmyCore/src/org/jemmy/input/ClickFocus.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/ClickFocus.java	Wed May 30 11:13:18 2018 -0700
@@ -30,6 +30,8 @@
 
 /**
  * Simple Focus implementation which clicks on a control to give focus.
+ * @param <CONTROL> the control type
+ *
  * @author shura
  */
 public class ClickFocus<CONTROL> implements Focus {
@@ -38,10 +40,10 @@
     Point clickPoint;
 
     /**
-     *
      * @param topControl a control to click on. Node that this could be
      * a control itself (the one we're giving the focus to) or a subcontrol
      * of it.
+     * @param  clickPoint the point to click
      */
     public ClickFocus(Wrap<? extends CONTROL> topControl, Point clickPoint) {
         this.topControl = topControl;
@@ -57,7 +59,7 @@
     }
 
     /**
-     * @{@inheritDoc}
+     * {@inheritDoc}
      */
     public void focus() {
         if (clickPoint == null) {
--- a/core/JemmyCore/src/org/jemmy/input/DefaultCharBindingMap.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/DefaultCharBindingMap.java	Wed May 30 11:13:18 2018 -0700
@@ -38,12 +38,10 @@
 
 
 /**
- *
  * Default implementation of CharBindingMap interface.
  * Provides a mapping for the following symbols:<BR>
- * @see org.jemmy.CharBindingMap
  *
- * @author Alexandre Iline (alexandre.iline@sun.com)
+ * @author shura
  */
 
 public class DefaultCharBindingMap implements CharBindingMap<KeyboardButton, KeyboardModifier> {
--- a/core/JemmyCore/src/org/jemmy/input/KnobDragScrollerImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/KnobDragScrollerImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -49,11 +49,6 @@
     float dragDelta = 1;
     boolean reverse;
 
-    /**
-     *
-     * @param wrap
-     * @param scroll
-     */
     public KnobDragScrollerImpl(Wrap<?> wrap, Scroll scroll) {
         this.wrap = wrap;
         this.scroll = scroll;
@@ -64,24 +59,12 @@
         this.reverse = reverse;
     }
 
-    /**
-     *
-     * @return
-     */
     public Wrap<?> getWrap() {
         return wrap;
     }
 
-    /**
-     *
-     * @return
-     */
     public abstract Vector getScrollVector();
 
-    /**
-     *
-     * @param dragDelta
-     */
     public void setDragDelta(float dragDelta) {
         this.dragDelta = dragDelta;
     }
@@ -166,9 +149,6 @@
     }
      *
      */
-    /**
-     *
-     * @return
-     */
+
     protected abstract Wrap<?> getKnob();
 }
--- a/core/JemmyCore/src/org/jemmy/input/RegexCaretDirection.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/RegexCaretDirection.java	Wed May 30 11:13:18 2018 -0700
@@ -36,9 +36,6 @@
  */
 public class RegexCaretDirection extends CaretImpl.DirectionToPosition {
 
-    /**
-     *
-     */
     public static final String REGEX_FLAGS = "";
 
     String regex;
@@ -47,15 +44,6 @@
     Text text;
     int flags;
 
-    /**
-     *
-     * @param text
-     * @param caretOwner
-     * @param regex
-     * @param flags
-     * @param front
-     * @param index
-     */
     public RegexCaretDirection(Text text, CaretOwner caretOwner, String regex, int flags, boolean front, int index) {
         super(caretOwner, 0);
         this.text = text;
@@ -68,24 +56,11 @@
         }
     }
 
-    /**
-     *
-     * @return
-     */
     @Override
     protected double position() {
         return position(text, regex, flags, front, index);
     }
 
-    /**
-     *
-     * @param text
-     * @param regex
-     * @param flags
-     * @param front
-     * @param index
-     * @return
-     */
     public static int position(Text text, String regex, int flags, boolean front, int index) {
         Matcher matcher = Pattern.compile(regex, flags).matcher(text.text());
         for (int i = 0; i <= index; i++) {
--- a/core/JemmyCore/src/org/jemmy/input/ScrollerImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/ScrollerImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -45,11 +45,6 @@
 
     Scroll scroll;
 
-    /**
-     *
-     * @param target
-     * @param caret
-     */
     public ScrollerImpl(Wrap target, CaretOwner caret) {
         super(target, caret);
         scroll = new CaretScroll(caret);
@@ -62,7 +57,7 @@
     }
 
     /**
-     * @param increase
+     * @param increase <code>true</code> to increase, <code>false</code> to decrease the value
      * @return  a point to click in order to decrease/increase the value
      */
     protected abstract Point getScrollClickPoint(boolean increase);
@@ -70,24 +65,16 @@
     /**
      * An auxiliary function to calculate click point, on the appropriate side
      * of the control depending on the parameters.
-     * @param c
+     * @param c the control wrapper
      * @param horizontal - horizontal or vertical
      * @param increase - increase or decrease
      * @param offset distance from the border
-     * @return
+     * @return the point instance
      */
     public static Point createScrollPoint(Wrap c, boolean horizontal, boolean increase, int offset) {
         return createScrollPoint(c.getScreenBounds(), horizontal, increase, offset);
     }
 
-    /**
-     *
-     * @param bounds
-     * @param horizontal
-     * @param increase
-     * @param offset
-     * @return
-     */
     public static Point createScrollPoint(Rectangle bounds, boolean horizontal, boolean increase, int offset) {
         if(horizontal) {
             return new Point(increase ? (bounds.width - 1 - offset) : offset, bounds.height / 2);
@@ -96,18 +83,10 @@
         }
     }
 
-    //only the value is used from it
-    /**
-     *
-     */
     public static class CaretScroll implements Scroll {
 
         CaretOwner co;
 
-        /**
-         *
-         * @param co
-         */
         public CaretScroll(CaretOwner co) {
             this.co = co;
         }
--- a/core/JemmyCore/src/org/jemmy/input/SelectionText.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/SelectionText.java	Wed May 30 11:13:18 2018 -0700
@@ -35,18 +35,15 @@
  */
 public abstract class SelectionText extends CaretText implements IntervalSelectable {
 
-    /**
-     *
-     * @param wrap
-     */
     public SelectionText(Wrap<?> wrap) {
         super(wrap);
     }
 
     /**
      * Selects <code>index</code>'th occurance of the regex.
-     * @param regex
-     * @param index
+     *
+     * @param regex the regular expression to select
+     * @param index the occurance index
      */
     public void select(String regex, int index) {
         to(regex, true, index);
@@ -55,15 +52,15 @@
 
     /**
      * Selects first occurance of the regex.
-     * @param regex
+     *
+     * @param regex the regular expression to select
      */
     public void select(String regex) {
         select(regex, 0);
     }
 
     /**
-     * Retuns the selection portion of the text.
-     * @return
+     * @return the selection portion of the text.
      */
     public String selection() {
         int a = (int) anchor(); int p = (int) position();
--- a/core/JemmyCore/src/org/jemmy/input/StringMenuOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/StringMenuOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -46,7 +46,7 @@
     /**
      * Pushes the menu using one string for one level of the menu. Comparison
      * is done according to the policy.
-     * @param texts
+     * @param texts todo document
      * @see #getPolicy()
      */
     public void push(String... texts) {
@@ -57,10 +57,10 @@
     }
 
     /**
-     * A shortcut to <code>menu().push(LookupCriteria<T> ...)</code>
+     * A shortcut to <code>menu().push(LookupCriteria ...)</code>
      * @see #menu()
-     * @see Menu#push(org.jemmy.lookup.LookupCriteria<T>[])
-     * @param criteria
+     * @see Menu#push(LookupCriteria[])
+     * @param criteria the lookup criteria
      */
     public void push(LookupCriteria<T>... criteria) {
         menu().push(criteria);
@@ -69,7 +69,7 @@
     /**
      * Select a menu item using one string for one level of the menu. Comparison
      * is done according to the policy.
-     * @param texts
+     * @param texts todo document
      * @return wrap for the last selected item
      * @see #getPolicy()
      */
@@ -81,10 +81,11 @@
     }
 
     /**
-     * A shortcut to <code>menu().select(LookupCriteria<T> ...)</code>
+     * A shortcut to <code>menu().select(LookupCriteria ...)</code>
      * @see #menu()
-     * @see Menu#select(org.jemmy.lookup.LookupCriteria<T>[])
-     * @param criteria
+     * @see Menu#select(LookupCriteria[])
+     * @param criteria the lookup criteria
+     * @return todo document
      */
     public Wrap<? extends T> select(LookupCriteria<T>... criteria) {
         return menu().select(criteria);
--- a/core/JemmyCore/src/org/jemmy/input/StringMenuSelectableOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/StringMenuSelectableOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -31,7 +31,7 @@
 /**
  *
  * @author erikgreijus
- * @param <T>
+ * @param <T> todo document
  */
 public abstract class StringMenuSelectableOwner<T> extends StringMenuOwner<T> implements MenuSelectableOwner<T> {
 
--- a/core/JemmyCore/src/org/jemmy/input/StringPopupSelectableOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/StringPopupSelectableOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -32,7 +32,7 @@
 /**
  *
  * @author erikgreijus
- * @param <T>
+ * @param <T> todo document
  */
 public abstract class StringPopupSelectableOwner<T> extends StringPopupOwner<T> implements PopupSelectableOwner<T> {
 
--- a/core/JemmyCore/src/org/jemmy/input/TextCaret.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/TextCaret.java	Wed May 30 11:13:18 2018 -0700
@@ -38,33 +38,16 @@
  */
 public class TextCaret extends CaretImpl implements IntervalSelector {
 
-    /**
-     *
-     * @param wrap
-     * @param scroll
-     */
     public TextCaret(Wrap<?> wrap, CaretOwner scroll) {
         super(wrap, scroll);
         addScrollAction(new KeyboardScrollAction(KeyboardButtons.LEFT, KeyboardButtons.RIGHT));
     }
 
-    /**
-     *
-     * @param down
-     * @param downMods
-     * @param up
-     * @param upMods
-     */
     public void addNavKeys(KeyboardButton down, KeyboardModifier[] downMods,
             KeyboardButton up, KeyboardModifier[] upMods) {
         addScrollAction(new CaretImpl.KeyboardScrollAction(down, downMods, up, upMods));
     }
 
-    /**
-     *
-     * @param down
-     * @param up
-     */
     public void addNavKeys(KeyboardButton down, KeyboardButton up) {
         addNavKeys(down, new KeyboardModifier[0], up, new KeyboardModifier[0]);
     }
--- a/core/JemmyCore/src/org/jemmy/input/TextImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/TextImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -45,28 +45,15 @@
     private int selectAllClickCount = DEFAULT_SELECT_ALL_CLICK_COUNT;
     boolean keyboardSelection;
 
-    /**
-     *
-     * @param target
-     * @param keyboardSelection
-     */
     protected TextImpl(Wrap<?> target, boolean keyboardSelection) {
         this.target = target;
         this.keyboardSelection = keyboardSelection;
     }
 
-    /**
-     *
-     * @param target
-     */
     protected TextImpl(Wrap<?> target) {
         this(target, false);
     }
 
-    /**
-     *
-     * @return
-     */
     public Wrap<?> getWrap() {
         return target;
     }
@@ -75,7 +62,7 @@
      * Types text into the control. Wrap may implement Focusable.
      *
      * @see Focusable
-     * @param newText
+     * @param newText the new text
      */
     public void type(final String newText) {
         target.getEnvironment().getExecutor().execute(target.getEnvironment(), false, new Action() {
--- a/core/JemmyCore/src/org/jemmy/input/WindowImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/input/WindowImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -39,31 +39,17 @@
     private Wrap control;
     private int offset;
 
-    /**
-     *
-     * @param control
-     * @param offset
-     */
     public WindowImpl(Wrap control, int offset) {
         this.control = control;
         this.offset = offset;
     }
 
-    /**
-     *
-     * @param dest
-     */
     public void move(Point dest) {
         Point start = control.getClickPoint();
         Point target = new Point(start.x + dest.x, start.y + dest.y);
         control.drag().dnd(start, control, target);
     }
 
-    /**
-     *
-     * @param size
-     * @param direction
-     */
     public void resize(Dimension size, Direction direction) {
         Point start = null, target = null;
         Dimension sizeDiff = new Dimension(size.width - control.getScreenBounds().width, size.height - control.getScreenBounds().height);
--- a/core/JemmyCore/src/org/jemmy/interfaces/Caret.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Caret.java	Wed May 30 11:13:18 2018 -0700
@@ -31,25 +31,15 @@
  * @author shura
  */
 public interface Caret {
-    /**
-     * @deprecated this is moved to CaretOwner
-     * @param value
-     */
+
+    @Deprecated
     public void to(double value);
 
-    /**
-     *
-     * @param condition
-     */
     public void to(Direction condition);
 
-    /**
-     *
-     */
     public interface Direction {
         /**
-         * @return < 0 to scroll toward decreasing value, > 0 - vice versa
-         * 0 to stop scrolling
+         * @return &lt; 0 to scroll toward decreasing value, &gt; 0 - vice versa 0 to stop scrolling
          */
         public int to();
     }
--- a/core/JemmyCore/src/org/jemmy/interfaces/CaretOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/CaretOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -38,16 +38,10 @@
  * @author shura
  */
 public interface CaretOwner extends ControlInterface {
-    /**
-     *
-     * @return
-     */
+
     @Property(Wrap.VALUE_PROP_NAME)
     public double position();
-    /**
-     *
-     * @return
-     */
+
     @Shortcut
     public Caret caret();
 
@@ -55,7 +49,7 @@
      * Utility method that invokes caret().to(Direction) with correct
      * direction.
      * TODO: Remove this method.
-     * @param position
+     * @param position the position
      */
     @Shortcut
     public void to(double position);
--- a/core/JemmyCore/src/org/jemmy/interfaces/ControlInterfaceFactory.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/ControlInterfaceFactory.java	Wed May 30 11:13:18 2018 -0700
@@ -47,7 +47,7 @@
     /**
      *
      * Instantiates interface.
-     * @param <TYPE>
+     * @param <TYPE> todo document
      * @param <INTERFACE> ControlInterface type
      * @param control control to provide the interface for
      * @param interfaceClass ControlInterface type
--- a/core/JemmyCore/src/org/jemmy/interfaces/Drag.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Drag.java	Wed May 30 11:13:18 2018 -0700
@@ -38,28 +38,17 @@
  * @author shura
  */
 public interface Drag extends ControlInterface {
-    /**
-     *
-     */
     public static final Timeout BEFORE_DRAG_TIMEOUT = new Timeout("Control.before.drag", 500);
-    /**
-     *
-     */
     public static final Timeout BEFORE_DROP_TIMEOUT = new Timeout("Control.after.drag", 500);
-    /**
-     *
-     */
     public static final Timeout IN_DRAG_TIMEOUT = new Timeout("Control.in.drag", 10);
 
     /**
-     *
      * @param targetPoint target point specified in component local coordinates
      */
     @Shortcut
     public void dnd(Point targetPoint);
     /**
-     *
-     * @param target
+     * @param target todo document
      * @param targetPoint target point specified in target component local coordinates
      */
     @Shortcut
@@ -67,7 +56,7 @@
     /**
      *
      * @param point source point specified in component local coordinates
-     * @param target
+     * @param target todo document
      * @param targetPoint target point specified in target component local coordinates
      */
     @Shortcut
@@ -75,19 +64,19 @@
     /**
      *
      * @param point source point specified in component local coordinates
-     * @param target
+     * @param target todo document
      * @param targetPoint target point specified in target component local coordinates
-     * @param button
+     * @param button todo document
      */
     @Shortcut
     public void dnd(Point point, Wrap target, Point targetPoint, MouseButton button);
     /**
      *
      * @param point source point specified in component local coordinates
-     * @param target
+     * @param target todo document
      * @param targetPoint target point specified in target component local coordinates
-     * @param button
-     * @param modifiers
+     * @param button todo document
+     * @param modifiers todo document
      */
     @Shortcut
     public void dnd(Point point, Wrap target, Point targetPoint, MouseButton button, Modifier... modifiers);
--- a/core/JemmyCore/src/org/jemmy/interfaces/Focusable.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Focusable.java	Wed May 30 11:13:18 2018 -0700
@@ -32,10 +32,7 @@
  * @author shura
  */
 public interface Focusable extends ControlInterface {
-    /**
-     *
-     * @return
-     */
+
     @Shortcut
     public Focus focuser();
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/InterfaceException.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/InterfaceException.java	Wed May 30 11:13:18 2018 -0700
@@ -34,25 +34,11 @@
  */
 public class InterfaceException extends JemmyException {
 
-    /**
-     *
-     * @param <T>
-     * @param object
-     * @param interfaceClass
-     */
     public <T extends ControlInterface> InterfaceException(Wrap object, Class<T> interfaceClass) {
         super(interfaceClass.getName() + " is not implemented for " + object.getControl().getClass().getName() +
                 " by " + object.getClass().getName(), object.getControl());
     }
 
-    /**
-     *
-     * @param <CT>
-     * @param <T>
-     * @param object
-     * @param interfaceClass
-     * @param type
-     */
     public <CT, T extends TypeControlInterface<CT>> InterfaceException(Wrap object, Class<T> interfaceClass, Class<CT> type) {
         super(interfaceClass.getName() + " is not implemented for " + object.getControl().getClass().getName() +
                 " by " + object.getClass().getName() +
--- a/core/JemmyCore/src/org/jemmy/interfaces/IntervalSelectable.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/IntervalSelectable.java	Wed May 30 11:13:18 2018 -0700
@@ -32,14 +32,8 @@
  * @author shura
  */
 public interface IntervalSelectable extends CaretOwner {
-    /**
-     *
-     */
     public static final String SELECTION_ANCHOR_PROP_NAME="selection.anchor";
-    /**
-     *
-     * @return
-     */
+
     @Property(SELECTION_ANCHOR_PROP_NAME)
     public double anchor();
     public IntervalSelector caret();
--- a/core/JemmyCore/src/org/jemmy/interfaces/IntervalSelector.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/IntervalSelector.java	Wed May 30 11:13:18 2018 -0700
@@ -30,15 +30,8 @@
  * @author shura
  */
 public interface IntervalSelector extends Caret {
-    /**
-     *
-     * @param value
-     */
+
     public void selectTo(double value);
 
-    /**
-     *
-     * @param condition
-     */
     public void selectTo(Caret.Direction condition);
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/Keyboard.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Keyboard.java	Wed May 30 11:13:18 2018 -0700
@@ -25,7 +25,9 @@
 
 package org.jemmy.interfaces;
 
+import org.jemmy.action.Action;
 import org.jemmy.dock.Shortcut;
+import org.jemmy.env.Environment;
 import org.jemmy.env.Timeout;
 
 
@@ -34,79 +36,39 @@
  */
 public interface Keyboard extends ControlInterface {
 
-    /**
-     *
-     */
     public static final Timeout PUSH = new Timeout("keyboard.push", 100);
 
-    /**
-     *
-     * @param key
-     * @param modifiers
-     */
     @Shortcut
     public void pressKey(KeyboardButton key, Modifier... modifiers);
-    /**
-     *
-     * @param key
-     */
+
     @Shortcut
     public void pressKey(KeyboardButton key);
 
-    /**
-     *
-     * @param key
-     * @param modifiers
-     */
     @Shortcut
     public void releaseKey(KeyboardButton key, Modifier... modifiers);
-    /**
-     *
-     * @param key
-     */
+
     @Shortcut
     public void releaseKey(KeyboardButton key);
 
-    /**
-     *
-     * @param key
-     * @param modifiers
-     * @param pushTime
-     */
     @Shortcut
     public void pushKey(Timeout pushTime, KeyboardButton key, Modifier... modifiers);
-    /**
-     *
-     * @param key
-     * @param modifiers
-     */
+
     @Shortcut
     public void pushKey(KeyboardButton key, Modifier... modifiers);
-    /**
-     *
-     * @param key
-     */
+
     @Shortcut
     public void pushKey(KeyboardButton key);
 
-    /**
-     *
-     * @param keyChar
-     * @param pushTime
-     */
     @Shortcut
     public void typeChar(char keyChar, Timeout pushTime);
-    /**
-     *
-     * @param keyChar
-     */
+
     @Shortcut
     public void typeChar(char keyChar);
 
     /**
      * Detaches the implementation so that all actions of it will be ran detached.
-     * @see org.jemmy.action.ActionExecutor#executeDetached(org.jemmy.env.Environment, org.jemmy.action.Action, java.lang.Object[])
-     * @return
+     * @see org.jemmy.action.ActionExecutor#executeDetached(Environment, boolean, Action, Object...)
+     * @return todo document
      */
     public Keyboard detached();
 
@@ -142,7 +104,6 @@
      * to be used in Keyboard interface methods
      */
     public static enum KeyboardButtons implements KeyboardButton {
-
         /**
          *
          */
--- a/core/JemmyCore/src/org/jemmy/interfaces/Label.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Label.java	Wed May 30 11:13:18 2018 -0700
@@ -36,7 +36,7 @@
     /**
      * Returns the currently displayed text.
      * TODO: Wrap.waitText
-     * @return
+     * @return the currently displayed text
      */
     @Property(Wrap.TEXT_PROP_NAME)
     public String text();
--- a/core/JemmyCore/src/org/jemmy/interfaces/Menu.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Menu.java	Wed May 30 11:13:18 2018 -0700
@@ -30,7 +30,7 @@
 /**
  * Represents a hierarchical structure (hence extending TreeSelector) in which
  * elements not only could be selected but also "pushes", which is an action
- * typically performed with menu.<br/>
+ * typically performed with menu.
  * @author shura
  * @see MenuOwner
  */
--- a/core/JemmyCore/src/org/jemmy/interfaces/MenuOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/MenuOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -37,7 +37,7 @@
 public interface MenuOwner<T> extends TypeControlInterface<T> {
     /**
      * Actual menu.
-     * @return
+     * @return the actual menu
      */
     @Shortcut
     public Menu menu();
--- a/core/JemmyCore/src/org/jemmy/interfaces/MenuSelectable.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/MenuSelectable.java	Wed May 30 11:13:18 2018 -0700
@@ -29,10 +29,9 @@
 /**
  * Represents a hierarchical structure in which elements not only could be
  * selected but also "pushes", which is an action typically performed with
- * menu.<br/>
+ * menu.
  *
  * @author erikgreijus
- * @param <T>
  */
 public interface MenuSelectable<T> extends Menu<T> {
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/MenuSelectableOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/MenuSelectableOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -25,9 +25,7 @@
 package org.jemmy.interfaces;
 
 /**
- *
  * @author erikgreijus
- * @param <T>
  */
 public interface MenuSelectableOwner<T> extends MenuOwner<T> {
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/Modifier.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Modifier.java	Wed May 30 11:13:18 2018 -0700
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Alexander Kouznetsov <mrkam@mail.ru>
+ * @author mrkam
  */
 public interface Modifier extends Button {
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/Mouse.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Mouse.java	Wed May 30 11:13:18 2018 -0700
@@ -27,126 +27,83 @@
 
 
 import org.jemmy.Point;
+import org.jemmy.action.Action;
 import org.jemmy.dock.Shortcut;
+import org.jemmy.env.Environment;
 import org.jemmy.env.Timeout;
 
 /**
- *
  * @author shura
  */
 public interface Mouse extends ControlInterface {
-    /**
-     *
-     */
     public static final Timeout CLICK = new Timeout("mouse.click", 100);
-    /**
-     *
-     */
+
     @Shortcut
     public void press();
-    /**
-     *
-     * @param button
-     */
+
     @Shortcut
     public void press(MouseButton button);
-    /**
-     *
-     * @param button
-     * @param modifiers
-     */
+
     @Shortcut
     public void press(MouseButton button, Modifier... modifiers);
-    /**
-     *
-     */
+
     @Shortcut
     public void release();
-    /**
-     *
-     * @param button
-     */
+
     @Shortcut
     public void release(MouseButton button);
-    /**
-     *
-     * @param button
-     * @param modifiers
-     */
+
     @Shortcut
     public void release(MouseButton button, Modifier... modifiers);
-    /**
-     *
-     */
+
     @Shortcut
     public void move();
-    /**
-     *
-     * @param p
-     */
+
     @Shortcut
     public void move(Point p);
-    /**
-     *
-     */
+
     @Shortcut
     public void click();
-    /**
-     *
-     * @param count
-     */
+
     @Shortcut
     public void click(int count);
-    /**
-     *
-     * @param count
-     * @param p
-     */
+
     @Shortcut
     public void click(int count, Point p);
-    /**
-     *
-     * @param count
-     * @param p
-     * @param button
-     */
+
     @Shortcut
     public void click(int count, Point p, MouseButton button);
-    /**
-     *
-     * @param count
-     * @param p
-     * @param button
-     * @param modifiers
-     */
+
     @Shortcut
     public void click(int count, Point p, MouseButton button, Modifier... modifiers);
 
     /*
      * This method turns mouse wheel.
-     * @parem amount Positive or negative
+     * @param amount Positive or negative
      */
     @Shortcut
     public void turnWheel(int amount);
 
     /*
      * This method turns mouse wheel.
-     * @parem amount Positive or negative
+     * @param amount Positive or negative
      */
     @Shortcut
     public void turnWheel(Point point, int amount);
 
     /*
      * This method turns mouse wheel.
-     * @parem amount Positive or negative
+     * @param point todo document
+     * @param amount Positive or negative
+     * @param modifiers todo document
      */
     @Shortcut
     public void turnWheel(Point point, int amount, Modifier... modifiers);
 
     /**
      * Detaches the implementation so that all actions of it will be ran detached.
-     * @see org.jemmy.action.ActionExecutor#executeDetached(org.jemmy.env.Environment, org.jemmy.action.Action, java.lang.Object[])
-     * @return
+     * @see org.jemmy.action.ActionExecutor#executeDetached(Environment, boolean, Action, Object...)
+     * @return todo document
      */
     public Mouse detached();
 
@@ -171,18 +128,8 @@
      * to be used in Keyboard interface methods
      */
     public static enum MouseModifiers implements MouseModifier {
-
-        /**
-         *
-         */
         BUTTON1_DOWN_MASK,
-        /**
-         *
-         */
         BUTTON2_DOWN_MASK,
-        /**
-         *
-         */
         BUTTON3_DOWN_MASK
     }
 
@@ -190,17 +137,8 @@
      * Mouse Buttons
      */
     public static enum MouseButtons implements MouseButton {
-        /**
-         *
-         */
         BUTTON1,
-        /**
-         *
-         */
         BUTTON2,
-        /**
-         *
-         */
         BUTTON3
     }
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/Parent.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Parent.java	Wed May 30 11:13:18 2018 -0700
@@ -39,17 +39,17 @@
      * the criteria.
      * @see Lookup
      * @see LookupCriteria
-     * @param <ST>
-     * @param controlClass
-     * @param criteria
+     * @param <ST> todo document
+     * @param controlClass todo document
+     * @param criteria todo document
      * @return an instance of Lookup, which holds found controls.
      */
     public <ST extends T> Lookup<ST> lookup(Class<ST> controlClass, LookupCriteria<ST> criteria);
     /**
-     * Same as <code>lookup(controlClass, new Any<ST>())</code>
+     * Same as <code>lookup(controlClass, new Any())</code>
      * @see #lookup(java.lang.Class, org.jemmy.lookup.LookupCriteria)
-     * @param <ST>
-     * @param controlClass
+     * @param <ST> todo document
+     * @param controlClass todo document
      * @return an instance of Lookup, which holds found controls.
      */
     public <ST extends T> Lookup<ST> lookup(Class<ST> controlClass);
@@ -58,12 +58,12 @@
      * the criteria.
      * @see Lookup
      * @see LookupCriteria
-     * @param criteria
+     * @param criteria todo document
      * @return an instance of Lookup, which holds found controls.
      */
     public Lookup<T> lookup(LookupCriteria<T> criteria);
     /**
-     * Same as <code>lookup(new Any<T>())</code>
+     * Same as <code>lookup(new Any())</code>
      * @see #lookup(org.jemmy.lookup.LookupCriteria)
      * @return an instance of Lookup, which holds found controls.
      */
--- a/core/JemmyCore/src/org/jemmy/interfaces/PopupSelectableOwner.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/PopupSelectableOwner.java	Wed May 30 11:13:18 2018 -0700
@@ -27,9 +27,7 @@
 import org.jemmy.Point;
 
 /**
- *
  * @author erikgreijus
- * @param <T>
  */
 public interface PopupSelectableOwner<T> extends PopupOwner<T> {
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/Scroll.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Scroll.java	Wed May 30 11:13:18 2018 -0700
@@ -35,28 +35,14 @@
  * @author shura
  */
 public interface Scroll extends CaretOwner {
-    /**
-     *
-     */
+
     public static final String VERTICAL_PROP_NAME = "vertical";
-    /**
-     *
-     */
     public static final String MAXIMUM_PROP_NAME = "maximum";
-    /**
-     *
-     */
     public static final String MINIMUM_PROP_NAME = "minimum";
-    /**
-     * TODO javadoc
-     * @return
-     */
+
     @Property(MAXIMUM_PROP_NAME)
     public double maximum();
-    /**
-     *
-     * @return
-     */
+
     @Property(MINIMUM_PROP_NAME)
     public double minimum();
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/Selectable.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Selectable.java	Wed May 30 11:13:18 2018 -0700
@@ -31,14 +31,11 @@
 
 /**
  * Interface for a control with one selected state among the number of them.
- * @param <STATE>
- * @author shura, KAM
+ * @author shura
+ * @author mrkam
  */
 public interface Selectable<STATE> extends TypeControlInterface<STATE> {
 
-    /**
-     *
-     */
     public static final String STATES_PROP_NAME = "states";
     public static final String STATE_PROP_NAME = "state";
 
--- a/core/JemmyCore/src/org/jemmy/interfaces/Selector.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Selector.java	Wed May 30 11:13:18 2018 -0700
@@ -26,14 +26,11 @@
 package org.jemmy.interfaces;
 
 /**
- *
- * @param <STATE>
  * @author shura
  */
 public interface Selector<STATE> {
     /**
-     *
-     * @param state
+     * @param state todo document
      */
     public void select(STATE state);
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/Showable.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Showable.java	Wed May 30 11:13:18 2018 -0700
@@ -32,10 +32,7 @@
  * @author shura
  */
 public interface Showable extends ControlInterface {
-    /**
-     *
-     * @return
-     */
+
     @Shortcut
     public Show shower();
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/Text.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Text.java	Wed May 30 11:13:18 2018 -0700
@@ -34,7 +34,8 @@
 public interface Text extends Label {
     /**
      * Supposed to type a new value from current position.
-     * @param newText
+     *
+     * @param newText the text to be set
      */
     @Shortcut
     public void type(String newText);
--- a/core/JemmyCore/src/org/jemmy/interfaces/TextInput.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/TextInput.java	Wed May 30 11:13:18 2018 -0700
@@ -30,13 +30,8 @@
  * @author shura
  */
 public interface TextInput {
-    /**
-     *
-     */
+
     public void clear();
-    /**
-     *
-     * @param text
-     */
+
     public void type(String text);
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/TypeControlInterface.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/TypeControlInterface.java	Wed May 30 11:13:18 2018 -0700
@@ -28,13 +28,11 @@
 
 /**
  * TODO: JavaDoc
- * @param <T>
  * @author shura
  */
 public interface TypeControlInterface<T> extends ControlInterface {
     /**
-     *
-     * @return
+     * @return todo document
      */
     public Class<T> getType();
 }
--- a/core/JemmyCore/src/org/jemmy/interfaces/Window.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/interfaces/Window.java	Wed May 30 11:13:18 2018 -0700
@@ -35,39 +35,16 @@
  */
 public interface Window extends ControlInterface {
 
-    /**
-     *
-     */
     public enum Direction {
-
-        /**
-         *
-         */
         NORTHEAST,
-        /**
-         *
-         */
         SOUTHEAST,
-        /**
-         *
-         */
         SOUTHWEST,
-        /**
-         *
-         */
         NORTHWEST
     };
-    /**
-     *
-     * @param dest
-     */
+
     @Shortcut
     public void move(Point dest);
-    /**
-     *
-     * @param size
-     * @param direction
-     */
+
     @Shortcut
     public void resize(Dimension size, Direction direction);
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/AbstractLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/AbstractLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -41,7 +41,7 @@
  * implementation and allow it to handle sub-lookups creation.
  * @see AbstractLookup#lookup(org.jemmy.lookup.LookupCriteria)
  * @see AbstractLookup#lookup(java.lang.Class, org.jemmy.lookup.LookupCriteria)
- * @param <CONTROL>
+ * @param <CONTROL> todo document
  * @author shura
  */
 public abstract class AbstractLookup<CONTROL> extends AbstractParent<CONTROL> implements Lookup<CONTROL> {
@@ -71,10 +71,10 @@
      * This actual lookup logic is delegated to <code>getCildren(java.lang.Object)</code>
      * method
      * @see AbstractLookup#getChildren(java.lang.Object)
-     * @param env
-     * @param controlClass
-     * @param criteria
-     * @param wrapper
+     * @param env todo document
+     * @param controlClass todo document
+     * @param criteria todo document
+     * @param wrapper todo document
      */
     public AbstractLookup(Environment env, Class<CONTROL> controlClass, LookupCriteria<CONTROL> criteria, Wrapper wrapper) {
         this.env = env;
@@ -88,24 +88,15 @@
         return wrapper;
     }
 
-    /**
-     *
-     * @return
-     */
     LookupCriteria<CONTROL> getCriteria() {
         return criteria;
     }
 
-    /**
-     *
-     * @return
-     */
     Environment getEnvironment() {
         return env;
     }
 
     /**
-     *
      * @return The class of the sount controls.
      */
     Class<CONTROL> getControlClass() {
@@ -123,7 +114,7 @@
     /**
      * Waits for certain number of controls to fit criteria.
      * Depending on how outputs set, prints out info about the lookup.
-     * @param count
+     * @param count todo document
      * @return this, after the count of found number of found controls
      * exceeds the required.
      * @see AbstractLookup#OUTPUT
@@ -152,7 +143,7 @@
      * Gets the number of controls which fit criteria.
      * Depending on how outputs set, prints out info about the lookup.
      * @see AbstractLookup#OUTPUT
-     * @return
+     * @return todo document
      */
     public int size() {
         getEnvironment().getOutput(OUTPUT).println("Getting number of controls of " + clss.getName() + " class fitting criteria " + criteria);
@@ -160,9 +151,6 @@
         return found.size();
     }
 
-    /**
-     *
-     */
     void refresh() {
         found.clear();
         List childen = getChildren(null);
@@ -188,55 +176,46 @@
         }
     }
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     protected boolean check(CONTROL control) {
         return control != null && criteria.check(control);
     }
 
     /**
      * Returns Wrap of the control with specified index
-     * @param index
+     * @param index todo document
      * @return Wrap
      */
     public Wrap<? extends CONTROL> wrap(int index) {
         return instantiate(get(index));
     }
 
-    /**
-     *
-     * @return
-     */
     public Wrap<? extends CONTROL> wrap() {
         return wrap(0);
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public <INTERFACE extends ControlInterface> INTERFACE as(int index, Class<INTERFACE> interfaceClass) {
         return wrap(index).as(interfaceClass);
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public <INTERFACE extends ControlInterface> INTERFACE as(Class<INTERFACE> interfaceClass) {
         return as(0, interfaceClass);
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> INTERFACE as(int index, Class<INTERFACE> interfaceClass, Class<TYPE> type) {
         return wrap(index).as(interfaceClass, type);
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> INTERFACE as(Class<INTERFACE> interfaceClass, Class<TYPE> type) {
         return as(0, interfaceClass, type);
@@ -248,24 +227,16 @@
     }
 
     /**
-     * @{inheritDoc}
+     * {@inheritDoc}
      */
     public CONTROL get() {
         return get(0);
     }
 
-    /**
-     *
-     * @return
-     */
     List<CONTROL> getFound() {
         return found;
     }
 
-    /**
-     *
-     * @return
-     */
     public Class<CONTROL> getType() {
         return getControlClass();
     }
@@ -275,7 +246,7 @@
      * List could contain any type of objects - not just <code>CONTROL</code>.
      * @param subParent - one of the elements in the hierarchy reflected by this lookup.
      * If null passed - first level children are expected.
-     * @return
+     * @return todo document
      */
     abstract List getChildren(Object subParent);
 
@@ -295,19 +266,13 @@
     /**
      * Wraps the control with a <code>Wrap</code> class.
      * @see Wrap
-     * @param wrap
+     * @param control todo document
      * @return Wrap
      */
     private Wrap<? extends CONTROL> instantiate(CONTROL control) {
         return wrapper.wrap(clss, control);
     }
 
-    /**
-     *
-     * @param out
-     * @param obj
-     * @param prefix
-     */
     protected void dumpOne(PrintStream out, CONTROL obj, String prefix) {
         Map<String, Object> data = getWrapper().wrap(getControlClass(), getControlClass().cast(obj)).getPropertiesQiuet();
         out.println(prefix + "+-" + buildClassChain(obj.getClass()));
@@ -321,11 +286,6 @@
         }
     }
 
-    /**
-     *
-     * @param out
-     * @param lookup
-     */
     protected abstract void dump(PrintStream out, Lookup<? extends CONTROL> lookup);
 
     public void dump(PrintStream out) {
--- a/core/JemmyCore/src/org/jemmy/lookup/AbstractParent.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/AbstractParent.java	Wed May 30 11:13:18 2018 -0700
@@ -29,26 +29,26 @@
 
 /**
  * Implements two shortcut methods.
- * @param <CONTROL>
+ * @param <CONTROL> todo document
  * @author shura
  */
 public abstract class AbstractParent<CONTROL> implements Parent<CONTROL> {
 
     /**
-     * Calls <code>lookup(controlClass, new Any<ST>())</code>
+     * Calls <code>lookup(controlClass, new Any())</code>
      * @see Any
-     * @param <ST>
-     * @param controlClass
-     * @return
+     * @param <ST> todo document
+     * @param controlClass todo document
+     * @return todo document
      */
     public <ST extends CONTROL> Lookup<ST> lookup(Class<ST> controlClass) {
         return lookup(controlClass, new Any<ST>());
     }
 
     /**
-     * Calls <code>lookup(new Any<T>())</code>
+     * Calls <code>lookup(new Any())</code>
      * @see Any
-     * @return
+     * @return todo document
      */
     public Lookup<CONTROL> lookup() {
         return lookup(new Any<CONTROL>());
--- a/core/JemmyCore/src/org/jemmy/lookup/Any.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/Any.java	Wed May 30 11:13:18 2018 -0700
@@ -26,21 +26,12 @@
 
 /**
  * @author shura
- * @param <T>
  */
 public class Any<T> implements LookupCriteria<T> {
 
-    /**
-     *
-     */
     public Any() {
     }
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     public boolean check(T control) {
         return true;
     }
--- a/core/JemmyCore/src/org/jemmy/lookup/ByStringLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/ByStringLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -29,7 +29,7 @@
 
 /**
  * Default comparison policy is StringComparePolicy.SUBSTRING
- * @param <T>
+ * @param <T> todo document
  * @author shura
  */
 public abstract  class ByStringLookup<T> implements LookupCriteria<T> {
@@ -39,34 +39,19 @@
 
     /**
      * Default comparison policy is StringComparePolicy.SUBSTRING
-     * @param text
+     * @param text todo document
      */
     protected ByStringLookup(String text) {
         this(text, StringComparePolicy.SUBSTRING);
     }
 
-    /**
-     *
-     * @param text
-     * @param policy
-     */
     protected ByStringLookup(String text, StringComparePolicy policy) {
         this.policy = policy;
         this.text = text;
     }
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     public abstract String getText(T control);
 
-    /**
-     *
-     * @param control
-     * @return
-     */
     public boolean check(T control) {
         return policy.compare(text, getText(control));
     }
--- a/core/JemmyCore/src/org/jemmy/lookup/CompoundLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/CompoundLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -26,27 +26,16 @@
 package org.jemmy.lookup;
 
 /**
- *
- * @param <CONTROL>
  * @author shura
  */
 public class CompoundLookup<CONTROL> implements LookupCriteria<CONTROL>{
 
     LookupCriteria<CONTROL>[] lookups;
 
-    /**
-     *
-     * @param subLookup
-     */
     public CompoundLookup(LookupCriteria<CONTROL>... subLookup) {
         this.lookups = subLookup;
     }
 
-    /**
-     *
-     * @param arg0
-     * @return
-     */
     public boolean check(CONTROL arg0) {
         for(LookupCriteria<CONTROL> lu : lookups) {
             if(!lu.check(arg0)) {
@@ -56,10 +45,4 @@
         return true;
     }
 
-    /*
-    public Class<CONTROL> type() {
-        return lookups[0].type();
-    }
-     */
-
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/ControlHierarchy.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/ControlHierarchy.java	Wed May 30 11:13:18 2018 -0700
@@ -37,14 +37,9 @@
      * List could contain any type of objects - not just <code>CONTROL</code>.
      * @param subParent - one of the elements in the hierarchy reflected by this lookup.
      * If null passed - first level children are expected.
-     * @return
+     * @return list of child control objects
      */
     public List<?> getChildren(Object subParent);
 
-    /**
-     *
-     * @param child
-     * @return
-     */
     public Object getParent(Object child);
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/ControlList.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/ControlList.java	Wed May 30 11:13:18 2018 -0700
@@ -32,9 +32,6 @@
  * @author shura
  */
 public interface ControlList {
-    /**
-     *
-     * @return
-     */
+
     public List<?> getControls();
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/CoordinateLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/CoordinateLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -31,7 +31,7 @@
  * the given rectangle. The way to determine bounds of any control is
  * implemented by the child class in @{@linkplain #getBounds(java.lang.Object)}
  * method.
- * @param <CONTROL>
+ *
  * @author shura
  */
 public abstract class CoordinateLookup<CONTROL> implements LookupCriteria<CONTROL>{
@@ -56,7 +56,7 @@
 
     /**
      *
-     * @param control
+     * @param control todo document
      * @return logical bounds for the control that has to be inside the given
      * rectangle to match the lookup
      */
--- a/core/JemmyCore/src/org/jemmy/lookup/HierarchyLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/HierarchyLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -31,34 +31,17 @@
 import org.jemmy.env.Environment;
 
 /**
- *
- * @param <CONTROL>
  * @author shura
  */
 public class HierarchyLookup<CONTROL> extends AbstractLookup<CONTROL> {
 
     ControlHierarchy hierarchy;
 
-    /**
-     *
-     * @param env
-     * @param hierarchy
-     * @param wrapper
-     * @param controlClass
-     * @param criteria
-     */
     public HierarchyLookup(Environment env, ControlHierarchy hierarchy, Wrapper wrapper, Class<CONTROL> controlClass, LookupCriteria<CONTROL> criteria) {
         super(env, controlClass, criteria, wrapper);
         this.hierarchy = hierarchy;
     }
 
-    /**
-     *
-     * @param env
-     * @param hierarchy
-     * @param controlClass
-     * @param criteria
-     */
     public HierarchyLookup(Environment env, ControlHierarchy hierarchy, Class<CONTROL> controlClass, LookupCriteria<CONTROL> criteria) {
         this(env, hierarchy, Wrap.getWrapper(), controlClass, criteria);
     }
@@ -72,11 +55,6 @@
         }
     }
 
-    /**
-     *
-     * @param out
-     * @param lookup
-     */
     @Override
     protected void dump(PrintStream out, Lookup<? extends CONTROL> lookup) {
         int size = lookup.size();
--- a/core/JemmyCore/src/org/jemmy/lookup/Lookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/Lookup.java	Wed May 30 11:13:18 2018 -0700
@@ -34,7 +34,7 @@
 
 /**
  * A searcheable container of a set on UI controls.
- * @param <CONTROL>
+ *
  * @author shura
  */
 public interface Lookup<CONTROL> extends Parent<CONTROL> {
@@ -47,89 +47,81 @@
     /**
      * Reruns the search until the number of found components is equal or greater
      * than required.
-     * @param count
+     * @param count todo document
      * @return this or another Lookup instance.
      */
     public Lookup<? extends CONTROL> wait(int count);
     /**
      * Creates an instance of the Wrap class for one of the found UI controls.
      * @see Wrap
-     * @param index
-     * @return
+     * @param index todo document
+     * @return todo document
      */
     public Wrap<? extends CONTROL> wrap(int index);
     /**
      * Same as <code>wrap(0)</code>
      * @see #wrap(int)
-     * @return
+     * @return todo document
      */
     public Wrap<? extends CONTROL> wrap();
 
     /**
      * Returns one of the found UI controls itself.
-     * @param index
-     * @return
+     * @param index todo document
+     * @return todo document
      */
     public CONTROL get(int index);
     /**
      * Same as <code>get(0)</code>
      * @see #get(int)
-     * @return
+     * @return todo document
      */
     public CONTROL get();
 
     /**
      * Same as <code>wrap(index).as(interfaceClass)</code>
-     * @param <INTERFACE>
-     * @param index
-     * @param interfaceClass
-     * @return
+     * @param <INTERFACE> todo document
+     * @param index todo document
+     * @param interfaceClass todo document
+     * @return todo document
      * @see #wrap(int)
      * @see Wrap#as(java.lang.Class)
      */
     public <INTERFACE extends ControlInterface> INTERFACE as(int index, Class<INTERFACE> interfaceClass);
     /**
      * Same as <code>wrap().as(interfaceClass)</code>
-     * @param <INTERFACE>
-     * @param interfaceClass
-     * @return
+     * @param <INTERFACE> todo document
+     * @param interfaceClass todo document
+     * @return todo document
      * @see #wrap()
      * @see Wrap#as(java.lang.Class)
      */
     public <INTERFACE extends ControlInterface> INTERFACE as(Class<INTERFACE> interfaceClass);
     /**
      * Same as <code>wrap(index).as(interfaceClass, type)</code>
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param index
-     * @param interfaceClass
-     * @param type
-     * @return
+     * @param <TYPE> todo document
+     * @param <INTERFACE> todo document
+     * @param index todo document
+     * @param interfaceClass todo document
+     * @param type todo document
+     * @return todo document
      * @see #wrap(int)
      * @see Wrap#as(java.lang.Class, java.lang.Class)
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> INTERFACE as(int index, Class<INTERFACE> interfaceClass, Class<TYPE> type);
     /**
      * Same as <code>wrap().as(interfaceClass, type)</code>
-     * @param <TYPE>
-     * @param <INTERFACE>
-     * @param interfaceClass
-     * @param type
-     * @return
+     * @param <TYPE> todo document
+     * @param <INTERFACE> todo document
+     * @param interfaceClass todo document
+     * @param type todo document
+     * @return todo document
      * @see #wrap(int)
      * @see Wrap#as(java.lang.Class, java.lang.Class)
      */
     public <TYPE, INTERFACE extends TypeControlInterface<TYPE>> INTERFACE as(Class<INTERFACE> interfaceClass, Class<TYPE> type);
 
-    /**
-     *
-     * @return
-     */
     public int size();
 
-    /**
-     *
-     * @param out
-     */
     public void dump(PrintStream out);
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/LookupCriteria.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/LookupCriteria.java	Wed May 30 11:13:18 2018 -0700
@@ -26,15 +26,9 @@
 package org.jemmy.lookup;
 
 /**
- *
- * @param <CONTROL>
  * @author shura
  */
 public interface LookupCriteria<CONTROL> {
-    /**
-     *
-     * @param control
-     * @return
-     */
+
     public boolean check(CONTROL control);
 }
--- a/core/JemmyCore/src/org/jemmy/lookup/ParentImpl.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/ParentImpl.java	Wed May 30 11:13:18 2018 -0700
@@ -31,8 +31,6 @@
 import org.jemmy.interfaces.Parent;
 
 /**
- *
- * @param <T>
  * @author shura
  */
 public class ParentImpl<T> extends AbstractParent<T> {
@@ -43,22 +41,10 @@
     private Environment env;
     private Wrapper wrapper;
 
-    /**
-     *
-     * @param env
-     * @param type
-     * @param ch
-     */
     public ParentImpl(Environment env, Class<T> type, ControlHierarchy ch) {
         this(env, type, ch, Wrap.getWrapper());
     }
-    /**
-     *
-     * @param env
-     * @param type
-     * @param ch
-     * @param wrapper
-     */
+
     public ParentImpl(Environment env, Class<T> type, ControlHierarchy ch, Wrapper wrapper) {
         this.type = type;
         this.ch = ch;
@@ -66,22 +52,10 @@
         this.wrapper = wrapper;
     }
 
-    /**
-     *
-     * @param env
-     * @param type
-     * @param cl
-     */
     public ParentImpl(Environment env, Class<T> type, ControlList cl) {
         this(env, type, cl, Wrap.getWrapper());
     }
-    /**
-     *
-     * @param env
-     * @param type
-     * @param cl
-     * @param wrapper
-     */
+
     public ParentImpl(Environment env, Class<T> type, ControlList cl, Wrapper wrapper) {
         this.type = type;
         this.cl = cl;
--- a/core/JemmyCore/src/org/jemmy/lookup/PlainLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/PlainLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -32,33 +32,18 @@
 
 /**
  * TODO: JavaDoc, class rename, arguments rename
- * @param <CONTROL>
+ *
  * @author shura
  */
 public class PlainLookup<CONTROL> extends AbstractLookup<CONTROL> {
 
     ControlList hierarchy;
 
-    /**
-     *
-     * @param env
-     * @param hierarchy
-     * @param wrapper
-     * @param controlClass
-     * @param criteria
-     */
     public PlainLookup(Environment env, ControlList hierarchy, Wrapper wrapper, Class<CONTROL> controlClass, LookupCriteria<CONTROL> criteria) {
         super(env, controlClass, criteria, wrapper);
         this.hierarchy = hierarchy;
     }
 
-    /**
-     *
-     * @param env
-     * @param hierarchy
-     * @param controlClass
-     * @param criteria
-     */
     public PlainLookup(Environment env, ControlList hierarchy, Class<CONTROL> controlClass, LookupCriteria<CONTROL> criteria) {
         this(env, hierarchy, Wrap.getWrapper(), controlClass, criteria);
     }
@@ -72,11 +57,6 @@
         }
     }
 
-    /**
-     *
-     * @param out
-     * @param lookup
-     */
     @Override
     protected void dump(PrintStream out, Lookup<? extends CONTROL> lookup) {
         for (int i = 0; i < lookup.size(); i++) {
--- a/core/JemmyCore/src/org/jemmy/lookup/PropLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/PropLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -29,8 +29,6 @@
 import org.jemmy.control.Wrapper;
 
 /**
- *
- * @param <CONTROL>
  * @author shura
  */
 public class PropLookup<CONTROL> implements LookupCriteria<CONTROL> {
@@ -39,20 +37,10 @@
     Wrapper wrapper;
     Object value;
 
-    /**
-     *
-     * @param propName
-     * @param value
-     */
     public PropLookup(String propName, Object value) {
         this(Wrap.getWrapper(), propName, value);
     }
-    /**
-     *
-     * @param wrapper
-     * @param propName
-     * @param value
-     */
+
     public PropLookup(Wrapper wrapper, String propName, Object value) {
         this.propName = propName;
         this.wrapper = wrapper;
--- a/core/JemmyCore/src/org/jemmy/lookup/RelativeCoordinateLookup.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/lookup/RelativeCoordinateLookup.java	Wed May 30 11:13:18 2018 -0700
@@ -28,8 +28,6 @@
 import org.jemmy.control.Wrap;
 
 /**
- *
- * @param <CONTROL>
  * @author shura
  */
 public abstract class RelativeCoordinateLookup<CONTROL> extends CoordinateLookup<CONTROL> {
@@ -41,13 +39,6 @@
     private int hr;
     private int vr;
 
-    /**
-     *
-     * @param wrap
-     * @param includeControl
-     * @param hr
-     * @param vr
-     */
     public RelativeCoordinateLookup(Wrap wrap, boolean includeControl, int hr, int vr) {
         super(wrap.getScreenBounds());
         this.wrap = wrap;
@@ -56,10 +47,6 @@
         this.vr = vr;
     }
 
-    /**
-     *
-     * @return
-     */
     @Override
     protected Rectangle getArea() {
         return constructArea(wrap, includeControl, hr, vr);
--- a/core/JemmyCore/src/org/jemmy/operators/Screen.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/operators/Screen.java	Wed May 30 11:13:18 2018 -0700
@@ -43,18 +43,10 @@
      */
     public static Screen SCREEN = null;
 
-    /**
-     *
-     * @param SCREEN
-     */
     public static void setSCREEN(Screen SCREEN) {
         Screen.SCREEN = SCREEN;
     }
 
-    /**
-     *
-     * @param env
-     */
     protected Screen(Environment env) {
         super(env, null);
     }
--- a/core/JemmyCore/src/org/jemmy/operators/ScreenRectangle.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/operators/ScreenRectangle.java	Wed May 30 11:13:18 2018 -0700
@@ -37,19 +37,10 @@
  */
 public class ScreenRectangle extends Wrap<Rectangle> {
 
-    /**
-     *
-     * @param env
-     * @param rect
-     */
     public ScreenRectangle(Environment env, Rectangle rect) {
         super(env, rect);
     }
 
-    /**
-     *
-     * @return
-     */
     public Rectangle getScreenBounds() {
         return getControl();
     }
--- a/core/JemmyCore/src/org/jemmy/resources/StringComparePolicy.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/resources/StringComparePolicy.java	Wed May 30 11:13:18 2018 -0700
@@ -30,33 +30,17 @@
  */
 public interface StringComparePolicy {
 
-    /**
-     *
-     */
     public static final StringComparePolicy EXACT = new ComparePolicy(true, true);
-    /**
-     *
-     */
     public static final StringComparePolicy SUBSTRING = new ComparePolicy(false, true);
 
-    /**
-     *
-     * @param golden
-     * @param value
-     * @return
-     */
     public boolean compare(String golden, String value);
 
-    /**
-     *
-     */
     static class ComparePolicy implements StringComparePolicy {
 
         boolean ce;
         boolean cc;
 
         /**
-         *
          * @param ce if true then entire strings are compared, if false golden
          * could be a substring of a value
          * @param cc case sensitive comparison policy
@@ -66,12 +50,6 @@
             this.ce = ce;
         }
 
-        /**
-         *
-         * @param golden
-         * @param value
-         * @return
-         */
         public boolean compare(String golden, String value) {
             if (value == null) {
                 return golden == null;
--- a/core/JemmyCore/src/org/jemmy/timing/State.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/timing/State.java	Wed May 30 11:13:18 2018 -0700
@@ -26,15 +26,10 @@
 package org.jemmy.timing;
 
 /**
- *
- * @param <T>
  * @author shura
  */
 public interface State<T> {
-    /**
-     *
-     * @return
-     */
+
     public T reached();
 
     // TODO: Provide a way to report problems during trying to reach the state
--- a/core/JemmyCore/src/org/jemmy/timing/Waiter.java	Tue May 08 13:49:16 2018 -0700
+++ b/core/JemmyCore/src/org/jemmy/timing/Waiter.java	Wed May 30 11:13:18 2018 -0700
@@ -30,42 +30,24 @@
 import org.jemmy.env.Timeout;
 
 /**
- *
  * @author shura
  */
 public class Waiter {
-    /**
-     *
-     */
+
     public static final Timeout DEFAULT_DELTA = new Timeout("default.wait.delta", 100);
     private long waitTime;
     private long delta;
 
-    /**
-     *
-     * @param waitTime
-     * @param delta
-     */
     public Waiter(Timeout waitTime, Timeout delta) {
         this.waitTime = waitTime.getValue();
         this.delta = delta.getValue();
     }
 
-    /**
-     *
-     * @param waitTime
-     */
     public Waiter(Timeout waitTime) {
         this.waitTime = waitTime.getValue();
         this.delta = DEFAULT_DELTA.getValue();
     }
 
-    /**
-     *
-     * @param <T>
-     * @param state
-     * @return
-     */
     public <T> T waitState(State<T> state) {
         long start = System.currentTimeMillis();
         T res;
@@ -83,13 +65,6 @@
         return null;
     }
 
-    /**
-     *
-     * @param <T>
-     * @param value
-     * @param state
-     * @return
-     */
     public <T> T waitValue(final T value, final State<T> state) {
         State<T> st = new State<T>() {
             public T reached() {
@@ -104,12 +79,6 @@
         return waitState(st);
     }
 
-    /**
-     *
-     * @param <T>
-     * @param state
-     * @return
-     */
     public <T> T ensureState(State<T> state) {
         T res = waitState(state);
         if(res == null) {
@@ -117,13 +86,7 @@
         }
         return res;
     }
-    /**
-     *
-     * @param <T>
-     * @param value
-     * @param state
-     * @return
-     */
+
     public <T> T ensureValue(T value, State<T> state) {
         T res = waitValue(value, state);
         if (res == null) {
--- a/pom.xml	Tue May 08 13:49:16 2018 -0700
+++ b/pom.xml	Wed May 30 11:13:18 2018 -0700
@@ -25,10 +25,30 @@
  questions.
     -->
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jemmy.v3</groupId>
-    <artifactId>Jemmy</artifactId>
-    <version>1.0</version>
+    <groupId>org.adoptopenjdk</groupId>
+    <artifactId>jemmy</artifactId>
+    <version>${revision}</version>
     <packaging>pom</packaging>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>UI test automation library</description>
+    <url>http://openjdk.java.net/projects/code-tools</url>
+    <licenses>
+        <license>
+            <name>GNU General Public License</name>
+            <url>http://www.gnu.org/licenses/gpl2.html</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <organization>Oracle</organization>
+            <organizationUrl>http://www.oracle.com</organizationUrl>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:hg:http://hg.openjdk.java.net/code-tools/jemmy/v3</connection>
+        <developerConnection>scm:hg:http://hg.openjdk.java.net/code-tools/jemmy/v3</developerConnection>
+        <url>http://hg.openjdk.java.net/code-tools/jemmy/v3</url>
+    </scm>
     <modules>
         <module>./core/JemmyCore</module>
         <module>./core/JemmyAWTInput</module>
@@ -36,6 +56,7 @@
         <module>./SWT/JemmySWT</module>
     </modules>
     <properties>
+        <revision>1.0.0</revision>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,6 +86,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <distributionManagement>
+      <snapshotRepository>
+        <id>ossrh</id>
+        <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      </snapshotRepository>
+      <repository>
+        <id>ossrh</id>
+        <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      </repository>
+    </distributionManagement>
     <build>
         <sourceDirectory>./src</sourceDirectory>
         <testSourceDirectory>./test</testSourceDirectory>
@@ -100,7 +131,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>${version.class}</mainClass>
+                            <mainClass>${project.version.class}</mainClass>
                         </manifest>
                     </archive>
                     <excludes>
@@ -108,6 +139,46 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-source-plugin</artifactId>
+              <version>2.2.1</version>
+              <executions>
+                <execution>
+                  <id>attach-sources</id>
+                  <goals>
+                    <goal>jar-no-fork</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.9.1</version>
+              <executions>
+                <execution>
+                  <id>attach-javadocs</id>
+                  <goals>
+                    <goal>jar</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-gpg-plugin</artifactId>
+              <version>1.5</version>
+              <executions>
+                <execution>
+                  <id>sign-artifacts</id>
+                  <phase>verify</phase>
+                  <goals>
+                    <goal>sign</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
         </plugins>
     </build>
 </project>