From 57a05f533ecca0e7ccdb16261caedf6797559356 Mon Sep 17 00:00:00 2001 From: Albert Latacz Date: Mon, 5 Dec 2016 19:30:10 +0000 Subject: [PATCH] Added support for web console in local repl (fixes #110) --- src/javarepl/Main.java | 12 ++-- .../console/rest/RestConsoleApplication.java | 3 + .../console/rest/RestConsoleResource.java | 30 ++++++++ src/javarepl/console/rest/favicon.ico | Bin 0 -> 1150 bytes src/javarepl/console/ui/ConsoleUiModule.java | 15 ++++ .../github-fork-ribbon-css/.bower.json | 0 .../github-fork-ribbon-css/LICENSE | 0 .../github-fork-ribbon-css/README.md | 0 .../github-fork-ribbon-css/bower.json | 0 .../github-fork-ribbon-css/gh-fork-ribbon.css | 0 .../gh-fork-ribbon.ie.css | 0 .../github-fork-ribbon-css/index.html | 0 .../github-fork-ribbon-css/package.json | 0 .../jquery.terminal/.bower.json | 0 .../jquery.terminal/.gitignore | 0 .../jquery.terminal/.npmignore | 0 .../bower_components/jquery.terminal/LICENSE | 0 .../jquery.terminal/Makefile.in | 0 .../jquery.terminal/README.md | 0 .../jquery.terminal/SpecRunner.html | 0 .../bin/yuicompressor-2.4.8.jar | Bin .../jquery.terminal/bower.json | 0 .../css/jquery.terminal-0.11.19.css | 0 .../css/jquery.terminal-0.11.19.min.css | 0 .../css/jquery.terminal-src.css | 0 .../jquery.terminal/css/jquery.terminal.css | 0 .../css/jquery.terminal.min.css | 0 .../jquery.terminal/js/dterm.js | 0 .../jquery.terminal/js/jquery-1.7.1.min.js | 0 .../js/jquery.mousewheel-min.js | 0 .../js/jquery.terminal-0.11.19.js | 0 .../js/jquery.terminal-0.11.19.min.js | 0 .../jquery.terminal/js/jquery.terminal-src.js | 0 .../jquery.terminal/js/jquery.terminal.js | 0 .../jquery.terminal/js/jquery.terminal.min.js | 0 .../jquery.terminal/js/unix_formatting.js | 0 .../jquery.terminal/js/xml_formatting.js | 0 .../jquery.terminal/package.in | 0 .../jquery.terminal/package.json | 0 .../jquery.terminal/spec/support/jasmine.json | 0 .../jquery.terminal/spec/terminalSpec.js | 0 .../jquery.terminal/terminal.jquery.json | 0 .../bower_components/jquery.terminal/version | 0 .../ui}/bower_components/jquery/.bower.json | 0 .../ui}/bower_components/jquery/AUTHORS.txt | 0 .../ui}/bower_components/jquery/LICENSE.txt | 0 .../ui}/bower_components/jquery/README.md | 0 .../ui}/bower_components/jquery/bower.json | 0 .../bower_components/jquery/dist/jquery.js | 0 .../jquery/dist/jquery.min.js | 0 .../jquery/dist/jquery.min.map | 0 .../jquery/external/sizzle/LICENSE.txt | 0 .../jquery/external/sizzle/dist/sizzle.js | 0 .../jquery/external/sizzle/dist/sizzle.min.js | 0 .../external/sizzle/dist/sizzle.min.map | 0 .../ui}/bower_components/jquery/src/.jshintrc | 0 .../ui}/bower_components/jquery/src/ajax.js | 0 .../bower_components/jquery/src/ajax/jsonp.js | 0 .../bower_components/jquery/src/ajax/load.js | 0 .../jquery/src/ajax/parseJSON.js | 0 .../jquery/src/ajax/parseXML.js | 0 .../jquery/src/ajax/script.js | 0 .../jquery/src/ajax/var/location.js | 0 .../jquery/src/ajax/var/nonce.js | 0 .../jquery/src/ajax/var/rquery.js | 0 .../bower_components/jquery/src/ajax/xhr.js | 0 .../bower_components/jquery/src/attributes.js | 0 .../jquery/src/attributes/attr.js | 0 .../jquery/src/attributes/classes.js | 0 .../jquery/src/attributes/prop.js | 0 .../jquery/src/attributes/support.js | 0 .../jquery/src/attributes/val.js | 0 .../bower_components/jquery/src/callbacks.js | 0 .../ui}/bower_components/jquery/src/core.js | 0 .../jquery/src/core/access.js | 0 .../bower_components/jquery/src/core/init.js | 0 .../jquery/src/core/parseHTML.js | 0 .../bower_components/jquery/src/core/ready.js | 2 +- .../jquery/src/core/var/rsingleTag.js | 0 .../ui}/bower_components/jquery/src/css.js | 0 .../jquery/src/css/addGetHookIf.js | 0 .../jquery/src/css/adjustCSS.js | 0 .../bower_components/jquery/src/css/curCSS.js | 0 .../jquery/src/css/defaultDisplay.js | 0 .../jquery/src/css/hiddenVisibleSelectors.js | 0 .../jquery/src/css/showHide.js | 0 .../jquery/src/css/support.js | 0 .../jquery/src/css/var/cssExpand.js | 0 .../jquery/src/css/var/getStyles.js | 0 .../jquery/src/css/var/isHidden.js | 0 .../jquery/src/css/var/rmargin.js | 0 .../jquery/src/css/var/rnumnonpx.js | 0 .../jquery/src/css/var/swap.js | 0 .../ui}/bower_components/jquery/src/data.js | 0 .../bower_components/jquery/src/data/Data.js | 0 .../jquery/src/data/var/acceptData.js | 0 .../jquery/src/data/var/dataPriv.js | 0 .../jquery/src/data/var/dataUser.js | 0 .../bower_components/jquery/src/deferred.js | 0 .../bower_components/jquery/src/deprecated.js | 0 .../bower_components/jquery/src/dimensions.js | 0 .../bower_components/jquery/src/effects.js | 0 .../jquery/src/effects/Tween.js | 0 .../jquery/src/effects/animatedSelector.js | 0 .../ui}/bower_components/jquery/src/event.js | 0 .../bower_components/jquery/src/event/ajax.js | 0 .../jquery/src/event/alias.js | 0 .../jquery/src/event/focusin.js | 0 .../jquery/src/event/support.js | 0 .../jquery/src/event/trigger.js | 0 .../jquery/src/exports/amd.js | 0 .../jquery/src/exports/global.js | 0 .../ui}/bower_components/jquery/src/intro.js | 0 .../ui}/bower_components/jquery/src/jquery.js | 0 .../jquery/src/manipulation.js | 0 .../jquery/src/manipulation/_evalUrl.js | 0 .../jquery/src/manipulation/buildFragment.js | 0 .../jquery/src/manipulation/getAll.js | 0 .../jquery/src/manipulation/setGlobalEval.js | 0 .../jquery/src/manipulation/support.js | 0 .../src/manipulation/var/rcheckableType.js | 0 .../src/manipulation/var/rscriptType.js | 0 .../jquery/src/manipulation/var/rtagName.js | 0 .../jquery/src/manipulation/wrapMap.js | 0 .../ui}/bower_components/jquery/src/offset.js | 0 .../ui}/bower_components/jquery/src/outro.js | 0 .../ui}/bower_components/jquery/src/queue.js | 0 .../jquery/src/queue/delay.js | 0 .../jquery/src/selector-native.js | 0 .../jquery/src/selector-sizzle.js | 0 .../bower_components/jquery/src/selector.js | 0 .../bower_components/jquery/src/serialize.js | 0 .../bower_components/jquery/src/traversing.js | 0 .../jquery/src/traversing/findFilter.js | 0 .../jquery/src/traversing/var/dir.js | 0 .../src/traversing/var/rneedsContext.js | 0 .../jquery/src/traversing/var/siblings.js | 0 .../bower_components/jquery/src/var/arr.js | 0 .../jquery/src/var/class2type.js | 0 .../bower_components/jquery/src/var/concat.js | 0 .../jquery/src/var/document.js | 0 .../jquery/src/var/documentElement.js | 0 .../bower_components/jquery/src/var/hasOwn.js | 0 .../jquery/src/var/indexOf.js | 0 .../bower_components/jquery/src/var/pnum.js | 0 .../bower_components/jquery/src/var/push.js | 0 .../jquery/src/var/rcssNum.js | 2 +- .../jquery/src/var/rnotwhite.js | 0 .../bower_components/jquery/src/var/slice.js | 0 .../jquery/src/var/support.js | 0 .../jquery/src/var/toString.js | 0 .../ui}/bower_components/jquery/src/wrap.js | 0 .../bower_components/underscore/.bower.json | 0 .../ui}/bower_components/underscore/LICENSE | 0 .../ui}/bower_components/underscore/README.md | 0 .../bower_components/underscore/bower.json | 0 .../underscore/underscore-min.js | 0 .../underscore/underscore-min.map | 0 .../bower_components/underscore/underscore.js | 0 src/javarepl/console/ui/console.html | 65 ++++++++++++++++++ src/javarepl/console/ui/favicon.ico | Bin 0 -> 1150 bytes .../{web => console/ui}/javarepl-icon.png | Bin src/javarepl/{web => console/ui}/term.css | 2 +- src/javarepl/{web => console/ui}/term.js | 0 src/javarepl/web/WebConsoleApplication.java | 2 + src/javarepl/web/embed.html | 22 +++--- src/javarepl/web/term.html | 18 ++--- 167 files changed, 144 insertions(+), 29 deletions(-) create mode 100644 src/javarepl/console/rest/favicon.ico create mode 100644 src/javarepl/console/ui/ConsoleUiModule.java rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/.bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/LICENSE (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/README.md (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/gh-fork-ribbon.ie.css (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/index.html (100%) rename src/javarepl/{web => console/ui}/bower_components/github-fork-ribbon-css/package.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/.bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/.gitignore (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/.npmignore (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/LICENSE (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/Makefile.in (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/README.md (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/SpecRunner.html (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/bin/yuicompressor-2.4.8.jar (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.css (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.min.css (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/css/jquery.terminal-src.css (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/css/jquery.terminal.css (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/css/jquery.terminal.min.css (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/dterm.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery-1.7.1.min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.mousewheel-min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.terminal-src.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.terminal.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/jquery.terminal.min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/unix_formatting.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/js/xml_formatting.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/package.in (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/package.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/spec/support/jasmine.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/spec/terminalSpec.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/terminal.jquery.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery.terminal/version (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/.bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/AUTHORS.txt (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/LICENSE.txt (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/README.md (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/dist/jquery.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/dist/jquery.min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/dist/jquery.min.map (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/external/sizzle/LICENSE.txt (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/external/sizzle/dist/sizzle.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/external/sizzle/dist/sizzle.min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/external/sizzle/dist/sizzle.min.map (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/.jshintrc (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/jsonp.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/load.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/parseJSON.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/parseXML.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/script.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/var/location.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/var/nonce.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/var/rquery.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/ajax/xhr.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes/attr.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes/classes.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes/prop.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes/support.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/attributes/val.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/callbacks.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core/access.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core/init.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core/parseHTML.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core/ready.js (99%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/core/var/rsingleTag.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/addGetHookIf.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/adjustCSS.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/curCSS.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/defaultDisplay.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/hiddenVisibleSelectors.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/showHide.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/support.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/cssExpand.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/getStyles.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/isHidden.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/rmargin.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/rnumnonpx.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/css/var/swap.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/data.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/data/Data.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/data/var/acceptData.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/data/var/dataPriv.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/data/var/dataUser.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/deferred.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/deprecated.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/dimensions.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/effects.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/effects/Tween.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/effects/animatedSelector.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event/ajax.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event/alias.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event/focusin.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event/support.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/event/trigger.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/exports/amd.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/exports/global.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/intro.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/jquery.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/_evalUrl.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/buildFragment.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/getAll.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/setGlobalEval.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/support.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/var/rcheckableType.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/var/rscriptType.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/var/rtagName.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/manipulation/wrapMap.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/offset.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/outro.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/queue.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/queue/delay.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/selector-native.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/selector-sizzle.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/selector.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/serialize.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/traversing.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/traversing/findFilter.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/traversing/var/dir.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/traversing/var/rneedsContext.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/traversing/var/siblings.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/arr.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/class2type.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/concat.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/document.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/documentElement.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/hasOwn.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/indexOf.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/pnum.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/push.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/rcssNum.js (87%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/rnotwhite.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/slice.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/support.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/var/toString.js (100%) rename src/javarepl/{web => console/ui}/bower_components/jquery/src/wrap.js (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/.bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/LICENSE (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/README.md (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/bower.json (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/underscore-min.js (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/underscore-min.map (100%) rename src/javarepl/{web => console/ui}/bower_components/underscore/underscore.js (100%) create mode 100644 src/javarepl/console/ui/console.html create mode 100644 src/javarepl/console/ui/favicon.ico rename src/javarepl/{web => console/ui}/javarepl-icon.png (100%) rename src/javarepl/{web => console/ui}/term.css (98%) rename src/javarepl/{web => console/ui}/term.js (100%) diff --git a/src/javarepl/Main.java b/src/javarepl/Main.java index e863a41..1359502 100644 --- a/src/javarepl/Main.java +++ b/src/javarepl/Main.java @@ -97,8 +97,6 @@ private static boolean handleTerminalCommand(EvaluationLog log) { return false; } - - private static String welcomeMessage() { return format("Welcome to JavaREPL version %s (%s, Java %s)", applicationVersion(), @@ -106,6 +104,10 @@ private static String welcomeMessage() { getProperty("java.version")); } + private static String welcomeInstructions() { + return "Type expression to evaluate, \u001B[32m:help\u001B[0m for more options or press \u001B[32mtab\u001B[0m to auto-complete."; + } + private static JavaREPLClient clientFor(Option hostname, Option port) throws Exception { console.printInfo(welcomeMessage()); @@ -146,6 +148,8 @@ private static JavaREPLClient startNewLocalInstance(String hostname, Integer por ProcessBuilder builder = new ProcessBuilder("java", "-cp", System.getProperty("java.class.path"), Repl.class.getCanonicalName(), "--port=" + port); builder.redirectErrorStream(true); + console.printInfo("Connected to local instance at http://" + hostname + ":" + port); + process = some(builder.start()); Runtime.getRuntime().addShutdownHook(new Thread() { public void run() { @@ -163,10 +167,6 @@ public void run() { return replClient; } - private static String welcomeInstructions() { - return "Type expression to evaluate, \u001B[32m:help\u001B[0m for more options or press \u001B[32mtab\u001B[0m to auto-complete."; - } - private static boolean waitUntilInstanceStarted(JavaREPLClient client) throws Exception { for (int i = 0; i < 500; i++) { Thread.sleep(10); diff --git a/src/javarepl/console/rest/RestConsoleApplication.java b/src/javarepl/console/rest/RestConsoleApplication.java index 7a658dc..7326a1c 100644 --- a/src/javarepl/console/rest/RestConsoleApplication.java +++ b/src/javarepl/console/rest/RestConsoleApplication.java @@ -2,6 +2,7 @@ import com.googlecode.utterlyidle.BasePath; import com.googlecode.utterlyidle.RestApplication; +import javarepl.console.ui.ConsoleUiModule; import static com.googlecode.utterlyidle.annotations.AnnotatedBindings.annotatedClass; import static com.googlecode.utterlyidle.modules.Modules.applicationInstance; @@ -14,6 +15,8 @@ public RestConsoleApplication(BasePath basePath, RestConsole console) { applicationInstance(console), applicationInstance(new RestConsoleExpressionReader())); + add(new ConsoleUiModule()); add(new RestConsoleModule()); + } } diff --git a/src/javarepl/console/rest/RestConsoleResource.java b/src/javarepl/console/rest/RestConsoleResource.java index 368a337..2de8395 100644 --- a/src/javarepl/console/rest/RestConsoleResource.java +++ b/src/javarepl/console/rest/RestConsoleResource.java @@ -3,6 +3,7 @@ import com.googlecode.totallylazy.Option; import com.googlecode.totallylazy.functions.Function1; import com.googlecode.utterlyidle.MediaType; +import com.googlecode.utterlyidle.Response; import com.googlecode.utterlyidle.annotations.*; import javarepl.console.ConsoleLog; import javarepl.console.ConsoleResult; @@ -11,6 +12,9 @@ import java.util.Map; import static com.googlecode.totallylazy.collections.PersistentMap.constructors.emptyMap; +import static com.googlecode.utterlyidle.Response.seeOther; +import static java.lang.String.format; +import static java.lang.System.getProperty; import static javarepl.Utils.applicationVersion; import static javarepl.completion.CompletionResult.methods.toJson; @@ -23,6 +27,21 @@ public RestConsoleResource(RestConsole console, RestConsoleExpressionReader expr this.expressionReader = expressionReader; } + @GET + @Path("") + public Response main() { + return seeOther("/ui/console.html"); + } + + @POST + @Path("create") + @Produces(MediaType.APPLICATION_JSON) + public Map create() throws Exception { + return emptyMap(String.class, Object.class) + .insert("id", this.hashCode()+"") + .insert("welcomeMessage", welcomeMessage()+"\n"+welcomeInstructions()); + } + @GET @Path("version") @Produces(MediaType.APPLICATION_JSON) @@ -91,4 +110,15 @@ private static Function1> toCommandResultMap() { .insert("type", consoleLog.type()) .insert("message", consoleLog.message()); } + + private String welcomeMessage() { + return format("Welcome to JavaREPL version %s (%s, Java %s)", + applicationVersion(), + getProperty("java.vm.name"), + getProperty("java.version")); + } + + private String welcomeInstructions() { + return "Type expression to evaluate, :help for more options or press tab to auto-complete."; + } } diff --git a/src/javarepl/console/rest/favicon.ico b/src/javarepl/console/rest/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..97a397d736471650c093f3910d5b77cde5948a2d GIT binary patch literal 1150 zcmb7EJ8J?#5MCjrg;g4xl!qcHzTYWC@Df1_|9}Xl@$m7<2H?l@@!+1Ov zM0%xC5$ohf{xbjNp1fW!w%e^JV>B8mKBH7BVKSLm zHWF5=6+9k~5`$`?-q&h1;cJ?vh1u8cu3J5md!RF^R;yR{=JGBzn@y#6@(ek*b$=;`%tsiKITvqF>T>-Nm%fDMZ%~&p W9%25j5hj&N>7S09zXe-H!hQo05Ia@? literal 0 HcmV?d00001 diff --git a/src/javarepl/console/ui/ConsoleUiModule.java b/src/javarepl/console/ui/ConsoleUiModule.java new file mode 100644 index 0000000..7c755c6 --- /dev/null +++ b/src/javarepl/console/ui/ConsoleUiModule.java @@ -0,0 +1,15 @@ +package javarepl.console.ui; + +import com.googlecode.utterlyidle.Resources; +import com.googlecode.utterlyidle.modules.ResourcesModule; + +import static com.googlecode.totallylazy.io.URLs.packageUrl; +import static com.googlecode.utterlyidle.dsl.DslBindings.bindings; +import static com.googlecode.utterlyidle.dsl.StaticBindingBuilder.in; + +public class ConsoleUiModule implements ResourcesModule { + @Override + public Resources addResources(Resources resources) throws Exception { + return resources.add(bindings(in(packageUrl(ConsoleUiModule.class)).path("/ui"))); + } +} diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/.bower.json b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/.bower.json similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/.bower.json rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/.bower.json diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/LICENSE b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/LICENSE similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/LICENSE rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/LICENSE diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/README.md b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/README.md similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/README.md rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/README.md diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/bower.json b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/bower.json similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/bower.json rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/bower.json diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/gh-fork-ribbon.ie.css b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/gh-fork-ribbon.ie.css similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/gh-fork-ribbon.ie.css rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/gh-fork-ribbon.ie.css diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/index.html b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/index.html similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/index.html rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/index.html diff --git a/src/javarepl/web/bower_components/github-fork-ribbon-css/package.json b/src/javarepl/console/ui/bower_components/github-fork-ribbon-css/package.json similarity index 100% rename from src/javarepl/web/bower_components/github-fork-ribbon-css/package.json rename to src/javarepl/console/ui/bower_components/github-fork-ribbon-css/package.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/.bower.json b/src/javarepl/console/ui/bower_components/jquery.terminal/.bower.json similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/.bower.json rename to src/javarepl/console/ui/bower_components/jquery.terminal/.bower.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/.gitignore b/src/javarepl/console/ui/bower_components/jquery.terminal/.gitignore similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/.gitignore rename to src/javarepl/console/ui/bower_components/jquery.terminal/.gitignore diff --git a/src/javarepl/web/bower_components/jquery.terminal/.npmignore b/src/javarepl/console/ui/bower_components/jquery.terminal/.npmignore similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/.npmignore rename to src/javarepl/console/ui/bower_components/jquery.terminal/.npmignore diff --git a/src/javarepl/web/bower_components/jquery.terminal/LICENSE b/src/javarepl/console/ui/bower_components/jquery.terminal/LICENSE similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/LICENSE rename to src/javarepl/console/ui/bower_components/jquery.terminal/LICENSE diff --git a/src/javarepl/web/bower_components/jquery.terminal/Makefile.in b/src/javarepl/console/ui/bower_components/jquery.terminal/Makefile.in similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/Makefile.in rename to src/javarepl/console/ui/bower_components/jquery.terminal/Makefile.in diff --git a/src/javarepl/web/bower_components/jquery.terminal/README.md b/src/javarepl/console/ui/bower_components/jquery.terminal/README.md similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/README.md rename to src/javarepl/console/ui/bower_components/jquery.terminal/README.md diff --git a/src/javarepl/web/bower_components/jquery.terminal/SpecRunner.html b/src/javarepl/console/ui/bower_components/jquery.terminal/SpecRunner.html similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/SpecRunner.html rename to src/javarepl/console/ui/bower_components/jquery.terminal/SpecRunner.html diff --git a/src/javarepl/web/bower_components/jquery.terminal/bin/yuicompressor-2.4.8.jar b/src/javarepl/console/ui/bower_components/jquery.terminal/bin/yuicompressor-2.4.8.jar similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/bin/yuicompressor-2.4.8.jar rename to src/javarepl/console/ui/bower_components/jquery.terminal/bin/yuicompressor-2.4.8.jar diff --git a/src/javarepl/web/bower_components/jquery.terminal/bower.json b/src/javarepl/console/ui/bower_components/jquery.terminal/bower.json similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/bower.json rename to src/javarepl/console/ui/bower_components/jquery.terminal/bower.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.css b/src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.css similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.css rename to src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.css diff --git a/src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.min.css b/src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.min.css similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.min.css rename to src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-0.11.19.min.css diff --git a/src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-src.css b/src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-src.css similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal-src.css rename to src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal-src.css diff --git a/src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal.css b/src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal.css similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal.css rename to src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal.css diff --git a/src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal.min.css b/src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal.min.css similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/css/jquery.terminal.min.css rename to src/javarepl/console/ui/bower_components/jquery.terminal/css/jquery.terminal.min.css diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/dterm.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/dterm.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/dterm.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/dterm.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery-1.7.1.min.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery-1.7.1.min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery-1.7.1.min.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery-1.7.1.min.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.mousewheel-min.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.mousewheel-min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.mousewheel-min.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.mousewheel-min.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.min.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.min.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-0.11.19.min.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-src.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-src.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal-src.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal-src.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal.min.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal.min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/jquery.terminal.min.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/jquery.terminal.min.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/unix_formatting.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/unix_formatting.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/unix_formatting.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/unix_formatting.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/js/xml_formatting.js b/src/javarepl/console/ui/bower_components/jquery.terminal/js/xml_formatting.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/js/xml_formatting.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/js/xml_formatting.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/package.in b/src/javarepl/console/ui/bower_components/jquery.terminal/package.in similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/package.in rename to src/javarepl/console/ui/bower_components/jquery.terminal/package.in diff --git a/src/javarepl/web/bower_components/jquery.terminal/package.json b/src/javarepl/console/ui/bower_components/jquery.terminal/package.json similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/package.json rename to src/javarepl/console/ui/bower_components/jquery.terminal/package.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/spec/support/jasmine.json b/src/javarepl/console/ui/bower_components/jquery.terminal/spec/support/jasmine.json similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/spec/support/jasmine.json rename to src/javarepl/console/ui/bower_components/jquery.terminal/spec/support/jasmine.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/spec/terminalSpec.js b/src/javarepl/console/ui/bower_components/jquery.terminal/spec/terminalSpec.js similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/spec/terminalSpec.js rename to src/javarepl/console/ui/bower_components/jquery.terminal/spec/terminalSpec.js diff --git a/src/javarepl/web/bower_components/jquery.terminal/terminal.jquery.json b/src/javarepl/console/ui/bower_components/jquery.terminal/terminal.jquery.json similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/terminal.jquery.json rename to src/javarepl/console/ui/bower_components/jquery.terminal/terminal.jquery.json diff --git a/src/javarepl/web/bower_components/jquery.terminal/version b/src/javarepl/console/ui/bower_components/jquery.terminal/version similarity index 100% rename from src/javarepl/web/bower_components/jquery.terminal/version rename to src/javarepl/console/ui/bower_components/jquery.terminal/version diff --git a/src/javarepl/web/bower_components/jquery/.bower.json b/src/javarepl/console/ui/bower_components/jquery/.bower.json similarity index 100% rename from src/javarepl/web/bower_components/jquery/.bower.json rename to src/javarepl/console/ui/bower_components/jquery/.bower.json diff --git a/src/javarepl/web/bower_components/jquery/AUTHORS.txt b/src/javarepl/console/ui/bower_components/jquery/AUTHORS.txt similarity index 100% rename from src/javarepl/web/bower_components/jquery/AUTHORS.txt rename to src/javarepl/console/ui/bower_components/jquery/AUTHORS.txt diff --git a/src/javarepl/web/bower_components/jquery/LICENSE.txt b/src/javarepl/console/ui/bower_components/jquery/LICENSE.txt similarity index 100% rename from src/javarepl/web/bower_components/jquery/LICENSE.txt rename to src/javarepl/console/ui/bower_components/jquery/LICENSE.txt diff --git a/src/javarepl/web/bower_components/jquery/README.md b/src/javarepl/console/ui/bower_components/jquery/README.md similarity index 100% rename from src/javarepl/web/bower_components/jquery/README.md rename to src/javarepl/console/ui/bower_components/jquery/README.md diff --git a/src/javarepl/web/bower_components/jquery/bower.json b/src/javarepl/console/ui/bower_components/jquery/bower.json similarity index 100% rename from src/javarepl/web/bower_components/jquery/bower.json rename to src/javarepl/console/ui/bower_components/jquery/bower.json diff --git a/src/javarepl/web/bower_components/jquery/dist/jquery.js b/src/javarepl/console/ui/bower_components/jquery/dist/jquery.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/dist/jquery.js rename to src/javarepl/console/ui/bower_components/jquery/dist/jquery.js diff --git a/src/javarepl/web/bower_components/jquery/dist/jquery.min.js b/src/javarepl/console/ui/bower_components/jquery/dist/jquery.min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/dist/jquery.min.js rename to src/javarepl/console/ui/bower_components/jquery/dist/jquery.min.js diff --git a/src/javarepl/web/bower_components/jquery/dist/jquery.min.map b/src/javarepl/console/ui/bower_components/jquery/dist/jquery.min.map similarity index 100% rename from src/javarepl/web/bower_components/jquery/dist/jquery.min.map rename to src/javarepl/console/ui/bower_components/jquery/dist/jquery.min.map diff --git a/src/javarepl/web/bower_components/jquery/external/sizzle/LICENSE.txt b/src/javarepl/console/ui/bower_components/jquery/external/sizzle/LICENSE.txt similarity index 100% rename from src/javarepl/web/bower_components/jquery/external/sizzle/LICENSE.txt rename to src/javarepl/console/ui/bower_components/jquery/external/sizzle/LICENSE.txt diff --git a/src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.js b/src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.js rename to src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.js diff --git a/src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.min.js b/src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.min.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.min.js rename to src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.min.js diff --git a/src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.min.map b/src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.min.map similarity index 100% rename from src/javarepl/web/bower_components/jquery/external/sizzle/dist/sizzle.min.map rename to src/javarepl/console/ui/bower_components/jquery/external/sizzle/dist/sizzle.min.map diff --git a/src/javarepl/web/bower_components/jquery/src/.jshintrc b/src/javarepl/console/ui/bower_components/jquery/src/.jshintrc similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/.jshintrc rename to src/javarepl/console/ui/bower_components/jquery/src/.jshintrc diff --git a/src/javarepl/web/bower_components/jquery/src/ajax.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/jsonp.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/jsonp.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/jsonp.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/jsonp.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/load.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/load.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/load.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/load.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/parseJSON.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/parseJSON.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/parseJSON.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/parseJSON.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/parseXML.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/parseXML.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/parseXML.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/parseXML.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/script.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/script.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/script.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/script.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/var/location.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/var/location.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/var/location.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/var/location.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/var/nonce.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/var/nonce.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/var/nonce.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/var/nonce.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/var/rquery.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/var/rquery.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/var/rquery.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/var/rquery.js diff --git a/src/javarepl/web/bower_components/jquery/src/ajax/xhr.js b/src/javarepl/console/ui/bower_components/jquery/src/ajax/xhr.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/ajax/xhr.js rename to src/javarepl/console/ui/bower_components/jquery/src/ajax/xhr.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes/attr.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes/attr.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes/attr.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes/attr.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes/classes.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes/classes.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes/classes.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes/classes.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes/prop.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes/prop.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes/prop.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes/prop.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes/support.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes/support.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes/support.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes/support.js diff --git a/src/javarepl/web/bower_components/jquery/src/attributes/val.js b/src/javarepl/console/ui/bower_components/jquery/src/attributes/val.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/attributes/val.js rename to src/javarepl/console/ui/bower_components/jquery/src/attributes/val.js diff --git a/src/javarepl/web/bower_components/jquery/src/callbacks.js b/src/javarepl/console/ui/bower_components/jquery/src/callbacks.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/callbacks.js rename to src/javarepl/console/ui/bower_components/jquery/src/callbacks.js diff --git a/src/javarepl/web/bower_components/jquery/src/core.js b/src/javarepl/console/ui/bower_components/jquery/src/core.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/core.js rename to src/javarepl/console/ui/bower_components/jquery/src/core.js diff --git a/src/javarepl/web/bower_components/jquery/src/core/access.js b/src/javarepl/console/ui/bower_components/jquery/src/core/access.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/core/access.js rename to src/javarepl/console/ui/bower_components/jquery/src/core/access.js diff --git a/src/javarepl/web/bower_components/jquery/src/core/init.js b/src/javarepl/console/ui/bower_components/jquery/src/core/init.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/core/init.js rename to src/javarepl/console/ui/bower_components/jquery/src/core/init.js diff --git a/src/javarepl/web/bower_components/jquery/src/core/parseHTML.js b/src/javarepl/console/ui/bower_components/jquery/src/core/parseHTML.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/core/parseHTML.js rename to src/javarepl/console/ui/bower_components/jquery/src/core/parseHTML.js diff --git a/src/javarepl/web/bower_components/jquery/src/core/ready.js b/src/javarepl/console/ui/bower_components/jquery/src/core/ready.js similarity index 99% rename from src/javarepl/web/bower_components/jquery/src/core/ready.js rename to src/javarepl/console/ui/bower_components/jquery/src/core/ready.js index 7d93e67..1ab2b12 100644 --- a/src/javarepl/web/bower_components/jquery/src/core/ready.js +++ b/src/javarepl/console/ui/bower_components/jquery/src/core/ready.js @@ -1,7 +1,7 @@ define( [ "../core", "../var/document", - "../core/init", + "./init", "../deferred" ], function( jQuery, document ) { diff --git a/src/javarepl/web/bower_components/jquery/src/core/var/rsingleTag.js b/src/javarepl/console/ui/bower_components/jquery/src/core/var/rsingleTag.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/core/var/rsingleTag.js rename to src/javarepl/console/ui/bower_components/jquery/src/core/var/rsingleTag.js diff --git a/src/javarepl/web/bower_components/jquery/src/css.js b/src/javarepl/console/ui/bower_components/jquery/src/css.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css.js rename to src/javarepl/console/ui/bower_components/jquery/src/css.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/addGetHookIf.js b/src/javarepl/console/ui/bower_components/jquery/src/css/addGetHookIf.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/addGetHookIf.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/addGetHookIf.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/adjustCSS.js b/src/javarepl/console/ui/bower_components/jquery/src/css/adjustCSS.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/adjustCSS.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/adjustCSS.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/curCSS.js b/src/javarepl/console/ui/bower_components/jquery/src/css/curCSS.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/curCSS.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/curCSS.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/defaultDisplay.js b/src/javarepl/console/ui/bower_components/jquery/src/css/defaultDisplay.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/defaultDisplay.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/defaultDisplay.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/hiddenVisibleSelectors.js b/src/javarepl/console/ui/bower_components/jquery/src/css/hiddenVisibleSelectors.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/hiddenVisibleSelectors.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/hiddenVisibleSelectors.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/showHide.js b/src/javarepl/console/ui/bower_components/jquery/src/css/showHide.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/showHide.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/showHide.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/support.js b/src/javarepl/console/ui/bower_components/jquery/src/css/support.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/support.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/support.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/cssExpand.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/cssExpand.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/cssExpand.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/cssExpand.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/getStyles.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/getStyles.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/getStyles.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/getStyles.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/isHidden.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/isHidden.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/isHidden.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/isHidden.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/rmargin.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/rmargin.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/rmargin.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/rmargin.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/rnumnonpx.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/rnumnonpx.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/rnumnonpx.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/rnumnonpx.js diff --git a/src/javarepl/web/bower_components/jquery/src/css/var/swap.js b/src/javarepl/console/ui/bower_components/jquery/src/css/var/swap.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/css/var/swap.js rename to src/javarepl/console/ui/bower_components/jquery/src/css/var/swap.js diff --git a/src/javarepl/web/bower_components/jquery/src/data.js b/src/javarepl/console/ui/bower_components/jquery/src/data.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/data.js rename to src/javarepl/console/ui/bower_components/jquery/src/data.js diff --git a/src/javarepl/web/bower_components/jquery/src/data/Data.js b/src/javarepl/console/ui/bower_components/jquery/src/data/Data.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/data/Data.js rename to src/javarepl/console/ui/bower_components/jquery/src/data/Data.js diff --git a/src/javarepl/web/bower_components/jquery/src/data/var/acceptData.js b/src/javarepl/console/ui/bower_components/jquery/src/data/var/acceptData.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/data/var/acceptData.js rename to src/javarepl/console/ui/bower_components/jquery/src/data/var/acceptData.js diff --git a/src/javarepl/web/bower_components/jquery/src/data/var/dataPriv.js b/src/javarepl/console/ui/bower_components/jquery/src/data/var/dataPriv.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/data/var/dataPriv.js rename to src/javarepl/console/ui/bower_components/jquery/src/data/var/dataPriv.js diff --git a/src/javarepl/web/bower_components/jquery/src/data/var/dataUser.js b/src/javarepl/console/ui/bower_components/jquery/src/data/var/dataUser.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/data/var/dataUser.js rename to src/javarepl/console/ui/bower_components/jquery/src/data/var/dataUser.js diff --git a/src/javarepl/web/bower_components/jquery/src/deferred.js b/src/javarepl/console/ui/bower_components/jquery/src/deferred.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/deferred.js rename to src/javarepl/console/ui/bower_components/jquery/src/deferred.js diff --git a/src/javarepl/web/bower_components/jquery/src/deprecated.js b/src/javarepl/console/ui/bower_components/jquery/src/deprecated.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/deprecated.js rename to src/javarepl/console/ui/bower_components/jquery/src/deprecated.js diff --git a/src/javarepl/web/bower_components/jquery/src/dimensions.js b/src/javarepl/console/ui/bower_components/jquery/src/dimensions.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/dimensions.js rename to src/javarepl/console/ui/bower_components/jquery/src/dimensions.js diff --git a/src/javarepl/web/bower_components/jquery/src/effects.js b/src/javarepl/console/ui/bower_components/jquery/src/effects.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/effects.js rename to src/javarepl/console/ui/bower_components/jquery/src/effects.js diff --git a/src/javarepl/web/bower_components/jquery/src/effects/Tween.js b/src/javarepl/console/ui/bower_components/jquery/src/effects/Tween.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/effects/Tween.js rename to src/javarepl/console/ui/bower_components/jquery/src/effects/Tween.js diff --git a/src/javarepl/web/bower_components/jquery/src/effects/animatedSelector.js b/src/javarepl/console/ui/bower_components/jquery/src/effects/animatedSelector.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/effects/animatedSelector.js rename to src/javarepl/console/ui/bower_components/jquery/src/effects/animatedSelector.js diff --git a/src/javarepl/web/bower_components/jquery/src/event.js b/src/javarepl/console/ui/bower_components/jquery/src/event.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event.js rename to src/javarepl/console/ui/bower_components/jquery/src/event.js diff --git a/src/javarepl/web/bower_components/jquery/src/event/ajax.js b/src/javarepl/console/ui/bower_components/jquery/src/event/ajax.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event/ajax.js rename to src/javarepl/console/ui/bower_components/jquery/src/event/ajax.js diff --git a/src/javarepl/web/bower_components/jquery/src/event/alias.js b/src/javarepl/console/ui/bower_components/jquery/src/event/alias.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event/alias.js rename to src/javarepl/console/ui/bower_components/jquery/src/event/alias.js diff --git a/src/javarepl/web/bower_components/jquery/src/event/focusin.js b/src/javarepl/console/ui/bower_components/jquery/src/event/focusin.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event/focusin.js rename to src/javarepl/console/ui/bower_components/jquery/src/event/focusin.js diff --git a/src/javarepl/web/bower_components/jquery/src/event/support.js b/src/javarepl/console/ui/bower_components/jquery/src/event/support.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event/support.js rename to src/javarepl/console/ui/bower_components/jquery/src/event/support.js diff --git a/src/javarepl/web/bower_components/jquery/src/event/trigger.js b/src/javarepl/console/ui/bower_components/jquery/src/event/trigger.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/event/trigger.js rename to src/javarepl/console/ui/bower_components/jquery/src/event/trigger.js diff --git a/src/javarepl/web/bower_components/jquery/src/exports/amd.js b/src/javarepl/console/ui/bower_components/jquery/src/exports/amd.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/exports/amd.js rename to src/javarepl/console/ui/bower_components/jquery/src/exports/amd.js diff --git a/src/javarepl/web/bower_components/jquery/src/exports/global.js b/src/javarepl/console/ui/bower_components/jquery/src/exports/global.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/exports/global.js rename to src/javarepl/console/ui/bower_components/jquery/src/exports/global.js diff --git a/src/javarepl/web/bower_components/jquery/src/intro.js b/src/javarepl/console/ui/bower_components/jquery/src/intro.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/intro.js rename to src/javarepl/console/ui/bower_components/jquery/src/intro.js diff --git a/src/javarepl/web/bower_components/jquery/src/jquery.js b/src/javarepl/console/ui/bower_components/jquery/src/jquery.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/jquery.js rename to src/javarepl/console/ui/bower_components/jquery/src/jquery.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/_evalUrl.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/_evalUrl.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/_evalUrl.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/_evalUrl.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/buildFragment.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/buildFragment.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/buildFragment.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/buildFragment.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/getAll.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/getAll.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/getAll.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/getAll.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/setGlobalEval.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/setGlobalEval.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/setGlobalEval.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/setGlobalEval.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/support.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/support.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/support.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/support.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/var/rcheckableType.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rcheckableType.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/var/rcheckableType.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rcheckableType.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/var/rscriptType.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rscriptType.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/var/rscriptType.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rscriptType.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/var/rtagName.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rtagName.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/var/rtagName.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/var/rtagName.js diff --git a/src/javarepl/web/bower_components/jquery/src/manipulation/wrapMap.js b/src/javarepl/console/ui/bower_components/jquery/src/manipulation/wrapMap.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/manipulation/wrapMap.js rename to src/javarepl/console/ui/bower_components/jquery/src/manipulation/wrapMap.js diff --git a/src/javarepl/web/bower_components/jquery/src/offset.js b/src/javarepl/console/ui/bower_components/jquery/src/offset.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/offset.js rename to src/javarepl/console/ui/bower_components/jquery/src/offset.js diff --git a/src/javarepl/web/bower_components/jquery/src/outro.js b/src/javarepl/console/ui/bower_components/jquery/src/outro.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/outro.js rename to src/javarepl/console/ui/bower_components/jquery/src/outro.js diff --git a/src/javarepl/web/bower_components/jquery/src/queue.js b/src/javarepl/console/ui/bower_components/jquery/src/queue.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/queue.js rename to src/javarepl/console/ui/bower_components/jquery/src/queue.js diff --git a/src/javarepl/web/bower_components/jquery/src/queue/delay.js b/src/javarepl/console/ui/bower_components/jquery/src/queue/delay.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/queue/delay.js rename to src/javarepl/console/ui/bower_components/jquery/src/queue/delay.js diff --git a/src/javarepl/web/bower_components/jquery/src/selector-native.js b/src/javarepl/console/ui/bower_components/jquery/src/selector-native.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/selector-native.js rename to src/javarepl/console/ui/bower_components/jquery/src/selector-native.js diff --git a/src/javarepl/web/bower_components/jquery/src/selector-sizzle.js b/src/javarepl/console/ui/bower_components/jquery/src/selector-sizzle.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/selector-sizzle.js rename to src/javarepl/console/ui/bower_components/jquery/src/selector-sizzle.js diff --git a/src/javarepl/web/bower_components/jquery/src/selector.js b/src/javarepl/console/ui/bower_components/jquery/src/selector.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/selector.js rename to src/javarepl/console/ui/bower_components/jquery/src/selector.js diff --git a/src/javarepl/web/bower_components/jquery/src/serialize.js b/src/javarepl/console/ui/bower_components/jquery/src/serialize.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/serialize.js rename to src/javarepl/console/ui/bower_components/jquery/src/serialize.js diff --git a/src/javarepl/web/bower_components/jquery/src/traversing.js b/src/javarepl/console/ui/bower_components/jquery/src/traversing.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/traversing.js rename to src/javarepl/console/ui/bower_components/jquery/src/traversing.js diff --git a/src/javarepl/web/bower_components/jquery/src/traversing/findFilter.js b/src/javarepl/console/ui/bower_components/jquery/src/traversing/findFilter.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/traversing/findFilter.js rename to src/javarepl/console/ui/bower_components/jquery/src/traversing/findFilter.js diff --git a/src/javarepl/web/bower_components/jquery/src/traversing/var/dir.js b/src/javarepl/console/ui/bower_components/jquery/src/traversing/var/dir.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/traversing/var/dir.js rename to src/javarepl/console/ui/bower_components/jquery/src/traversing/var/dir.js diff --git a/src/javarepl/web/bower_components/jquery/src/traversing/var/rneedsContext.js b/src/javarepl/console/ui/bower_components/jquery/src/traversing/var/rneedsContext.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/traversing/var/rneedsContext.js rename to src/javarepl/console/ui/bower_components/jquery/src/traversing/var/rneedsContext.js diff --git a/src/javarepl/web/bower_components/jquery/src/traversing/var/siblings.js b/src/javarepl/console/ui/bower_components/jquery/src/traversing/var/siblings.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/traversing/var/siblings.js rename to src/javarepl/console/ui/bower_components/jquery/src/traversing/var/siblings.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/arr.js b/src/javarepl/console/ui/bower_components/jquery/src/var/arr.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/arr.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/arr.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/class2type.js b/src/javarepl/console/ui/bower_components/jquery/src/var/class2type.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/class2type.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/class2type.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/concat.js b/src/javarepl/console/ui/bower_components/jquery/src/var/concat.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/concat.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/concat.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/document.js b/src/javarepl/console/ui/bower_components/jquery/src/var/document.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/document.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/document.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/documentElement.js b/src/javarepl/console/ui/bower_components/jquery/src/var/documentElement.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/documentElement.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/documentElement.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/hasOwn.js b/src/javarepl/console/ui/bower_components/jquery/src/var/hasOwn.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/hasOwn.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/hasOwn.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/indexOf.js b/src/javarepl/console/ui/bower_components/jquery/src/var/indexOf.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/indexOf.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/indexOf.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/pnum.js b/src/javarepl/console/ui/bower_components/jquery/src/var/pnum.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/pnum.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/pnum.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/push.js b/src/javarepl/console/ui/bower_components/jquery/src/var/push.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/push.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/push.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/rcssNum.js b/src/javarepl/console/ui/bower_components/jquery/src/var/rcssNum.js similarity index 87% rename from src/javarepl/web/bower_components/jquery/src/var/rcssNum.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/rcssNum.js index 408f5e2..c50c9e7 100644 --- a/src/javarepl/web/bower_components/jquery/src/var/rcssNum.js +++ b/src/javarepl/console/ui/bower_components/jquery/src/var/rcssNum.js @@ -1,5 +1,5 @@ define( [ - "../var/pnum" + "./pnum" ], function( pnum ) { return new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); diff --git a/src/javarepl/web/bower_components/jquery/src/var/rnotwhite.js b/src/javarepl/console/ui/bower_components/jquery/src/var/rnotwhite.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/rnotwhite.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/rnotwhite.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/slice.js b/src/javarepl/console/ui/bower_components/jquery/src/var/slice.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/slice.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/slice.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/support.js b/src/javarepl/console/ui/bower_components/jquery/src/var/support.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/support.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/support.js diff --git a/src/javarepl/web/bower_components/jquery/src/var/toString.js b/src/javarepl/console/ui/bower_components/jquery/src/var/toString.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/var/toString.js rename to src/javarepl/console/ui/bower_components/jquery/src/var/toString.js diff --git a/src/javarepl/web/bower_components/jquery/src/wrap.js b/src/javarepl/console/ui/bower_components/jquery/src/wrap.js similarity index 100% rename from src/javarepl/web/bower_components/jquery/src/wrap.js rename to src/javarepl/console/ui/bower_components/jquery/src/wrap.js diff --git a/src/javarepl/web/bower_components/underscore/.bower.json b/src/javarepl/console/ui/bower_components/underscore/.bower.json similarity index 100% rename from src/javarepl/web/bower_components/underscore/.bower.json rename to src/javarepl/console/ui/bower_components/underscore/.bower.json diff --git a/src/javarepl/web/bower_components/underscore/LICENSE b/src/javarepl/console/ui/bower_components/underscore/LICENSE similarity index 100% rename from src/javarepl/web/bower_components/underscore/LICENSE rename to src/javarepl/console/ui/bower_components/underscore/LICENSE diff --git a/src/javarepl/web/bower_components/underscore/README.md b/src/javarepl/console/ui/bower_components/underscore/README.md similarity index 100% rename from src/javarepl/web/bower_components/underscore/README.md rename to src/javarepl/console/ui/bower_components/underscore/README.md diff --git a/src/javarepl/web/bower_components/underscore/bower.json b/src/javarepl/console/ui/bower_components/underscore/bower.json similarity index 100% rename from src/javarepl/web/bower_components/underscore/bower.json rename to src/javarepl/console/ui/bower_components/underscore/bower.json diff --git a/src/javarepl/web/bower_components/underscore/underscore-min.js b/src/javarepl/console/ui/bower_components/underscore/underscore-min.js similarity index 100% rename from src/javarepl/web/bower_components/underscore/underscore-min.js rename to src/javarepl/console/ui/bower_components/underscore/underscore-min.js diff --git a/src/javarepl/web/bower_components/underscore/underscore-min.map b/src/javarepl/console/ui/bower_components/underscore/underscore-min.map similarity index 100% rename from src/javarepl/web/bower_components/underscore/underscore-min.map rename to src/javarepl/console/ui/bower_components/underscore/underscore-min.map diff --git a/src/javarepl/web/bower_components/underscore/underscore.js b/src/javarepl/console/ui/bower_components/underscore/underscore.js similarity index 100% rename from src/javarepl/web/bower_components/underscore/underscore.js rename to src/javarepl/console/ui/bower_components/underscore/underscore.js diff --git a/src/javarepl/console/ui/console.html b/src/javarepl/console/ui/console.html new file mode 100644 index 0000000..623c86a --- /dev/null +++ b/src/javarepl/console/ui/console.html @@ -0,0 +1,65 @@ + + + + Java REPL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/javarepl/console/ui/favicon.ico b/src/javarepl/console/ui/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..97a397d736471650c093f3910d5b77cde5948a2d GIT binary patch literal 1150 zcmb7EJ8J?#5MCjrg;g4xl!qcHzTYWC@Df1_|9}Xl@$m7<2H?l@@!+1Ov zM0%xC5$ohf{xbjNp1fW!w%e^JV>B8mKBH7BVKSLm zHWF5=6+9k~5`$`?-q&h1;cJ?vh1u8cu3J5md!RF^R;yR{=JGBzn@y#6@(ek*b$=;`%tsiKITvqF>T>-Nm%fDMZ%~&p W9%25j5hj&N>7S09zXe-H!hQo05Ia@? literal 0 HcmV?d00001 diff --git a/src/javarepl/web/javarepl-icon.png b/src/javarepl/console/ui/javarepl-icon.png similarity index 100% rename from src/javarepl/web/javarepl-icon.png rename to src/javarepl/console/ui/javarepl-icon.png diff --git a/src/javarepl/web/term.css b/src/javarepl/console/ui/term.css similarity index 98% rename from src/javarepl/web/term.css rename to src/javarepl/console/ui/term.css index 688bebc..ad07fc4 100644 --- a/src/javarepl/web/term.css +++ b/src/javarepl/console/ui/term.css @@ -39,7 +39,7 @@ body { height: 72px; margin: 20px 10px 20px; line-height: 72px; - background: url(javarepl-icon.png) no-repeat; + background: url(/ui/javarepl-icon.png) no-repeat; padding: 0; padding-left: 75px; diff --git a/src/javarepl/web/term.js b/src/javarepl/console/ui/term.js similarity index 100% rename from src/javarepl/web/term.js rename to src/javarepl/console/ui/term.js diff --git a/src/javarepl/web/WebConsoleApplication.java b/src/javarepl/web/WebConsoleApplication.java index db376d6..c16ec4d 100644 --- a/src/javarepl/web/WebConsoleApplication.java +++ b/src/javarepl/web/WebConsoleApplication.java @@ -2,6 +2,7 @@ import com.googlecode.utterlyidle.BasePath; import com.googlecode.utterlyidle.RestApplication; +import javarepl.console.ui.ConsoleUiModule; import static com.googlecode.utterlyidle.annotations.AnnotatedBindings.annotatedClass; import static com.googlecode.utterlyidle.modules.Modules.applicationInstance; @@ -14,6 +15,7 @@ public WebConsoleApplication(BasePath basePath) { applicationInstance(new WebConsole()) ); + add(new ConsoleUiModule()); add(new WebConsoleModule()); } } diff --git a/src/javarepl/web/embed.html b/src/javarepl/web/embed.html index 1b48e88..0940c48 100644 --- a/src/javarepl/web/embed.html +++ b/src/javarepl/web/embed.html @@ -5,16 +5,16 @@ Java REPL - - - - + + + + - - + + @@ -24,10 +24,10 @@ (function (i, s, o, g, r, a, m) { i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { - (i[r].q = i[r].q || []).push(arguments) - }, i[r].l = 1 * new Date(); + (i[r].q = i[r].q || []).push(arguments) + }, i[r].l = 1 * new Date(); a = s.createElement(o), - m = s.getElementsByTagName(o)[0]; + m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) @@ -59,7 +59,7 @@ - + \ No newline at end of file diff --git a/src/javarepl/web/term.html b/src/javarepl/web/term.html index 691ea71..7bc6498 100644 --- a/src/javarepl/web/term.html +++ b/src/javarepl/web/term.html @@ -5,20 +5,20 @@ Java REPL - - - - + + + + - - + + - + +