[sikuli] 02/04: Merge tag 'upstream/1.1.1'

Gilles Filippini pini at debian.org
Sun Sep 17 18:16:47 UTC 2017


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository sikuli.

commit de6060648ebe9e41b0a2d2f3e68e60e284374a81
Merge: 1afd103 6624a54
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Sep 16 19:54:35 2017 +0200

    Merge tag 'upstream/1.1.1'

 .gitignore                                         |    1 +
 API/pom.xml                                        |  320 +--
 .../main/java/org/sikuli/android/ADBClient.java    |  108 +
 .../main/java/org/sikuli/android/ADBDevice.java    |  412 ++++
 API/src/main/java/org/sikuli/android/ADBRobot.java |  244 ++
 .../main/java/org/sikuli/android/ADBScreen.java    |  251 ++
 API/src/main/java/org/sikuli/android/ADBTest.java  |  116 +
 API/src/main/java/org/sikuli/basics/Animator.java  |    4 +-
 .../java/org/sikuli/basics/AnimatorLinear.java     |    6 +
 .../sikuli/basics/AnimatorLinearInterpolation.java |    7 +-
 .../org/sikuli/basics/AnimatorOutQuarticEase.java  |    7 +-
 .../main/java/org/sikuli/basics/AnimatorPulse.java |    7 +-
 .../org/sikuli/basics/AnimatorQuarticEase.java     |    7 +-
 .../org/sikuli/basics/AnimatorStopExtention.java   |    7 +-
 .../java/org/sikuli/basics/AnimatorTimeBased.java  |   21 +-
 .../sikuli/basics/AnimatorTimeValueFunction.java   |    6 +
 API/src/main/java/org/sikuli/basics/Debug.java     |   41 +-
 .../java/org/sikuli/basics/ExtensionManager.java   |    4 +-
 .../main/java/org/sikuli/basics/FileManager.java   |   55 +-
 .../main/java/org/sikuli/basics/HotkeyEvent.java   |    5 +-
 .../java/org/sikuli/basics/HotkeyListener.java     |    3 +-
 .../main/java/org/sikuli/basics/HotkeyManager.java |    3 +-
 .../java/org/sikuli/basics/LinuxHotkeyManager.java |    6 +-
 .../java/org/sikuli/basics/MacHotkeyManager.java   |    3 +-
 API/src/main/java/org/sikuli/basics/OS.java        |    3 +-
 .../java/org/sikuli/basics/PreferencesUser.java    |    3 +-
 API/src/main/java/org/sikuli/basics/Settings.java  |  627 ++---
 .../java/org/sikuli/basics/SikulixForJython.java   |    5 +-
 .../main/java/org/sikuli/basics/SplashFrame.java   |    6 +
 .../main/java/org/sikuli/basics/VDictProxy.java    |    4 +-
 .../org/sikuli/basics/WindowsHotkeyManager.java    |    5 +-
 .../java/org/sikuli/guide/AnimationFactory.java    |    7 +-
 API/src/main/java/org/sikuli/guide/Animator.java   |   10 +-
 .../java/org/sikuli/guide/ClickableWindow.java     |    8 +-
 .../main/java/org/sikuli/guide/ComponentMover.java |   48 +-
 .../sikuli/guide/GlobalMouseMotionListener.java    |    6 +
 .../org/sikuli/guide/GlobalMouseMotionTracker.java |   12 +-
 API/src/main/java/org/sikuli/guide/Guide.java      |    8 +-
 .../main/java/org/sikuli/guide/HTMLTextPane.java   |    8 +-
 API/src/main/java/org/sikuli/guide/IAnimator.java  |    6 +
 API/src/main/java/org/sikuli/guide/Run.java        |    9 +-
 .../main/java/org/sikuli/guide/ShadowRenderer.java |    9 +-
 API/src/main/java/org/sikuli/guide/SxAnchor.java   |    8 +-
 API/src/main/java/org/sikuli/guide/SxArea.java     |   50 +-
 API/src/main/java/org/sikuli/guide/SxArrow.java    |    8 +-
 API/src/main/java/org/sikuli/guide/SxBeam.java     |   15 +-
 API/src/main/java/org/sikuli/guide/SxBracket.java  |    6 +
 API/src/main/java/org/sikuli/guide/SxButton.java   |    8 +-
 API/src/main/java/org/sikuli/guide/SxCallout.java  |    6 +
 API/src/main/java/org/sikuli/guide/SxCircle.java   |    8 +-
 .../main/java/org/sikuli/guide/SxClickable.java    |    8 +-
 API/src/main/java/org/sikuli/guide/SxFlag.java     |    6 +
 API/src/main/java/org/sikuli/guide/SxHotspot.java  |    8 +-
 API/src/main/java/org/sikuli/guide/SxImage.java    |    8 +-
 API/src/main/java/org/sikuli/guide/SxMagnet.java   |   17 +-
 .../main/java/org/sikuli/guide/SxRectangle.java    |    8 +-
 .../main/java/org/sikuli/guide/SxSpotlight.java    |   64 +-
 API/src/main/java/org/sikuli/guide/SxText.java     |    8 +-
 .../java/org/sikuli/guide/TimeoutTransition.java   |    9 +-
 API/src/main/java/org/sikuli/guide/Tracker.java    |    6 +
 API/src/main/java/org/sikuli/guide/Transition.java |   15 +-
 .../java/org/sikuli/guide/TransitionDialog.java    |   14 +-
 API/src/main/java/org/sikuli/guide/Visual.java     |   23 +-
 .../sikuli/natives/CommandExecutorException.java   |   50 +
 .../org/sikuli/natives/CommandExecutorHelper.java  |   41 +
 .../org/sikuli/natives/CommandExecutorResult.java  |   31 +
 .../main/java/org/sikuli/natives/LinuxUtil.java    |  590 ++---
 API/src/main/java/org/sikuli/natives/MacUtil.java  |   20 +-
 API/src/main/java/org/sikuli/natives/OSUtil.java   |   14 +-
 API/src/main/java/org/sikuli/natives/SysUtil.java  |   12 +-
 API/src/main/java/org/sikuli/natives/WinUtil.java  |    5 +-
 .../common/CommandLineExecutor.java                |   11 -
 .../remoteinterfaces/common/FileProcessor.java     |   23 -
 .../sikuli/remoteinterfaces/common/Sikulix.java    |   21 -
 .../sikuli/remoteinterfaces/entities/Command.java  |   15 -
 .../sikuli/remoteinterfaces/entities/Image.java    |   12 -
 API/src/main/java/org/sikuli/script/App.java       |  241 +-
 API/src/main/java/org/sikuli/script/Button.java    |    3 +-
 API/src/main/java/org/sikuli/script/Commands.java  | 1109 ++++-----
 API/src/main/java/org/sikuli/script/Constants.java |    4 +-
 API/src/main/java/org/sikuli/script/Device.java    |   24 +-
 API/src/main/java/org/sikuli/script/Do.java        |  353 +++
 API/src/main/java/org/sikuli/script/Env.java       |    5 +-
 .../main/java/org/sikuli/script/FindFailed.java    |   89 +-
 .../java/org/sikuli/script/FindFailedDialog.java   |  103 +-
 .../java/org/sikuli/script/FindFailedResponse.java |    6 +-
 API/src/main/java/org/sikuli/script/Finder.java    |   11 +-
 API/src/main/java/org/sikuli/script/IRobot.java    |    5 +-
 API/src/main/java/org/sikuli/script/IScreen.java   |   11 +-
 API/src/main/java/org/sikuli/script/Image.java     |  273 ++-
 API/src/main/java/org/sikuli/script/ImageFind.java |    8 +-
 .../main/java/org/sikuli/script/ImageFinder.java   |   10 +-
 .../main/java/org/sikuli/script/ImageGroup.java    |   16 +-
 .../main/java/org/sikuli/script/ImageLocator.java  |    5 +-
 API/src/main/java/org/sikuli/script/ImagePath.java |   23 +-
 API/src/main/java/org/sikuli/script/Key.java       |   37 +-
 .../main/java/org/sikuli/script/KeyModifier.java   |    6 +-
 API/src/main/java/org/sikuli/script/Keys.java      |   45 -
 API/src/main/java/org/sikuli/script/Location.java  |   38 +-
 API/src/main/java/org/sikuli/script/Match.java     |   28 +-
 API/src/main/java/org/sikuli/script/Mouse.java     |   65 +-
 .../main/java/org/sikuli/script/ObserveEvent.java  |   99 +-
 API/src/main/java/org/sikuli/script/Observer.java  |    7 +-
 .../java/org/sikuli/script/ObserverCallBack.java   |  125 +-
 API/src/main/java/org/sikuli/script/Observing.java |   24 +-
 API/src/main/java/org/sikuli/script/Pattern.java   |    5 +-
 API/src/main/java/org/sikuli/script/Region.java    | 2019 +++++++++-------
 .../main/java/org/sikuli/script/RobotDesktop.java  |   75 +-
 .../main/java/org/sikuli/script/RobotRemote.java   |  444 ----
 API/src/main/java/org/sikuli/script/Run.java       |   17 +-
 API/src/main/java/org/sikuli/script/RunServer.java |   75 +-
 API/src/main/java/org/sikuli/script/RunTime.java   |  721 ++++--
 API/src/main/java/org/sikuli/script/Runner.java    |  137 +-
 API/src/main/java/org/sikuli/script/Screen.java    |  317 ++-
 .../main/java/org/sikuli/script/ScreenImage.java   |   23 +-
 .../main/java/org/sikuli/script/ScreenRemote.java  |  202 --
 .../main/java/org/sikuli/script/ScreenUnion.java   |    5 +-
 .../main/java/org/sikuli/script/SikuliEvent.java   |    3 +-
 .../java/org/sikuli/script/SikuliEventAdapter.java |    3 +-
 .../org/sikuli/script/SikuliEventObserver.java     |    3 +-
 .../java/org/sikuli/script/SikuliException.java    |    7 +-
 API/src/main/java/org/sikuli/script/Sikulix.java   |  387 ++-
 .../java/org/sikuli/script/SikulixForJython.java   |   21 +-
 .../java/org/sikuli/script/TextRecognizer.java     |  271 ++-
 .../sikuli/script/compare/DistanceComparator.java  |    2 +-
 .../script/compare/HorizontalComparator.java       |    2 +-
 .../sikuli/script/compare/VerticalComparator.java  |    2 +-
 API/src/main/java/org/sikuli/util/CommandArgs.java |  465 ++--
 .../main/java/org/sikuli/util/CommandArgsEnum.java |    3 +-
 .../main/java/org/sikuli/util/EventObserver.java   |    3 +-
 .../main/java/org/sikuli/util/EventSubject.java    |    3 +-
 API/src/main/java/org/sikuli/util/FakeRobot.java   |  172 ++
 .../java/org/sikuli/util/JLangHelperInterface.java |   26 +
 API/src/main/java/org/sikuli/util/JRubyHelper.java |   62 +
 .../main/java/org/sikuli/util/JythonHelper.java    |  438 ++--
 .../main/java/org/sikuli/util/LinuxSupport.java    |  131 +-
 .../java/org/sikuli/util/OverlayCapturePrompt.java |  258 +-
 .../org/sikuli/util/OverlayTransparentWindow.java  |   95 +-
 .../java/org/sikuli/util/ScreenHighlighter.java    |   72 +-
 .../java/org/sikuli/util/SikulixFileChooser.java   |  207 ++
 API/src/main/java/org/sikuli/util/SysJNA.java      |   49 +
 API/src/main/java/org/sikuli/util/Tests.java       |    6 +
 .../java/org/sikuli/vnc/BasicUserPasswdGetter.java |   50 +
 .../org/sikuli/vnc/ThreadLocalSecurityClient.java  |  109 +
 API/src/main/java/org/sikuli/vnc/VNCClient.java    |  250 ++
 .../main/java/org/sikuli/vnc/VNCFrameBuffer.java   |  158 ++
 API/src/main/java/org/sikuli/vnc/VNCRobot.java     |  714 ++++++
 API/src/main/java/org/sikuli/vnc/VNCScreen.java    |  217 ++
 API/src/main/java/org/sikuli/vnc/XKeySym.java      | 2256 +++++++++++++++++
 API/src/main/resources/Lib/sikuli/Region.py        |  112 +-
 API/src/main/resources/Lib/sikuli/Screen.py        |   90 +-
 API/src/main/resources/Lib/sikuli/Sikuli.py        |  519 ++--
 .../resources/Lib/sikuli/SikuliImporter_1.0.1.py   |   85 -
 API/src/main/resources/Support/Linux/runBuild      |   40 +-
 .../java/edu/unh/iol/dlc/ProtocolVersionTest.java  |   27 -
 .../java/edu/unh/iol/dlc/VersionParserTest.java    |   85 -
 API/src/test/java/org/sikuli/script/APITest.java   |   84 -
 IDE/pom.xml                                        |   18 +-
 IDE/src/main/java/org/sikuli/ide/AutoUpdater.java  |    6 +-
 .../java/org/sikuli/ide/BevelDividerPainter.java   |    3 +-
 .../main/java/org/sikuli/ide/ButtonCapture.java    |  208 +-
 .../main/java/org/sikuli/ide/ButtonGenCommand.java |    3 +-
 .../main/java/org/sikuli/ide/ButtonOnToolbar.java  |    3 +-
 .../sikuli/ide/CloseableModernTabbedPaneUI.java    |    4 +-
 .../java/org/sikuli/ide/CloseableTabbedPane.java   |    3 +-
 .../sikuli/ide/CloseableTabbedPaneListener.java    |    4 +-
 .../java/org/sikuli/ide/EditorConsolePane.java     |    5 +-
 .../sikuli/ide/EditorCurrentLineHighlighter.java   |    6 +-
 .../java/org/sikuli/ide/EditorLineNumberView.java  |    3 +-
 .../main/java/org/sikuli/ide/EditorMyDocument.java |    4 +-
 IDE/src/main/java/org/sikuli/ide/EditorPane.java   | 2552 ++++++++++----------
 .../java/org/sikuli/ide/EditorPatternButton.java   |    3 +-
 .../java/org/sikuli/ide/EditorPatternLabel.java    |    3 +-
 .../java/org/sikuli/ide/EditorRegionButton.java    |   47 +-
 .../java/org/sikuli/ide/EditorRegionLabel.java     |   57 +-
 .../java/org/sikuli/ide/EditorUndoManager.java     |    3 +-
 .../java/org/sikuli/ide/EditorViewFactory.java     |   10 +-
 .../main/java/org/sikuli/ide/ExtensionItem.java    |    4 +-
 .../java/org/sikuli/ide/ExtensionManagerFrame.java |    5 +-
 IDE/src/main/java/org/sikuli/ide/GifDecoder.java   |   25 +-
 .../main/java/org/sikuli/ide/LoadingSpinner.java   |    4 +-
 .../java/org/sikuli/ide/PatternPaneNaming.java     |    3 +-
 .../java/org/sikuli/ide/PatternPaneScreenshot.java |    3 +-
 .../org/sikuli/ide/PatternPaneTargetOffset.java    |    7 +-
 .../org/sikuli/ide/PatternSimilaritySlider.java    |    3 +-
 .../main/java/org/sikuli/ide/PatternWindow.java    |   12 +-
 .../main/java/org/sikuli/ide/PreferencesWin.java   |    5 +-
 .../java/org/sikuli/ide/PreferencesWindowMore.java |    3 +-
 .../main/java/org/sikuli/ide/PreviewWindow.java    |    8 +-
 .../main/java/org/sikuli/ide/SikuliEditorKit.java  |    6 +-
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java    |  817 ++++---
 .../java/org/sikuli/ide/SikuliIDEFileChooser.java  |  172 --
 .../main/java/org/sikuli/ide/SikuliIDEI18N.java    |    5 +-
 .../java/org/sikuli/ide/SikuliIDEPopUpMenu.java    |    6 +
 .../java/org/sikuli/ide/SikuliIDEStatusBar.java    |    3 +-
 IDE/src/main/java/org/sikuli/ide/Sikulix.java      |   14 +-
 .../main/java/org/sikuli/idesupport/IDESplash.java |    6 +
 .../java/org/sikuli/idesupport/IDESupport.java     |    3 +-
 .../java/org/sikuli/idesupport/IIDESupport.java    |    6 +
 .../org/sikuli/idesupport/IIndentationLogic.java   |    6 +
 .../org/sikuli/idesupport/JRubyIDESupport.java     |    3 +-
 .../org/sikuli/idesupport/JythonIDESupport.java    |    3 +-
 .../org/sikuli/idesupport/PythonIndentation.java   |    4 +-
 .../java/org/sikuli/idesupport/PythonState.java    |    4 +-
 .../org/sikuli/scriptrunner/IScriptRunner.java     |    5 +-
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |   36 +-
 .../sikuli/scriptrunner/JythonScriptRunner.java    |  941 ++++----
 .../java/org/sikuli/scriptrunner/RemoteRunner.java |   20 +-
 .../org/sikuli/scriptrunner/ScriptingSupport.java  |    7 +-
 .../services/org.sikuli.idesupport.IIDESupport     |    6 +
 .../services/org.sikuli.scriptrunner.IScriptRunner |    6 +
 IDE/src/main/resources/i18n/IDE/IDE-fr.po          |    2 +-
 IDE/src/main/resources/i18n/IDE_ar.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_bg.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_ca.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_da.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_de.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_en_US.properties   |    6 +
 IDE/src/main/resources/i18n/IDE_es.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_fr.properties      |    8 +-
 IDE/src/main/resources/i18n/IDE_he.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_it.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_ja.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_ko.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_nl.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_pl.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_pt_BR.properties   |    6 +
 IDE/src/main/resources/i18n/IDE_ru.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_sv.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_ta_IN.properties   |    6 +
 IDE/src/main/resources/i18n/IDE_tr.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_uk.properties      |    6 +
 IDE/src/main/resources/i18n/IDE_zh_CN.properties   |    6 +
 IDE/src/main/resources/i18n/IDE_zh_TW.properties   |    6 +
 JRubyGem/invoker.properties                        |    6 +
 JRubyGem/lib/sikulix/sikulix.rb                    |   62 -
 JRubyGem/pom.xml                                   |   14 +-
 Jygments4SikuliX/pom.xml                           |   10 +-
 .../syntaxhighlight/contrib/HtmlFormatter.java     |   15 +-
 .../org/sikuli/syntaxhighlight/grammar/Lexer.java  |    1 -
 .../syntaxhighlight/grammar/PatternRule.java       |    2 +-
 .../org/sikuli/syntaxhighlight/grammar/Rule.java   |    3 +-
 .../org/sikuli/syntaxhighlight/style/Style.java    |    2 +-
 Libslux/pom.xml                                    |   16 +-
 .../src/main/java/org/sikuli/libslux/Sikulix.java  |    3 +-
 .../main/resources/srcnativelibs/Vision/cvgui.cpp  | 1757 +++++++-------
 .../main/resources/srcnativelibs/Vision/cvgui.h    |   14 +-
 .../resources/srcnativelibs/Vision/find-result.h   |    4 +-
 .../main/resources/srcnativelibs/Vision/finder.cpp | 1378 ++++++-----
 .../main/resources/srcnativelibs/Vision/finder.h   |  383 ++-
 .../main/resources/srcnativelibs/Vision/opencv.hpp |   26 +-
 .../Vision/pyramid-template-matcher.cpp            |   24 +-
 .../Vision/pyramid-template-matcher.h              |    6 +-
 .../srcnativelibs/Vision/sikuli-debug.cpp          |    3 +-
 .../resources/srcnativelibs/Vision/sikuli-debug.h  |  103 +-
 .../resources/srcnativelibs/Vision/tessocr.cpp     | 1944 ++++++++-------
 .../main/resources/srcnativelibs/Vision/tessocr.h  |   92 +-
 .../main/resources/srcnativelibs/Vision/vision.cpp |   15 +-
 .../main/resources/srcnativelibs/Vision/vision.h   |    3 +-
 README.md                                          |   76 +-
 Setup/pom.xml                                      |   14 +-
 Setup/src/main/java/org/sikuli/setup/RunSetup.java |  372 +--
 .../main/java/org/sikuli/setup/SetUpSelect.java    |    6 +
 .../main/resources/Commands/windows/runsikulix.cmd |    1 -
 Setup/src/main/resources/content/createJavadocs    |    8 -
 Setup/src/main/resources/content/deployapi.xml     |   75 +-
 Setup/src/main/resources/content/deploylux.xml     |   12 +-
 Setup/src/main/resources/content/deploymac.xml     |   12 +-
 Setup/src/main/resources/content/deploysetup.xml   |   22 +-
 .../src/main/resources/content/deploysetupapi.xml  |   14 +-
 .../src/main/resources/content/deploysetupide.xml  |   16 +-
 Setup/src/main/resources/content/deploywin.xml     |   12 +-
 Setup/src/main/resources/content/ide-fat.xml       |    7 +-
 .../main/resources/content/nightlybuildindex.html  |   46 +-
 .../resources/content/nightlybuildindextail.html   |  206 ++
 Setup/src/main/resources/content/plain.xml         |    6 +
 .../src/main/resources/macapp/Contents/Info.plist  |    4 +-
 SetupAPI/pom.xml                                   |   16 +-
 .../sikulix/sikulixsetupAPI/SikulixsetupAPI.java   |    6 +
 SetupIDE/pom.xml                                   |   16 +-
 .../sikulix/sikulixsetupIDE/SikulixsetupIDE.java   |    6 +
 TestRunMaven/pom.xml                               |    8 +-
 .../src/main/java/com/sikulix/testrun/TestRun.java |    2 +-
 TestScripts/args.sikuli/args.py                    |   41 +
 WindowsExe/sikulix.xml                             |    6 +
 pom.xml                                            |   78 +-
 286 files changed, 18354 insertions(+), 11738 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git



More information about the pkg-java-commits mailing list