[sikuli] 01/53: Merge tag 'upstream/1.1.0_beta1'

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 20:38:43 UTC 2014


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

pini pushed a commit to branch master
in repository sikuli.

commit 6ebcd35268fdf9cd82eac0c40a5238f5606317db
Merge: 55f4576 035b1d4
Author: Gilles Filippini <pini at debian.org>
Date:   Mon May 5 19:51:41 2014 +0200

    Merge tag 'upstream/1.1.0_beta1'
    
    Conflicts:
    	.gitignore

 .gitignore                                         |   10 +
 API/README.md                                      |    8 +
 API/pom.xml                                        |   66 +
 .../src/main/java/org/sikuli/script/App.java       |  144 +-
 .../src/main/java/org/sikuli/script/Button.java    |    9 +-
 API/src/main/java/org/sikuli/script/Constants.java |   19 +
 .../src/main/java/org/sikuli/script/Env.java       |   11 +-
 .../main/java/org/sikuli/script/EventObserver.java |    7 +-
 .../main/java/org/sikuli/script/EventSubject.java  |    7 +-
 .../main/java/org/sikuli/script/FindFailed.java    |   49 +
 .../java/org/sikuli/script/FindFailedDialog.java   |  162 +
 .../java/org/sikuli/script/FindFailedResponse.java |    7 +-
 API/src/main/java/org/sikuli/script/Finder.java    |  412 +++
 .../src/main/java/org/sikuli/script/IRobot.java    |   18 +-
 .../src/main/java/org/sikuli/script/IScreen.java   |    8 +-
 API/src/main/java/org/sikuli/script/Image.java     |  994 ++++++
 API/src/main/java/org/sikuli/script/ImageFind.java |  421 +++
 .../main/java/org/sikuli/script/ImageFinder.java   |  381 ++
 .../main/java/org/sikuli/script/ImageGroup.java    |  125 +
 .../main/java/org/sikuli/script/ImageLocator.java  |  337 ++
 API/src/main/java/org/sikuli/script/ImagePath.java |  462 +++
 .../src/main/java/org/sikuli/script/Key.java       |  581 ++-
 .../main/java/org/sikuli/script/KeyModifier.java   |    8 +-
 .../src/main/java/org/sikuli/script/Location.java  |  263 +-
 .../src/main/java/org/sikuli/script/Match.java     |   90 +-
 API/src/main/java/org/sikuli/script/Mouse.java     |  541 +++
 .../main/java/org/sikuli/script/ObserveEvent.java  |  214 ++
 API/src/main/java/org/sikuli/script/Observer.java  |  399 +++
 .../java/org/sikuli/script/ObserverCallBack.java   |   41 +
 API/src/main/java/org/sikuli/script/Observing.java |  243 ++
 .../java/org/sikuli/script/OverlayAnimator.java    |    9 +-
 .../org/sikuli/script/OverlayCapturePrompt.java    |  345 ++
 .../sikuli/script/OverlayTransparentWindow.java    |    8 +-
 API/src/main/java/org/sikuli/script/Pattern.java   |  279 ++
 API/src/main/java/org/sikuli/script/Region.java    | 3725 ++++++++++++++++++++
 .../main/java/org/sikuli/script/RobotDesktop.java  |   97 +-
 .../main/java/org/sikuli/script/RobotRemote.java   |  444 +++
 .../src/main/java/org/sikuli/script/Screen.java    |  121 +-
 .../java/org/sikuli/script/ScreenHighlighter.java  |   54 +-
 .../main/java/org/sikuli/script/ScreenImage.java   |   12 +-
 .../main/java/org/sikuli/script/ScreenRemote.java  |  202 ++
 .../main/java/org/sikuli/script/ScreenUnion.java   |   71 +
 .../main/java/org/sikuli/script/SikuliEvent.java   |   15 +
 .../java/org/sikuli/script/SikuliEventAdapter.java |   39 +
 .../org/sikuli/script/SikuliEventObserver.java     |   20 +
 .../java/org/sikuli/script/SikuliException.java    |    7 +-
 .../src/main/java/org/sikuli/script/SikuliX.java   |   32 +-
 .../java/org/sikuli/script/TextRecognizer.java     |   72 +-
 .../sikuli/script/compare/DistanceComparator.java  |    0
 .../script/compare/HorizontalComparator.java       |    0
 .../sikuli/script/compare/VerticalComparator.java  |    0
 .../resources/might-be-obsolete}/SikuliAction.java |    4 +-
 .../might-be-obsolete}/SikuliActionListener.java   |    0
 .../might-be-obsolete}/SikuliActionManager.java    |    0
 APIFat/README.md                                   |    4 +
 APIFat/pom.xml                                     |   58 +
 Basics/README.md                                   |    7 +
 Basics/pom.xml                                     |   99 +
 .../main/java/org/sikuli/basics/AutoUpdater.java   |   57 +-
 .../main/java/org/sikuli/basics/CommandArgs.java   |    4 +-
 .../java/org/sikuli/basics/CommandArgsEnum.java    |    0
 .../src/main/java/org/sikuli/basics/Debug.java     |  126 +-
 .../java/org/sikuli/basics/ExtensionManager.java   |    0
 .../main/java/org/sikuli/basics/FileManager.java   |  506 ++-
 .../main/java/org/sikuli/basics}/GifDecoder.java   |    8 +-
 .../main/java/org/sikuli/basics/HotkeyEvent.java   |    0
 .../java/org/sikuli/basics/HotkeyListener.java     |    0
 .../main/java/org/sikuli/basics/HotkeyManager.java |    0
 .../main/java/org/sikuli/basics/IDESupport.java    |    9 +
 .../java/org/sikuli/basics/IResourceLoader.java    |    0
 .../main/java/org/sikuli/basics/IScriptRunner.java |    1 -
 .../java/org/sikuli/basics/IndentationLogic.java   |   41 +
 .../org/sikuli/basics/KeyBoardSetupWindow.form     |   82 +
 .../org/sikuli/basics/KeyBoardSetupWindow.java     |   96 +
 .../java/org/sikuli/basics/KeyCodeConverter.java   |    0
 .../java/org/sikuli/basics/LinuxHotkeyManager.java |    5 -
 .../java/org/sikuli/basics}/LoadingSpinner.java    |    2 +-
 .../java/org/sikuli/basics/MacHotkeyManager.java   |    0
 .../main/java/org/sikuli/basics/MultiFrame.java    |    2 +-
 .../src/main/java/org/sikuli/basics/OS.java        |    0
 .../java/org/sikuli/basics/PreferencesUser.java    |   28 +-
 .../java/org/sikuli/basics/ResourceLoader.java     |  486 ++-
 .../src/main/java/org/sikuli/basics/RunSetup.java  | 1582 +++++++++
 .../main/java/org/sikuli/basics/SetUpSelect.form   |  347 +-
 .../main/java/org/sikuli/basics/SetUpSelect.java   |  329 +-
 .../src/main/java/org/sikuli/basics/Settings.java  |  212 +-
 .../main/java/org/sikuli/basics/SikuliScript.java  |   85 +-
 .../src/main/java/org/sikuli/basics/SikuliX.java   |  519 +++
 .../java/org/sikuli/basics/SikuliXforJython.java   |   10 +-
 Basics/src/main/java/org/sikuli/basics/SysJNA.java |   75 +
 .../main/java/org/sikuli/basics/VDictProxy.java    |    0
 .../org/sikuli/basics/WindowsHotkeyManager.java    |   10 +-
 .../src/main/resources/Commands/linux/runsikulix   |   26 +
 Basics/src/main/resources/Commands/mac/runsikulix  |   52 +
 .../main/resources/Commands/windows/runsikulix.cmd |   31 +-
 Basics/src/main/resources/Images/SikuliLogo.png    |  Bin 0 -> 8578 bytes
 .../src/main/resources/Lib/sikuli/Env.py           |    0
 .../src/main/resources/Lib/sikuli/Finder.py        |    0
 .../src/main/resources/Lib/sikuli/Region.py        |   62 +-
 .../src/main/resources/Lib/sikuli/Screen.py        |   27 +-
 .../src/main/resources/Lib/sikuli/Sikuli.py        |  252 +-
 .../main/resources/Lib/sikuli/SikuliImporter.py    |   18 +-
 .../src/main/resources/Lib/sikuli/__init__.py      |    0
 Basics/src/main/resources/Lib/sikulix.rb           |  175 +
 .../META-INF/services/org.sikuli.basics.IDESupport |    2 +
 .../services/org.sikuli.basics.IResourceLoader     |    0
 .../services/org.sikuli.basics.IScriptRunner       |    1 +
 Guide/README.md                                    |    8 +
 Guide/pom.xml                                      |   31 +
 .../java/org/sikuli/guide/AnimationFactory.java    |  370 ++
 .../src/main/java/org/sikuli/guide/Animator.java   |   20 +-
 .../java/org/sikuli/guide/ClickableWindow.java     |  181 +
 .../main/java/org/sikuli/guide/ComponentMover.java |  518 +++
 .../sikuli/guide/GlobalMouseMotionListener.java    |    6 +
 .../org/sikuli/guide/GlobalMouseMotionTracker.java |   92 +
 .../main/java/org/sikuli/guide/HTMLTextPane.java   |   65 +
 .../main/java/org/sikuli/guide/ShadowRenderer.java |   81 +
 .../main/java/org/sikuli/guide/SikuliGuide.java    |  801 +++++
 .../java/org/sikuli/guide/SikuliGuideAnchor.java   |  151 +
 .../java/org/sikuli/guide/SikuliGuideAnimator.java |  156 +
 .../java/org/sikuli/guide/SikuliGuideArea.java     |  177 +
 .../java/org/sikuli/guide/SikuliGuideArrow.java    |  177 +
 .../java/org/sikuli/guide/SikuliGuideBeam.java     |  297 ++
 .../java/org/sikuli/guide/SikuliGuideBracket.java  |  130 +
 .../java/org/sikuli/guide/SikuliGuideButton.java   |   77 +
 .../java/org/sikuli/guide/SikuliGuideCallout.java  |  158 +
 .../java/org/sikuli/guide/SikuliGuideCircle.java   |   66 +
 .../org/sikuli/guide/SikuliGuideClickable.java     |   99 +
 .../org/sikuli/guide/SikuliGuideComponent.java     | 1197 +++++++
 .../java/org/sikuli/guide/SikuliGuideFlag.java     |  167 +
 .../java/org/sikuli/guide/SikuliGuideHotspot.java  |   99 +
 .../java/org/sikuli/guide/SikuliGuideImage.java    |   72 +
 .../java/org/sikuli/guide/SikuliGuideMagnet.java   |  266 ++
 .../org/sikuli/guide/SikuliGuideRectangle.java     |   57 +
 .../org/sikuli/guide/SikuliGuideSpotlight.java     |  111 +
 .../java/org/sikuli/guide/SikuliGuideText.java     |   67 +
 .../java/org/sikuli/guide/TimeoutTransition.java   |   30 +
 Guide/src/main/java/org/sikuli/guide/Tracker.java  |  222 ++
 .../src/main/java/org/sikuli/guide/Transition.java |   12 +
 .../java/org/sikuli/guide/TransitionDialog.java    |  229 ++
 Guide/src/main/resources/guide/__init__.py         |    2 +
 Guide/src/main/resources/guide/guide.py            |  581 +++
 IDE/README.md                                      |    9 +
 IDE/pom.xml                                        |  108 +
 .../java/org/sikuli/ide/BevelDividerPainter.java   |    0
 .../main/java/org/sikuli/ide/ButtonCapture.java    |  279 ++
 .../main/java/org/sikuli/ide/ButtonGenCommand.java |   12 +-
 .../main/java/org/sikuli/ide/ButtonOnToolbar.java  |    0
 .../sikuli/ide/CloseableModernTabbedPaneUI.java    |    0
 .../java/org/sikuli/ide/CloseableTabbedPane.java   |  407 ++-
 .../sikuli/ide/CloseableTabbedPaneListener.java    |    0
 .../java/org/sikuli/ide/EditorConsolePane.java     |   83 +-
 .../sikuli/ide/EditorCurrentLineHighlighter.java   |    0
 .../java/org/sikuli/ide/EditorLineNumberView.java  |   46 +-
 .../main/java/org/sikuli/ide/EditorMyDocument.java |    0
 IDE/src/main/java/org/sikuli/ide/EditorPane.java   | 1227 +++++++
 .../java/org/sikuli/ide/EditorPatternButton.java   |   69 +-
 .../java/org/sikuli/ide/EditorPatternLabel.java    |  159 +-
 .../java/org/sikuli/ide/EditorRegionButton.java    |    0
 .../java/org/sikuli/ide/EditorRegionLabel.java     |   80 +-
 .../java/org/sikuli/ide/EditorUndoManager.java     |    0
 .../java/org/sikuli/ide/EditorViewFactory.java     |  116 +-
 .../main/java/org/sikuli/ide}/ExtensionItem.java   |    2 +-
 .../org/sikuli/ide}/ExtensionManagerFrame.java     |    2 +-
 .../main/java/org/sikuli/ide/NativeSupport.java    |   13 +
 .../main/java/org/sikuli/ide/NativeSupportMac.java |   65 +
 .../java/org/sikuli/ide/PatternPaneNaming.java     |    0
 .../java/org/sikuli/ide/PatternPaneScreenshot.java |  321 ++
 .../org/sikuli/ide/PatternPaneTargetOffset.java    |  177 +-
 .../org/sikuli/ide/PatternSimilaritySlider.java    |   10 +-
 .../main/java/org/sikuli/ide/PatternWindow.java    |   93 +-
 .../main/java/org/sikuli/ide/PreferencesWin.java   |   12 +-
 .../main/java/org/sikuli/ide/PreferencesWin.jfd    |    0
 .../java/org/sikuli/ide/PreferencesWindowMore.form |    0
 .../java/org/sikuli/ide/PreferencesWindowMore.java |    0
 .../main/java/org/sikuli/ide/PreviewWindow.java    |    0
 .../main/java/org/sikuli/ide/SikuliEditorKit.java  |  573 +++
 .../src/main/java/org/sikuli/ide/SikuliIDE.java    |  811 +++--
 .../java/org/sikuli/ide/SikuliIDEFileChooser.java  |   10 +-
 .../main/java/org/sikuli/ide/SikuliIDEI18N.java    |    0
 .../java/org/sikuli/ide/SikuliIDEPopUpMenu.java    |  386 ++
 .../java/org/sikuli/ide/SikuliIDESettings.java     |    0
 .../java/org/sikuli/ide/SikuliIDEStatusBar.java    |   86 +
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-ar.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-bg.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-ca.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-da.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-de.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-es.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-fr.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-he.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-ja.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-ko.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-nl.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-pl.po |    0
 .../src/main/resources/i18n/IDE/IDE-pt_BR.po       |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-ru.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-sv.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-tr.po |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE-uk.po |    0
 .../src/main/resources/i18n/IDE/IDE-zh_CN.po       |    0
 .../src/main/resources/i18n/IDE/IDE-zh_TW.po       |    0
 {ide => IDE}/src/main/resources/i18n/IDE/IDE.pot   |    0
 .../src/main/resources/i18n/IDE_ar.properties      |    0
 .../src/main/resources/i18n/IDE_bg.properties      |    0
 .../src/main/resources/i18n/IDE_ca.properties      |    0
 .../src/main/resources/i18n/IDE_da.properties      |    0
 .../src/main/resources/i18n/IDE_de.properties      |    0
 .../src/main/resources/i18n/IDE_en_US.properties   |    0
 .../src/main/resources/i18n/IDE_es.properties      |    0
 .../src/main/resources/i18n/IDE_fr.properties      |    0
 .../src/main/resources/i18n/IDE_he.properties      |    0
 .../src/main/resources/i18n/IDE_ja.properties      |    0
 .../src/main/resources/i18n/IDE_ko.properties      |    0
 .../src/main/resources/i18n/IDE_nl.properties      |    0
 .../src/main/resources/i18n/IDE_pl.properties      |    0
 .../src/main/resources/i18n/IDE_pt_BR.properties   |    0
 IDE/src/main/resources/i18n/IDE_ru.properties      |  165 +
 .../src/main/resources/i18n/IDE_sv.properties      |    0
 .../src/main/resources/i18n/IDE_tr.properties      |    0
 .../src/main/resources/i18n/IDE_uk.properties      |    0
 .../src/main/resources/i18n/IDE_zh_CN.properties   |    0
 .../src/main/resources/i18n/IDE_zh_TW.properties   |    0
 .../src/main/resources/icons/camera-icon.png       |  Bin
 .../src/main/resources/icons/camera-icon.psd       |  Bin
 .../src/main/resources/icons/capture-small.png     |  Bin
 .../main/resources/icons/capture-very-small.png    |  Bin
 {ide => IDE}/src/main/resources/icons/capture.png  |  Bin
 .../src/main/resources/icons/close-hover.gif       |  Bin
 .../src/main/resources/icons/close-normal.gif      |  Bin
 .../src/main/resources/icons/close-pressed.gif     |  Bin
 {ide => IDE}/src/main/resources/icons/error.gif    |  Bin
 .../src/main/resources/icons/error_icon.gif        |  Bin
 {ide => IDE}/src/main/resources/icons/failure.gif  |  Bin
 .../src/main/resources/icons/hierarchy.gif         |  Bin
 .../src/main/resources/icons/insert-image-icon.png |  Bin
 .../src/main/resources/icons/insert-image-icon.psd |  Bin
 .../src/main/resources/icons/insert-image.png      |  Bin
 {ide => IDE}/src/main/resources/icons/loading.gif  |  Bin
 .../resources/icons/mac-toolbar-icon-template.psd  |  Bin
 {ide => IDE}/src/main/resources/icons/ok.gif       |  Bin
 .../src/main/resources/icons/py-src-16x16.png      |  Bin
 {ide => IDE}/src/main/resources/icons/record.png   |  Bin
 .../src/main/resources/icons/region-icon.png       |  Bin
 .../src/main/resources/icons/region-icon.psd       |  Bin
 {ide => IDE}/src/main/resources/icons/run.png      |  Bin
 {ide => IDE}/src/main/resources/icons/run_big.png  |  Bin
 {ide => IDE}/src/main/resources/icons/run_big.psd  |  Bin
 .../src/main/resources/icons/run_big_green.png     |  Bin
 .../src/main/resources/icons/run_big_yl.png        |  Bin
 {ide => IDE}/src/main/resources/icons/runviz.png   |  Bin
 .../src/main/resources/icons/subregion.png         |  Bin
 .../resources/icons/tab/tab-aqua-highlight-sep.png |  Bin
 .../resources/icons/tab/tab-aqua-highlight.png     |  Bin
 .../src/main/resources/icons/tab/tab-aqua-sep.png  |  Bin
 .../src/main/resources/icons/tab/tab-aqua.png      |  Bin
 .../icons/tab/tab-normal-highlight-sep.png         |  Bin
 .../resources/icons/tab/tab-normal-highlight.png   |  Bin
 .../main/resources/icons/tab/tab-normal-sep.png    |  Bin
 .../src/main/resources/icons/tab/tab-normal.png    |  Bin
 IDEFat/README.md                                   |    4 +
 IDEFat/pom.xml                                     |   88 +
 JRuby/README.md                                    |    5 +
 JRuby/pom.xml                                      |   47 +
 .../org/sikuli/idesupport/JRubyIDESupport.java     |   27 +
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |  552 +++
 JRubyFat/README.md                                 |    4 +
 JRubyFat/pom.xml                                   |   63 +
 .../org/sikuli/idesupport/JythonIDESupport.java    |   18 +
 .../sikuli/scriptrunner/JythonScriptRunner.java    |   83 +
 Jygments4SikuliX/README.md                         |    4 +
 Jygments4SikuliX/pom.xml                           |   37 +
 .../main/java/org/sikuli/syntaxhighlight/Def.java  |   56 +
 .../java/org/sikuli/syntaxhighlight/Filter.java    |   23 +
 .../java/org/sikuli/syntaxhighlight/Jygments.java  |   53 +
 .../java/org/sikuli/syntaxhighlight/NestedDef.java |   83 +
 .../syntaxhighlight/ResolutionException.java       |   42 +
 .../main/java/org/sikuli/syntaxhighlight/Run.java  |   35 +
 .../main/java/org/sikuli/syntaxhighlight/Util.java |  164 +
 .../sikuli/syntaxhighlight/contrib/Css2Lexer.java  |  109 +
 .../syntaxhighlight/contrib/DebugFormatter.java    |   51 +
 .../syntaxhighlight/contrib/Default2Style.java     |   81 +
 .../syntaxhighlight/contrib/HtmlFormatter.java     |  209 ++
 .../sikuli/syntaxhighlight/format/Formatter.java   |  105 +
 .../syntaxhighlight/grammar/DelegatedLexer.java    |  122 +
 .../sikuli/syntaxhighlight/grammar/Grammar.java    |  154 +
 .../org/sikuli/syntaxhighlight/grammar/Lexer.java  |  372 ++
 .../syntaxhighlight/grammar/PatternRule.java       |   43 +
 .../sikuli/syntaxhighlight/grammar/RegexLexer.java |  391 ++
 .../syntaxhighlight/grammar/RelativeState.java     |   50 +
 .../org/sikuli/syntaxhighlight/grammar/Rule.java   |   20 +
 .../sikuli/syntaxhighlight/grammar/SaveRule.java   |   42 +
 .../org/sikuli/syntaxhighlight/grammar/State.java  |   85 +
 .../org/sikuli/syntaxhighlight/grammar/Token.java  |   57 +
 .../sikuli/syntaxhighlight/grammar/TokenRule.java  |   58 +
 .../sikuli/syntaxhighlight/grammar/TokenType.java  |  274 ++
 .../sikuli/syntaxhighlight/grammar/UsingRule.java  |   44 +
 .../grammar/def/ChangeStateTokenRuleDef.java       |   84 +
 .../syntaxhighlight/grammar/def/IncludeDef.java    |   86 +
 .../syntaxhighlight/grammar/def/SaveDef.java       |   80 +
 .../syntaxhighlight/grammar/def/StateDef.java      |   43 +
 .../syntaxhighlight/grammar/def/TokenRuleDef.java  |  135 +
 .../syntaxhighlight/grammar/def/UsingRuleDef.java  |   98 +
 .../org/sikuli/syntaxhighlight/scan/EndOfText.java |   20 +
 .../org/sikuli/syntaxhighlight/scan/Scanner.java   |  121 +
 .../syntaxhighlight/style/ColorStyleElement.java   |   86 +
 .../syntaxhighlight/style/EffectStyleElement.java  |   49 +
 .../syntaxhighlight/style/FontStyleElement.java    |   43 +
 .../org/sikuli/syntaxhighlight/style/Style.java    |  247 ++
 .../sikuli/syntaxhighlight/style/StyleElement.java |   83 +
 .../syntaxhighlight/style/def/StyleElementDef.java |   73 +
 .../main/resources/LexerContrib/ClojureLexer.jso   |  132 +
 .../src/main/resources/LexerContrib/CssLexer.jso   |  160 +
 .../main/resources/LexerContrib/DefaultStyle.jso   |   51 +
 .../src/main/resources/LexerContrib/HtmlLexer.jso  |   64 +
 .../src/main/resources/LexerContrib/JavaLexer.jso  |   48 +
 .../resources/LexerContrib/JavascriptLexer.jso     |   84 +
 .../main/resources/LexerContrib/PythonLexer.jso    |  214 ++
 .../src/main/resources/LexerContrib/XmlLexer.jso   |   38 +
 .../main/resources/jygments-legal/copyright.txt    |    8 +
 .../src/main/resources/jygments-legal/license.txt  |   25 +
 Jython/README.md                                   |    6 +
 Jython/pom.xml                                     |   47 +
 .../org/sikuli/idesupport/JythonIDESupport.java    |   26 +
 .../org/sikuli/idesupport}/PythonIndentation.java  |   55 +-
 .../java/org/sikuli/idesupport}/PythonState.java   |    6 +-
 .../sikuli/scriptrunner/JythonScriptRunner.java    |  219 +-
 .../src/main/resources/scripts/sikuli2html.py      |    0
 JythonFat/README.md                                |    4 +
 JythonFat/pom.xml                                  |   63 +
 .../org/sikuli/idesupport/JRubyIDESupport.java     |   18 +
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |   83 +
 .../org/sikuli/idesupport/JRubyIDESupport.java     |   18 +
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |   83 +
 Natives/README.md                                  |    7 +
 Natives/pom.xml                                    |   37 +
 .../java/org/sikuli/natives}/DebugCategories.java  |    4 +-
 .../main/java/org/sikuli/natives}/FindInput.java   |    4 +-
 .../main/java/org/sikuli/natives}/FindResult.java  |    4 +-
 .../main/java/org/sikuli/natives}/FindResults.java |    4 +-
 .../main/java/org/sikuli/natives/LinuxUtil.java    |  243 ++
 .../src/main/java/org/sikuli/natives}/MacUtil.java |   67 +-
 .../src/main/java/org/sikuli/natives}/Mat.java     |    4 +-
 .../src/main/java/org/sikuli/natives}/OCR.java     |    4 +-
 .../src/main/java/org/sikuli/natives}/OCRChar.java |    4 +-
 .../main/java/org/sikuli/natives}/OCRChars.java    |    4 +-
 .../src/main/java/org/sikuli/natives}/OCRLine.java |    4 +-
 .../main/java/org/sikuli/natives}/OCRLines.java    |    4 +-
 .../java/org/sikuli/natives}/OCRParagraph.java     |    4 +-
 .../java/org/sikuli/natives}/OCRParagraphs.java    |    4 +-
 .../src/main/java/org/sikuli/natives}/OCRRect.java |    4 +-
 .../src/main/java/org/sikuli/natives}/OCRText.java |    4 +-
 .../src/main/java/org/sikuli/natives}/OCRWord.java |    4 +-
 .../main/java/org/sikuli/natives}/OCRWords.java    |    4 +-
 .../src/main/java/org/sikuli/natives}/OSUtil.java  |    6 +-
 .../main/java/org/sikuli/natives/RunNatives.java   |    9 +
 .../org/sikuli/natives}/SWIGTYPE_p_cv__Rect.java   |    2 +-
 .../src/main/java/org/sikuli/natives/SysUtil.java  |   46 +
 .../main/java/org/sikuli/natives}/TARGET_TYPE.java |    7 +-
 .../src/main/java/org/sikuli/natives}/Vision.java  |   28 +-
 .../main/java/org/sikuli/natives}/VisionProxy.java |    4 +-
 .../java/org/sikuli/natives}/VisionProxyJNI.java   |   24 +-
 .../src/main/java/org/sikuli/natives}/WinUtil.java |   13 +-
 .../src/main/native/Hotkey/Mac/MacHotkeyManager.cc |  168 +
 .../Mac/org_sikuli_basics_MacHotkeyManager.h       |   45 +
 Natives/src/main/native/OSUtil/Mac/MacUtil.m       |  213 ++
 .../native/OSUtil/Mac/org_sikuli_natives_MacUtil.h |   69 +
 Natives/src/main/native/OSUtil/Windows/WinUtil.cc  |  364 ++
 .../OSUtil/Windows/org_sikuli_natives_WinUtil.h    |   93 +
 .../src/main/native/Vision}/cvgui.cpp              |    3 +-
 .../src => Natives/src/main/native/Vision}/cvgui.h |    0
 .../src/main/native/Vision}/find-result.h          |    0
 .../src/main/native/Vision}/finder.cpp             |    6 -
 .../src/main/native/Vision}/finder.h               |    0
 .../src/main/native/Vision}/opencv.hpp             |    2 -
 .../native/Vision}/pyramid-template-matcher.cpp    |    5 -
 .../main/native/Vision}/pyramid-template-matcher.h |    0
 .../src/main/native/Vision}/sikuli-debug.cpp       |    0
 .../src/main/native/Vision}/sikuli-debug.h         |    0
 .../src/main/native/Vision}/tessocr.cpp            |    9 +-
 .../src/main/native/Vision}/tessocr.h              |    0
 .../src/main/native/Vision}/vision.cpp             |  220 +-
 .../src/main/native/Vision}/vision.h               |   67 +-
 .../src/main/native/Vision}/vision.swig            |   20 +-
 .../src/main/native/Vision}/visionJAVA_wrap.cxx    |  656 ++--
 README.md                                          |  195 +
 Remote/README.md                                   |   29 +
 Remote/pom.xml                                     |   39 +
 Remote/src/main/java/org/sikuli/remote/Server.java |  420 +++
 Setup/README.md                                    |    4 +
 Setup/pom.xml                                      |   68 +
 Tesseract4SikuliX/README.md                        |    8 +
 Tesseract4SikuliX/pom.xml                          |   42 +
 .../src/main/java/org/sikuli/tesseract/Run.java    |   52 +
 .../main/java/org/sikuli/tesseract/TessAPI.java    |  703 ++++
 .../org/sikuli/tesseract/TesseractException.java   |   36 +
 api/.gitignore                                     |   23 -
 api/README.md                                      |   58 -
 api/pom.xml                                        |   86 -
 api/pom_make_sikuli-java-jar.xml                   |  141 -
 api/pom_make_sikuli-script-jar.xml                 |  153 -
 api/src/main/java/org/sikuli/script/Constants.java |   12 -
 .../main/java/org/sikuli/script/FindFailed.java    |   21 -
 .../java/org/sikuli/script/FindFailedDialog.java   |  168 -
 api/src/main/java/org/sikuli/script/Finder.java    |  323 --
 .../org/sikuli/script/OverlayCapturePrompt.java    |  334 --
 api/src/main/java/org/sikuli/script/Pattern.java   |  255 --
 api/src/main/java/org/sikuli/script/Region.java    | 2840 ---------------
 .../main/java/org/sikuli/script/ScreenUnion.java   |   56 -
 .../main/java/org/sikuli/script/SikuliEvent.java   |   77 -
 .../java/org/sikuli/script/SikuliEventAdapter.java |   22 -
 .../java/org/sikuli/script/SikuliEventAppear.java  |   16 -
 .../java/org/sikuli/script/SikuliEventChange.java  |   23 -
 .../java/org/sikuli/script/SikuliEventManager.java |  293 --
 .../org/sikuli/script/SikuliEventObserver.java     |   16 -
 .../java/org/sikuli/script/SikuliEventVanish.java  |   15 -
 api/src/test/jython/test/TestJython.py             |    7 -
 api/src/test/xjava/test/ComparatorTest.java        |   77 -
 api/src/test/xjava/test/RegionTest.java            |  232 --
 api/src/test/xjava/test/ScreenCaptureTest.java     |   37 -
 api/src/test/xjava/test/TestNative.java            |   34 -
 basics/.gitignore                                  |    6 -
 basics/README.md                                   |   10 -
 basics/pom.xml                                     |  120 -
 basics/pom_make_sikuli-setup-jar.xml               |  150 -
 basics/pom_make_sikuli_basics_small_jar.xml        |  132 -
 .../main/java/org/sikuli/basics/ImageLocator.java  |  390 --
 .../src/main/java/org/sikuli/basics/LinuxUtil.java |  241 --
 .../src/main/java/org/sikuli/basics/RunSetup.java  |  968 -----
 .../src/main/java/org/sikuli/basics/SikuliX.java   |  281 --
 .../src/main/java/org/sikuli/basics/SysUtil.java   |   46 -
 .../main/java/org/sikuli/basics/proxies/Blob.java  |   90 -
 .../java/org/sikuli/basics/proxies/OpenCV.java     |   46 -
 basics/src/main/resources/Commands/linux/runIDE    |   21 -
 basics/src/main/resources/Commands/linux/runScript |   21 -
 basics/src/main/resources/Commands/linux/runSetup  |    7 -
 basics/src/main/resources/Commands/mac/runIDE      |   47 -
 basics/src/main/resources/Commands/mac/runScript   |   38 -
 basics/src/main/resources/Commands/mac/runSetup    |   26 -
 .../src/main/resources/Commands/windows/runIDE.cmd |   55 -
 .../main/resources/Commands/windows/runSetup.cmd   |   54 -
 collectJars                                        |   83 +
 collectJars.bat                                    |   90 +
 complete.xml                                       |   26 +
 createJavadocs                                     |   20 +
 createJavadocsClasses                              |   10 +
 ide-fat.xml                                        |   26 +
 ide/.gitignore                                     |   26 -
 ide/README.md                                      |   50 -
 ide/pom.xml                                        |  157 -
 ide/pom_make_sikuli-ide-jar.xml                    |  218 --
 .../main/java/org/sikuli/ide/ButtonCapture.java    |  277 --
 ide/src/main/java/org/sikuli/ide/EditorKit.java    |  557 ---
 ide/src/main/java/org/sikuli/ide/EditorPane.java   | 1048 ------
 ide/src/main/java/org/sikuli/ide/NativeLayer.java  |   13 -
 .../java/org/sikuli/ide/NativeLayerForLinux.java   |   18 -
 .../java/org/sikuli/ide/NativeLayerForMac.java     |   79 -
 .../java/org/sikuli/ide/NativeLayerForWindows.java |   18 -
 .../java/org/sikuli/ide/PatternPaneScreenshot.java |  323 --
 .../java/org/sikuli/ide/SikuliIDEStatusBar.java    |   58 -
 ide/src/main/java/org/sikuli/ide/util/Utils.java   |  163 -
 ide/src/main/resources/i18n/IDE_ru.properties      |  162 -
 ide/src/stuff/z_notused/EditorDocument.java        |  444 ---
 ide/src/stuff/z_notused/EditorView.java            |  137 -
 .../stuff/z_notused/sikuli_test/CounterPanel.java  |  125 -
 .../sikuli_test/DefaultFailureDetailView.java      |  106 -
 .../z_notused/sikuli_test/FailureRunView.java      |  129 -
 .../stuff/z_notused/sikuli_test/ProgressBar.java   |   51 -
 ide/src/stuff/z_notused/sikuli_test/RunTest.java   |   38 -
 .../sikuli_test/TestHierarchyRunView.java          |   83 -
 .../z_notused/sikuli_test/TestRunContext.java      |   26 -
 .../stuff/z_notused/sikuli_test/TestRunView.java   |   44 -
 .../z_notused/sikuli_test/TestSuitePanel.java      |  179 -
 .../stuff/z_notused/sikuli_test/TestTreeModel.java |  195 -
 .../z_notused/sikuli_test/TextUnitTestRunner.java  |   83 -
 .../z_notused/sikuli_test/UnitTestRunner.java      |  530 ---
 jython/.gitignore                                  |   26 -
 jython/README.md                                   |   15 -
 jython/pom.xml                                     |   81 -
 .../main/java/org/sikuli/jython/IDESupport.java    |   14 -
 .../src/main/resources/scripts/clean-dot-sikuli.py |   29 -
 jython/src/test/jython/TestHelper.py               |   46 -
 plain.xml                                          |   17 +
 pom.xml                                            |  279 ++
 vision-proxy/.gitignore                            |   16 -
 vision-proxy/README.md                             |   27 -
 vision-proxy/makeVisionProxy                       |   42 -
 vision-proxy/makeVisionProxy-RHEL5x                |   44 -
 vision-proxy/src/TimingBlock.cc                    |   10 -
 vision-proxy/src/TimingBlock.h                     |   74 -
 vision-proxy/src/imgdb.cpp                         |  311 --
 vision-proxy/src/imgdb.h                           |   75 -
 492 files changed, 37360 insertions(+), 16977 deletions(-)

diff --cc .gitignore
index 3189ca8,9c731b6..0ab26e5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,9 +1,12 @@@
 +# Ignore quilt cache
 +.pc
++#
+ target*/
+ .idea
+ nb*
+ *.iml
+ stuff/
+ *.versionsBackup
+ *.log
+ *.o
+ *.o.d

-- 
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